heater: always rely on localy measured heater voltage

if board able to measure it localy

Author: dron0gus

firmware/heater_control.cpp

@@ -199,14 +199,14 @@ void HeaterControllerBase::Update(const ISampler& sampler, HeaterAllow heaterAll
     float sensorEsr = sampler.GetSensorInternalResistance();
     float sensorTemperature = sampler.GetSensorTemperature();
 
-    #ifdef BOARD_HAS_VOLTAGE_SENSE
+    #if defined(HEATER_INPUT_DIVIDER)
+        // if board has ability to measure heater supply localy - use it
+        float heaterSupplyVoltage = sampler.GetInternalHeaterVoltage();
+    #elif defined(BOARD_HAS_VOLTAGE_SENSE)
         float heaterSupplyVoltage = GetSupplyVoltage();
     #else // not BOARD_HAS_VOLTAGE_SENSE
-        // If we haven't heard from the ECU, use the internally sensed
-        // battery voltage instead of voltage over CAN.
-        float heaterSupplyVoltage = heaterAllowState == HeaterAllow::Unknown
-                                    ? sampler.GetInternalHeaterVoltage()
-                                    : GetRemoteBatteryVoltage();
+        // this board rely on measured voltage from ECU
+        float heaterSupplyVoltage = GetRemoteBatteryVoltage();
     #endif
 
     // Run the state machine

firmware/sampling.cpp

@@ -38,21 +38,15 @@ float Sampler::GetPumpNominalCurrent() const
     return pumpCurrentSenseVoltage * ratio;
 }
 
+#ifdef HEATER_INPUT_DIVIDER
+// Dual HW can measure heater voltage for each channel
+// by measuring voltage on Heater- while FET is off
 float Sampler::GetInternalHeaterVoltage() const
 {
-#ifdef HEATER_INPUT_DIVIDER
-    // Dual HW can measure heater voltage for each channel
-    // by measuring voltage on Heater- while FET is off
     return internalHeaterVoltage;
-#else
-    // After 5 seconds, pretend that we get battery voltage.
-    // This makes the controller usable without CAN control
-    // enabling the heater - CAN message will be able to keep
-    // it disabled, but if no message ever arrives, this will
-    // start heating.
-    return m_startupTimer.hasElapsedSec(5) ? 13 : 0;
-#endif
+
 }
+#endif
 
 float Sampler::GetSensorTemperature() const
 {

firmware/sampling.h

@@ -9,7 +9,9 @@ struct ISampler
     virtual float GetNernstDc() const = 0;
     virtual float GetNernstAc() const = 0;
     virtual float GetPumpNominalCurrent() const = 0;
+#ifdef HEATER_INPUT_DIVIDER
     virtual float GetInternalHeaterVoltage() const = 0;
+#endif
     virtual float GetSensorTemperature() const = 0;
     virtual float GetSensorInternalResistance() const = 0;
 };
@@ -25,7 +27,9 @@ class Sampler : public ISampler
     float GetNernstDc() const override;
     float GetNernstAc() const override;
     float GetPumpNominalCurrent() const override;
+#ifdef HEATER_INPUT_DIVIDER
     float GetInternalHeaterVoltage() const override;
+#endif
     float GetSensorTemperature() const override;
     float GetSensorInternalResistance() const override;