From 129f6f8d103b0546ef37c595450c8e0afbfe0e1d Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 4 May 2023 13:01:35 -0700 Subject: [PATCH] Channel names #98 --- firmware/console/binary/output_channels.txt | 4 +- .../controllers/actuators/boost_control.txt | 4 +- firmware/integration/rusefi_config_shared.txt | 89 ++++++++----------- 3 files changed, 43 insertions(+), 54 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index f734f1f618..c1f0977a44 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -81,7 +81,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2 uint8_t autoscale injectorDutyCycle;@@GAUGE_NAME_FUEL_INJ_DUTY@@;"%",{1/2}, 0, 0, 0, 0 uint8_t autoscale veValue;@@GAUGE_NAME_FUEL_VE@@;"ratio",{1/2}, 0, 0, 0, 1 - int16_t injectionOffset;;"deg", 1, 0, 0, 0, 0 + int16_t injectionOffset;@@GAUGE_NAME_FUEL_INJECTION_TIMING@@;"deg", 1, 0, 0, 0, 0 int16_t autoscale tCharge;;"deg C",{1/@@PACK_MULT_TEMPERATURE@@}, 0, 0, 0, 1 @@ -193,7 +193,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2 int16_t autoscale rawPpsSecondary;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3 - int8_t[12 iterate] knock;;"dBv",1, 0, 0, 0, 0 + int8_t[12 iterate] knock;Knock: Cyl;"dBv",1, 0, 0, 0, 0 int8_t tcuDesiredGear;@@GAUGE_NAME_DESIRED_GEAR@@;"gear",1, 0, -1, 10, 0 uint8_t autoscale flexPercent;@@GAUGE_NAME_FLEX@@;"%",{1/2}, 0, 0, 0, 1 diff --git a/firmware/controllers/actuators/boost_control.txt b/firmware/controllers/actuators/boost_control.txt index a49058c4ed..f0e1ab565f 100644 --- a/firmware/controllers/actuators/boost_control.txt +++ b/firmware/controllers/actuators/boost_control.txt @@ -11,10 +11,10 @@ bit tpsTooLow bit mapTooLow int16_t autoscale luaTargetAdd;"Boost: Lua Target Add";"v", 0.5,0, -100,100, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ -int16_t autoscale boostOutput;"Boost: Output";"percent", 0.01,0, -100,100, 2, @@GAUGE_CATEGORY_BOOST_CONTROL@@ +int16_t autoscale boostOutput;@@GAUGE_NAME_BOOST_OUTPUT@@;"percent", 0.01,0, -100,100, 2, @@GAUGE_CATEGORY_BOOST_CONTROL@@ float luaTargetMult;"Boost: Lua Target Mult";"v", 1,0, -100,100, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ -float openLoopPart;"Boost: Open Loop";"v", 1,0, -100,100, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ +float openLoopPart;@@GAUGE_NAME_BOOST_OPEN_LOOP@@;"v", 1,0, -100,100, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ float luaOpenLoopAdd;"Boost: Lua Open Loop Add";"v", 1,0, -100,100, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ int8_t autoscale boostControllerClosedLoopPart;@@GAUGE_NAME_BOOST_CLOSED_LOOP@@;"%", 0.5,0, -50,50, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ int16_t autoscale boostControlTarget;@@GAUGE_NAME_BOOST_TARGET@@;"kPa",{1/@@PACK_MULT_PRESSURE@@},0, 0, 300, 1, @@GAUGE_CATEGORY_BOOST_CONTROL@@ diff --git a/firmware/integration/rusefi_config_shared.txt b/firmware/integration/rusefi_config_shared.txt index 5aa73de4b8..39062f6a15 100644 --- a/firmware/integration/rusefi_config_shared.txt +++ b/firmware/integration/rusefi_config_shared.txt @@ -75,10 +75,10 @@ #define GAUGE_NAME_TPS2 "TPS2" #define GAUGE_NAME_MAP "MAP" #define GAUGE_NAME_MAF "MAF" -#define GAUGE_NAME_ETB_TARGET "ETB position target" +#define GAUGE_NAME_ETB_TARGET "ETB: position target" #define GAUGE_NAME_WG_POSITION "Wastegate position sensor" -#define GAUGE_NAME_ETB_ERROR "ETB position error" -#define GAUGE_NAME_ETB_DUTY "ETB Duty" +#define GAUGE_NAME_ETB_ERROR "ETB: position error" +#define GAUGE_NAME_ETB_DUTY "ETB: Duty" #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" #define GAUGE_NAME_WARNING_COUNT "Warning count" #define GAUGE_NAME_LAST_ERROR "Last error" @@ -110,14 +110,14 @@ #define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1" #define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2" -#define GAUGE_NAME_BOOST_OUTPUT "Boost Output" -#define GAUGE_NAME_BOOST_CLOSED_LOOP "Boost Closed Loop" -#define GAUGE_NAME_BOOST_OPEN_LOOP "Boost Open Loop" -#define GAUGE_NAME_BOOST_TARGET "Boost Target" +#define GAUGE_NAME_BOOST_OUTPUT "Boost: Output" +#define GAUGE_NAME_BOOST_CLOSED_LOOP "Boost: Closed Loop" +#define GAUGE_NAME_BOOST_OPEN_LOOP "Boost: Open Loop" +#define GAUGE_NAME_BOOST_TARGET "Boost: Target" -#define INDICATOR_NAME_CLUTCH_UP "clutch: up" -#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down" -#define INDICATOR_NAME_BRAKE_DOWN "brake: down" +#define INDICATOR_NAME_CLUTCH_UP "Clutch: up" +#define INDICATOR_NAME_CLUTCH_DOWN "Clutch: down" +#define INDICATOR_NAME_BRAKE_DOWN "Brake switch" #define INDICATOR_NAME_AC_SWITCH "AC switch" #define GAUGE_NAME_AIR_FLOW_MEASURED "MAF" @@ -128,49 +128,38 @@ #define GAUGE_NAME_WARNING_LAST "warning: last" #define GAUGE_NAME_WARNING_COUNTER "warning: counter" -#define GAUGE_NAME_FUEL_LEVEL "fuel level" -#define GAUGE_NAME_KNOCK_LEVEL "knock: current level" -#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" -#define GAUGE_NAME_KNOCK_4 "knock 4" -#define GAUGE_NAME_KNOCK_5 "knock 5" -#define GAUGE_NAME_KNOCK_6 "knock 6" -#define GAUGE_NAME_KNOCK_7 "knock 7" -#define GAUGE_NAME_KNOCK_8 "knock 8" -#define GAUGE_NAME_KNOCK_9 "knock 9" -#define GAUGE_NAME_KNOCK_10 "knock 10" -#define GAUGE_NAME_KNOCK_11 "knock 11" -#define GAUGE_NAME_KNOCK_12 "knock 12" +#define GAUGE_NAME_FUEL_LEVEL "Fuel level" +#define GAUGE_NAME_KNOCK_LEVEL "Knock: Current level" +#define GAUGE_NAME_KNOCK_COUNTER "Knock: Count" +#define GAUGE_NAME_KNOCK_RETARD "Knock: Retard" -#define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure mult" +#define GAUGE_NAME_FUEL_BARO_CORR "Fuel: Barometric pressure mult" #define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position" -#define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" -#define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change" -#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature" -#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration add fuel ms" -#define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel" -#define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction" -#define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction" -#define GAUGE_NAME_FUEL_VE "fuel: VE" -#define GAUGE_NAME_FUEL_CRANKING "fuel: cranking" -#define GAUGE_NAME_FUEL_RUNNING "fuel: running" -#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last inj pulse width" -#define GAUGE_NAME_FUEL_BASE "fuel: base mass" -#define GAUGE_NAME_FUEL_TRIM "fuel: fuel trim" -#define GAUGE_NAME_FUEL_TRIM_2 "fuel: fuel trim 2" -#define GAUGE_NAME_FUEL_WALL_AMOUNT "fuel: wall amount" -#define GAUGE_NAME_FUEL_WALL_CORRECTION "fuel: wall correction" -#define GAUGE_NAME_FUEL_LOAD "fuel: load" -#define GAUGE_NAME_FUEL_CONSUMPTION "fuel: Total consumed" -#define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate" +#define GAUGE_NAME_INJECTOR_LAG "Fuel: injector lag" +#define GAUGE_NAME_FUEL_TPS_ROC "Fuel: TPS change" +#define GAUGE_NAME_FUEL_CHARGE_TEMP "Fuel: Estimated charge temperature" +#define GAUGE_NAME_FUEL_TPS_EXTRA "Fuel: TPS acceleration add fuel ms" +#define GAUGE_NAME_FUEL_EL_EXTRA "Fuel: engine load acceleration extra fuel" +#define GAUGE_NAME_FUEL_CLT_CORR "Fuel: CLT correction" +#define GAUGE_NAME_FUEL_IAT_CORR "Fuel: IAT correction" +#define GAUGE_NAME_FUEL_VE "Fuel: VE" +#define GAUGE_NAME_FUEL_CRANKING "Fuel: cranking" +#define GAUGE_NAME_FUEL_RUNNING "Fuel: running" +#define GAUGE_NAME_FUEL_LAST_INJECTION "Fuel: Last inj pulse width" +#define GAUGE_NAME_FUEL_BASE "Fuel: base mass" +#define GAUGE_NAME_FUEL_TRIM "Fuel: fuel trim" +#define GAUGE_NAME_FUEL_TRIM_2 "Fuel: fuel trim 2" +#define GAUGE_NAME_FUEL_WALL_AMOUNT "Fuel: wall amount" +#define GAUGE_NAME_FUEL_WALL_CORRECTION "Fuel: wall correction" +#define GAUGE_NAME_FUEL_LOAD "Fuel: load" +#define GAUGE_NAME_FUEL_CONSUMPTION "Fuel: Total consumed" +#define GAUGE_NAME_FUEL_FLOW "Fuel: Flow rate" -#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle" -#define GAUGE_NAME_TCHARGE "fuel: SD tCharge" -#define GAUGE_NAME_TARGET_AFR "fuel: target AFR" -#define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda" +#define GAUGE_NAME_FUEL_INJ_DUTY "Fuel: injector duty cycle" +#define GAUGE_NAME_TCHARGE "Fuel: SD tCharge" +#define GAUGE_NAME_TARGET_AFR "Fuel: target AFR" +#define GAUGE_NAME_TARGET_LAMBDA "Fuel: target lambda" +#define GAUGE_NAME_FUEL_INJECTION_TIMING "Fuel: Injection timing SOI" #define GAUGE_NAME_AFR "Air/Fuel Ratio" #define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2" #define GAUGE_NAME_LAMBDA "Lambda"