josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init

This commit is contained in:
PavelSindler 2018-09-10 20:08:13 +02:00
parent bad112c8e1
commit 6fa798aa83
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Firmware/mmu.cpp
View File

@ -113,8 +113,10 @@ void mmu_loop(void)
case -1: case -1:
if (mmu_rx_start() > 0) if (mmu_rx_start() > 0)
{ {
#ifdef MMU_DEBUG
puts_P(PSTR("MMU => 'start'")); puts_P(PSTR("MMU => 'start'"));
puts_P(PSTR("MMU <= 'S1'")); puts_P(PSTR("MMU <= 'S1'"));
#endif //MMU_DEBUG
mmu_puts_P(PSTR("S1\n")); //send 'read version' request mmu_puts_P(PSTR("S1\n")); //send 'read version' request
mmu_state = -2; mmu_state = -2;
} }
@ -128,9 +130,11 @@ void mmu_loop(void)
if (mmu_rx_ok() > 0) if (mmu_rx_ok() > 0)
{ {
fscanf_P(uart2io, PSTR("%u"), &mmu_version); //scan version from buffer fscanf_P(uart2io, PSTR("%u"), &mmu_version); //scan version from buffer
#ifdef MMU_DEBUG
printf_P(PSTR("MMU => '%dok'\n"), mmu_version); printf_P(PSTR("MMU => '%dok'\n"), mmu_version);
puts_P(PSTR("MMU <= 'S2'")); puts_P(PSTR("MMU <= 'S2'"));
mmu_puts_P(PSTR("S2\n")); //send 'read buildnr' request #endif //MMU_DEBUG
mmu_puts_P(PSTR("S2\n")); //send 'read buildnr' request
mmu_state = -3; mmu_state = -3;
} }
return; return;
@ -138,11 +142,15 @@ void mmu_loop(void)
if (mmu_rx_ok() > 0) if (mmu_rx_ok() > 0)
{ {
fscanf_P(uart2io, PSTR("%u"), &mmu_buildnr); //scan buildnr from buffer fscanf_P(uart2io, PSTR("%u"), &mmu_buildnr); //scan buildnr from buffer
#ifdef MMU_DEBUG
printf_P(PSTR("MMU => '%dok'\n"), mmu_buildnr); printf_P(PSTR("MMU => '%dok'\n"), mmu_buildnr);
#endif //MMU_DEBUG
bool version_valid = mmu_check_version(); bool version_valid = mmu_check_version();
if (!version_valid) mmu_show_warning(); if (!version_valid) mmu_show_warning();
else puts_P(PSTR("MMU version valid")); else puts_P(PSTR("MMU version valid"));
#ifdef MMU_DEBUG
puts_P(PSTR("MMU <= 'P0'")); puts_P(PSTR("MMU <= 'P0'"));
#endif //MMU_DEBUG
mmu_puts_P(PSTR("P0\n")); //send 'read finda' request mmu_puts_P(PSTR("P0\n")); //send 'read finda' request
mmu_state = -4; mmu_state = -4;
} }
@ -151,7 +159,9 @@ void mmu_loop(void)
if (mmu_rx_ok() > 0) if (mmu_rx_ok() > 0)
{ {
fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer
#ifdef MMU_DEBUG
printf_P(PSTR("MMU => '%dok'\n"), mmu_finda); printf_P(PSTR("MMU => '%dok'\n"), mmu_finda);
#endif //MMU_DEBUG
puts_P(PSTR("MMU - ENABLED")); puts_P(PSTR("MMU - ENABLED"));
mmu_enabled = true; mmu_enabled = true;
mmu_state = 1; mmu_state = 1;
@ -203,7 +213,9 @@ void mmu_loop(void)
} }
else if ((mmu_last_response + 300) < millis()) //request every 300ms else if ((mmu_last_response + 300) < millis()) //request every 300ms
{ {
#ifdef MMU_DEBUG
puts_P(PSTR("MMU <= 'P0'")); puts_P(PSTR("MMU <= 'P0'"));
#endif //MMU_DEBUG
mmu_puts_P(PSTR("P0\n")); //send 'read finda' request mmu_puts_P(PSTR("P0\n")); //send 'read finda' request
mmu_state = 2; mmu_state = 2;
} }

14
Firmware/ultralcd.cpp
View File

@ -530,7 +530,7 @@ void lcdui_print_extruder(void)
{ {
int chars = 0; int chars = 0;
if (mmu_extruder == tmp_extruder) if (mmu_extruder == tmp_extruder)
chars = lcd_printf_P(_N(" T%u"), mmu_extruder+1); chars = lcd_printf_P(_N(" F%u"), mmu_extruder+1);
else else
chars = lcd_printf_P(_N(" %u>%u"), mmu_extruder+1, tmp_extruder+1); chars = lcd_printf_P(_N(" %u>%u"), mmu_extruder+1, tmp_extruder+1);
lcd_space(5 - chars); lcd_space(5 - chars);
@ -4361,8 +4361,10 @@ void lcd_wizard(int state) {
int wizard_event; int wizard_event;
const char *msg = NULL; const char *msg = NULL;
while (!end) { while (!end) {
printf_P(PSTR("Wizard state: %d"), state);
switch (state) { switch (state) {
case 0: // run wizard? case 0: // run wizard?
wizard_active = true;
wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7 wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7
if (wizard_event) { if (wizard_event) {
state = 1; state = 1;
@ -4408,7 +4410,6 @@ void lcd_wizard(int state) {
break; break;
case 5: //is filament loaded? case 5: //is filament loaded?
//start to preheat nozzle and bed to save some time later //start to preheat nozzle and bed to save some time later
lcd_commands_type = LCD_COMMAND_V2_CAL;
setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0); setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0);
setTargetBed(PLA_PREHEAT_HPB_TEMP); setTargetBed(PLA_PREHEAT_HPB_TEMP);
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2
@ -4446,7 +4447,7 @@ void lcd_wizard(int state) {
#ifdef SNMM #ifdef SNMM
change_extr(0); change_extr(0);
#endif #endif
loading_flag = true; loading_flag = true;
gcode_M701(); gcode_M701();
state = 9; state = 9;
break; break;
@ -4480,7 +4481,7 @@ void lcd_wizard(int state) {
} }
} }
printf_P(_N("State: %d\n"), state); printf_P(_N("Wizard end state: %d\n"), state);
switch (state) { //final message switch (state) { //final message
case 0: //user dont want to use wizard case 0: //user dont want to use wizard
msg = _T(MSG_WIZARD_QUIT); msg = _T(MSG_WIZARD_QUIT);
@ -4514,7 +4515,10 @@ void lcd_wizard(int state) {
break; break;
} }
if (state != 9) lcd_show_fullscreen_message_and_wait_P(msg); if (state != 9) {
lcd_show_fullscreen_message_and_wait_P(msg);
wizard_active = false;
}
lcd_update_enable(true); lcd_update_enable(true);
lcd_return_to_status(); lcd_return_to_status();
lcd_update(2); lcd_update(2);