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

livedata: temp is now packed int16 (#250) 

Co-authored-by: Andrey Gusakov <dron0gus@gmail.com>
This commit is contained in:
rusefillc 2023-05-29 16:11:55 -04:00 committed by GitHub
parent 94de9fd776
commit 9534851a66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/ini/wideband_dual.ini
View File

@ -96,7 +96,7 @@ VBatt = scalar, F32, 0, "V", 1, 0
; AFR0 ; AFR0
AFR0_lambda = scalar, F32, 32, "", 1, 0 AFR0_lambda = scalar, F32, 32, "", 1, 0
AFR0_afr = scalar, F32, 32, "", 14.7, 0 AFR0_afr = scalar, F32, 32, "", 14.7, 0
AFR0_temp = scalar, F32, 36, "C", 1, 0 AFR0_temp = scalar, U16, 36, "C", 0.1, 0
AFR0_NernstDc = scalar, U16, 40, "V", 0.001, 0 AFR0_NernstDc = scalar, U16, 40, "V", 0.001, 0
AFR0_NernstAc = scalar, U16, 42, "V", 0.001, 0 AFR0_NernstAc = scalar, U16, 42, "V", 0.001, 0
AFR0_PumpITarget = scalar, F32, 44, "mA", 1, 0 AFR0_PumpITarget = scalar, F32, 44, "mA", 1, 0
@ -110,7 +110,7 @@ AFR0_heater = scalar, U08, 61, "", 1, 0
; AFR1 ; AFR1
AFR1_lambda = scalar, F32, 64, "", 1, 0 AFR1_lambda = scalar, F32, 64, "", 1, 0
AFR1_afr = scalar, F32, 64, "", 14.7, 0 AFR1_afr = scalar, F32, 64, "", 14.7, 0
AFR1_temp = scalar, F32, 68, "C", 1, 0 AFR1_temp = scalar, U16, 68, "C", 0.1, 0
AFR1_NernstDc = scalar, U16, 72, "V", 0.001, 0 AFR1_NernstDc = scalar, U16, 72, "V", 0.001, 0
AFR1_NernstAc = scalar, U16, 74, "V", 0.001, 0 AFR1_NernstAc = scalar, U16, 74, "V", 0.001, 0
AFR1_PumpITarget = scalar, F32, 76, "mA", 1, 0 AFR1_PumpITarget = scalar, F32, 76, "mA", 1, 0

2
firmware/ini/wideband_f1.ini
View File

@ -89,7 +89,7 @@ VBatt = scalar, F32, 0, "V", 1, 0
; AFR0 ; AFR0
AFR0_lambda = scalar, F32, 32, "", 1, 0 AFR0_lambda = scalar, F32, 32, "", 1, 0
AFR0_afr = scalar, F32, 32, "", 14.7, 0 AFR0_afr = scalar, F32, 32, "", 14.7, 0
AFR0_temp = scalar, F32, 36, "C", 1, 0 AFR0_temp = scalar, U16, 36, "C", 0.1, 0
AFR0_NernstDc = scalar, U16, 40, "V", 0.001, 0 AFR0_NernstDc = scalar, U16, 40, "V", 0.001, 0
AFR0_NernstAc = scalar, U16, 42, "V", 0.001, 0 AFR0_NernstAc = scalar, U16, 42, "V", 0.001, 0
AFR0_PumpITarget = scalar, F32, 44, "mA", 1, 0 AFR0_PumpITarget = scalar, F32, 44, "mA", 1, 0

2
firmware/livedata.cpp
View File

@ -21,7 +21,7 @@ void SamplingUpdateLiveData()
volatile struct livedata_afr_s *data = &livedata_afr[ch]; volatile struct livedata_afr_s *data = &livedata_afr[ch];
data->lambda = GetLambda(ch); data->lambda = GetLambda(ch);
data->temperature = GetSensorTemperature(ch); data->temperature = GetSensorTemperature(ch) * 10;
data->nernstDc = GetNernstDc(ch) * 1000; data->nernstDc = GetNernstDc(ch) * 1000;
data->nernstAc = GetNernstAc(ch) * 1000; data->nernstAc = GetNernstAc(ch) * 1000;
data->pumpCurrentTarget = GetPumpCurrent(ch); data->pumpCurrentTarget = GetPumpCurrent(ch);

3
firmware/livedata.h
View File

@ -22,7 +22,8 @@ struct livedata_afr_s {
struct { struct {
// lambda also displayed by TS as AFR, same data with different scale factor // lambda also displayed by TS as AFR, same data with different scale factor
float lambda; float lambda;
float temperature; uint16_t temperature;
uint16_t padding;
uint16_t nernstDc; uint16_t nernstDc;
uint16_t nernstAc; uint16_t nernstAc;
float pumpCurrentTarget; float pumpCurrentTarget;