Merge pull request #1383 from zorgms/header_adc

Refactor smartEQ class layout and defaults

Author: dexterbg

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_can.cpp

@@ -53,28 +53,26 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
       REQ_DLC(7);      // logic by vehicle.cpp events
       switch(CAN_BYTE(6)) {
         case 0x00: // Parking
-          m_gear = 0;
+          can_gear = 0;
           break;
         case 0x10: // Rear
-          m_gear = -1;
+          can_gear = -1;
           break;
         case 0x20: // Neutral
-          m_gear = 0;
+          can_gear = 0;
           break;
         case 0x70: // Drive
-          m_gear = 1;
+          can_gear = 1;
           break;
         }
       break;
       }
     case 0x350:
       {
       REQ_DLC(7);
-      bool awake = (CAN_BYTE(0) > 0xc0);
-      bool locked = (CAN_BYTE(6) == 0x96) || (mt_driver_door_locked->AsBool(false) && !DoorOpen());
-      StdMetrics.ms_v_env_locked->SetValue(locked);
-      StdMetrics.ms_v_env_awake->SetValue(awake);
-      if (awake && !mt_bus_awake->AsBool())
+      can_awake = (CAN_BYTE(0) > 0xc0);
+      can_locked = (CAN_BYTE(6) == 0x96) || (mt_driver_door_locked->AsBool(false) && !DoorOpen());
+      if (can_awake && !mt_bus_awake->AsBool())
         {
         ESP_LOGI(TAG,"Car has woken (CAN bus activity)");
         mt_bus_awake->SetValue(true);
@@ -103,11 +101,10 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
     case 0x392:
       {
       REQ_DLC(6);
-      bool hvac_on = (CAN_BYTE(1) & 0x40) > 0;
-      StdMetrics.ms_v_env_hvac->SetValue(hvac_on);
-      if (hvac_on)
+      can_hvac = (CAN_BYTE(1) & 0x40) > 0;
+      if (can_hvac || IsOnEQ())
         {
-        StdMetrics.ms_v_env_cabintemp->SetValue(CAN_BYTE(5) - 40.0f);
+        can_cabintemp = CAN_BYTE(5) - 40.0f;
         }      
       break;
       }
@@ -120,33 +117,33 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
       // Ignore invalid sensor reading (0x7F = 127 → 87°C after offset)
       if (raw_temp != 0x7F) 
         {
-        StdMetrics.ms_v_bat_temp->SetValue(_temp);
+        can_bat_temp = _temp;
         }
 
-      StdMetrics.ms_v_bat_voltage->SetValue((float)((CAN_UINT(3) >> 5) & 0x3ff) / 2.0f);
-      StdMetrics.ms_v_charge_climit->SetValue((c >> 20) & 0x3Fu);
+      can_bat_voltage = (float)((CAN_UINT(3) >> 5) & 0x3ff) / 2.0f;
+      can_charge_climit = (c >> 20) & 0x3Fu;
 
       break;
       }
     case 0x4F8:
       REQ_DLC(3);
-      StdMetrics.ms_v_env_handbrake->SetValue((CAN_BYTE(0) & 0x08) > 0);
-      //StdMetrics.ms_v_env_awake->SetValue((CAN_BYTE(0) & 0x40) > 0); // Ignition on
+      can_handbrake = (CAN_BYTE(0) & 0x08) > 0;
+      //can_awake = (CAN_BYTE(0) & 0x40) > 0; // Ignition on
       break;
     case 0x5D7: // Speed, ODO
       REQ_DLC(6);
-      StdMetrics.ms_v_pos_speed->SetValue((float) CAN_UINT(0) / 100.0f);
-      StdMetrics.ms_v_pos_odometer->SetValue((float) (CAN_UINT32(2)>>4) / 100.0f);
+      can_speed = (float) CAN_UINT(0) / 100.0f;
+      can_odometer = (float) (CAN_UINT32(2)>>4) / 100.0f;
       mt_pos_odometer_trip->SetValue((float) (CAN_UINT(4)>>4) / 100.0f);
       break;
     case 0x5de:
       REQ_DLC(8);
-      StdMetrics.ms_v_env_headlights->SetValue((CAN_BYTE(0) & 0x04) > 0);
-      StdMetrics.ms_v_door_fl->SetValue((CAN_BYTE(1) & 0x08) > 0);
-      StdMetrics.ms_v_door_fr->SetValue((CAN_BYTE(1) & 0x02) > 0);
-      StdMetrics.ms_v_door_rl->SetValue((CAN_BYTE(2) & 0x40) > 0);
-      StdMetrics.ms_v_door_rr->SetValue((CAN_BYTE(2) & 0x10) > 0);
-      StdMetrics.ms_v_door_trunk->SetValue((CAN_BYTE(7) & 0x10) > 0);
+      can_headlights = (CAN_BYTE(0) & 0x04) > 0;
+      can_door_fl = (CAN_BYTE(1) & 0x08) > 0;
+      can_door_fr = (CAN_BYTE(1) & 0x02) > 0;
+      can_door_rl = (CAN_BYTE(2) & 0x40) > 0;
+      can_door_rr = (CAN_BYTE(2) & 0x10) > 0;
+      can_door_trunk = (CAN_BYTE(7) & 0x10) > 0;
       break;
     case 0x62d:
       REQ_DLC(3);
@@ -161,7 +158,7 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
       mt_worst_consumption->SetValue(worst_consumption);
       mt_best_consumption->SetValue(best_consumption);
       mt_bcb_power_mains->SetValue(bcb_power_mains);
-      StdMetrics.ms_v_bat_consumption->SetValue(best_consumption * 10.0f); // convert to Wh/km
+      can_bat_consumption = best_consumption * 10.0f; // convert to Wh/km
       break;
       }
     case 0x637:
