Make START_PUMP_TEMP_THRESHOLD relative

dron0gus · Jun 1, 2024 · 4adc794 · 4adc794
1 parent 5c672e4
commit 4adc794
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/firmware/boards/f0_module/wideband_board_config.h b/firmware/boards/f0_module/wideband_board_config.h
@@ -19,7 +19,7 @@
 #define VM_RESISTOR_VALUE (10)
 
 // *******************************
-// Hack: allow pump driving above this temperature
-// to avoid Vnerns voltage clamp near 0V
+// Hack: allow pump driving above target temperature
+// minus this offset to avoid Vnerns voltage clamp near 0V
 // *******************************
-#define START_PUMP_TEMP_THRESHOLD	(650.0)
+#define START_PUMP_TEMP_OFFSET	(200.0)
diff --git a/firmware/heater_control.cpp b/firmware/heater_control.cpp
@@ -28,6 +28,11 @@ bool HeaterControllerBase::IsRunningClosedLoop() const
     return heaterState == HeaterState::ClosedLoop;
 }
 
+float HeaterControllerBase::GetTargetTemp() const
+{
+    return m_targetTempC;
+}
+
 float HeaterControllerBase::GetHeaterEffectiveVoltage() const
 {
     return heaterVoltage;

diff --git a/firmware/heater_control.h b/firmware/heater_control.h
@@ -25,6 +25,7 @@ struct IHeaterController
     virtual bool IsRunningClosedLoop() const = 0;
     virtual float GetHeaterEffectiveVoltage() const = 0;
     virtual HeaterState GetHeaterState() const = 0;
+    virtual float GetTargetTemp() const = 0;
 };
 
 class HeaterControllerBase : public IHeaterController
@@ -37,6 +38,7 @@ class HeaterControllerBase : public IHeaterController
     bool IsRunningClosedLoop() const override;
     float GetHeaterEffectiveVoltage() const override;
     HeaterState GetHeaterState() const override;
+    float GetTargetTemp() const override;
 
     virtual void SetDuty(float duty) const = 0;
 

diff --git a/firmware/pump_control.cpp b/firmware/pump_control.cpp
@@ -39,8 +39,8 @@ static void PumpThread(void*)
 
             // Only actuate pump when running closed loop!
             if (heater.IsRunningClosedLoop() ||
-#ifdef START_PUMP_TEMP_THRESHOLD
-                (sampler.GetSensorTemperature() >= START_PUMP_TEMP_THRESHOLD) ||
+#ifdef START_PUMP_TEMP_OFFSET
+                (sampler.GetSensorTemperature() >= heater.GetTargetTemp() - START_PUMP_TEMP_OFFSET) ||
 #endif
                 (0))
             {

diff --git a/firmware/pump_dac.cpp b/firmware/pump_dac.cpp
@@ -90,7 +90,7 @@ void InitPumpDac()
 
 void SetPumpCurrentTarget(int ch, int32_t microampere)
 {
-#ifndef START_PUMP_TEMP_THRESHOLD
+#ifndef START_PUMP_TEMP_OFFSET
     // Don't allow pump current when the sensor isn't hot
     if (!GetHeaterController(ch).IsRunningClosedLoop())
     {