浏览代码

removed 4 bytes from maiden eeprom check as these could be set earlier to 0 by lcd_status_screen function

PavelSindler 7 年之前
父节点
当前提交
31add2e69f
共有 3 个文件被更改,包括 3 次插入4 次删除
  1. 1 2
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/cardreader.cpp
  3. 1 1
      Firmware/ultralcd.cpp

+ 1 - 2
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

+ 1 - 1
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)

+ 1 - 1
Firmware/ultralcd.cpp

@@ -373,7 +373,7 @@ void set_language_from_EEPROM() {
 
 static void lcd_status_screen()
 {
-	
+
   if (firstrun == 1) 
   {
     firstrun = 0;