binary log knock count and retard (#4139)

This commit is contained in:
Matthew Kennedy 2022-05-04 21:41:41 -07:00 committed by GitHub
parent 045cbcbff1
commit 2a204b9b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

View File

@ -62,7 +62,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0
uint16_t autoscale baroPressure;;"kPa",{1/@@PACK_MULT_PRESSURE@@}, 0, 0, 0, 0
uint16_t autoscale lambdaValue;@@GAUGE_NAME_LAMBDA@@;"",{1/@@PACK_MULT_LAMBDA@@}, 0, 0, 0, 0
uint8_t autoscale knockRetard;;"deg",{1/10}, 0, 0, 0, 0
uint8_t autoscale knockRetard;@@GAUGE_NAME_KNOCK_RETARD@@;"deg",{1/10}, 0, 0, 0, 0
uint8_t autoscale idleCurrentPosition;;"%", 0.5, 0, 0, 100, 1
uint16_t autoscale VBatt;@@GAUGE_NAME_VBAT@@;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 0, 0
@ -234,7 +234,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0
int16_t autoscale rawTps2Primary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3
int16_t autoscale rawTps2Secondary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3
uint16_t knockCount;"knock: count";"",1, 0, 0, 0, 0
uint16_t autoscale knockCount;@@GAUGE_NAME_KNOCK_COUNTER@@;"",1, 0, 0, 0, 0
int16_t autoscale accelerationZ;@@GAUGE_NAME_ACCEL_Z@@;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
int16_t autoscale accelerationRoll;@@GAUGE_NAME_ACCEL_ROLL@@;"G",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0

View File

@ -99,6 +99,8 @@ static constexpr LogField fields[] = {
{engine->outputChannels.knock[9], GAUGE_NAME_KNOCK_10, "dBv", 0},
{engine->outputChannels.knock[10], GAUGE_NAME_KNOCK_11, "dBv", 0},
{engine->outputChannels.knock[11], GAUGE_NAME_KNOCK_12, "dBv", 0},
{engine->outputChannels.knockCount, GAUGE_NAME_KNOCK_COUNTER, "", 0},
{engine->outputChannels.knockRetard, GAUGE_NAME_KNOCK_RETARD, "deg", 1},
{engine->outputChannels.sparkCutReason, "Spark Cut Code", "", 0},
{engine->outputChannels.fuelCutReason, "Fuel Cut Code", "", 0},
{engine->outputChannels.auxLinear1, GAUGE_NAME_AUX_LINEAR_1, "", 2},

View File

@ -1810,7 +1810,8 @@ end_struct
#define GAUGE_NAME_FUEL_LEVEL "fuel level"
#define GAUGE_NAME_KNOCK_LEVEL "knock: current level"
#define GAUGE_NAME_KNOCK_COUNTER "knock: counter"
#define GAUGE_NAME_KNOCK_COUNTER "knock: count"
#define GAUGE_NAME_KNOCK_RETARD "knock: retard"
#define GAUGE_NAME_KNOCK_1 "knock 1"
#define GAUGE_NAME_KNOCK_2 "knock 2"
#define GAUGE_NAME_KNOCK_3 "knock 3"