@@ -193,45 +190,33 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
       if(trip_energy < 0x7FFF) 
         mt_reset_energy->SetValue((float)trip_energy * 0.1f);
       mt_reset_speed->SetValue((float)avg_speed * 0.1f);
-      if(m_bcvalue){
-        StdMetrics.ms_v_gen_kwh_grid_total->SetValue((float)rest_consumption); // not the best idea at the moment
-      } else {
-        StdMetrics.ms_v_gen_kwh_grid_total->SetValue(0.0f);
-      }
+      can_kwh_grid_total = m_bcvalue ? (float)rest_consumption : 0.0f;
       break;
       }
     case 0x654:        // SOC / charge port status
       {
       REQ_DLC(4);
       float _soc = (float) CAN_BYTE(3);
-      if (_soc <= 100.0f) StdMetrics.ms_v_bat_soc->SetValue(_soc); // SOC
-      StdMetrics.ms_v_door_chargeport->SetValue((CAN_BYTE(0) & 0x20) != 0); // ChargingPlugConnected
+      if (_soc <= 100.0f) can_soc = _soc; // SOC
+      can_chargeport = (CAN_BYTE(0) & 0x20) != 0; // ChargingPlugConnected
       int _duration_full = (((c >> 22) & 0x3ffu) < 0x3ff) ? (c >> 22) & 0x3ffu : 0;
       mt_obd_duration->SetValue((int)(_duration_full), Minutes);
       float _range_est = ((c >> 12) & 0x3FFu); // VehicleAutonomy
-      float _bat_temp = StdMetrics.ms_v_bat_temp->AsFloat(0) - 20.0;
+      float _bat_temp = can_bat_temp - 20.0;
       float _full_km = m_full_km;
       float _range_cac = _full_km + (_bat_temp); // temperature compensation +/- range
       if (_range_est != 1023.0f) 
         {
-        StdMetrics.ms_v_bat_range_est->SetValue(_range_est);
+        can_range_est = _range_est;
 
         if (_soc > 0.1f)  // prevent div/0
           {
-          StdMetrics.ms_v_bat_range_full->SetValue((_range_est / _soc) * 100.0f);
-          StdMetrics.ms_v_bat_range_ideal->SetValue((_range_cac * _soc) / 100.0f);
+          can_range_full = (_range_est / _soc) * 100.0f;
+          can_range_ideal = (_range_cac * _soc) / 100.0f;
           }
         }
       break;
       }
