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

sampling: move sampling circle buffer into state struct

This commit is contained in:
Andrey Gusakov 2022-06-19 14:57:42 +03:00
parent cd689ba82e
commit 66f74b2085
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/sampling.cpp
View File

@ -19,6 +19,7 @@ struct measure_results {
float nernstDc; float nernstDc;
float pumpCurrentSenseVoltage; float pumpCurrentSenseVoltage;
float internalBatteryVoltage; float internalBatteryVoltage;
float r_buf[3];
}; };
static struct measure_results results[AFR_CHANNELS]; static struct measure_results results[AFR_CHANNELS];
@ -56,7 +57,6 @@ static void SamplingThread(void*)
{ {
int idx = 0; int idx = 0;
bool ready = false; bool ready = false;
float r_buf[AFR_CHANNELS][3];
/* GD32: Insert 20us delay after ADC enable */ /* GD32: Insert 20us delay after ADC enable */
chThdSleepMilliseconds(1); chThdSleepMilliseconds(1);
@ -70,13 +70,11 @@ static void SamplingThread(void*)
for (int ch = 0; ch < AFR_CHANNELS; ch++) { for (int ch = 0; ch < AFR_CHANNELS; ch++) {
struct measure_results *res = &results[ch]; struct measure_results *res = &results[ch];
float *r = r_buf[ch];
#ifdef BATTERY_INPUT_DIVIDER #ifdef BATTERY_INPUT_DIVIDER
res->internalBatteryVoltage = result.ch[ch].BatteryVoltage; res->internalBatteryVoltage = result.ch[ch].BatteryVoltage;
#endif #endif
r[idx] = result.ch[ch].NernstVoltage; res->r_buf[idx] = result.ch[ch].NernstVoltage;
if (ready) if (ready)
{ {
@ -85,11 +83,11 @@ static void SamplingThread(void*)
// of the AC component on the nernst voltage. We have to pull this trick so as to use the past 3 // of the AC component on the nernst voltage. We have to pull this trick so as to use the past 3
// samples to cancel out any slope in the DC (aka actual nernst cell output) from the AC measurement // samples to cancel out any slope in the DC (aka actual nernst cell output) from the AC measurement
// See firmware/sampling.png for a drawing of what's going on here // See firmware/sampling.png for a drawing of what's going on here
float opposite_phase = (r[idx] + r[(idx + 1) % 3]) / 2; float opposite_phase = (res->r_buf[idx] + res->r_buf[(idx + 1) % 3]) / 2;
// Compute AC (difference) and DC (average) components // Compute AC (difference) and DC (average) components
float nernstAcLocal = f_abs(opposite_phase - r[(idx + 2) % 3]); float nernstAcLocal = f_abs(opposite_phase - res->r_buf[(idx + 2) % 3]);
res->nernstDc = (opposite_phase + r[(idx + 1) % 3]) / 2; res->nernstDc = (opposite_phase + res->r_buf[(idx + 1) % 3]) / 2;
res->nernstAc = res->nernstAc =
(1 - ESR_SENSE_ALPHA) * res->nernstAc + (1 - ESR_SENSE_ALPHA) * res->nernstAc +