Add heater control parameters to TunerStudio

Author: xtitoris

firmware/boards/port.h

@@ -57,7 +57,7 @@ class Configuration {
 private:
     // Increment this any time the configuration format changes
     // It is stored along with the data to ensure that it has been written before
-    static constexpr uint32_t ExpectedTag = 0xDEADBE02;
+    static constexpr uint32_t ExpectedTag = 0xDEADBE03;
     uint32_t Tag = ExpectedTag;
 
 public:
@@ -107,6 +107,10 @@ class Configuration {
             egt[i].AemNetIdOffset = i;
         }
 
+        heaterConfig.HeaterSupplyOffVoltage = HEATER_SUPPLY_OFF_VOLTAGE * 100;
+        heaterConfig.HeaterSupplyOnVoltage = HEATER_SUPPLY_ON_VOLTAGE * 100;
+        heaterConfig.HeaterBatteryStabTime = HEATER_BATTERY_STAB_TIME * 100;
+
         /* Finaly */
         Tag = ExpectedTag;
     }
@@ -143,6 +147,13 @@ class Configuration {
                 uint8_t AemNetIdOffset;
                 uint8_t pad[5];
             } egt[2];
+
+            struct {
+                uint16_t HeaterSupplyOffVoltage; // volts * 100
+                uint16_t HeaterSupplyOnVoltage;  // volts * 100
+                uint16_t HeaterBatteryStabTime;  // seconds * 100
+                uint8_t pad[2];
+            } heaterConfig;
         } __attribute__((packed));
 
         // pad to 256 bytes including tag

firmware/heater_control.cpp

@@ -3,8 +3,12 @@
 #include "status.h"
 #include "sampling.h"
 
+#include "port.h"
+
 using namespace wbo;
 
+static Configuration* configuration;
+
 static const PidConfig heaterPidConfig =
 {
     .kP = 0.3f,      // kP
@@ -23,6 +27,8 @@ HeaterControllerBase::HeaterControllerBase(int ch, int preheatTimeSec, int warmu
 
 void HeaterControllerBase::Configure(float targetTempC, float targetEsr)
 {
+    configuration = GetConfiguration();
+
     m_targetTempC = targetTempC;
     m_targetEsr = targetEsr;
 
@@ -60,14 +66,14 @@ HeaterState HeaterControllerBase::GetNextState(HeaterState currentState, HeaterA
     if (heaterAllowState == HeaterAllow::Unknown)
     {
         // measured voltage too low to auto-start heating
-        if (heaterSupplyVoltage < HEATER_SUPPLY_OFF_VOLTAGE)
+        if (heaterSupplyVoltage < configuration->heaterConfig.HeaterSupplyOffVoltage / 100.0f)
         {
             m_heaterStableTimer.reset();
         }
-        else if (heaterSupplyVoltage > HEATER_SUPPLY_ON_VOLTAGE)
+        else if (heaterSupplyVoltage > configuration->heaterConfig.HeaterSupplyOnVoltage / 100.0f)
         {
             // measured voltage is high enougth to auto-start heating, wait some time to stabilize
-            heaterAllowed = m_heaterStableTimer.hasElapsedSec(HEATER_BATTERY_STAB_TIME);
+            heaterAllowed = m_heaterStableTimer.hasElapsedSec(configuration->heaterConfig.HeaterBatteryStabTime / 100.0f);
         }
     }
 
@@ -168,8 +174,6 @@ HeaterState HeaterControllerBase::GetNextState(HeaterState currentState, HeaterA
                 // looks like heavy ramped Ipump affects sensorTemp measure
                 // and right after switch to closed loop sensorTemp drops below underhead threshold
             }
-            // reset fault
-            SetFault(ch, Fault::None);
 
             break;
         case HeaterState::Stopped:

firmware/heater_control.h

@@ -77,8 +77,6 @@ class HeaterControllerBase : public IHeaterController
     //    occured
     Timer m_underheatTimer;
     Timer m_overheatTimer;
-
-    static const int batteryStabTimeCounter = HEATER_BATTERY_STAB_TIME / HEATER_CONTROL_PERIOD;
 };
 
 const IHeaterController& GetHeaterController(int ch);

firmware/ini/wideband_dual.ini

@@ -87,6 +87,9 @@ AemNetEgtIdx0  = scalar,  U08,    154,             "",     1,         0,   0,  2
 AemNetEgtTx1   = bits,    U08,    160,   [2:2], "Disable", "Enable"
 AemNetEgtIdx1 = scalar,  U08,    162,             "",     1,         0,   0,  255,       0
 
+HeaterSupplyOffVoltage = scalar, U16,    168,           "V",    0.01,      0,   0,   24.0,     2
+HeaterSupplyOnVoltage = scalar, U16,    170,           "V",    0.01,      0,   0,   24.0,     2
+
 page     = 2 ; this is a RAM only page with no burnable flash
 ; name         =  class, type, offset, [shape], units, scale, translate, min,   max, digits
 highSpeedOffsets = array, U16,      0,    [32],    "",     1,         0,   0, 65535,      0, noMsqSave
@@ -333,6 +336,7 @@ entry = EGT1_commErrors,     "EGT 1: comm errors",   int, "%d"
 menuDialog = main
    menu = "&Settings"
       subMenu = sensor_settings, "Sensor settings"
+      subMenu = heater_settings, "Heater settings"
       subMenu = can_settings, "CAN AFR settings"
       subMenu = can_egt_settings, "CAN EGT settings"
 
@@ -365,6 +369,10 @@ cmd_openblt                  = "Z\x00\xbc\x00\x00"
 dialog = sensor_settings, "Sensor Settings"
    field = "Sensor Type", LsuSensorType
 
+dialog = heater_settings, "Heater Settings"
+   field = "Heater Supply Off Voltage", HeaterSupplyOffVoltage
+   field = "Heater Supply On Voltage", HeaterSupplyOnVoltage
+
 dialog = afr0_can_settings, "AFR 0 (left) channel CAN Settings"
    field = "RusEFI protocol:"
    field = "Output AFR", RusEfiTx0