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

Wizard: dont ask if color is clear and dont use automatic filament load; multiscreen messages update

Browse Source
This commit is contained in:
PavelSindler 2017-12-20 13:33:45 +01:00
parent 38d1877016
commit a9d5af4a07
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/fsensor.cpp
View File

@ -47,6 +47,14 @@ uint16_t fsensor_autoload_y = 0;
uint8_t fsensor_autoload_c = 0; uint8_t fsensor_autoload_c = 0;
uint32_t fsensor_autoload_last_millis = 0; uint32_t fsensor_autoload_last_millis = 0;
void fsensor_block()
{
fsensor_enabled = false;
}
void fsensor_unblock() {
fsensor_enabled = (eeprom_read_byte((uint8_t*)EEPROM_FSENSOR) == 0x01);
}
bool fsensor_enable() bool fsensor_enable()
{ {

4
Firmware/fsensor.h
View File

@ -7,6 +7,10 @@
extern void fsensor_stop_and_save_print(); extern void fsensor_stop_and_save_print();
extern void fsensor_restore_print_and_continue(); extern void fsensor_restore_print_and_continue();
//temporarily enable/disable without writing to eeprom
extern void fsensor_block();
extern void fsensor_unblock();
//enable/disable //enable/disable
extern bool fsensor_enable(); extern bool fsensor_enable();
extern void fsensor_disable(); extern void fsensor_disable();

21
Firmware/ultralcd.cpp
View File

@ -110,6 +110,9 @@ int8_t FSensorStateMenu = 1;
int8_t CrashDetectMenu = 1; int8_t CrashDetectMenu = 1;
extern void fsensor_block();
extern void fsensor_unblock();
extern bool fsensor_enable(); extern bool fsensor_enable();
extern void fsensor_disable(); extern void fsensor_disable();
@ -2646,11 +2649,16 @@ void lcd_show_fullscreen_message_and_wait_P(const char *msg)
while (lcd_clicked()) ; while (lcd_clicked()) ;
delay(10); delay(10);
while (lcd_clicked()) ; while (lcd_clicked()) ;
KEEPALIVE_STATE(IN_HANDLER); if (msg_next == NULL) {
lcd_set_custom_characters(); KEEPALIVE_STATE(IN_HANDLER);
lcd_update_enable(true); lcd_set_custom_characters();
lcd_update(2); lcd_update_enable(true);
return; lcd_update(2);
return;
}
else {
break;
}
} }
} }
if (multi_screen) { if (multi_screen) {
@ -3618,15 +3626,16 @@ void lcd_wizard(int state) {
state = 7; state = 7;
break; break;
case 7: //load filament case 7: //load filament
fsensor_block();
lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_LOAD_FILAMENT); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_LOAD_FILAMENT);
lcd_update_enable(false); lcd_update_enable(false);
lcd_implementation_clear(); lcd_implementation_clear();
lcd_print_at_PGM(0, 2, MSG_LOADING_FILAMENT); lcd_print_at_PGM(0, 2, MSG_LOADING_FILAMENT);
loading_flag = true;
#ifdef SNMM #ifdef SNMM
change_extr(0); change_extr(0);
#endif #endif
gcode_M701(); gcode_M701();
fsensor_unblock();
state = 9; state = 9;
break; break;
case 8: case 8: