Refactor CHADEMO-BATTERY to remove SimpleISA

Software/src/battery/CHADEMO-BATTERY.cpp

@@ -4,10 +4,8 @@
 #include "../devboard/utils/events.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/CAN_config.h"
 #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h"
-#ifdef ISA_SHUNT
-#include "../lib/smaresca-SimpleISA/SimpleISA.h"
-#endif
 #include "CHADEMO-BATTERY-INTERNAL.h"
+#include "CHADEMO-SHUNTS.h"
 #include "CHADEMO-BATTERY.h"
 
 /* CHADEMO handling runs at 6.25 times the rate of most other code, so, rather than the
@@ -41,10 +39,6 @@ uint8_t framecount = 0;
 
 uint8_t max_discharge_current = 0;  //TODO not sure on this one, but really influenced by inverter capability
 
-#ifdef ISA_SHUNT
-extern ISA sensor;
-#endif
-
 bool high_current_control_enabled = false;  // set to true when high current control is operating
                                             //  if true, values from 110.1 and 110.2 should be used instead of 102.3
                                             //  and 118 should be used for evse responses
@@ -133,7 +127,7 @@ void update_values_battery() {
   datalayer.battery.status.max_discharge_power_W =
       (x200_discharge_limits.MaximumDischargeCurrent * x100_chg_lim.MaximumBatteryVoltage);  //In Watts, Convert A to P
 
-  datalayer.battery.status.voltage_dV = sensor.Voltage * 10;
+  datalayer.battery.status.voltage_dV = get_measured_voltage() * 10;
 
   datalayer.battery.info.total_capacity_Wh =
       ((x101_chg_est.RatedBatteryCapacity / 0.11) *
@@ -339,14 +333,12 @@ inline void process_vehicle_charging_limits(CAN_frame_t rx_frame) {
   */
 #endif
 
