Skip to content

Commit 3abe314

Browse files
amrikarismaamrikarisma
committed
Bump rusefi-core (check engine light + workflow disable); regenerate mini6ch
- ext/rusefi -> 2581d076 adds the full Check Engine Light (sensor range checks + shift-light mode) and restricts the fork's own CI workflows to manual dispatch - regenerate mini6ch INI + generated tables: cel_* config/output channels, Check Engine Light dialog + menu
1 parent b4573f6 commit 3abe314

13 files changed

Lines changed: 6969 additions & 2703 deletions

‎ext/rusefi‎

‎generated/console/binary/generated/data_logs.ini‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ entry = isAnalogFailure, "Analog sensors supply failure", int, "%d"
3030
entry = isTuningNow, "isTuningNow", int, "%d"
3131
entry = sd_formating, "SD: formating is in progress", int, "%d"
3232
entry = isMapAveraging, "isMapAveraging", int, "%d"
33+
entry = cel_error_codes_count, "CEL: active sensor faults", int, "%d"
34+
entry = cel_batv, "CEL: battery voltage out of range", int, "%d"
35+
entry = cel_map, "CEL: MAP sensor out of range", int, "%d"
36+
entry = cel_iat, "CEL: IAT sensor out of range", int, "%d"
37+
entry = cel_clt, "CEL: CLT sensor out of range", int, "%d"
38+
entry = cel_tps, "CEL: TPS sensor out of range", int, "%d"
39+
entry = cel_afr, "CEL: AFR/EGO sensor out of range", int, "%d"
40+
entry = cel_oil_temp, "CEL: oil temperature out of range", int, "%d"
41+
entry = cel_oil_pressure, "CEL: oil pressure out of range", int, "%d"
42+
entry = cel_fuel_pressure, "CEL: fuel pressure out of range", int, "%d"
43+
entry = cel_maf, "CEL: MAF sensor out of range", int, "%d"
44+
entry = cel_sync_loss, "CEL: sync losses over limit", int, "%d"
45+
entry = cel_any_cut, "CEL: fuel/spark cut active", int, "%d"
46+
entry = cel_shiftlight_active, "CEL: shift light active", int, "%d"
3347
entry = RPMValue, "RPM", int, "%d"
3448
entry = rpmAcceleration, "dRPM", int, "%d"
3549
entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f"

‎generated/console/binary/generated/live_data_fragments.ini‎

Lines changed: 1053 additions & 1039 deletions
Large diffs are not rendered by default.

