Merge pull request #103 from PavelSindler/print_menu_fix

Print menu fix
This commit is contained in:
PavelSindler 2017-11-26 20:58:32 +01:00 committed by GitHub
commit 856d8c1be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -9,7 +9,7 @@
// Firmware version // Firmware version
#define FW_version "3.0.12-RC2" #define FW_version "3.0.12-RC2"
#define FW_build 111 #define FW_build 112
//#define FW_build --BUILD-NUMBER-- //#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) #define FW_version_build FW_version " b" STR(FW_build)

View File

@ -1205,14 +1205,12 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char*
lcd.setCursor(0, row); lcd.setCursor(0, row);
lcd.print('>'); lcd.print('>');
int i = 1; int i = 1;
int j = 0; int j = 0;
char* longFilenameTMP = longFilename; char* longFilenameTMP = longFilename;
while((c = *longFilenameTMP) != '\0') while((c = *longFilenameTMP) != '\0')
{ {
lcd.setCursor(i, row); lcd.setCursor(i, row);
lcd.print(c); lcd.print(c);
i++; i++;
@ -1223,6 +1221,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char*
longFilenameTMP = longFilename + j; longFilenameTMP = longFilename + j;
n = LCD_WIDTH - 1; n = LCD_WIDTH - 1;
for(int g = 0; g<300 ;g++){ for(int g = 0; g<300 ;g++){
manage_heater();
if(LCD_CLICKED || ( enc_dif != encoderDiff )){ if(LCD_CLICKED || ( enc_dif != encoderDiff )){
longFilenameTMP = longFilename; longFilenameTMP = longFilename;
*(longFilenameTMP + LCD_WIDTH - 2) = '\0'; *(longFilenameTMP + LCD_WIDTH - 2) = '\0';