replace ECVF_AMMETER_CAL with ECVF_MENNEKES_MANUAL

lincomatic · Dec 2, 2021 · 5dde798 · 5dde798
1 parent 45a004e
commit 5dde798
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/firmware/open_evse/J1772EvseController.cpp b/firmware/open_evse/J1772EvseController.cpp
@@ -1787,7 +1787,11 @@ if (TempChkEnabled()) {
   ReadVoltmeter();
 #endif // VOLTMETER
 #ifdef AMMETER
-  if (((m_EvseState == EVSE_STATE_C) && (m_CurrentScaleFactor > 0)) || AmmeterCalEnabled()) {
+  if (((m_EvseState == EVSE_STATE_C) && (m_CurrentScaleFactor > 0))
+#ifdef ECVF_AMMETER_CAL  
+      || AmmeterCalEnabled()
+#endif
+      ) {
 
 #ifndef FAKE_CHARGING_CURRENT
     readAmmeter();

diff --git a/firmware/open_evse/J1772EvseController.h b/firmware/open_evse/J1772EvseController.h
@@ -103,7 +103,7 @@ typedef uint8_t (*EvseStateTransitionReqFunc)(uint8_t prevPilotState,uint8_t cur
 #define ECVF_TIMER_ON           0x1000 // delay timer enabled
 #define ECVF_CHARGE_LIMIT       0x2000
 // reserved #define ECVF_BOOT_LOCK          0x4000 // locked at boot
-#define ECVF_AMMETER_CAL        0x8000
+#define ECVF_MENNEKES_MANUAL    0x8000 // Mennekes lock manual mode
 #if defined(AUTH_LOCK) && (AUTH_LOCK != 0)
 #define ECVF_DEFAULT            ECVF_AUTH_LOCKED|ECVF_SESSION_ENDED
 #else
@@ -470,13 +470,15 @@ int GetHearbeatTrigger();
     m_CurrentScaleFactor = scale;
     eeprom_write_word((uint16_t*)EOFS_CURRENT_SCALE_FACTOR,scale);
   }
+#ifdef ECVF_AMMETER_CAL
   uint8_t AmmeterCalEnabled() { 
     return vFlagIsSet(ECVF_AMMETER_CAL);
   }
   void EnableAmmeterCal(uint8_t tf) {
     if (tf) setVFlags(ECVF_AMMETER_CAL);
     else clrVFlags(ECVF_AMMETER_CAL);
   }
+#endif // ECVF_AMMETER_CAL
   void ZeroChargingCurrent() { m_ChargingCurrent = 0; }
   uint8_t GetInstantaneousChargingAmps() {
     readAmmeter();

diff --git a/firmware/open_evse/open_evse.ino b/firmware/open_evse/open_evse.ino
@@ -834,7 +834,11 @@ void OnboardDisplay::Update(int8_t updmode)
 
 #ifdef LCD16X2
 #if defined(AMMETER)
-    if (((curstate == EVSE_STATE_C) || g_EvseController.AmmeterCalEnabled()) && AmmeterIsDirty()) {
+    if (((curstate == EVSE_STATE_C)
+#ifdef ECVF_AMMETER_CAL
+         || g_EvseController.AmmeterCalEnabled()
+#endif 
+         ) && AmmeterIsDirty()) {
       SetAmmeterDirty(0);
 
       uint32_t current = g_EvseController.GetChargingCurrent();

diff --git a/firmware/open_evse/rapi_proc.cpp b/firmware/open_evse/rapi_proc.cpp
@@ -393,14 +393,14 @@ int EvseRapiProcessor::processCmd()
       }
       break;
 #endif // RTC      
-#ifdef AMMETER
+#if defined(AMMETER) && defined(ECVF_AMMETER_CAL)
     case '2': // ammeter calibration mode
       if (tokenCnt == 2) {
 	g_EvseController.EnableAmmeterCal((*tokens[1] == '1') ? 1 : 0);
 	rc = 0;
       }
       break;
-#endif // AMMETER
+#endif // AMMETER && ECVF_AMMETER_CAL
 #ifdef TIME_LIMIT
     case '3': // set time limit
       if (tokenCnt == 2) {