Merge commit 'ca6d95f0bcc5d0bb8b739e7936d32795bcc07836'

OpenEVSE · Feb 8, 2023 · 37753a3 · 37753a3
2 parents 823162f + ca6d95f
commit 37753a3
Show file tree

Hide file tree

Showing 7 changed files with 2,010 additions and 27 deletions.
diff --git a/firmware/open_evse/CHANGELOG b/firmware/open_evse/CHANGELOG
@@ -1,5 +1,8 @@
 Change Log
 
+20220408 V8.2.1 SCL
+- fix bug: SaveSettings() should save GetMaxCurrentCapacity() instead of GetCurrentCapacity(), in case called during throttling
+
 20220124 V8.2.0 SCL
 - don't convert 0x01 in $FP strings to <SPC>, because it filters out STOP icon
   -> just send 0x11 as space instead. prints as <SPC> on HD44780

diff --git a/firmware/open_evse/J1772EvseController.cpp b/firmware/open_evse/J1772EvseController.cpp
@@ -169,7 +169,7 @@ void J1772EVSEController::SaveSettings()
   else {
     dest = (uint8_t *)EOFS_CURRENT_CAPACITY_L2;
   }
-  eeprom_write_byte(dest, GetCurrentCapacity());
+  eeprom_write_byte(dest, GetMaxCurrentCapacity());
   SaveEvseFlags();
 }
 

diff --git a/firmware/open_evse/main.cpp b/firmware/open_evse/main.cpp
@@ -263,25 +263,6 @@ void wdt_init(void)
 
 
 #ifdef TEMPERATURE_MONITORING
-#ifdef TEMPERATURE_MONITORING_NY
-void TempMonitor::LoadThresh()
-{
-  m_ambient_thresh = eeprom_read_word((uint16_t *)EOFS_THRESH_AMBIENT);
-  if (m_ambient_thresh == 0xffff) {
-    m_ambient_thresh = TEMPERATURE_AMBIENT_THROTTLE_DOWN;
-  }
-  m_ir_thresh = eeprom_read_word((uint16_t *)EOFS_THRESH_IR);
-  if (m_ir_thresh == 0xffff) {
-    m_ir_thresh = TEMPERATURE_INFRARED_THROTTLE_DOWN;
-  }
-}
-
-void TempMonitor::SaveThresh()
-{
-  eeprom_write_word((uint16_t *)EOFS_THRESH_AMBIENT,m_ambient_thresh);
-  eeprom_write_word((uint16_t *)EOFS_THRESH_IR,m_ir_thresh);
-}
-#endif // TEMPERATURE_MONITORING_NY
 
 void TempMonitor::Init()
 {

diff --git a/firmware/open_evse/open_evse.h b/firmware/open_evse/open_evse.h
@@ -41,7 +41,7 @@
 #define clrBits(flags,bits) (flags &= ~(bits))
 
 #ifndef VERSION
-#define VERSION "D8.2.0"
+#define VERSION "8.2.1"
 #endif // !VERSION
 
 #include "Language_default.h"   //Default language should always be included as bottom layer
@@ -969,11 +969,6 @@ class TempMonitor {
 #ifdef TMP007_IS_ON_I2C
   Adafruit_TMP007 m_tmp007;
 #endif  //TMP007_IS_ON_I2C
-#ifdef TEMPERATURE_MONITORING_NY
-  int16_t m_ambient_thresh;
-  int16_t m_ir_thresh;
-  int16_t m_TMP007_thresh;
-#endif //TEMPERATURE_MONITORING_NY
   // these three temperatures need to be signed integers
   int16_t m_MCP9808_temperature;  // 230 means 23.0C  Using an integer to save on floating point library use
   int16_t m_DS3231_temperature;   // the DS3231 RTC has a built in temperature sensor