reduce write cycles to flash (#332)

MobiFlight · Sep 5, 2024 · 5967300 · 5967300
1 parent ddc92cf
commit 5967300
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/Config.cpp b/src/Config.cpp
@@ -201,6 +201,7 @@ void OnResetConfig()
 
 void OnSaveConfig()
 {
+    MFeeprom.commit();
     cmdMessenger.sendCmd(kConfigSaved, F("OK"));
 }
 

diff --git a/src/MF_Modules/MFEEPROM.cpp b/src/MF_Modules/MFEEPROM.cpp
@@ -12,7 +12,7 @@ MFEEPROM::MFEEPROM() {}
 
 void MFEEPROM::init(void)
 {
-#if defined(ARDUINO_ARCH_RP2040)
+#if !defined(ARDUINO_ARCH_AVR)
     EEPROM.begin(4096);
 #endif
     _eepromLength = EEPROM.length();
@@ -33,9 +33,6 @@ bool MFEEPROM::write_byte(uint16_t adr, const uint8_t data)
 {
     if (adr >= _eepromLength) return false;
     EEPROM.write(adr, data);
-#if defined(ARDUINO_ARCH_RP2040)
-    EEPROM.commit();
-#endif
     return true;
 }
 

diff --git a/src/MF_Modules/MFEEPROM.h b/src/MF_Modules/MFEEPROM.h
@@ -19,6 +19,11 @@ class MFEEPROM
     uint16_t get_length(void);
     uint8_t read_byte(uint16_t adr);
     bool write_byte(uint16_t adr, const uint8_t data);
+    void commit() {
+#if !defined(ARDUINO_ARCH_AVR)
+        EEPROM.commit();
+#endif
+    }
 
     template <typename T>
     bool read_block(uint16_t adr, T &t)
@@ -44,9 +49,6 @@ class MFEEPROM
     {
         if (adr + sizeof(T) > _eepromLength) return false;
         EEPROM.put(adr, t);
-#if defined(ARDUINO_ARCH_RP2040)
-        EEPROM.commit();
-#endif
         return true;
     }
 
@@ -57,9 +59,6 @@ class MFEEPROM
         for (uint16_t i = 0; i < len; i++) {
             EEPROM.put(adr + i, t[i]);
         }
-#if defined(ARDUINO_ARCH_RP2040)
-        EEPROM.commit();
-#endif
         return true;
     }
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,6 +201,7 @@ void OnResetConfig() @@
     void OnSaveConfig()
     {
+        MFeeprom.commit();
         cmdMessenger.sendCmd(kConfigSaved, F("OK"));
     }
@@ Expand Down @@