|
@@ -3253,9 +3253,6 @@ void lcd_show_fullscreen_message_and_wait_P(const char *msg)
|
|
for (uint8_t i = 0; i < 100; ++ i) {
|
|
for (uint8_t i = 0; i < 100; ++ i) {
|
|
delay_keep_alive(50);
|
|
delay_keep_alive(50);
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked()) ;
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked()) ;
|
|
|
|
if (msg_next == NULL) {
|
|
if (msg_next == NULL) {
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
lcd_set_custom_characters();
|
|
lcd_set_custom_characters();
|
|
@@ -3289,9 +3286,6 @@ void lcd_wait_for_click()
|
|
manage_heater();
|
|
manage_heater();
|
|
manage_inactivity(true);
|
|
manage_inactivity(true);
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked()) ;
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked()) ;
|
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -3338,9 +3332,6 @@ int8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allo
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
if (msg_next == NULL) {
|
|
if (msg_next == NULL) {
|
|
//KEEPALIVE_STATE(IN_HANDLER);
|
|
//KEEPALIVE_STATE(IN_HANDLER);
|
|
lcd_set_custom_characters();
|
|
lcd_set_custom_characters();
|
|
@@ -3415,9 +3406,6 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow
|
|
enc_dif = lcd_encoder_diff;
|
|
enc_dif = lcd_encoder_diff;
|
|
}
|
|
}
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
return yes;
|
|
return yes;
|
|
}
|
|
}
|
|
@@ -3534,9 +3522,6 @@ void lcd_diag_show_end_stops()
|
|
manage_inactivity(true);
|
|
manage_inactivity(true);
|
|
lcd_show_end_stops();
|
|
lcd_show_end_stops();
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked()) ;
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked()) ;
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -4299,9 +4284,6 @@ void lcd_v2_calibration()
|
|
for (int i = 0; i < 20; i++) { //wait max. 2s
|
|
for (int i = 0; i < 20; i++) { //wait max. 2s
|
|
delay_keep_alive(100);
|
|
delay_keep_alive(100);
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -4901,9 +4883,6 @@ void bowden_menu() {
|
|
}
|
|
}
|
|
|
|
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
|
|
|
|
lcd_clear();
|
|
lcd_clear();
|
|
while (1) {
|
|
while (1) {
|
|
@@ -4935,9 +4914,6 @@ void bowden_menu() {
|
|
}
|
|
}
|
|
delay(100);
|
|
delay(100);
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
EEPROM_save_B(EEPROM_BOWDEN_LENGTH + cursor_pos * 2, &bowden_length[cursor_pos]);
|
|
EEPROM_save_B(EEPROM_BOWDEN_LENGTH + cursor_pos * 2, &bowden_length[cursor_pos]);
|
|
if (lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Continue with another bowden?"))) {
|
|
if (lcd_show_fullscreen_message_yes_no_and_wait_P(PSTR("Continue with another bowden?"))) {
|
|
lcd_update_enable(true);
|
|
lcd_update_enable(true);
|
|
@@ -4998,9 +4974,6 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
return(cursor_pos - 1);
|
|
return(cursor_pos - 1);
|
|
}
|
|
}
|
|
@@ -5187,9 +5160,6 @@ char reset_menu() {
|
|
}
|
|
}
|
|
|
|
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
return(cursor_pos + first);
|
|
return(cursor_pos + first);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5446,9 +5416,6 @@ unsigned char lcd_choose_color() {
|
|
}
|
|
}
|
|
|
|
|
|
if (lcd_clicked()) {
|
|
if (lcd_clicked()) {
|
|
- while (lcd_clicked());
|
|
|
|
- delay(10);
|
|
|
|
- while (lcd_clicked());
|
|
|
|
switch(cursor_pos + first - 1) {
|
|
switch(cursor_pos + first - 1) {
|
|
case 0: return 1; break;
|
|
case 0: return 1; break;
|
|
case 1: return 0; break;
|
|
case 1: return 0; break;
|