From 31add2e69ff1ab6f4ec0976555075b2ee69cf0e3 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 18 Dec 2017 19:15:36 +0100 Subject: [PATCH 1/2] removed 4 bytes from maiden eeprom check as these could be set earlier to 0 by lcd_status_screen function --- Firmware/Marlin_main.cpp | 3 +-- Firmware/cardreader.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 365ea052..3d8b2226 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1064,8 +1064,7 @@ void setup() card.ToshibaFlashAir_enable(eeprom_read_byte((unsigned char*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY) == 1); if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && - eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff && - eeprom_read_dword((uint32_t*)(EEPROM_TOP - 12)) == 0x0ffffffff) { + eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff) { // Maiden startup. The firmware has been loaded and first started on a virgin RAMBo board, // where all the EEPROM entries are set to 0x0ff. // Once a firmware boots up, it forces at least a language selection, which changes diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 4732d0a1..be8e5b7c 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -921,7 +921,7 @@ void CardReader::presort() { } } if (!didSwap) break; - } //end of bubble sort loop + } //end of bubble sort loop #endif // Using RAM but not keeping names around #if (SDSORT_USES_RAM && !SDSORT_CACHE_NAMES) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f75154b9..43f25cc6 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -373,7 +373,7 @@ void set_language_from_EEPROM() { static void lcd_status_screen() { - + if (firstrun == 1) { firstrun = 0; From 525d022841f540db48881feef855c6eab6de961a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 18 Dec 2017 19:17:39 +0100 Subject: [PATCH 2/2] whitespace --- Firmware/cardreader.cpp | 2 +- Firmware/ultralcd.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index be8e5b7c..4732d0a1 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -921,7 +921,7 @@ void CardReader::presort() { } } if (!didSwap) break; - } //end of bubble sort loop + } //end of bubble sort loop #endif // Using RAM but not keeping names around #if (SDSORT_USES_RAM && !SDSORT_CACHE_NAMES) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 43f25cc6..598cbb23 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -373,7 +373,6 @@ void set_language_from_EEPROM() { static void lcd_status_screen() { - if (firstrun == 1) { firstrun = 0;