‎generated/console/binary/generated/live_data_ids.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,41 @@ LDS_vvl_controller_state,
5151
LDS_live_data_rotational_idle,
5252
} live_data_e;
5353
#define OUTPUT_CHANNELS_BASE_ADDRESS 0
54-
#define FUEL_COMPUTER_BASE_ADDRESS 944
55-
#define IGNITION_STATE_BASE_ADDRESS 996
56-
#define KNOCK_CONTROLLER_BASE_ADDRESS 1052
57-
#define PRIME_INJECTION_BASE_ADDRESS 1164
58-
#define TCU_CONTROLLER_BASE_ADDRESS 1168
59-
#define THROTTLE_MODEL_BASE_ADDRESS 1184
60-
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1196
61-
#define INJECTOR_MODEL_BASE_ADDRESS 1240
62-
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1256
63-
#define SHIFT_TORQUE_REDUCTION_STATE_BASE_ADDRESS 1264
64-
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1276
65-
#define BOOST_CONTROL_BASE_ADDRESS 1288
66-
#define AC_CONTROL_BASE_ADDRESS 1320
67-
#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1328
68-
#define FAN_CONTROL_BASE_ADDRESS 1332
69-
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1380
70-
#define MAIN_RELAY_BASE_ADDRESS 1384
71-
#define ENGINE_STATE_BASE_ADDRESS 1388
72-
#define TPS_ACCEL_STATE_BASE_ADDRESS 1548
73-
#define TRIGGER_CENTRAL_BASE_ADDRESS 1596
74-
#define TRIGGER_STATE_BASE_ADDRESS 1668
75-
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1848
76-
#define WALL_FUEL_STATE_BASE_ADDRESS 1856
77-
#define CLOSED_LOOP_IDLE_BASE_ADDRESS 1864
78-
#define MISFIRE_DETECTION_STATE_BASE_ADDRESS 1872
79-
#define LIVE_DATA_EXAMPLE_BASE_ADDRESS 1900
80-
#define IDLE_STATE_BASE_ADDRESS 1904
81-
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1960
82-
#define WIDEBAND_STATE_BASE_ADDRESS 2072
83-
#define DC_MOTORS_BASE_ADDRESS 2104
84-
#define SENT_STATE_BASE_ADDRESS 2116
85-
#define VVT_BASE_ADDRESS 2124
86-
#define LAMBDA_MONITOR_BASE_ADDRESS 2128
87-
#define MC33810_STATE_BASE_ADDRESS 2136
88-
#define LONG_TERM_FUEL_TRIM_STATE_BASE_ADDRESS 2152
89-
#define SHORT_TERM_FUEL_TRIM_STATE_BASE_ADDRESS 2184
90-
#define VVL_CONTROLLER_STATE_BASE_ADDRESS 2200
91-
#define LIVE_DATA_ROTATIONAL_IDLE_BASE_ADDRESS 2204
54+
#define FUEL_COMPUTER_BASE_ADDRESS 952
55+
#define IGNITION_STATE_BASE_ADDRESS 1004
56+
#define KNOCK_CONTROLLER_BASE_ADDRESS 1060
57+
#define PRIME_INJECTION_BASE_ADDRESS 1172
58+
#define TCU_CONTROLLER_BASE_ADDRESS 1176
59+
#define THROTTLE_MODEL_BASE_ADDRESS 1192
60+
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1204
61+
#define INJECTOR_MODEL_BASE_ADDRESS 1248
62+
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1264
63+
#define SHIFT_TORQUE_REDUCTION_STATE_BASE_ADDRESS 1272
64+
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1284
65+
#define BOOST_CONTROL_BASE_ADDRESS 1296
66+
#define AC_CONTROL_BASE_ADDRESS 1328
67+
#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1336
68+
#define FAN_CONTROL_BASE_ADDRESS 1340
69+
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1388
70+
#define MAIN_RELAY_BASE_ADDRESS 1392
71+
#define ENGINE_STATE_BASE_ADDRESS 1396
72+
#define TPS_ACCEL_STATE_BASE_ADDRESS 1556
73+
#define TRIGGER_CENTRAL_BASE_ADDRESS 1604
74+
#define TRIGGER_STATE_BASE_ADDRESS 1676
75+
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1856
76+
#define WALL_FUEL_STATE_BASE_ADDRESS 1864
77+
#define CLOSED_LOOP_IDLE_BASE_ADDRESS 1872
78+
#define MISFIRE_DETECTION_STATE_BASE_ADDRESS 1880
79+
#define LIVE_DATA_EXAMPLE_BASE_ADDRESS 1908
80+
#define IDLE_STATE_BASE_ADDRESS 1912
81+
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1968
82+
#define WIDEBAND_STATE_BASE_ADDRESS 2080
83+
#define DC_MOTORS_BASE_ADDRESS 2112
84+
#define SENT_STATE_BASE_ADDRESS 2124
85+
#define VVT_BASE_ADDRESS 2132
86+
#define LAMBDA_MONITOR_BASE_ADDRESS 2136
87+
#define MC33810_STATE_BASE_ADDRESS 2144
88+
#define LONG_TERM_FUEL_TRIM_STATE_BASE_ADDRESS 2160
89+
#define SHORT_TERM_FUEL_TRIM_STATE_BASE_ADDRESS 2192
90+
#define VVL_CONTROLLER_STATE_BASE_ADDRESS 2208
91+
#define LIVE_DATA_ROTATIONAL_IDLE_BASE_ADDRESS 2212

