From f974df0da700a984a956b13272d6a1251d6ecc02 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 5 Mar 2023 11:49:57 -0500 Subject: [PATCH] Poor man categories for logs #5153 --- firmware/controllers/algo/ignition_state.txt | 17 ++++++++--------- firmware/integration/rusefi_config.txt | 6 +++--- .../test/java/com/rusefi/test/OutputsTest.java | 7 ++++++- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/firmware/controllers/algo/ignition_state.txt b/firmware/controllers/algo/ignition_state.txt index e67366c02a..9ce52a258b 100644 --- a/firmware/controllers/algo/ignition_state.txt +++ b/firmware/controllers/algo/ignition_state.txt @@ -1,20 +1,19 @@ ! "units",scale,offset, min,max, digits,category struct_no_prefix ignition_state_s - float baseDwell;;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@ + float baseDwell;"Ignition: base dwell";"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@ floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@ - angle_t dwellAngle;ignition dwell duration\nas crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell;"deg", 1,0, 0,120, 1,@@GAUGE_CATEGORY_TIMING@@ + angle_t dwellAngle;Ignition: dwell duration\nas crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell;"deg", 1,0, 0,120, 1,@@GAUGE_CATEGORY_TIMING@@ - int16_t autoscale cltTimingCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ - int16_t autoscale timingIatCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ - int16_t autoscale timingPidCorrection;;"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ + int16_t autoscale cltTimingCorrection;"Ignition: CLT correction";"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ + int16_t autoscale timingIatCorrection;"Ignition: IAT correction";"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ + int16_t autoscale timingPidCorrection;"Ignition: PID correction";"deg",{1/@@PACK_MULT_PERCENT@@},0, -20,20, 2,@@GAUGE_CATEGORY_TIMING@@ + float dwellVoltageCorrection;"Ignition: dwell corr" -float dwellVoltageCorrection - - float luaTimingAdd;;"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@ - float luaTimingMult;;"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@ + float luaTimingAdd;"Ignition: Lua add";"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@ + float luaTimingMult;"Ignition: Lua mult";"deg",1, 0, -20, 20, 2, @@GAUGE_CATEGORY_TIMING@@ end_struct diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index adc78b159d..02c60b0ed5 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1966,9 +1966,9 @@ end_struct #define GAUGE_NAME_LAMBDA2 "Lambda 2" #define GAUGE_NAME_IAC "Idle Air Valve" -#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" -#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" -#define GAUGE_NAME_IGNITION_LOAD "ign: load" +#define GAUGE_NAME_DWELL_DUTY "Ignition: coil duty cycle" +#define GAUGE_COIL_DWELL_TIME "Ignition: coil charge time" +#define GAUGE_NAME_IGNITION_LOAD "Ignition: load" #define GAUGE_NAME_DEBUG_F1 "debug f1" #define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm" diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java index d23b318858..329af27cae 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/OutputsTest.java @@ -81,8 +81,10 @@ public class OutputsTest { "bit issue_294_31,\"si_example\",\"nada_example\"\n" + "uint8_t[2 iterate] autoscale knock;;\"\",1, 0, 0, 0, 0\n" + "uint8_t[2 iterate] autoscale withName;\"MyNameIsEarl\";\"\",1, 0, 0, 0, 0\n" + + "uint8_t[2 iterate] withNameNoScale;\"HisNameIsEarl\"\n" + + "uint8_t yourMonwithNameNoScale;\"HisMon\"\n" + "\tuint16_t autoscale baseFuel;@@GAUGE_NAME_FUEL_BASE@@\\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections;\"mg\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" + - "float afr_type;PID dTime;\"ms\", 1, 0, 0, 3000, 0\n" + + "float afr_type;PID dTime;\"ms\"\n" + "uint16_t autoscale speedToRpmRatio;s2rpm;\"value\",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0\n" + "uint8_t afr_typet;;\"ms\", 1, 0, 0, 3000, 0\n" + "uint8_t autoscale vehicleSpeedKph;;\"kph\",1, 0, 0, 0, 0\n" + @@ -102,6 +104,9 @@ public class OutputsTest { "entry = knock2, \"knock 2\", int, \"%d\"\n" + "entry = withName1, \"MyNameIsEarl 1\", int, \"%d\"\n" + "entry = withName2, \"MyNameIsEarl 2\", int, \"%d\"\n" + + "entry = withNameNoScale1, \"HisNameIsEarl 1\", int, \"%d\"\n" + + "entry = withNameNoScale2, \"HisNameIsEarl 2\", int, \"%d\"\n" + + "entry = yourMonwithNameNoScale, \"HisMon\", int, \"%d\"\n" + "entry = baseFuel, \"hello\", float, \"%.3f\"\n" + "entry = afr_type, \"PID dTime\", float, \"%.3f\"\n" + "entry = speedToRpmRatio, \"s2rpm\", float, \"%.3f\"\n" +