-    case 0x656:
-      {
-      REQ_DLC(7);
-      float _env_temp = (float) CAN_BYTE(6) - 40.0f;
-      if (_env_temp > -40.0f && _env_temp < 85.0f)
-        StdMetrics.ms_v_env_temp->SetValue(_env_temp);
-      break;
-      }
     case 0x658:
       {
       REQ_DLC(6);
@@ -246,24 +231,24 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
         last_bat_serial = bat_serial;
       }
       float _soh = (float)(CAN_BYTE(4) & 0x7Fu);
-      if (_soh <= 100.0f) StdMetrics.ms_v_bat_soh->SetValue(_soh); // SOH
-      StdMetrics.ms_v_bat_health->SetValue(
+      if (_soh <= 100.0f) can_soh = _soh; // SOH
+      can_bat_health =
         (_soh >= 95.0f) ? "excellent"
       : (_soh >= 85.0f) ? "good"
       : (_soh >= 75.0f) ? "average"
       : (_soh >= 65.0f) ? "poor"
-      : "consider replacement");
-      StdMetrics.ms_v_charge_inprogress->SetValue(CAN_BYTE(5) & 0x20);
+      : "consider replacement";
+      can_charge_inprogress = (CAN_BYTE(5) & 0x20) != 0;
       break;
       }
     case 0x668:
       REQ_DLC(1);
