From e605305db4de1522c3b141c446b686e64ad7f337 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 24 Nov 2017 23:01:53 +0100 Subject: [PATCH 1/5] 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 f7acb8ac..e6a4981b 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 2/5] 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 710de49f..c5b3b7f2 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 3/5] 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 c5b3b7f2..a3d63e3d 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 4/5] 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 a3d63e3d..46dc3e2a 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 5/5] 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 46dc3e2a..3774bf62 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 - } + } } }