Merge pull request #57 from klcjr89/master

Fix EEPROM saving issue when issuing a RESET command via a serial ter…
pyr0ball · Oct 30, 2019 · 61d7bd6 · 61d7bd6
2 parents 5e69da1 + 0e7862c
commit 61d7bd6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.cpp b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.cpp
@@ -12,6 +12,9 @@ long voltMeterConstant = VM_CONST_DEFAULT;
 uint8_t pP_i2c_address = 0xa0;
 
 void resetEEPROM() {
+
+	resetConfig();
+
     EEPROM.put(GAIN_FACTOR_ADDRESS, GAIN_FACTOR);
     EEPROM.put(FOLLOWER_THRESHOLD_ADDRESS, followerThrs);
     EEPROM.put(COMP_THRESHOLD_ADDRESS, compThrs);
@@ -24,56 +27,62 @@ void resetEEPROM() {
 // Restore config from EEPROM, otherwise reset config and write to EEPROM
 void restoreConfig() {
     int temp;
+
+	bool reset = false;
 
     EEPROM.get(GAIN_FACTOR_ADDRESS, temp);
     if (temp < 0 || temp > 4) {
-        resetEEPROM();
+		reset = true;
     } else {
         GAIN_FACTOR = temp;
     }
 
     EEPROM.get(FOLLOWER_THRESHOLD_ADDRESS, temp);
     if (temp < 0 || temp > 5000) {
-        resetEEPROM();
+        reset = true;
     } else {
         followerThrs = temp;
     }
 
     EEPROM.get(COMP_THRESHOLD_ADDRESS, temp);
     if (temp < 0 || temp > 5000) {
-        resetEEPROM();
+        reset = true;
     } else {
         compThrs = temp;
     }
 
     EEPROM.get(LOOP_DUR_ADDRESS, temp);
     if (temp < 0 && temp > 1000) {
-        resetEEPROM();
+        reset = true;
     } else {
         LOOP_DUR = temp;
     }
 
     EEPROM.get(TRG_DUR_ADDRESS, temp);
     if (temp < 0 || temp > 1000) {
-        resetEEPROM();
+        reset = true;
     } else {
         TRG_DUR = temp;
     }
 
     EEPROM.get(HYST_ADDRESS, temp);
     if (temp < 0 || temp > 1000) {
-        resetEEPROM();
+        reset = true;
     } else {
         Hyst = temp;
     }
 
     long longTemp;
     EEPROM.get(VM_CONST_ADDRESS, longTemp);
     if (longTemp < 1000000L || longTemp > 1200000L) {
-        resetEEPROM();
+        reset = true;
     } else {
         voltMeterConstant = longTemp;
     }
+
+	if (reset) {
+		resetEEPROM();
+	}
 }
 
 void resetConfig() {

diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_config.h
@@ -61,6 +61,7 @@
 #endif
 
 void resetEEPROM();
+void resetConfig();
 void restoreConfig();
 
-#endif
+#endif