-      StdMetrics.ms_v_env_on->SetValue((CAN_BYTE(0) & 0x40) > 0); // Drive Ready
+      can_env_on = (CAN_BYTE(0) & 0x40) > 0; // Drive Ready
       break;
     case 0x673:
       {
       // TPMS pressure values only used, when CAN write is disabled, otherwise utilize PollReply_TPMS_InputCapt
-      if ((!m_enable_write && !m_enable_write_caron) || !m_obdii_745_tpms)
+      if (!IsCANwrite() || !m_obdii_745_tpms)
         {
         REQ_DLC(6);
         // Read TPMS pressure values:
@@ -275,7 +260,7 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
             if (m_tpms_temp_enable)
               {
               // Dummy value to indicate valid temp reading, actual temp value is not available in this frame, but can be read via PollReply_TPMS_InputCapt when CAN write is enabled
-              m_tpms_temperature[i] = StdMetrics.ms_v_env_temp->AsFloat(1.1f);
+              m_tpms_temperature[i] = StdMetrics.ms_v_env_temp->AsFloat(0.0f); // use ambient temp as dummy value for valid reading, since actual temp is not available in this frame
               }
             // Prevent warnings when readings are valid if the data is not read via OBDII.
             m_tpms_lowbatt[i] = 0; 
@@ -290,3 +275,36 @@ void OvmsVehicleSmartEQ::IncomingFrameCan1(CAN_frame_t* p_frame) {
       break;
   }
 }
+
+// Sync CAN datapoints to OVMS metrics, called by Ticker1, because CAN refresh rate is too high
+void OvmsVehicleSmartEQ::smartCAN2Metrics()
+{  
+  StdMetrics.ms_v_env_gear->SetValue(can_gear);
+  StdMetrics.ms_v_env_locked->SetValue(can_locked);
+  StdMetrics.ms_v_env_awake->SetValue(can_awake);
+  StdMetrics.ms_v_env_hvac->SetValue(can_hvac);
+  StdMetrics.ms_v_env_cabintemp->SetValue(can_cabintemp);
+  StdMetrics.ms_v_bat_temp->SetValue(can_bat_temp);
+  StdMetrics.ms_v_bat_voltage->SetValue(can_bat_voltage);
+  StdMetrics.ms_v_charge_climit->SetValue(can_charge_climit);
+  StdMetrics.ms_v_env_handbrake->SetValue(can_handbrake);
+  StdMetrics.ms_v_pos_speed->SetValue(can_speed);
+  StdMetrics.ms_v_pos_odometer->SetValue(can_odometer);
+  StdMetrics.ms_v_env_headlights->SetValue(can_headlights);
+  StdMetrics.ms_v_door_fl->SetValue(can_door_fl);
+  StdMetrics.ms_v_door_fr->SetValue(can_door_fr);
+  StdMetrics.ms_v_door_rl->SetValue(can_door_rl);
+  StdMetrics.ms_v_door_rr->SetValue(can_door_rr);
+  StdMetrics.ms_v_door_trunk->SetValue(can_door_trunk);
+  StdMetrics.ms_v_bat_consumption->SetValue(can_bat_consumption);
+  StdMetrics.ms_v_gen_kwh_grid_total->SetValue(can_kwh_grid_total);
+  StdMetrics.ms_v_bat_soc->SetValue(can_soc);
+  StdMetrics.ms_v_door_chargeport->SetValue(can_chargeport);
+  StdMetrics.ms_v_bat_range_est->SetValue(can_range_est);
+  StdMetrics.ms_v_bat_range_full->SetValue(can_range_full);
+  StdMetrics.ms_v_bat_range_ideal->SetValue(can_range_ideal);
+  StdMetrics.ms_v_bat_soh->SetValue(can_soh);
+  StdMetrics.ms_v_bat_health->SetValue(can_bat_health);
+  StdMetrics.ms_v_charge_inprogress->SetValue(can_charge_inprogress);
+  StdMetrics.ms_v_env_on->SetValue(can_env_on);
+}

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_cmds_override.cpp

@@ -65,7 +65,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandClimateControl(bool en
     return Success;
     }
   // force enable write access for sending the command, even when user has not enabled it (can be required for some vehicles to wake up the car)
-  bool force = !m_enable_write && !m_enable_write_caron ? true : false;
+  bool force = !IsCANwrite() ? true : false;
   if(force)
     {
     m_enable_write_caron = true;
@@ -201,7 +201,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandHomelink(int button, i
 }
 
 OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandWakeup() {
-  if(!m_enable_write && !m_enable_write_caron)
+  if(!IsCANwrite())
     {
     ESP_LOGE(TAG, "CommandWakeup failed: no write access!");
     return Fail;
@@ -245,7 +245,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandWakeup() {
 }
 
 OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandWakeup2() {
-  if(!m_enable_write && !m_enable_write_caron)
+  if(!IsCANwrite())
     {
     ESP_LOGE(TAG, "CommandWakeup2 failed: no write access!");
     return Fail;
@@ -289,7 +289,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandWakeup2() {
 
 // lock: can can1 tx st 745 04 30 01 00 00
 OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandLock(const char* pin) {
-  if(!m_enable_write && !m_enable_write_caron) 
+  if(!IsCANwrite()) 
     {
     ESP_LOGE(TAG, "CommandLock failed / no write access");
     return Fail;
@@ -326,7 +326,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandLock(const char* pin)
 // unlock: can can1 tx st 745 04 30 01 00 01
 OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandUnlock(const char* pin) {
 
-  if(!m_enable_write && !m_enable_write_caron)
+  if(!IsCANwrite())
     {
     ESP_LOGE(TAG, "CommandUnlock failed / no write access");
     return Fail;

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_commands.cpp

@@ -36,7 +36,7 @@ static const char *TAG = "v-smarteq";
 
 // CommandCanVector(txid, rxid, hexbytes = {"30010000","30082002"}, reset CAN = true/false, CommandWakeup = true/ CommandWakeup2 = false)
 OvmsVehicle::vehicle_command_t  OvmsVehicleSmartEQ::CommandCanVector(uint32_t txid,uint32_t rxid, std::vector<std::string> hexbytes,bool reset,bool wakeup) {
-  if(!m_enable_write && !m_enable_write_caron)
+  if(!IsCANwrite())
     {
     ESP_LOGE(TAG, "CommandCanVector failed / no write access");
     return Fail;
@@ -184,7 +184,7 @@ void OvmsVehicleSmartEQ::xsq_canwrite(int verbosity, OvmsWriter* writer, OvmsCom
   if (!smarteq)
     return;
 
-  if(!smarteq->m_ddt4all || !smarteq->m_enable_write) {
+  if(!smarteq->m_ddt4all || !smarteq->IsCANwrite()) {
     ESP_LOGE(TAG, "DDT4all failed / no Canbus write access or DDT4all not enabled");
     writer->puts("DDT4all failed / no Canbus write access or DDT4all not enabled");
     return;
@@ -574,7 +574,8 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandPreset(int verbosity,
     "obdii_79b",
     "obdii_7e4",
     "obdii_7e4_modify",
-    "basic_tpms"
+    "basic_tpms",
+    "calc.adcfactor.samples"
   };
 
   int removed_count = 0;

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_ddt4all.cpp

@@ -63,7 +63,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleSmartEQ::CommandDDT4all(int number, Ov
     return Success;
   }
 
-  if((!m_ddt4all || !m_enable_write) && number > 9) {
+  if((!m_ddt4all || !IsCANwrite()) && number > 9) {
     ESP_LOGE(TAG, "DDT4all failed / no Canbus write access or DDT4all not enabled");
     writer->printf("DDT4all failed / no Canbus write access or DDT4all not enabled");
     return Fail;

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_features.cpp

@@ -380,6 +380,7 @@ void OvmsVehicleSmartEQ::ReCalcADCfactor(float can12V, OvmsWriter* writer) {
       mt_adc_factor_history->SetElemValues(0, n, hist);
     mt_adc_factor->SetValue(adc_factor_new);
     MyConfig.SetParamValueFloat("system.adc", "factor12v", adc_factor_new);
+    MyConfig.SetParamValueBool("xsq", "calc.adcfactor", false);
     if (writer) writer->printf("New ADC factor stored: %.3f (prev %.3f, history size %u)\n", adc_factor_new, adc_factor_prev, (unsigned)n);
   #else
     ESP_LOGD(TAG, "ADC support not enabled");
@@ -470,7 +471,7 @@ void OvmsVehicleSmartEQ::smartOn()
   // reset idle ticker when vehicle turned on to prevent trigger every 60 sec.
   m_idle_ticker = 15 * 60;
   // canwrite enable write access, only when car is on
-  if(m_enable_write || m_enable_write_caron) 
+  if(IsCANwrite()) 
     {
     smartCANmode(true);
     }
@@ -517,11 +518,11 @@ void OvmsVehicleSmartEQ::smartChargeStart()
   // trigger ADC factor recalculation when HV charging started
   if(m_enable_calcADCfactor && !m_ADCfactor_recalc) 
     {
-    m_ADCfactor_recalc_timer = 4;   // wait at least 4 min. before recalculation
+    m_ADCfactor_recalc_timer = 2;   // wait at least 2 min. before recalculation
     m_ADCfactor_recalc = true;      // recalculate ADC factor when HV charging
     }
   // canwrite enable write access, only when car is on
-  if(m_enable_write || m_enable_write_caron) 
+  if(IsCANwrite()) 
     {
     m_poll_on_charge = true;
     smartCANmode(true);
@@ -553,7 +554,7 @@ void OvmsVehicleSmartEQ::smartChargeStop()
     StdMetrics.ms_v_charge_substate->SetValue("onrequest");
   }
   // stop recalculation when HV charging stopped
-  m_ADCfactor_recalc_timer = 0;
+  m_ADCfactor_recalc_timer = 2;
   m_ADCfactor_recalc = false;
   ESP_LOGD(TAG, "smartChargeStop()");
 }
@@ -563,7 +564,7 @@ void OvmsVehicleSmartEQ::smartChargePrepare()
   if (m_charge_finished) ResetChargingValues();
   if (m_resettrip) ResetTripCounters();
   // canwrite enable write access, only when car is on
-  if(m_enable_write || m_enable_write_caron) 
+  if(IsCANwrite()) 
     {
     m_poll_on_charge = true;
     smartCANmode(true);
@@ -581,7 +582,7 @@ void OvmsVehicleSmartEQ::smartChargeFinish()
 
 void OvmsVehicleSmartEQ::smartCANmode(bool activate)
 {
-  if(!m_enable_write && !m_enable_write_caron)
+  if(!IsCANwrite())
     {
     m_can1->Stop();
     vTaskDelay(200 / portTICK_PERIOD_MS);

vehicle/OVMS.V3/components/vehicle_smarteq/src/eq_handle.cpp

@@ -39,7 +39,7 @@ void OvmsVehicleSmartEQ::HandlePollState() {
 
   static const char* state_names[] = {"Off", "Awake", "Running", "Charging"};
   static const char* state_disabled = "Pollstate Off (write disabled)";
-  if (!m_enable_write && !m_enable_write_caron) 
+  if (!IsCANwrite()) 
     {
     if (m_poll_state != POLLSTATE_OFF) 
       {