From e605305db4de1522c3b141c446b686e64ad7f337 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 24 Nov 2017 23:01:53 +0100 Subject: [PATCH 01/10] build number changed --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index f7acb8acd..e6a4981b8 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.0.12-RC2" -#define FW_build 111 +#define FW_build 112 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build) From 4297a98fdd13d88a5cc7748440b7a37520301a6d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 19:10:38 +0100 Subject: [PATCH 02/10] debuging messages --- Firmware/ultralcd_implementation_hitachi_HD44780.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index 710de49ff..c5b3b7f20 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -1205,14 +1205,18 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* lcd.setCursor(0, row); lcd.print('>'); - + int counter = 0; int i = 1; int j = 0; char* longFilenameTMP = longFilename; + MYSERIAL.println(""); + MYSERIAL.println(""); + MYSERIAL.println("================================Start: "); while((c = *longFilenameTMP) != '\0') { - + MYSERIAL.print("Counter: "); + MYSERIAL.println(counter++); lcd.setCursor(i, row); lcd.print(c); i++; @@ -1223,11 +1227,15 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* longFilenameTMP = longFilename + j; n = LCD_WIDTH - 1; for(int g = 0; g<300 ;g++){ + MYSERIAL.print("G: "); + MYSERIAL.println(g); + if (!SdFatUtil::test_stack_integrity()) stack_error(); if(LCD_CLICKED || ( enc_dif != encoderDiff )){ longFilenameTMP = longFilename; *(longFilenameTMP + LCD_WIDTH - 2) = '\0'; i = 1; j = 0; + MYSERIAL.println("Here"); break; }else{ if (j == 1) delay(3); //wait around 1.2 s to start scrolling text From d8bf1489965dd6b2da1de7caf1583130e7f2ba11 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 20:51:56 +0100 Subject: [PATCH 03/10] manage heater added --- Firmware/ultralcd_implementation_hitachi_HD44780.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index c5b3b7f20..a3d63e3d3 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -1227,9 +1227,9 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* longFilenameTMP = longFilename + j; n = LCD_WIDTH - 1; for(int g = 0; g<300 ;g++){ + manage_heater(); MYSERIAL.print("G: "); MYSERIAL.println(g); - if (!SdFatUtil::test_stack_integrity()) stack_error(); if(LCD_CLICKED || ( enc_dif != encoderDiff )){ longFilenameTMP = longFilename; *(longFilenameTMP + LCD_WIDTH - 2) = '\0'; @@ -1240,7 +1240,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* }else{ if (j == 1) delay(3); //wait around 1.2 s to start scrolling text delay(1); //then scroll with redrawing every 300 ms - } + } } } From 626818f87de7bf80f29a2623d76223c4eae91784 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 20:53:09 +0100 Subject: [PATCH 04/10] removed debug messages --- Firmware/ultralcd_implementation_hitachi_HD44780.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index a3d63e3d3..46dc3e2ae 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -1205,13 +1205,9 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* lcd.setCursor(0, row); lcd.print('>'); - int counter = 0; - int i = 1; + int i = 1; int j = 0; char* longFilenameTMP = longFilename; - MYSERIAL.println(""); - MYSERIAL.println(""); - MYSERIAL.println("================================Start: "); while((c = *longFilenameTMP) != '\0') { @@ -1228,14 +1224,11 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* n = LCD_WIDTH - 1; for(int g = 0; g<300 ;g++){ manage_heater(); - MYSERIAL.print("G: "); - MYSERIAL.println(g); if(LCD_CLICKED || ( enc_dif != encoderDiff )){ longFilenameTMP = longFilename; *(longFilenameTMP + LCD_WIDTH - 2) = '\0'; i = 1; j = 0; - MYSERIAL.println("Here"); break; }else{ if (j == 1) delay(3); //wait around 1.2 s to start scrolling text From a61964666e91236fa3847bdbd9dfa6b76c481000 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 20:57:28 +0100 Subject: [PATCH 05/10] whitespace and minor corrections --- Firmware/ultralcd_implementation_hitachi_HD44780.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index 46dc3e2ae..3774bf624 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -1205,14 +1205,12 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* lcd.setCursor(0, row); lcd.print('>'); - int i = 1; + int i = 1; int j = 0; char* longFilenameTMP = longFilename; while((c = *longFilenameTMP) != '\0') { - MYSERIAL.print("Counter: "); - MYSERIAL.println(counter++); lcd.setCursor(i, row); lcd.print(c); i++; @@ -1233,7 +1231,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* }else{ if (j == 1) delay(3); //wait around 1.2 s to start scrolling text delay(1); //then scroll with redrawing every 300 ms - } + } } } From 4c7cc5520e83f6ae1b2ef31ee939ab8db51be339 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 26 Nov 2017 21:26:36 +0100 Subject: [PATCH 06/10] "confirm nozzle clean" message re-added --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1cd9a6bfd..d298b828e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1919,6 +1919,7 @@ bool gcode_M45(bool onlyZ) { KEEPALIVE_STATE(PAUSED_FOR_USER); bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false); if(result) lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET); + lcd_show_fullscreen_message_and_wait_P(MSG_CONFIRM_NOZZLE_CLEAN); lcd_show_fullscreen_message_and_wait_P(MSG_PAPER); KEEPALIVE_STATE(IN_HANDLER); lcd_display_message_fullscreen_P(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1); From 7de187d8134857dd44ea897f48ba73a346f1b18a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 00:17:45 +0100 Subject: [PATCH 07/10] if user dont confirm live adjust Z by pressing the knob, save last live adjust value to eeprom --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d298b828e..0c6c3ba5e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1089,7 +1089,7 @@ void setup() #ifndef DEBUG_DISABLE_STARTMSGS if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { - lcd_wizard(0); + lcd_wizard(0); } else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bed0da31b..01cb739c1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1121,6 +1121,7 @@ void lcd_commands() lcd_setstatuspgm(WELCOME_MSG); lcd_commands_step = 0; lcd_commands_type = 0; + menuExiting = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by going to status screen if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(10); } @@ -3564,7 +3565,9 @@ void lcd_wizard(int state) { case 10: //repeat first layer cal.? wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(MSG_WIZARD_REPEAT_V2_CAL, false); if (wizard_event) { + //reset status and live adjust z value in eeprom calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); + EEPROM_save_B(EEPROM_BABYSTEP_Z, 0); lcd_show_fullscreen_message_and_wait_P(MSG_WIZARD_CLEAN_HEATBED); state = 9; } From a7b40d43e33f98df7cce8e9167c8661c039726a9 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 01:23:11 +0100 Subject: [PATCH 08/10] timeouting to status in the end of first layer cal. --- Firmware/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 01cb739c1..ab7e5f9ab 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -36,6 +36,7 @@ extern bool fans_check_enabled = true; typedef void (*menuFunc_t)(); static void lcd_sd_updir(); +static void lcd_return_to_status(); struct EditMenuParentState { @@ -1114,14 +1115,14 @@ void lcd_commands() enquecommand_P(PSTR("G1 Z10 F1300.000")); enquecommand_P(PSTR("G1 X10 Y180 F4000")); //home X axis enquecommand_P(PSTR("M84"));// disable motors + lcd_timeoutToStatus = millis() - 1; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen lcd_commands_step = 1; } if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty()) { lcd_setstatuspgm(WELCOME_MSG); lcd_commands_step = 0; - lcd_commands_type = 0; - menuExiting = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by going to status screen + lcd_commands_type = 0; if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(10); } From 24195557ea466ebf398035c52a914c35fc0a485b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 01:24:58 +0100 Subject: [PATCH 09/10] removed redundant line --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ab7e5f9ab..d491381c5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -36,7 +36,6 @@ extern bool fans_check_enabled = true; typedef void (*menuFunc_t)(); static void lcd_sd_updir(); -static void lcd_return_to_status(); struct EditMenuParentState { From a40c759ee7c0fbacec66624447ed3e6eae2b7ad8 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 02:03:42 +0100 Subject: [PATCH 10/10] First run: show calibration status messages in case that user refused to use wizard --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0c6c3ba5e..74fb22e15 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1091,7 +1091,7 @@ void setup() if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { lcd_wizard(0); } - else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 0) { //dont show calibration status messages if wizard is currently active if (calibration_status() == CALIBRATION_STATUS_ASSEMBLED || calibration_status() == CALIBRATION_STATUS_UNKNOWN) { // Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled.