diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index b7289ba429..75df0dbb00 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Aug 25 22:49:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Sep 01 15:02:30 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -284,26 +284,19 @@ struct running_fuel_s { */ float timeSinceCrankingInSecs = (float)0; /** - * injectorLag(VBatt) - * this value depends on a slow-changing VBatt value, so - * we update it once in a while * offset 16 */ - floatms_t injectorLag = (floatms_t)0; - /** - * offset 20 - */ floatms_t baseFuel = (floatms_t)0; /** * Actual injection duration with CLT, IAT and TPS acceleration corrections per cycle, as squirt duration. * Without injector lag. * @see baseFuel * @see actualLastInjection - * offset 24 + * offset 20 */ floatms_t fuel = (floatms_t)0; }; -static_assert(sizeof(running_fuel_s) == 28); +static_assert(sizeof(running_fuel_s) == 24); // start of engine_state_s struct engine_state_s { @@ -362,166 +355,166 @@ struct engine_state_s { /** * ignition dwell duration in ms * See also dwellAngle - * offset 120 + * offset 116 */ floatms_t sparkDwell = (floatms_t)0; /** * ignition dwell duration as crankshaft angle * NAN if engine is stopped * See also sparkDwell - * offset 124 + * offset 120 */ angle_t dwellAngle = (angle_t)0; /** deg - * offset 128 + * offset 124 */ scaled_channel cltTimingCorrection = (int16_t)0; /** deg - * offset 130 + * offset 126 */ scaled_channel timingIatCorrection = (int16_t)0; /** deg - * offset 132 + * offset 128 */ scaled_channel timingPidCorrection = (int16_t)0; /** * Detected Board ID id - * offset 134 + * offset 130 */ int16_t hellenBoardId = (int16_t)0; /** * @@INDICATOR_NAME_CLUTCH_UP@@ - offset 136 bit 0 */ + offset 132 bit 0 */ bool clutchUpState : 1 {}; /** * @@INDICATOR_NAME_CLUTCH_DOWN@@ - offset 136 bit 1 */ + offset 132 bit 1 */ bool clutchDownState : 1 {}; /** * @@INDICATOR_NAME_BRAKE_DOWN@@ - offset 136 bit 2 */ + offset 132 bit 2 */ bool brakePedalState : 1 {}; /** - offset 136 bit 3 */ + offset 132 bit 3 */ bool unusedBit_22_3 : 1 {}; /** - offset 136 bit 4 */ + offset 132 bit 4 */ bool unusedBit_22_4 : 1 {}; /** - offset 136 bit 5 */ + offset 132 bit 5 */ bool unusedBit_22_5 : 1 {}; /** - offset 136 bit 6 */ + offset 132 bit 6 */ bool unusedBit_22_6 : 1 {}; /** - offset 136 bit 7 */ + offset 132 bit 7 */ bool unusedBit_22_7 : 1 {}; /** - offset 136 bit 8 */ + offset 132 bit 8 */ bool unusedBit_22_8 : 1 {}; /** - offset 136 bit 9 */ + offset 132 bit 9 */ bool unusedBit_22_9 : 1 {}; /** - offset 136 bit 10 */ + offset 132 bit 10 */ bool unusedBit_22_10 : 1 {}; /** - offset 136 bit 11 */ + offset 132 bit 11 */ bool unusedBit_22_11 : 1 {}; /** - offset 136 bit 12 */ + offset 132 bit 12 */ bool unusedBit_22_12 : 1 {}; /** - offset 136 bit 13 */ + offset 132 bit 13 */ bool unusedBit_22_13 : 1 {}; /** - offset 136 bit 14 */ + offset 132 bit 14 */ bool unusedBit_22_14 : 1 {}; /** - offset 136 bit 15 */ + offset 132 bit 15 */ bool unusedBit_22_15 : 1 {}; /** - offset 136 bit 16 */ + offset 132 bit 16 */ bool unusedBit_22_16 : 1 {}; /** - offset 136 bit 17 */ + offset 132 bit 17 */ bool unusedBit_22_17 : 1 {}; /** - offset 136 bit 18 */ + offset 132 bit 18 */ bool unusedBit_22_18 : 1 {}; /** - offset 136 bit 19 */ + offset 132 bit 19 */ bool unusedBit_22_19 : 1 {}; /** - offset 136 bit 20 */ + offset 132 bit 20 */ bool unusedBit_22_20 : 1 {}; /** - offset 136 bit 21 */ + offset 132 bit 21 */ bool unusedBit_22_21 : 1 {}; /** - offset 136 bit 22 */ + offset 132 bit 22 */ bool unusedBit_22_22 : 1 {}; /** - offset 136 bit 23 */ + offset 132 bit 23 */ bool unusedBit_22_23 : 1 {}; /** - offset 136 bit 24 */ + offset 132 bit 24 */ bool unusedBit_22_24 : 1 {}; /** - offset 136 bit 25 */ + offset 132 bit 25 */ bool unusedBit_22_25 : 1 {}; /** - offset 136 bit 26 */ + offset 132 bit 26 */ bool unusedBit_22_26 : 1 {}; /** - offset 136 bit 27 */ + offset 132 bit 27 */ bool unusedBit_22_27 : 1 {}; /** - offset 136 bit 28 */ + offset 132 bit 28 */ bool unusedBit_22_28 : 1 {}; /** - offset 136 bit 29 */ + offset 132 bit 29 */ bool unusedBit_22_29 : 1 {}; /** - offset 136 bit 30 */ + offset 132 bit 30 */ bool unusedBit_22_30 : 1 {}; /** - offset 136 bit 31 */ + offset 132 bit 31 */ bool unusedBit_22_31 : 1 {}; /** - * offset 140 + * offset 136 */ float egt1 = (float)0; /** - * offset 144 + * offset 140 */ float egt2 = (float)0; /** * User-defined RPM hard limit rpm - * offset 148 + * offset 144 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment units - * offset 150 + * offset 146 */ - uint8_t alignmentFill_at_150[2]; + uint8_t alignmentFill_at_146[2]; /** - * offset 152 + * offset 148 */ int fuelInjectionCounter = (int)0; /** - * offset 156 + * offset 152 */ int sparkCounter = (int)0; }; -static_assert(sizeof(engine_state_s) == 160); +static_assert(sizeof(engine_state_s) == 156); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Aug 25 22:49:55 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Sep 01 15:02:30 UTC 2022 diff --git a/firmware/controllers/algo/fuel/injector_model_generated.h b/firmware/controllers/algo/fuel/injector_model_generated.h index 231d265a2a..93f19f40b8 100644 --- a/firmware/controllers/algo/fuel/injector_model_generated.h +++ b/firmware/controllers/algo/fuel/injector_model_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Thu Sep 01 14:38:33 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Thu Sep 01 15:02:30 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,6 +6,9 @@ // start of injector_model_s struct injector_model_s { /** + * injectorLag(VBatt) + * this value depends on a slow-changing VBatt value, so + * we update it once in a while * offset 0 */ float m_deadtime = (float)0; @@ -24,4 +27,4 @@ struct injector_model_s { static_assert(sizeof(injector_model_s) == 12); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Thu Sep 01 14:38:33 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Thu Sep 01 15:02:30 UTC 2022 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 594bf3c427..2648850216 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1862063384 -#define TS_SIGNATURE "rusEFI 2022.09.01.48way.1862063384" +#define SIGNATURE_HASH 1771114753 +#define TS_SIGNATURE "rusEFI 2022.09.01.48way.1771114753" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 096a8c06d1..9bd2b33374 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2044452183 -#define TS_SIGNATURE "rusEFI 2022.09.01.all.2044452183" +#define SIGNATURE_HASH 2125863246 +#define TS_SIGNATURE "rusEFI 2022.09.01.all.2125863246" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index ab591c8cb8..0c4c55a226 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1271480379 -#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-2chan.1271480379" +#define SIGNATURE_HASH 1285850146 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-2chan.1285850146" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 4252f9b323..76a4179c45 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4073135832 -#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-4chan.4073135832" +#define SIGNATURE_HASH 4121615041 +#define TS_SIGNATURE "rusEFI 2022.09.01.alphax-4chan.4121615041" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index d18ad57ab1..e81213fe2e 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1695623280 -#define TS_SIGNATURE "rusEFI 2022.09.01.atlas.1695623280" +#define SIGNATURE_HASH 1652354153 +#define TS_SIGNATURE "rusEFI 2022.09.01.atlas.1652354153" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index cc5815f783..41a1991d09 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2402782382 -#define TS_SIGNATURE "rusEFI 2022.09.01.core8.2402782382" +#define SIGNATURE_HASH 2287618231 +#define TS_SIGNATURE "rusEFI 2022.09.01.core8.2287618231" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 5d9e155442..4b263f9b61 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 2044452183 -#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.2044452183" +#define SIGNATURE_HASH 2125863246 +#define TS_SIGNATURE "rusEFI 2022.09.01.cypress.2125863246" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index d18ba0fc62..9df7d1aeb2 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2044452183 -#define TS_SIGNATURE "rusEFI 2022.09.01.f407-discovery.2044452183" +#define SIGNATURE_HASH 2125863246 +#define TS_SIGNATURE "rusEFI 2022.09.01.f407-discovery.2125863246" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 1b9867097d..6b61118df7 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2044452183 -#define TS_SIGNATURE "rusEFI 2022.09.01.f429-discovery.2044452183" +#define SIGNATURE_HASH 2125863246 +#define TS_SIGNATURE "rusEFI 2022.09.01.f429-discovery.2125863246" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 8202b7f251..84d8f66b31 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1001857427 -#define TS_SIGNATURE "rusEFI 2022.09.01.frankenso_na6.1001857427" +#define SIGNATURE_HASH 1020978570 +#define TS_SIGNATURE "rusEFI 2022.09.01.frankenso_na6.1020978570" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 9b21fc7d1a..12e1aa78ba 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2301024376 -#define TS_SIGNATURE "rusEFI 2022.09.01.harley81.2301024376" +#define SIGNATURE_HASH 2387287137 +#define TS_SIGNATURE "rusEFI 2022.09.01.harley81.2387287137" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 27cc39ca53..e554649ebf 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3451672801 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-gm-e67.3451672801" +#define SIGNATURE_HASH 3402734840 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-gm-e67.3402734840" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f2ec0c5864..b03ef988b3 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2689658011 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-nb1.2689658011" +#define SIGNATURE_HASH 2805803138 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen-nb1.2805803138" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 872b9e35fd..f6b8bc7817 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4043662781 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121nissan.4043662781" +#define SIGNATURE_HASH 4134052260 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121nissan.4134052260" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 3e1c5c8797..196c542237 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 167386669 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121vag.167386669" +#define SIGNATURE_HASH 244832820 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen121vag.244832820" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index cb38979fdf..a4747a5a73 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2267406441 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen128.2267406441" +#define SIGNATURE_HASH 2152211568 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen128.2152211568" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 5bcb4e3159..35bb0ca001 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3784617939 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen154hyundai.3784617939" +#define SIGNATURE_HASH 3875105738 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen154hyundai.3875105738" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index eb8bc6b6d1..48e7e03f1f 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2347037779 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen72.2347037779" +#define SIGNATURE_HASH 2357801034 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen72.2357801034" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index c429b3da6f..1abc4b3821 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1533936989 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen81.1533936989" +#define SIGNATURE_HASH 1543749956 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen81.1543749956" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index c38f97a894..df37e77f14 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1815006875 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellen88bmw.1815006875" +#define SIGNATURE_HASH 1799555714 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellen88bmw.1799555714" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 71b247a21d..ed485b0a93 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3156837333 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA6.3156837333" +#define SIGNATURE_HASH 3141814220 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA6.3141814220" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 1d4d4a6096..db278bb8e7 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3654446271 -#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA8_96.3654446271" +#define SIGNATURE_HASH 3737102502 +#define TS_SIGNATURE "rusEFI 2022.09.01.hellenNA8_96.3737102502" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 68747d7771..0fddb9b5ef 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 286031771 -#define TS_SIGNATURE "rusEFI 2022.09.01.kin.286031771" +#define SIGNATURE_HASH 375503746 +#define TS_SIGNATURE "rusEFI 2022.09.01.kin.375503746" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 9a16a74d9f..ff7a9c5896 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3054326177 -#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f4.3054326177" +#define SIGNATURE_HASH 2975897016 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f4.2975897016" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e89e5777e9..b2ea53736e 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3054326177 -#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f7.3054326177" +#define SIGNATURE_HASH 2975897016 +#define TS_SIGNATURE "rusEFI 2022.09.01.mre_f7.2975897016" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6679152e37..26bc06d9b6 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 691078321 -#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_405.691078321" +#define SIGNATURE_HASH 777830568 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_405.777830568" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 617eea5746..f3d6ec47b4 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 691078321 -#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_469.691078321" +#define SIGNATURE_HASH 777830568 +#define TS_SIGNATURE "rusEFI 2022.09.01.prometheus_469.777830568" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index bf659dfd86..525857a688 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3692436001 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f4.3692436001" +#define SIGNATURE_HASH 3682328120 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f4.3682328120" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 243e429cd5..2d481c7a44 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3692436001 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f7.3692436001" +#define SIGNATURE_HASH 3682328120 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_f7.3682328120" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index b263fed669..39732043a0 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3692436001 -#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_h7.3692436001" +#define SIGNATURE_HASH 3682328120 +#define TS_SIGNATURE "rusEFI 2022.09.01.proteus_h7.3682328120" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 9e2d5586df..f6cab48997 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 12911757 -#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.12911757" +#define SIGNATURE_HASH 128499860 +#define TS_SIGNATURE "rusEFI 2022.09.01.subaru_eg33_f7.128499860" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 396964a61b..811c56505a 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3553825539 -#define TS_SIGNATURE "rusEFI 2022.09.01.tdg-pdm8.3553825539" +#define SIGNATURE_HASH 3569276698 +#define TS_SIGNATURE "rusEFI 2022.09.01.tdg-pdm8.3569276698" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 718d3d1ca9..0d81337e3e 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -113,6 +113,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.injectionOffset; if (strEqualCaseInsensitive(name, "tCharge")) return engine->outputChannels.tCharge; + if (strEqualCaseInsensitive(name, "injectorLagMs")) + return engine->outputChannels.injectorLagMs; if (strEqualCaseInsensitive(name, "iatCorrection")) return engine->outputChannels.iatCorrection; if (strEqualCaseInsensitive(name, "cltCorrection")) diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 085e82d2e1..dcfe257b98 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 29 12:19:32 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Thu Sep 01 15:02:30 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -476,53 +476,52 @@ public class EngineState { public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 96, FieldType.FLOAT); public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 100, FieldType.FLOAT); public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 104, FieldType.FLOAT); - public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 108, FieldType.FLOAT); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 112, FieldType.FLOAT); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 116, FieldType.FLOAT); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 120, FieldType.FLOAT); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 124, FieldType.FLOAT); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 128, FieldType.INT16).setScale(0.01); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 130, FieldType.INT16).setScale(0.01); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 132, FieldType.INT16).setScale(0.01); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 134, FieldType.INT16).setScale(1.0); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 136, FieldType.BIT, 0); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 136, FieldType.BIT, 1); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 136, FieldType.BIT, 2); - public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 136, FieldType.BIT, 3); - public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 136, FieldType.BIT, 4); - public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 136, FieldType.BIT, 5); - public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 136, FieldType.BIT, 6); - public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 136, FieldType.BIT, 7); - public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 136, FieldType.BIT, 8); - public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 136, FieldType.BIT, 9); - public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 136, FieldType.BIT, 10); - public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 136, FieldType.BIT, 11); - public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 136, FieldType.BIT, 12); - public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 136, FieldType.BIT, 13); - public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 136, FieldType.BIT, 14); - public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 136, FieldType.BIT, 15); - public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 136, FieldType.BIT, 16); - public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 136, FieldType.BIT, 17); - public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 136, FieldType.BIT, 18); - public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 136, FieldType.BIT, 19); - public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 136, FieldType.BIT, 20); - public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 136, FieldType.BIT, 21); - public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 136, FieldType.BIT, 22); - public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 136, FieldType.BIT, 23); - public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 136, FieldType.BIT, 24); - public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 136, FieldType.BIT, 25); - public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 136, FieldType.BIT, 26); - public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 136, FieldType.BIT, 27); - public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 136, FieldType.BIT, 28); - public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 136, FieldType.BIT, 29); - public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 136, FieldType.BIT, 30); - public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 136, FieldType.BIT, 31); - public static final Field EGT1 = Field.create("EGT1", 140, FieldType.FLOAT); - public static final Field EGT2 = Field.create("EGT2", 144, FieldType.FLOAT); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 148, FieldType.INT16).setScale(1.0); - public static final Field ALIGNMENTFILL_AT_150 = Field.create("ALIGNMENTFILL_AT_150", 150, FieldType.INT8).setScale(1.0); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 152, FieldType.INT).setScale(1.0); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 156, FieldType.INT).setScale(1.0); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 108, FieldType.FLOAT); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 112, FieldType.FLOAT); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 116, FieldType.FLOAT); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 120, FieldType.FLOAT); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.INT16).setScale(0.01); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 126, FieldType.INT16).setScale(0.01); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 128, FieldType.INT16).setScale(0.01); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 130, FieldType.INT16).setScale(1.0); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 132, FieldType.BIT, 0); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 132, FieldType.BIT, 1); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 132, FieldType.BIT, 2); + public static final Field UNUSEDBIT_22_3 = Field.create("UNUSEDBIT_22_3", 132, FieldType.BIT, 3); + public static final Field UNUSEDBIT_22_4 = Field.create("UNUSEDBIT_22_4", 132, FieldType.BIT, 4); + public static final Field UNUSEDBIT_22_5 = Field.create("UNUSEDBIT_22_5", 132, FieldType.BIT, 5); + public static final Field UNUSEDBIT_22_6 = Field.create("UNUSEDBIT_22_6", 132, FieldType.BIT, 6); + public static final Field UNUSEDBIT_22_7 = Field.create("UNUSEDBIT_22_7", 132, FieldType.BIT, 7); + public static final Field UNUSEDBIT_22_8 = Field.create("UNUSEDBIT_22_8", 132, FieldType.BIT, 8); + public static final Field UNUSEDBIT_22_9 = Field.create("UNUSEDBIT_22_9", 132, FieldType.BIT, 9); + public static final Field UNUSEDBIT_22_10 = Field.create("UNUSEDBIT_22_10", 132, FieldType.BIT, 10); + public static final Field UNUSEDBIT_22_11 = Field.create("UNUSEDBIT_22_11", 132, FieldType.BIT, 11); + public static final Field UNUSEDBIT_22_12 = Field.create("UNUSEDBIT_22_12", 132, FieldType.BIT, 12); + public static final Field UNUSEDBIT_22_13 = Field.create("UNUSEDBIT_22_13", 132, FieldType.BIT, 13); + public static final Field UNUSEDBIT_22_14 = Field.create("UNUSEDBIT_22_14", 132, FieldType.BIT, 14); + public static final Field UNUSEDBIT_22_15 = Field.create("UNUSEDBIT_22_15", 132, FieldType.BIT, 15); + public static final Field UNUSEDBIT_22_16 = Field.create("UNUSEDBIT_22_16", 132, FieldType.BIT, 16); + public static final Field UNUSEDBIT_22_17 = Field.create("UNUSEDBIT_22_17", 132, FieldType.BIT, 17); + public static final Field UNUSEDBIT_22_18 = Field.create("UNUSEDBIT_22_18", 132, FieldType.BIT, 18); + public static final Field UNUSEDBIT_22_19 = Field.create("UNUSEDBIT_22_19", 132, FieldType.BIT, 19); + public static final Field UNUSEDBIT_22_20 = Field.create("UNUSEDBIT_22_20", 132, FieldType.BIT, 20); + public static final Field UNUSEDBIT_22_21 = Field.create("UNUSEDBIT_22_21", 132, FieldType.BIT, 21); + public static final Field UNUSEDBIT_22_22 = Field.create("UNUSEDBIT_22_22", 132, FieldType.BIT, 22); + public static final Field UNUSEDBIT_22_23 = Field.create("UNUSEDBIT_22_23", 132, FieldType.BIT, 23); + public static final Field UNUSEDBIT_22_24 = Field.create("UNUSEDBIT_22_24", 132, FieldType.BIT, 24); + public static final Field UNUSEDBIT_22_25 = Field.create("UNUSEDBIT_22_25", 132, FieldType.BIT, 25); + public static final Field UNUSEDBIT_22_26 = Field.create("UNUSEDBIT_22_26", 132, FieldType.BIT, 26); + public static final Field UNUSEDBIT_22_27 = Field.create("UNUSEDBIT_22_27", 132, FieldType.BIT, 27); + public static final Field UNUSEDBIT_22_28 = Field.create("UNUSEDBIT_22_28", 132, FieldType.BIT, 28); + public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 132, FieldType.BIT, 29); + public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 132, FieldType.BIT, 30); + public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 132, FieldType.BIT, 31); + public static final Field EGT1 = Field.create("EGT1", 136, FieldType.FLOAT); + public static final Field EGT2 = Field.create("EGT2", 140, FieldType.FLOAT); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 144, FieldType.INT16).setScale(1.0); + public static final Field ALIGNMENTFILL_AT_146 = Field.create("ALIGNMENTFILL_AT_146", 146, FieldType.INT8).setScale(1.0); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 148, FieldType.INT).setScale(1.0); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 152, FieldType.INT).setScale(1.0); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -613,7 +612,6 @@ public class EngineState { RUNNING_INTAKETEMPERATURECOEFFICIENT, RUNNING_COOLANTTEMPERATURECOEFFICIENT, RUNNING_TIMESINCECRANKINGINSECS, - RUNNING_INJECTORLAG, RUNNING_BASEFUEL, RUNNING_FUEL, SPARKDWELL, @@ -657,7 +655,7 @@ public class EngineState { EGT1, EGT2, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_150, + ALIGNMENTFILL_AT_146, FUELINJECTIONCOUNTER, SPARKCOUNTER, };