From fc64267fdeef5c887320434d14e4c8eb43646301 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sat, 14 Jan 2023 10:42:09 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary_log/log_fields_generated.h | 1 + .../algo/fuel/fuel_computer_generated.h | 148 +++++++++--------- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../lua/generated/output_lookup_generated.cpp | 2 + .../rusefi/config/generated/AcControl.java | 24 +-- .../config/generated/AntilagSystem.java | 26 +-- .../rusefi/config/generated/BoostControl.java | 26 +-- .../config/generated/ElectronicThrottle.java | 34 ++-- .../rusefi/config/generated/EngineState.java | 102 ++++++------ .../rusefi/config/generated/FanControl.java | 16 +- .../rusefi/config/generated/FuelComputer.java | 18 ++- .../com/rusefi/config/generated/FuelPump.java | 10 +- .../rusefi/config/generated/IdleState.java | 54 +++---- .../config/generated/IgnitionState.java | 10 +- .../config/generated/LaunchControl.java | 24 +-- .../rusefi/config/generated/MainRelay.java | 10 +- .../config/generated/TpsAccelState.java | 36 ++--- .../config/generated/TriggerCentral.java | 34 ++-- .../rusefi/config/generated/TriggerState.java | 18 +-- .../config/generated/TriggerStatePrimary.java | 4 +- .../config/generated/WallFuelState.java | 6 +- .../config/generated/WidebandController.java | 18 +-- 56 files changed, 385 insertions(+), 376 deletions(-) diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index df4450046f..c9c195bd0d 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -249,6 +249,7 @@ static constexpr LogField fields[] = { {engine->outputChannels.rawMaf2, "rawMaf2", "V", 3}, {engine->outputChannels.mafMeasured2, "MAF #2", "kg/h", 1}, {engine->outputChannels.schedulingUsedCount, "schedulingUsedCount", "", 0}, + {engine->fuelComputer.totalFuelCorrection, "totalFuelCorrection", "", 0}, {engine->fuelComputer.afrTableYAxis, "afrTableYAxis", "%", 0}, {engine->fuelComputer.targetLambda, "fuel: target lambda", "", 3}, {engine->fuelComputer.targetAFR, "fuel: target AFR", "ratio", 2}, diff --git a/firmware/controllers/algo/fuel/fuel_computer_generated.h b/firmware/controllers/algo/fuel/fuel_computer_generated.h index 2f493c9747..c7e1aef759 100644 --- a/firmware/controllers/algo/fuel/fuel_computer_generated.h +++ b/firmware/controllers/algo/fuel/fuel_computer_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sun Nov 06 00:27:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,135 +6,139 @@ // start of fuel_computer_s struct fuel_computer_s { /** - % * offset 0 */ + float totalFuelCorrection = (float)0; + /** + % + * offset 4 + */ scaled_channel afrTableYAxis = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_LAMBDA@@ - * offset 2 + * offset 6 */ scaled_channel targetLambda = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_AFR@@ ratio - * offset 4 + * offset 8 */ scaled_channel targetAFR = (uint16_t)0; /** * fuel: stoich ratio ratio - * offset 6 + * offset 10 */ scaled_channel stoichiometricRatio = (uint16_t)0; /** - * offset 8 + * offset 12 */ float sdTcharge_coff = (float)0; /** * SD cylinder mass * Speed-density logic: calculated air mass in one cylinder, in grams - * offset 12 + * offset 16 */ float sdAirMassInOneCylinder = (float)0; /** - offset 16 bit 0 */ + offset 20 bit 0 */ bool sdIsTChargeAirModel : 1 {}; /** - offset 16 bit 1 */ - bool unusedBit_7_1 : 1 {}; + offset 20 bit 1 */ + bool unusedBit_8_1 : 1 {}; /** - offset 16 bit 2 */ - bool unusedBit_7_2 : 1 {}; + offset 20 bit 2 */ + bool unusedBit_8_2 : 1 {}; /** - offset 16 bit 3 */ - bool unusedBit_7_3 : 1 {}; + offset 20 bit 3 */ + bool unusedBit_8_3 : 1 {}; /** - offset 16 bit 4 */ - bool unusedBit_7_4 : 1 {}; + offset 20 bit 4 */ + bool unusedBit_8_4 : 1 {}; /** - offset 16 bit 5 */ - bool unusedBit_7_5 : 1 {}; + offset 20 bit 5 */ + bool unusedBit_8_5 : 1 {}; /** - offset 16 bit 6 */ - bool unusedBit_7_6 : 1 {}; + offset 20 bit 6 */ + bool unusedBit_8_6 : 1 {}; /** - offset 16 bit 7 */ - bool unusedBit_7_7 : 1 {}; + offset 20 bit 7 */ + bool unusedBit_8_7 : 1 {}; /** - offset 16 bit 8 */ - bool unusedBit_7_8 : 1 {}; + offset 20 bit 8 */ + bool unusedBit_8_8 : 1 {}; /** - offset 16 bit 9 */ - bool unusedBit_7_9 : 1 {}; + offset 20 bit 9 */ + bool unusedBit_8_9 : 1 {}; /** - offset 16 bit 10 */ - bool unusedBit_7_10 : 1 {}; + offset 20 bit 10 */ + bool unusedBit_8_10 : 1 {}; /** - offset 16 bit 11 */ - bool unusedBit_7_11 : 1 {}; + offset 20 bit 11 */ + bool unusedBit_8_11 : 1 {}; /** - offset 16 bit 12 */ - bool unusedBit_7_12 : 1 {}; + offset 20 bit 12 */ + bool unusedBit_8_12 : 1 {}; /** - offset 16 bit 13 */ - bool unusedBit_7_13 : 1 {}; + offset 20 bit 13 */ + bool unusedBit_8_13 : 1 {}; /** - offset 16 bit 14 */ - bool unusedBit_7_14 : 1 {}; + offset 20 bit 14 */ + bool unusedBit_8_14 : 1 {}; /** - offset 16 bit 15 */ - bool unusedBit_7_15 : 1 {}; + offset 20 bit 15 */ + bool unusedBit_8_15 : 1 {}; /** - offset 16 bit 16 */ - bool unusedBit_7_16 : 1 {}; + offset 20 bit 16 */ + bool unusedBit_8_16 : 1 {}; /** - offset 16 bit 17 */ - bool unusedBit_7_17 : 1 {}; + offset 20 bit 17 */ + bool unusedBit_8_17 : 1 {}; /** - offset 16 bit 18 */ - bool unusedBit_7_18 : 1 {}; + offset 20 bit 18 */ + bool unusedBit_8_18 : 1 {}; /** - offset 16 bit 19 */ - bool unusedBit_7_19 : 1 {}; + offset 20 bit 19 */ + bool unusedBit_8_19 : 1 {}; /** - offset 16 bit 20 */ - bool unusedBit_7_20 : 1 {}; + offset 20 bit 20 */ + bool unusedBit_8_20 : 1 {}; /** - offset 16 bit 21 */ - bool unusedBit_7_21 : 1 {}; + offset 20 bit 21 */ + bool unusedBit_8_21 : 1 {}; /** - offset 16 bit 22 */ - bool unusedBit_7_22 : 1 {}; + offset 20 bit 22 */ + bool unusedBit_8_22 : 1 {}; /** - offset 16 bit 23 */ - bool unusedBit_7_23 : 1 {}; + offset 20 bit 23 */ + bool unusedBit_8_23 : 1 {}; /** - offset 16 bit 24 */ - bool unusedBit_7_24 : 1 {}; + offset 20 bit 24 */ + bool unusedBit_8_24 : 1 {}; /** - offset 16 bit 25 */ - bool unusedBit_7_25 : 1 {}; + offset 20 bit 25 */ + bool unusedBit_8_25 : 1 {}; /** - offset 16 bit 26 */ - bool unusedBit_7_26 : 1 {}; + offset 20 bit 26 */ + bool unusedBit_8_26 : 1 {}; /** - offset 16 bit 27 */ - bool unusedBit_7_27 : 1 {}; + offset 20 bit 27 */ + bool unusedBit_8_27 : 1 {}; /** - offset 16 bit 28 */ - bool unusedBit_7_28 : 1 {}; + offset 20 bit 28 */ + bool unusedBit_8_28 : 1 {}; /** - offset 16 bit 29 */ - bool unusedBit_7_29 : 1 {}; + offset 20 bit 29 */ + bool unusedBit_8_29 : 1 {}; /** - offset 16 bit 30 */ - bool unusedBit_7_30 : 1 {}; + offset 20 bit 30 */ + bool unusedBit_8_30 : 1 {}; /** - offset 16 bit 31 */ - bool unusedBit_7_31 : 1 {}; + offset 20 bit 31 */ + bool unusedBit_8_31 : 1 {}; }; -static_assert(sizeof(fuel_computer_s) == 20); +static_assert(sizeof(fuel_computer_s) == 24); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sun Nov 06 00:27:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index feaa580509..59a9940966 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_46469 -#define TS_SIGNATURE "rusEFI 2023.01.13.48way.snap_46469" +#define SIGNATURE_HASH snap_29084 +#define TS_SIGNATURE "rusEFI 2023.01.14.48way.snap_29084" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a30fe7b730..f7b8ad3f58 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_48586 -#define TS_SIGNATURE "rusEFI 2023.01.13.all.snap_48586" +#define SIGNATURE_HASH snap_31187 +#define TS_SIGNATURE "rusEFI 2023.01.14.all.snap_31187" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 026455d30d..a4d9affbc6 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_8358 -#define TS_SIGNATURE "rusEFI 2023.01.13.alphax-2chan.snap_8358" +#define SIGNATURE_HASH snap_58559 +#define TS_SIGNATURE "rusEFI 2023.01.14.alphax-2chan.snap_58559" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 713255f670..8cb60c9d79 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_44259 -#define TS_SIGNATURE "rusEFI 2023.01.13.alphax-4chan.snap_44259" +#define SIGNATURE_HASH snap_26874 +#define TS_SIGNATURE "rusEFI 2023.01.14.alphax-4chan.snap_26874" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index c879aa423e..c9963b57a6 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_8774 -#define TS_SIGNATURE "rusEFI 2023.01.13.alphax-8chan.snap_8774" +#define SIGNATURE_HASH snap_58975 +#define TS_SIGNATURE "rusEFI 2023.01.14.alphax-8chan.snap_58975" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ef3b6c8465..ca3557888c 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_18669 -#define TS_SIGNATURE "rusEFI 2023.01.13.atlas.snap_18669" +#define SIGNATURE_HASH snap_36084 +#define TS_SIGNATURE "rusEFI 2023.01.14.atlas.snap_36084" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index d684696bf2..39109c7b27 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_60467 -#define TS_SIGNATURE "rusEFI 2023.01.13.core8.snap_60467" +#define SIGNATURE_HASH snap_10282 +#define TS_SIGNATURE "rusEFI 2023.01.14.core8.snap_10282" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 6dce4ab36e..e6d3dfc2b7 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_48586 -#define TS_SIGNATURE "rusEFI 2023.01.13.cypress.snap_48586" +#define SIGNATURE_HASH snap_31187 +#define TS_SIGNATURE "rusEFI 2023.01.14.cypress.snap_31187" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index fba75907d9..143b676cd7 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_48586 -#define TS_SIGNATURE "rusEFI 2023.01.13.f407-discovery.snap_48586" +#define SIGNATURE_HASH snap_31187 +#define TS_SIGNATURE "rusEFI 2023.01.14.f407-discovery.snap_31187" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index dbbeb15e50..56711320ac 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_48586 -#define TS_SIGNATURE "rusEFI 2023.01.13.f429-discovery.snap_48586" +#define SIGNATURE_HASH snap_31187 +#define TS_SIGNATURE "rusEFI 2023.01.14.f429-discovery.snap_31187" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 866efb5bc1..aae87b7d60 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_16654 -#define TS_SIGNATURE "rusEFI 2023.01.13.frankenso_na6.snap_16654" +#define SIGNATURE_HASH snap_34071 +#define TS_SIGNATURE "rusEFI 2023.01.14.frankenso_na6.snap_34071" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 29ce779e0a..00bc5ab652 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_64309 -#define TS_SIGNATURE "rusEFI 2023.01.13.harley81.snap_64309" +#define SIGNATURE_HASH snap_16172 +#define TS_SIGNATURE "rusEFI 2023.01.14.harley81.snap_16172" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 97569eef73..664c94327f 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_57038 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen-gm-e67.snap_57038" +#define SIGNATURE_HASH snap_6871 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen-gm-e67.snap_6871" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 1e91f7baea..dfc1cd2b87 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_35846 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen-nb1.snap_35846" +#define SIGNATURE_HASH snap_18463 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen-nb1.snap_18463" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 26cadd5cdf..946d1c8233 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_16472 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen121nissan.snap_16472" +#define SIGNATURE_HASH snap_33857 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen121nissan.snap_33857" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 83a95d33b0..a5ca63d282 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_10967 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen121vag.snap_10967" +#define SIGNATURE_HASH snap_61134 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen121vag.snap_61134" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8d532db7ab..3f7e79cae2 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_49393 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen128.snap_49393" +#define SIGNATURE_HASH snap_1256 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen128.snap_1256" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2e3c1394db..8af35a2806 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_34601 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen154hyundai.snap_34601" +#define SIGNATURE_HASH snap_17200 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen154hyundai.snap_17200" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index dfcf543d44..bcbd002168 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_45889 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen72.snap_45889" +#define SIGNATURE_HASH snap_30552 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen72.snap_30552" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 84eb1e7735..639b1a420b 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_9143 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen81.snap_9143" +#define SIGNATURE_HASH snap_59310 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen81.snap_59310" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 3b022abf0f..c3a8a45e5b 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_44550 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellen88bmw.snap_44550" +#define SIGNATURE_HASH snap_27167 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellen88bmw.snap_27167" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index abbe23417e..ad8e515a13 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_3325 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellenNA6.snap_3325" +#define SIGNATURE_HASH snap_51428 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellenNA6.snap_51428" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 5b004d3fe9..8d0997a387 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_3106 -#define TS_SIGNATURE "rusEFI 2023.01.13.hellenNA8_96.snap_3106" +#define SIGNATURE_HASH snap_51259 +#define TS_SIGNATURE "rusEFI 2023.01.14.hellenNA8_96.snap_51259" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 80eb355ecc..7b1219975a 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_7942 -#define TS_SIGNATURE "rusEFI 2023.01.13.kin.snap_7942" +#define SIGNATURE_HASH snap_56095 +#define TS_SIGNATURE "rusEFI 2023.01.14.kin.snap_56095" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 55e536bfe8..db7e968a19 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_24817 -#define TS_SIGNATURE "rusEFI 2023.01.13.m74_9.snap_24817" +#define SIGNATURE_HASH snap_42216 +#define TS_SIGNATURE "rusEFI 2023.01.14.m74_9.snap_42216" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 0fa6d71ff6..cfdf5eb49e 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_56010 -#define TS_SIGNATURE "rusEFI 2023.01.13.mre_f4.snap_56010" +#define SIGNATURE_HASH snap_7891 +#define TS_SIGNATURE "rusEFI 2023.01.14.mre_f4.snap_7891" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 717e5fe3cb..1ec3bb1f5f 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_56010 -#define TS_SIGNATURE "rusEFI 2023.01.13.mre_f7.snap_56010" +#define SIGNATURE_HASH snap_7891 +#define TS_SIGNATURE "rusEFI 2023.01.14.mre_f7.snap_7891" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 43aa8c99c6..3077de697e 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_25644 -#define TS_SIGNATURE "rusEFI 2023.01.13.prometheus_405.snap_25644" +#define SIGNATURE_HASH snap_41013 +#define TS_SIGNATURE "rusEFI 2023.01.14.prometheus_405.snap_41013" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 71b5fc0ba0..8162bbc7d8 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_25644 -#define TS_SIGNATURE "rusEFI 2023.01.13.prometheus_469.snap_25644" +#define SIGNATURE_HASH snap_41013 +#define TS_SIGNATURE "rusEFI 2023.01.14.prometheus_469.snap_41013" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index d02c63e35b..8999009fbc 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_30330 -#define TS_SIGNATURE "rusEFI 2023.01.13.proteus_f4.snap_30330" +#define SIGNATURE_HASH snap_45667 +#define TS_SIGNATURE "rusEFI 2023.01.14.proteus_f4.snap_45667" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 7e016725a0..ac87f841b1 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_30330 -#define TS_SIGNATURE "rusEFI 2023.01.13.proteus_f7.snap_30330" +#define SIGNATURE_HASH snap_45667 +#define TS_SIGNATURE "rusEFI 2023.01.14.proteus_f7.snap_45667" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f2612f5a64..877c1e5ba6 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_30330 -#define TS_SIGNATURE "rusEFI 2023.01.13.proteus_h7.snap_30330" +#define SIGNATURE_HASH snap_45667 +#define TS_SIGNATURE "rusEFI 2023.01.14.proteus_h7.snap_45667" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 5242ae8c3a..4a46cd6dda 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_36791 -#define TS_SIGNATURE "rusEFI 2023.01.13.s105.snap_36791" +#define SIGNATURE_HASH snap_19374 +#define TS_SIGNATURE "rusEFI 2023.01.14.s105.snap_19374" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 4d9bbcebe2..a17a0e44fa 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_25616 -#define TS_SIGNATURE "rusEFI 2023.01.13.subaru_eg33_f7.snap_25616" +#define SIGNATURE_HASH snap_40969 +#define TS_SIGNATURE "rusEFI 2023.01.14.subaru_eg33_f7.snap_40969" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index d4ae2c7a06..ad11e5208c 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_29598 -#define TS_SIGNATURE "rusEFI 2023.01.13.tdg-pdm8.snap_29598" +#define SIGNATURE_HASH snap_46983 +#define TS_SIGNATURE "rusEFI 2023.01.14.tdg-pdm8.snap_46983" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index c4ca63dfb3..a8b22260c4 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -475,6 +475,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.mafMeasured2; case 967311941: return engine->outputChannels.schedulingUsedCount; + case -1779658835: + return engine->fuelComputer.totalFuelCorrection; case 995190836: return engine->fuelComputer.afrTableYAxis; case -734904659: diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index 56b5655a94..bdde965952 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.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/actuators/ac_control.txt Sat Jan 07 03:08:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,17 +401,17 @@ public class AcControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(864); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(864); - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(864); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(864); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(864); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(864); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(864); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(864); - public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(864); - public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(864); - public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(864); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(868); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(868); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(868); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(868); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(868); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(868); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(868); + public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(868); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(868); + public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(868); + public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(868); public static final Field[] VALUES = { ACBUTTONSTATE, M_ACENABLED, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index af943c71ba..c7b76985a5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.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/antilag_system_state.txt Sat Jan 07 03:08:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class AntilagSystem { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(828); - public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(828); - public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(828); - public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(828); - public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(828); - public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(828); - public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(828); - public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(828); - public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(828); - public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(828); - public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(828); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(828); + public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(832); + public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(832); + public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(832); + public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(832); + public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(832); + public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(832); + public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(832); + public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(832); + public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(832); + public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(832); + public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(832); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(832); public static final Field[] VALUES = { ISANTILAGCONDITION, ALSMINRPMCONDITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index 6278ac7e2e..abe696a2fe 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.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/actuators/boost_control.txt Sat Jan 07 03:08:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class BoostControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(840); - public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(840); - public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(840); - public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(840); - public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(840); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(840); - public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(840); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(840); - public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(840); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(840); - public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(840); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(840); + public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(844); + public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(844); + public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(844); + public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(844); + public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(844); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(844); + public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(844); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(844); + public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(844); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(844); + public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(844); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(844); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 3e67b1c04b..ee83a88c91 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,27 +1,27 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class ElectronicThrottle { - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1232); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1232); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1232); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 28, FieldType.BIT, 1).setBaseOffset(1232); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1232); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1232); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1232); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1232); - public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1232); - public static final Field JAMTIMER = Field.create("JAMTIMER", 46, FieldType.INT16).setScale(0.01).setBaseOffset(1232); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1236); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1236); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0).setBaseOffset(1236); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 28, FieldType.BIT, 1).setBaseOffset(1236); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 32, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 36, FieldType.FLOAT).setBaseOffset(1236); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 40, FieldType.INT16).setScale(1.0).setBaseOffset(1236); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 42, FieldType.INT16).setScale(1.0).setBaseOffset(1236); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 44, FieldType.INT8).setScale(1.0).setBaseOffset(1236); + public static final Field ALIGNMENTFILL_AT_45 = Field.create("ALIGNMENTFILL_AT_45", 45, FieldType.INT8).setScale(1.0).setBaseOffset(1236); + public static final Field JAMTIMER = Field.create("JAMTIMER", 46, FieldType.INT16).setScale(0.01).setBaseOffset(1236); public static final Field[] VALUES = { IDLEPOSITION, TRIM, 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 33d7abaf9b..168ecaaa07 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 Sat Jan 07 03:08:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,56 +401,56 @@ public class EngineState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(888); - public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(888); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(888); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(888); - public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(888); - public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(888); - public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(888); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(888); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(888); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(888); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(888); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(888); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(888); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(888); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(888); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(888); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(888); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(888); - public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(888); - public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(888); - public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(888); - public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(888); - public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(888); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(888); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(888); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(888); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(888); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(888); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(888); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(888); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(888); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(888); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(888); - public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(888); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(888); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(888); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(888); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(888); - public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(888); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(888); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(888); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(888); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(888); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(888); - public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(888); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(892); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(892); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(892); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(892); + public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(892); + public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(892); + public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(892); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(892); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(892); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(892); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(892); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(892); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(892); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(892); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(892); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(892); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(892); + public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(892); + public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(892); + public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(892); + public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(892); + public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(892); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(892); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(892); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(892); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(892); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(892); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(892); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(892); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(892); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(892); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(892); + public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(892); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(892); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(892); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(892); + public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(892); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(892); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(892); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(892); + public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(892); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java index 617d895f67..441cf2a410 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java @@ -1,18 +1,18 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Thu Dec 22 00:28:50 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FanControl { - public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(876); - public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(876); - public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(876); - public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(876); - public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(876); - public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(876); - public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(876); + public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(880); + public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(880); + public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(880); + public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(880); + public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(880); + public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(880); + public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(880); public static final Field[] VALUES = { CRANKING, NOTRUNNING, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 2c30a69a1a..ec4d72147d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.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/fuel/fuel_computer.txt Sat Jan 07 03:08:26 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,14 +401,16 @@ public class FuelComputer { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 0, FieldType.INT16).setScale(0.01).setBaseOffset(800); - public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 2, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); - public static final Field TARGETAFR = Field.create("TARGETAFR", 4, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 6, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 8, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 12, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 16, FieldType.BIT, 0).setBaseOffset(800); + public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(800); + public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 4, FieldType.INT16).setScale(0.01).setBaseOffset(800); + public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 6, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); + public static final Field TARGETAFR = Field.create("TARGETAFR", 8, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 10, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 12, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 16, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 20, FieldType.BIT, 0).setBaseOffset(800); public static final Field[] VALUES = { + TOTALFUELCORRECTION, AFRTABLEYAXIS, TARGETLAMBDA, TARGETAFR, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java index 19f93d6619..aad9763964 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Thu Dec 22 00:28:50 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelPump { - public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(880); - public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(880); - public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(880); - public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(880); + public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(884); + public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(884); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(884); + public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(884); public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index b911b0909b..e9b851bb72 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,37 +1,37 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IdleState { - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1176); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1176); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1176); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1176); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1176); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1176); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1176); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1176); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1176); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1176); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1176); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1176); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1176); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1176); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1176); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1176); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1176); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1176); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1176); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1176); - public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1176); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1176); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1176); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1176); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1176); - public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1176); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1180); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1180); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1180); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1180); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1180); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1180); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1180); + public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1180); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1180); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1180); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1180); + public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1180); + public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1180); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1180); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1180); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1180); + public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1180); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1180); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1180); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1180); + public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1180); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1180); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1180); + public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1180); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1180); + public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1180); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java index 0bf88ce9b8..d86808c03e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IgnitionState.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IgnitionState { - public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(1216); - public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT).setBaseOffset(1216); - public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 8, FieldType.FLOAT).setBaseOffset(1216); - public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 12, FieldType.FLOAT).setBaseOffset(1216); + public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT).setBaseOffset(1220); + public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT).setBaseOffset(1220); + public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 8, FieldType.FLOAT).setBaseOffset(1220); + public static final Field LUATIMINGMULT = Field.create("LUATIMINGMULT", 12, FieldType.FLOAT).setBaseOffset(1220); public static final Field[] VALUES = { BASEDWELL, DWELLVOLTAGECORRECTION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java index 47ee25855e..13ad3dee1d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java @@ -1,22 +1,22 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Nov 26 05:37:37 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LaunchControl { - public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(820); - public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(820); - public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(820); - public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(820); - public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(820); - public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(820); - public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(820); - public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(820); - public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(820); - public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(820); - public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(820); + public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(824); + public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(824); + public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(824); + public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(824); + public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(824); + public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(824); + public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(824); + public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(824); + public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(824); + public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(824); + public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(824); public static final Field[] VALUES = { RETARDTHRESHOLDRPM, COMBINEDCONDITIONS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java index 1d1309ea99..ea56b2c308 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Thu Dec 22 00:28:50 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class MainRelay { - public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(884); - public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(884); - public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(884); - public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(884); + public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(888); + public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(888); + public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(888); + public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(888); public static final Field[] VALUES = { ISBENCHTEST, HASIGNITIONVOLTAGE, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java index a1ebd9f0ee..63b2dfbc6d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TpsAccelState.java @@ -1,28 +1,28 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Thu Dec 22 00:28:50 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TpsAccelState { - public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1044); - public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1044); - public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1044); - public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1044); - public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1044); - public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1044); - public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1044); - public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1044); - public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1044); - public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1044); - public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1044); - public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1044); - public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1044); - public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1044); - public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1044); - public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1044); - public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1044); + public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT).setBaseOffset(1048); + public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT).setBaseOffset(1048); + public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT).setBaseOffset(1048); + public static final Field EXTRAFUEL = Field.create("EXTRAFUEL", 12, FieldType.FLOAT).setBaseOffset(1048); + public static final Field VALUEFROMTABLE = Field.create("VALUEFROMTABLE", 16, FieldType.FLOAT).setBaseOffset(1048); + public static final Field ISABOVEACCELTHRESHOLD = Field.create("ISABOVEACCELTHRESHOLD", 20, FieldType.BIT, 0).setBaseOffset(1048); + public static final Field ISBELOWDECELTHRESHOLD = Field.create("ISBELOWDECELTHRESHOLD", 20, FieldType.BIT, 1).setBaseOffset(1048); + public static final Field ISTIMETORESETACCUMULATOR = Field.create("ISTIMETORESETACCUMULATOR", 20, FieldType.BIT, 2).setBaseOffset(1048); + public static final Field ISFRACTIONALENRICHMENT = Field.create("ISFRACTIONALENRICHMENT", 20, FieldType.BIT, 3).setBaseOffset(1048); + public static final Field BELOWEPSILON = Field.create("BELOWEPSILON", 20, FieldType.BIT, 4).setBaseOffset(1048); + public static final Field TOOSHORT = Field.create("TOOSHORT", 20, FieldType.BIT, 5).setBaseOffset(1048); + public static final Field FRACTIONALINJFUEL = Field.create("FRACTIONALINJFUEL", 24, FieldType.FLOAT).setBaseOffset(1048); + public static final Field ACCUMULATEDVALUE = Field.create("ACCUMULATEDVALUE", 28, FieldType.FLOAT).setBaseOffset(1048); + public static final Field MAXEXTRAPERCYCLE = Field.create("MAXEXTRAPERCYCLE", 32, FieldType.FLOAT).setBaseOffset(1048); + public static final Field MAXEXTRAPERPERIOD = Field.create("MAXEXTRAPERPERIOD", 36, FieldType.FLOAT).setBaseOffset(1048); + public static final Field MAXINJECTEDPERPERIOD = Field.create("MAXINJECTEDPERPERIOD", 40, FieldType.FLOAT).setBaseOffset(1048); + public static final Field CYCLECNT = Field.create("CYCLECNT", 44, FieldType.INT).setScale(1.0).setBaseOffset(1048); public static final Field[] VALUES = { TPSFROM, TPSTO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 0f4c056efe..b4f42047eb 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,28 +1,28 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { public static final int HW_EVENT_TYPES = 6; - public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1092); - public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1092); - public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1092); - public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1092); - public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1092); - public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1092); - public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1092); - public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1092); - public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1092); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1092); + public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field HWEVENTCOUNTERS3 = Field.create("HWEVENTCOUNTERS3", 8, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field HWEVENTCOUNTERS4 = Field.create("HWEVENTCOUNTERS4", 12, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field HWEVENTCOUNTERS5 = Field.create("HWEVENTCOUNTERS5", 16, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field HWEVENTCOUNTERS6 = Field.create("HWEVENTCOUNTERS6", 20, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field VVTCAMCOUNTER = Field.create("VVTCAMCOUNTER", 24, FieldType.INT).setScale(1.0).setBaseOffset(1096); + public static final Field MAPVVT_MAP_AT_SPECIAL_POINT = Field.create("MAPVVT_MAP_AT_SPECIAL_POINT", 28, FieldType.FLOAT).setBaseOffset(1096); + public static final Field MAPVVT_MAP_AT_DIFF = Field.create("MAPVVT_MAP_AT_DIFF", 32, FieldType.FLOAT).setBaseOffset(1096); + public static final Field MAPVVT_MAP_AT_CYCLE_COUNT = Field.create("MAPVVT_MAP_AT_CYCLE_COUNT", 36, FieldType.INT8).setScale(1.0).setBaseOffset(1096); + public static final Field MAPVVT_MAP_PEAK = Field.create("MAPVVT_MAP_PEAK", 37, FieldType.INT8).setScale(1.0).setBaseOffset(1096); + public static final Field ALIGNMENTFILL_AT_38 = Field.create("ALIGNMENTFILL_AT_38", 38, FieldType.INT8).setScale(1.0).setBaseOffset(1096); + public static final Field CURRENTENGINEDECODEDPHASE = Field.create("CURRENTENGINEDECODEDPHASE", 40, FieldType.FLOAT).setBaseOffset(1096); + public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1096); + public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1096); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1096); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index fe2fbc29ed..feb4250ecd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.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/trigger/trigger_state.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,14 +401,14 @@ public class TriggerState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1144); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1144); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1144); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1144); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 16, FieldType.INT8).setScale(1.0).setBaseOffset(1144); - public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 17, FieldType.INT8).setScale(1.0).setBaseOffset(1144); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 18, FieldType.INT8).setScale(1.0).setBaseOffset(1144); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 19, FieldType.INT8).setScale(1.0).setBaseOffset(1144); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1148); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1148); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 8, FieldType.FLOAT).setBaseOffset(1148); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 12, FieldType.FLOAT).setBaseOffset(1148); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 16, FieldType.INT8).setScale(1.0).setBaseOffset(1148); + public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 17, FieldType.INT8).setScale(1.0).setBaseOffset(1148); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 18, FieldType.INT8).setScale(1.0).setBaseOffset(1148); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 19, FieldType.INT8).setScale(1.0).setBaseOffset(1148); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 241f17539b..fb209532c7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.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/trigger/trigger_state_primary.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,7 +401,7 @@ public class TriggerStatePrimary { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1164); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1168); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, }; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index dbf6703346..198ec8ccdb 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1168); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1168); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1172); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1172); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index 0a21a9feba..c61410f549 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Jan 10 21:34:44 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Sat Jan 14 10:41:18 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1280); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1280); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1280); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1280); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1280); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1280); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1280); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1280); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1284); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1284); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1284); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1284); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1284); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,