‎generated/console/binary/generated/log_fields_generated.h‎

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ static LOG_FIELD_CONSTNESS_SPECIFIER_STORAGE MLG::Entries::Field fields[] = {
3838
{engine->outputChannels, 0, 29, "isTuningNow", ""},
3939
{engine->outputChannels, 0, 30, "SD: formating is in progress", ""},
4040
{engine->outputChannels, 0, 31, "isMapAveraging", ""},
41+
{engine->outputChannels.cel_error_codes_count, "CEL: active sensor faults", "", 0},
42+
{engine->outputChannels, 8, 0, "CEL: battery voltage out of range", ""},
43+
{engine->outputChannels, 8, 1, "CEL: MAP sensor out of range", ""},
44+
{engine->outputChannels, 8, 2, "CEL: IAT sensor out of range", ""},
45+
{engine->outputChannels, 8, 3, "CEL: CLT sensor out of range", ""},
46+
{engine->outputChannels, 8, 4, "CEL: TPS sensor out of range", ""},
47+
{engine->outputChannels, 8, 5, "CEL: AFR/EGO sensor out of range", ""},
48+
{engine->outputChannels, 8, 6, "CEL: oil temperature out of range", ""},
49+
{engine->outputChannels, 8, 7, "CEL: oil pressure out of range", ""},
50+
{engine->outputChannels, 8, 8, "CEL: fuel pressure out of range", ""},
51+
{engine->outputChannels, 8, 9, "CEL: MAF sensor out of range", ""},
52+
{engine->outputChannels, 8, 10, "CEL: sync losses over limit", ""},
53+
{engine->outputChannels, 8, 11, "CEL: fuel/spark cut active", ""},
54+
{engine->outputChannels, 8, 12, "CEL: shift light active", ""},
4155
{engine->outputChannels.RPMValue, "RPM", "RPM", 0},
4256
{engine->outputChannels.rpmAcceleration, "dRPM", "RPM acceleration/Rate of Change/ROC", 2},
4357
{engine->outputChannels.speedToRpmRatio, "Gearbox Ratio", "value", 2},
@@ -333,38 +347,38 @@ static LOG_FIELD_CONSTNESS_SPECIFIER_STORAGE MLG::Entries::Field fields[] = {
333347
{engine->outputChannels.targetAfrBlendOutput[1], "targetAfrBlendOutput 2", "%", 1},
334348
{engine->outputChannels.targetAfrBlendYAxis[0], "targetAfrBlendYAxis 1", "", 1},
335349
{engine->outputChannels.targetAfrBlendYAxis[1], "targetAfrBlendYAxis 2", "", 1},
336-
{engine->outputChannels, 720, 0, "coilState1", ""},
337-
{engine->outputChannels, 720, 1, "coilState2", ""},
338-
{engine->outputChannels, 720, 2, "coilState3", ""},
339-
{engine->outputChannels, 720, 3, "coilState4", ""},
340-
{engine->outputChannels, 720, 4, "coilState5", ""},
341-
{engine->outputChannels, 720, 5, "coilState6", ""},
342-
{engine->outputChannels, 720, 6, "coilState7", ""},
343-
{engine->outputChannels, 720, 7, "coilState8", ""},
344-
{engine->outputChannels, 720, 8, "coilState9", ""},
345-
{engine->outputChannels, 720, 9, "coilState10", ""},
346-
{engine->outputChannels, 720, 10, "coilState11", ""},
347-
{engine->outputChannels, 720, 11, "coilState12", ""},
348-
{engine->outputChannels, 720, 12, "injectorState1", ""},
349-
{engine->outputChannels, 720, 13, "injectorState2", ""},
350-
{engine->outputChannels, 720, 14, "injectorState3", ""},
351-
{engine->outputChannels, 720, 15, "injectorState4", ""},
352-
{engine->outputChannels, 720, 16, "injectorState5", ""},
353-
{engine->outputChannels, 720, 17, "injectorState6", ""},
354-
{engine->outputChannels, 720, 18, "injectorState7", ""},
355-
{engine->outputChannels, 720, 19, "injectorState8", ""},
356-
{engine->outputChannels, 720, 20, "injectorState9", ""},
357-
{engine->outputChannels, 720, 21, "injectorState10", ""},
358-
{engine->outputChannels, 720, 22, "injectorState11", ""},
359-
{engine->outputChannels, 720, 23, "injectorState12", ""},
360-
{engine->outputChannels, 720, 24, "triggerChannel1", ""},
361-
{engine->outputChannels, 720, 25, "triggerChannel2", ""},
362-
{engine->outputChannels, 720, 26, "bank 1 intake cam input", ""},
363-
{engine->outputChannels, 720, 27, "bank 1 exhaust cam input", ""},
364-
{engine->outputChannels, 720, 28, "bank 2 intake cam input", ""},
365-
{engine->outputChannels, 720, 29, "bank 2 exhaust cam input", ""},
366-
{engine->outputChannels, 720, 30, "AE: Map Prediction Active", ""},
367-
{engine->outputChannels, 720, 31, "Error: Flex", ""},
350+
{engine->outputChannels, 728, 0, "coilState1", ""},
351+
{engine->outputChannels, 728, 1, "coilState2", ""},
352+
{engine->outputChannels, 728, 2, "coilState3", ""},
353+
{engine->outputChannels, 728, 3, "coilState4", ""},
354+
{engine->outputChannels, 728, 4, "coilState5", ""},
355+
{engine->outputChannels, 728, 5, "coilState6", ""},
356+
{engine->outputChannels, 728, 6, "coilState7", ""},
357+
{engine->outputChannels, 728, 7, "coilState8", ""},
358+
{engine->outputChannels, 728, 8, "coilState9", ""},
359+
{engine->outputChannels, 728, 9, "coilState10", ""},
360+
{engine->outputChannels, 728, 10, "coilState11", ""},
361+
{engine->outputChannels, 728, 11, "coilState12", ""},
362+
{engine->outputChannels, 728, 12, "injectorState1", ""},
363+
{engine->outputChannels, 728, 13, "injectorState2", ""},
364+
{engine->outputChannels, 728, 14, "injectorState3", ""},
365+
{engine->outputChannels, 728, 15, "injectorState4", ""},
366+
{engine->outputChannels, 728, 16, "injectorState5", ""},
367+
{engine->outputChannels, 728, 17, "injectorState6", ""},
368+
{engine->outputChannels, 728, 18, "injectorState7", ""},
369+
{engine->outputChannels, 728, 19, "injectorState8", ""},
370+
{engine->outputChannels, 728, 20, "injectorState9", ""},
371+
{engine->outputChannels, 728, 21, "injectorState10", ""},
372+
{engine->outputChannels, 728, 22, "injectorState11", ""},
373+
{engine->outputChannels, 728, 23, "injectorState12", ""},
374+
{engine->outputChannels, 728, 24, "triggerChannel1", ""},
375+
{engine->outputChannels, 728, 25, "triggerChannel2", ""},
376+
{engine->outputChannels, 728, 26, "bank 1 intake cam input", ""},
377+
{engine->outputChannels, 728, 27, "bank 1 exhaust cam input", ""},
378+
{engine->outputChannels, 728, 28, "bank 2 intake cam input", ""},
379+
{engine->outputChannels, 728, 29, "bank 2 exhaust cam input", ""},
380+
{engine->outputChannels, 728, 30, "AE: Map Prediction Active", ""},
381+
{engine->outputChannels, 728, 31, "Error: Flex", ""},
368382
{engine->outputChannels.outputRequestPeriod, "outputRequestPeriod", "", 0},
369383
{engine->outputChannels.mapFast, "mapFast", "", 0},
370384
{engine->outputChannels.luaGauges[0], "Lua: Gauge 1", "value", 3},

‎generated/console/binary/generated/total_live_data_generated.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// generated by gen_live_documentation.sh / LiveDataProcessor.java
2-
#define TS_TOTAL_OUTPUT_SIZE 2208
2+
#define TS_TOTAL_OUTPUT_SIZE 2216

‎generated/controllers/lua/generated/output_lookup_generated.cpp‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,48 @@ float getOutputValueByHash(const int hash) {
103103
// isMapAveraging
104104
case -1626840525:
105105
return engine->outputChannels.isMapAveraging;
106+
// cel_error_codes_count
107+
case 92358935:
108+
return engine->outputChannels.cel_error_codes_count;
109+
// cel_batv
110+
case 985545253:
111+
return engine->outputChannels.cel_batv;
112+
// cel_map
113+
case -1141477738:
114+
return engine->outputChannels.cel_map;
115+
// cel_iat
116+
case -1141482090:
117+
return engine->outputChannels.cel_iat;
118+
// cel_clt
119+
case -1141488261:
120+
return engine->outputChannels.cel_clt;
121+
// cel_tps
122+
case -1141469617:
123+
return engine->outputChannels.cel_tps;
124+
// cel_afr
125+
case -1141490639:
126+
return engine->outputChannels.cel_afr;
127+
// cel_oil_temp
128+
case -653633135:
129+
return engine->outputChannels.cel_oil_temp;
130+
// cel_oil_pressure
131+
case -934637260:
132+
return engine->outputChannels.cel_oil_pressure;
133+
// cel_fuel_pressure
134+
case 351458524:
135+
return engine->outputChannels.cel_fuel_pressure;
136+
// cel_maf
137+
case -1141477748:
138+
return engine->outputChannels.cel_maf;
139+
// cel_sync_loss
140+
case 842372917:
141+
return engine->outputChannels.cel_sync_loss;
142+
// cel_any_cut
143+
case 461941227:
144+
return engine->outputChannels.cel_any_cut;
145+
// cel_shiftlight_active
146+
case -2039338359:
147+
return engine->outputChannels.cel_shiftlight_active;
106148
// RPMValue
107149
case 1699696209:
108150
return engine->outputChannels.RPMValue;

0 commit comments

Comments
 (0)