Browse Source

Non-fatal error from ps::access_start (#14845)

pull/1/head
Tanguy Pruvot 5 years ago
committed by Scott Lahteine
parent
commit
92c35d14a4
  1. 2
      Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
  2. 2
      Marlin/src/module/configuration_store.cpp

2
Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp

@ -52,7 +52,7 @@ static char _ALIGN(4) HAL_eeprom_data[HAL_EEPROM_SIZE];
SdFile file, root = card.getroot(); SdFile file, root = card.getroot();
if (!file.open(&root, EEPROM_FILENAME, O_RDONLY)) if (!file.open(&root, EEPROM_FILENAME, O_RDONLY))
return false; return true; // false aborts the save
int bytes_read = file.read(HAL_eeprom_data, HAL_EEPROM_SIZE); int bytes_read = file.read(HAL_eeprom_data, HAL_EEPROM_SIZE);
if (bytes_read < 0) return false; if (bytes_read < 0) return false;

2
Marlin/src/module/configuration_store.cpp

@ -450,7 +450,7 @@ void MarlinSettings::postprocess() {
#define WORD_PADDED_EEPROM ENABLED(__STM32F1__, FLASH_EEPROM_EMULATION) #define WORD_PADDED_EEPROM ENABLED(__STM32F1__, FLASH_EEPROM_EMULATION)
#if WORD_PADDED_EEPROM && ENABLED(DEBUG_EEPROM_READWRITE) #if WORD_PADDED_EEPROM && ENABLED(DEBUG_EEPROM_READWRITE)
#define UPDATE_TEST_INDEX(VAR) (text_index += sizeof(VAR)) #define UPDATE_TEST_INDEX(VAR) (test_index += sizeof(VAR))
#else #else
#define UPDATE_TEST_INDEX(VAR) NOOP #define UPDATE_TEST_INDEX(VAR) NOOP
#endif #endif

Loading…
Cancel
Save