-#ifdef ISA_SHUNT
+  if (get_measured_voltage() <= x200_discharge_limits.MinimumDischargeVoltage && CHADEMO_Status > CHADEMO_NEGOTIATE) {
-  if (sensor.Voltage <= x200_discharge_limits.MinimumDischargeVoltage && CHADEMO_Status > CHADEMO_NEGOTIATE) {
 #ifdef DEBUG_VIA_USB
     Serial.println("x200 minimum discharge voltage met or exceeded, stopping.");
 #endif
     CHADEMO_Status = CHADEMO_STOP;
   }
-#endif
 }
 
 /* Vehicle 0x201, peer to EVSE 0x209 
@@ -543,18 +535,18 @@ void update_evse_status(CAN_frame_t& f) {
     x109_evse_state.remaining_time_1m = 60;
 
   } else if (EVSE_mode == CHADEMO_CHARGE) {
-#ifdef ISA_SENSOR
+    x109_evse_state.setpoint_HV_VDC = get_measured_voltage();
-    x109_evse_state.setpoint_HV_VDC = sensor.Voltage;
+    x109_evse_state.setpoint_HV_IDC = get_measured_current();
-    x109_evse_state.setpoint_HV_IDC = sensor.Amperes;
+
-#else
+    /*For posterity if anyone is forced to simulate a shunt
-    //NOTE: these are supposed to be measured values, e.g., from a shunt
+      NOTE: these are supposed to be measured values, e.g., from a shunt
-    //If a sensor is not used, we are literally asserting that the measured value is exactly equivalent to the request or max charger capability
+      If a sensor is not used, we are literally asserting that the measured value is exactly equivalent to the request or max charger capability
-    //this is pretty likely to fail on most vehicles
+      this is pretty likely to fail on most vehicles
     x109_evse_state.setpoint_HV_VDC =
         min(x102_chg_session.TargetBatteryVoltage, x108_evse_cap.available_output_voltage);
     x109_evse_state.setpoint_HV_IDC =
         min(x102_chg_session.ChargingCurrentRequest, x108_evse_cap.available_output_current);
-#endif
+    */
 
     /* The spec suggests throwing a 109.5.4 = 1 if vehicle curr request 102.3 > evse curr available 108.3, 
      *  but realistically many chargers seem to act tolerant here and stay under limits and supply whatever they are able
@@ -625,16 +617,15 @@ void update_evse_discharge_estimate(CAN_frame_t& f) {
 
 /* x208 EVSE, peer to 0x200 Vehicle */
 void update_evse_discharge_capabilities(CAN_frame_t& f) {
-#ifdef ISA_SHUNT
   //present discharge current is a measured value
-  x208_evse_dischg_cap.present_discharge_current = 0xFF - sensor.Amperes;
+  x208_evse_dischg_cap.present_discharge_current = 0xFF - get_measured_current();
-#else
+
-  //Present discharge current is a measured value. In the absence of
+  /* Present discharge current is a measured value. In the absence of
-  // a shunt, the evse here is quite literally lying to the vehicle. The spec
+     a shunt, the evse here is quite literally lying to the vehicle. The spec
-  // seems to suggest this is tolerated unless the current measured on the EV
+     seems to suggest this is tolerated unless the current measured on the EV
-  // side continualy exceeds the maximum discharge current by 10amps
+     side continualy exceeds the maximum discharge current by 10amps
   x208_evse_dischg_cap.present_discharge_current = 0xFF - 6;
-#endif
+  */
 
   //EVSE maximum current input is partly an inverter-influenced value i.e., min(inverter, vehicle_max_discharge)
   //use max_discharge_current variable if nonzero, otherwise tell the vehicle the EVSE will take everything it can give
@@ -892,7 +883,7 @@ void handle_chademo_sequence() {
                     }
        */
       if (x102_chg_session.s.status.StatusVehicleChargingEnabled) {
-        if (sensor.Voltage < 20) {
+        if (get_measured_voltage() < 20) {
 
           digitalWrite(CHADEMO_PIN_10, HIGH);
           evse_permission = true;
@@ -940,7 +931,7 @@ void handle_chademo_sequence() {
 #ifdef DEBUG_VIA_USB
         Serial.println("Contactors ready");
         Serial.print("Voltage: ");
-        Serial.println(sensor.Voltage);
+        Serial.println(get_measured_voltage());
 #endif
         /* transition to POWERFLOW state if discharge compatible on both sides */
         if (x109_evse_state.discharge_compatible && x102_chg_session.s.status.StatusVehicleDischargeCompatible &&
@@ -978,14 +969,14 @@ void handle_chademo_sequence() {
         //TODO flag error and do not calculate power in EVSE response?
         //	probably unnecessary as other flags will be set causing this to be caught
       }
-#ifdef ISA_SHUNT
+
-      if (sensor.Voltage <= x200_discharge_limits.MinimumDischargeVoltage) {
+      if (get_measured_voltage() <= x200_discharge_limits.MinimumDischargeVoltage) {
 #ifdef DEBUG_VIA_USB
         Serial.println("x200 minimum discharge voltage met or exceeded, stopping.");
 #endif
         CHADEMO_Status = CHADEMO_STOP;
       }
-#endif
+
       // Potentially unnecessary (set in CHADEMO_EVSE_CONTACTORS_ENABLED stanza), but just in case
       x109_evse_state.s.status.ChgDischStopControl = 0;
       x109_evse_state.s.status.EVSE_status = 1;
@@ -1010,7 +1001,7 @@ void handle_chademo_sequence() {
        * We will re-enter the handler until the amperage drops sufficiently
        * and then transition to CHADEMO_IDLE
        */
-      if (sensor.Amperes <= 5 && sensor.Voltage <= 10) {
+      if (get_measured_current() <= 5 && get_measured_voltage() <= 10) {
         /* welding detection ideally here */
         digitalWrite(CHADEMO_PIN_10, LOW);
         digitalWrite(CHADEMO_PIN_2, LOW);