diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index ca1556d401..f8a146296c 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -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 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index ba4e32de30..afef7b5717 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -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}, diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9e72fefd09..4c55002898 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -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"