Poor man categories for logs #5153

This commit is contained in:
rusefillc 2023-03-05 11:49:57 -05:00
parent d716245edc
commit f974df0da7
3 changed files with 17 additions and 13 deletions

View File

@ -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

View File

@ -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"

View File

@ -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" +