rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-heat after 5 seconds of no CAN command #194

This commit is contained in:
Matthew Kennedy 2023-11-15 20:28:51 -08:00
parent b73adb2e61
commit 50f8e1f2bb
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/sampling.cpp
View File

@ -15,6 +15,11 @@ static const float lsu42TempValues[] = { 1199, 961, 857, 806, 775, 750, 730, 715
static const float lsuAdvTempBins[] = { 53, 96, 130, 162, 184, 206, 239, 278, 300, 330, 390, 462, 573, 730, 950, 1200, 1500, 1900, 2500, 3500, 5000, 6000 }; static const float lsuAdvTempBins[] = { 53, 96, 130, 162, 184, 206, 239, 278, 300, 330, 390, 462, 573, 730, 950, 1200, 1500, 1900, 2500, 3500, 5000, 6000 };
static const float lsuAdvTempValues[] = { 1198, 982, 914, 875, 855, 838, 816, 794, 785, 771, 751, 732, 711, 691, 671, 653, 635, 614, 588, 562, 537, 528 }; static const float lsuAdvTempValues[] = { 1198, 982, 914, 875, 855, 838, 816, 794, 785, 771, 751, 732, 711, 691, 671, 653, 635, 614, 588, 562, 537, 528 };
void Sampler::Init()
{
m_startupTimer.reset();
}
float Sampler::GetNernstDc() const float Sampler::GetNernstDc() const
{ {
return nernstDc; return nernstDc;
@ -36,10 +41,19 @@ float Sampler::GetPumpNominalCurrent() const
float Sampler::GetInternalBatteryVoltage() const float Sampler::GetInternalBatteryVoltage() const
{ {
#ifdef BATTERY_INPUT_DIVIDER
// Dual HW can measure heater voltage for each channel // Dual HW can measure heater voltage for each channel
// by measuring voltage on Heater- while FET is off // by measuring voltage on Heater- while FET is off
// TODO: rename function? // TODO: rename function?
return internalBatteryVoltage; return internalBatteryVoltage;
#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
} }
float Sampler::GetSensorTemperature() const float Sampler::GetSensorTemperature() const

5
firmware/sampling.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "timer.h"
struct ISampler struct ISampler
{ {
virtual float GetNernstDc() const = 0; virtual float GetNernstDc() const = 0;
@ -16,6 +18,7 @@ class Sampler : public ISampler
{ {
public: public:
void ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt); void ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt);
void Init();
float GetNernstDc() const override; float GetNernstDc() const override;
float GetNernstAc() const override; float GetNernstAc() const override;
@ -32,6 +35,8 @@ private:
float nernstDc = 0; float nernstDc = 0;
float pumpCurrentSenseVoltage = 0; float pumpCurrentSenseVoltage = 0;
float internalBatteryVoltage = 0; float internalBatteryVoltage = 0;
Timer m_startupTimer;
}; };
// Get the sampler for a particular channel // Get the sampler for a particular channel

5
firmware/sampling_thread.cpp
View File

@ -46,6 +46,11 @@ static void SamplingThread(void*)
void StartSampling() void StartSampling()
{ {
for (int i = 0; i < AFR_CHANNELS; i++)
{
samplers[i].Init();
}
adcStart(&ADCD1, nullptr); adcStart(&ADCD1, nullptr);
chThdCreateStatic(waSamplingThread, sizeof(waSamplingThread), NORMALPRIO + 5, SamplingThread, nullptr); chThdCreateStatic(waSamplingThread, sizeof(waSamplingThread), NORMALPRIO + 5, SamplingThread, nullptr);
} }

2
firmware/util/timer.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <cstdint>
/** /**
* Helper class with "has X amount of time elapsed since most recent reset" methods * Helper class with "has X amount of time elapsed since most recent reset" methods
* Brand new instances have most recent reset time far in the past, i.e. "hasElapsed" is true for any reasonable range * Brand new instances have most recent reset time far in the past, i.e. "hasElapsed" is true for any reasonable range