From 92c35d14a47a7b333690989f7b749d6385185bd7 Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tpruvot@users.noreply.github.com>
Date: Wed, 7 Aug 2019 07:43:00 +0200
Subject: [PATCH] Non-fatal error from ps::access_start (#14845)
---
Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp | 2 +-
Marlin/src/module/configuration_store.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp b/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
index 61391fda2b..ea7b46f4dd 100644
--- a/Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
+++ b/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();
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);
if (bytes_read < 0) return false;
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 70ae30bec4..da3a52035d 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -450,7 +450,7 @@ void MarlinSettings::postprocess() {
#define WORD_PADDED_EEPROM ENABLED(__STM32F1__, FLASH_EEPROM_EMULATION)
#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
#define UPDATE_TEST_INDEX(VAR) NOOP
#endif
--
GitLab