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

add isampler

This commit is contained in:
Matthew Kennedy 2023-06-20 17:24:48 -07:00
parent 6ebbe939ad
commit 2907a5378f
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/sampling.cpp
View File

@ -21,19 +21,19 @@ 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 };
struct Sampler { struct Sampler : public ISampler {
public: public:
void ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt); void ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt);
float GetNernstDc() const { float GetNernstDc() const override {
return nernstDc; return nernstDc;
} }
float GetNernstAc() const { float GetNernstAc() const override {
return nernstAc; return nernstAc;
} }
float GetPumpNominalCurrent() const { float GetPumpNominalCurrent() const override {
// Gain is 10x, then a 61.9 ohm resistor // Gain is 10x, then a 61.9 ohm resistor
// Effective resistance with the gain is 619 ohms // Effective resistance with the gain is 619 ohms
// 1000 is to convert to milliamperes // 1000 is to convert to milliamperes
@ -41,7 +41,7 @@ public:
return pumpCurrentSenseVoltage * ratio; return pumpCurrentSenseVoltage * ratio;
} }
float GetInternalBatteryVoltage() const { float GetInternalBatteryVoltage() const override {
// 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?
@ -92,11 +92,9 @@ static void SamplingThread(void*)
/* tunerstudio */ /* tunerstudio */
SamplingUpdateLiveData(); SamplingUpdateLiveData();
#endif #endif
} }
} }
void Sampler::ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt) void Sampler::ApplySample(AnalogChannelResult& result, float virtualGroundVoltageInt)
{ {
float r_1 = result.NernstVoltage; float r_1 = result.NernstVoltage;

11
firmware/sampling.h
View File

@ -1,5 +1,16 @@
#pragma once #pragma once
struct ISampler
{
virtual float GetNernstDc() const = 0;
virtual float GetNernstAc() const = 0;
virtual float GetPumpNominalCurrent() const = 0;
virtual float GetInternalBatteryVoltage() const = 0;
};
// Get the sampler for a particular channel
ISampler& GetSampler(int ch);
void StartSampling(); void StartSampling();
float GetNernstAc(int ch); float GetNernstAc(int ch);