From 72ead5be96b7d6d21b73d82cc5b76e1be076b787 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 15 Aug 2022 21:22:59 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../binary/output_channels_generated.h | 10 +++---- .../controllers/generated/signature_48way.h | 4 +-- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../controllers/generated/signature_core8.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 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.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 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- .../trigger/trigger_central_generated.h | 14 ++-------- .../rusefi/config/generated/AcControl.java | 12 ++++----- .../rusefi/config/generated/BoostControl.java | 12 ++++----- .../config/generated/ElectronicThrottle.java | 6 +---- .../rusefi/config/generated/EngineState.java | 12 ++++----- .../rusefi/config/generated/FanControl.java | 6 +---- .../com/rusefi/config/generated/FuelPump.java | 6 +---- .../generated/HighPressureFuelPump.java | 6 +---- .../rusefi/config/generated/IdleState.java | 6 +---- .../config/generated/IgnitionState.java | 6 +---- .../config/generated/InjectorModel.java | 6 +---- .../config/generated/KnockController.java | 6 +---- .../config/generated/LaunchControl.java | 6 +---- .../rusefi/config/generated/MainRelay.java | 6 +---- .../config/generated/TpsAccelState.java | 6 +---- .../config/generated/TriggerCentral.java | 6 +---- .../rusefi/config/generated/TriggerState.java | 12 ++++----- .../rusefi/config/generated/TsOutputs.java | 26 +++++-------------- .../config/generated/WallFuelState.java | 6 +---- .../config/generated/WidebandController.java | 6 +---- 53 files changed, 114 insertions(+), 196 deletions(-) diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 07f2d3a3f4..be425ba805 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 19:03:34 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 21:21:41 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1305,13 +1305,9 @@ struct output_channels_s { /** * offset 532 */ - pid_status_s vvtStatus[CAM_INPUTS_COUNT]; - /** - * offset 548 - */ uint8_t unusedAtTheEnd[160]; }; -static_assert(sizeof(output_channels_s) == 708); +static_assert(sizeof(output_channels_s) == 692); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 19:03:34 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 21:21:41 UTC 2022 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index f9f4b1e672..c10f904bd0 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1629379022 -#define TS_SIGNATURE "rusEFI 2022.08.15.48way.1629379022" +#define SIGNATURE_HASH 243429048 +#define TS_SIGNATURE "rusEFI 2022.08.15.48way.243429048" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 14f78fd0ce..f9954719ec 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 754892908 -#define TS_SIGNATURE "rusEFI 2022.08.15.all.754892908" +#define SIGNATURE_HASH 430270199 +#define TS_SIGNATURE "rusEFI 2022.08.15.all.430270199" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 8f3515df5a..8f792b6c36 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1143721197 -#define TS_SIGNATURE "rusEFI 2022.08.15.alphax-2chan.1143721197" +#define SIGNATURE_HASH 733477787 +#define TS_SIGNATURE "rusEFI 2022.08.15.alphax-2chan.733477787" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 6c4a468ace..a3a971d13a 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1437974210 -#define TS_SIGNATURE "rusEFI 2022.08.15.alphax-4chan.1437974210" +#define SIGNATURE_HASH 975800756 +#define TS_SIGNATURE "rusEFI 2022.08.15.alphax-4chan.975800756" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 38a848182d..11fe48fc92 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1794352294 -#define TS_SIGNATURE "rusEFI 2022.08.15.atlas.1794352294" +#define SIGNATURE_HASH 91198416 +#define TS_SIGNATURE "rusEFI 2022.08.15.atlas.91198416" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index fcae20d8a9..28664c10f9 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2161442936 -#define TS_SIGNATURE "rusEFI 2022.08.15.core8.2161442936" +#define SIGNATURE_HASH 4014552846 +#define TS_SIGNATURE "rusEFI 2022.08.15.core8.4014552846" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 34316dc928..dce1077466 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1983467905 -#define TS_SIGNATURE "rusEFI 2022.08.15.f407-discovery.1983467905" +#define SIGNATURE_HASH 430270199 +#define TS_SIGNATURE "rusEFI 2022.08.15.f407-discovery.430270199" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 5060412c69..81292fddb7 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1983467905 -#define TS_SIGNATURE "rusEFI 2022.08.15.f429-discovery.1983467905" +#define SIGNATURE_HASH 430270199 +#define TS_SIGNATURE "rusEFI 2022.08.15.f429-discovery.430270199" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4c09472c10..3f931acd22 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 878030149 -#define TS_SIGNATURE "rusEFI 2022.08.15.frankenso_na6.878030149" +#define SIGNATURE_HASH 1539938867 +#define TS_SIGNATURE "rusEFI 2022.08.15.frankenso_na6.1539938867" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index f1e8ce10d4..64788fff6b 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 47517438 -#define TS_SIGNATURE "rusEFI 2022.08.15.harley81.47517438" +#define SIGNATURE_HASH 1833515400 +#define TS_SIGNATURE "rusEFI 2022.08.15.harley81.1833515400" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index aba0713615..ecbe88b6ff 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1463173348 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen-gm-e67.1463173348" +#define SIGNATURE_HASH 950695826 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen-gm-e67.950695826" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 169ff1581a..bcbd12fad1 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2947702861 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen-nb1.2947702861" +#define SIGNATURE_HASH 3224262459 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen-nb1.3224262459" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index a199bba760..7f8ac4cc3b 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4276611435 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen121nissan.4276611435" +#define SIGNATURE_HASH 2440814109 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen121nissan.2440814109" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f7e6796a9f..7e1c5be73a 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 102273787 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen121vag.102273787" +#define SIGNATURE_HASH 1770300813 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen121vag.1770300813" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index c9e353f575..f25cf40160 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2294770879 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen128.2294770879" +#define SIGNATURE_HASH 3881524169 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen128.3881524169" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index bdb7d52acf..c18ddaf6bc 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4000719621 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen154hyundai.4000719621" +#define SIGNATURE_HASH 2179601523 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen154hyundai.2179601523" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 131e839970..da00035629 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2215016581 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen72.2215016581" +#define SIGNATURE_HASH 3952758771 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen72.3952758771" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a9f1f65027..966211069f 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1418496395 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen81.1418496395" +#define SIGNATURE_HASH 990953213 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen81.990953213" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8774587d8f..4f23153926 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1674330701 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen88bmw.1674330701" +#define SIGNATURE_HASH 206599483 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen88bmw.206599483" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 243f000a3e..ad6b4f5849 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4105347297 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellenNA6.4105347297" +#define SIGNATURE_HASH 2603521943 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellenNA6.2603521943" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 1dac17c7cf..2a9f7ad390 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1954581425 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellenNA8_96.1954581425" +#define SIGNATURE_HASH 454868167 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellenNA8_96.454868167" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 1aa25446f7..92e524db36 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1775406694 -#define TS_SIGNATURE "rusEFI 2022.08.15.hellen_cypress.1775406694" +#define SIGNATURE_HASH 1552492797 +#define TS_SIGNATURE "rusEFI 2022.08.15.hellen_cypress.1552492797" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index e8109c8491..b8722573bd 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 932309483 -#define TS_SIGNATURE "rusEFI 2022.08.15.kin.932309483" +#define SIGNATURE_HASH 46813040 +#define TS_SIGNATURE "rusEFI 2022.08.15.kin.46813040" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 6a076f6f3f..e683c274eb 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3119504759 -#define TS_SIGNATURE "rusEFI 2022.08.15.mre_f4.3119504759" +#define SIGNATURE_HASH 3597920769 +#define TS_SIGNATURE "rusEFI 2022.08.15.mre_f4.3597920769" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index c2fc45833d..81adc8b09b 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3119504759 -#define TS_SIGNATURE "rusEFI 2022.08.15.mre_f7.3119504759" +#define SIGNATURE_HASH 3597920769 +#define TS_SIGNATURE "rusEFI 2022.08.15.mre_f7.3597920769" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 7ed2173a24..3e8721e28d 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 651397223 -#define TS_SIGNATURE "rusEFI 2022.08.15.prometheus_405.651397223" +#define SIGNATURE_HASH 1229963025 +#define TS_SIGNATURE "rusEFI 2022.08.15.prometheus_405.1229963025" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index d43af727ef..e591435757 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 651397223 -#define TS_SIGNATURE "rusEFI 2022.08.15.prometheus_469.651397223" +#define SIGNATURE_HASH 1229963025 +#define TS_SIGNATURE "rusEFI 2022.08.15.prometheus_469.1229963025" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index dfb2a20c56..c3f2ab348e 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3556022007 -#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_f4.3556022007" +#define SIGNATURE_HASH 3160973697 +#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_f4.3160973697" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 298de061e0..af2a65193c 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3556022007 -#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_f7.3556022007" +#define SIGNATURE_HASH 3160973697 +#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_f7.3160973697" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 544dc086a6..639d5cdde0 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3556022007 -#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_h7.3556022007" +#define SIGNATURE_HASH 3160973697 +#define TS_SIGNATURE "rusEFI 2022.08.15.proteus_h7.3160973697" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 8b3c402616..5e8ab7a988 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 669989342 -#define TS_SIGNATURE "rusEFI 2022.08.15.subaru_eg33_f7.669989342" +#define SIGNATURE_HASH 313827141 +#define TS_SIGNATURE "rusEFI 2022.08.15.subaru_eg33_f7.313827141" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index cc87f17174..4d6e39b91b 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3694239701 -#define TS_SIGNATURE "rusEFI 2022.08.15.tdg-pdm8.3694239701" +#define SIGNATURE_HASH 3014502563 +#define TS_SIGNATURE "rusEFI 2022.08.15.tdg-pdm8.3014502563" diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index ab4bf58586..53d71559fb 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,19 +1,9 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 19:03:34 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once #include "rusefi_types.h" -#define adc_channel_e_enum "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" -#define BANKS_COUNT 1 -#define brain_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" -#define CAM_INPUTS_COUNT_padding 3 -#define CAMS_PER_BANK 1 -#define CAMS_PER_BANK_padding 1 -#define Gpio_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" #define HW_EVENT_TYPES 6 -#define output_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" -#define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" -#define ts_show_trigger_comparator true // start of trigger_central_s struct trigger_central_s { /** @@ -51,4 +41,4 @@ struct trigger_central_s { static_assert(sizeof(trigger_central_s) == 40); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 19:03:34 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 21:21:43 UTC 2022 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 ce270608ba..3700aab87f 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,15 +12,15 @@ public class AcControl { public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; - public static final int BANKS_COUNT = 1; + public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; public static final int BLOCKING_FACTOR = 500; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; - public static final int CAM_INPUTS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; public static final int CAN_DEFAULT_BASE = 0x200; public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; 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 94b43d0900..a8478d2741 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Aug 15 21:21:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,15 +12,15 @@ public class BoostControl { public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; - public static final int BANKS_COUNT = 1; + public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; public static final int BLOCKING_FACTOR = 500; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; - public static final int CAM_INPUTS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; public static final int CAN_DEFAULT_BASE = 0x200; public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; 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 b2b1918112..03a3cafcea 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,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class ElectronicThrottle { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT); public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT); public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT); 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 54ef363722..f1129d2e87 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,15 +12,15 @@ public class EngineState { public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; - public static final int BANKS_COUNT = 1; + public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; public static final int BLOCKING_FACTOR = 500; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; - public static final int CAM_INPUTS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; public static final int CAN_DEFAULT_BASE = 0x200; public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; 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 fca7a5c73e..47609e9755 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,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FanControl { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0); public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1); public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2); 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 aeabff6dae..aa2c080a86 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,11 @@ 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelPump { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0); public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1); public static final Field ISPUMPON = Field.create("ISPUMPON", 0, FieldType.BIT, 2); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java index 7a6cf5a415..cec660fdbd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/HighPressureFuelPump.java @@ -1,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Mon Aug 15 21:21:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class HighPressureFuelPump { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 0, FieldType.FLOAT); public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 4, FieldType.FLOAT); public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 8, FieldType.FLOAT); 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 27c9ef3735..b373fb350c 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,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/idle_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IdleState { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0); public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT); public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT); 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 b1b1f0c2e6..fab6455797 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,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/ignition_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IgnitionState { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field BASEDWELL = Field.create("BASEDWELL", 0, FieldType.FLOAT); public static final Field DWELLVOLTAGECORRECTION = Field.create("DWELLVOLTAGECORRECTION", 4, FieldType.FLOAT); public static final Field LUATIMINGADD = Field.create("LUATIMINGADD", 8, FieldType.FLOAT); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java index 838feb408c..d3ca4ddc05 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/InjectorModel.java @@ -1,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/injector_model.txt Mon Aug 15 21:21:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class InjectorModel { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field M_DEADTIME = Field.create("M_DEADTIME", 0, FieldType.FLOAT); public static final Field PRESSUREDELTA = Field.create("PRESSUREDELTA", 4, FieldType.FLOAT); public static final Field PRESSURERATIO = Field.create("PRESSURERATIO", 8, FieldType.FLOAT); diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java index c3285941e7..198b75fbae 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/KnockController.java @@ -1,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/knock_controller.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/knock_controller.txt Mon Aug 15 21:21:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class KnockController { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field M_KNOCKRETARD = Field.create("M_KNOCKRETARD", 0, FieldType.FLOAT); public static final Field M_KNOCKTHRESHOLD = Field.create("M_KNOCKTHRESHOLD", 4, FieldType.FLOAT); public static final Field M_KNOCKCOUNT = Field.create("M_KNOCKCOUNT", 8, FieldType.INT).setScale(1.0); 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 319870e3c2..1a498ae072 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,15 +1,11 @@ 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Mon Aug 15 21:21:42 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LaunchControl { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0); public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0); public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1); 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 e1d129f9ef..fbeee9600f 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,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class MainRelay { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0); public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1); public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2); 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 25c0bb3e95..8ce73533f3 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,15 +1,11 @@ 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/tps_accel_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TpsAccelState { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field TPSFROM = Field.create("TPSFROM", 0, FieldType.FLOAT); public static final Field TPSTO = Field.create("TPSTO", 4, FieldType.FLOAT); public static final Field DELTATPS = Field.create("DELTATPS", 8, FieldType.FLOAT); 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 83c7b8786a..999142aa16 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,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class TriggerCentral { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final int HW_EVENT_TYPES = 6; public static final Field HWEVENTCOUNTERS1 = Field.create("HWEVENTCOUNTERS1", 0, FieldType.INT).setScale(1.0); public static final Field HWEVENTCOUNTERS2 = Field.create("HWEVENTCOUNTERS2", 4, FieldType.INT).setScale(1.0); 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 c4887360b8..456440c023 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,15 +12,15 @@ public class TriggerState { public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; - public static final int BANKS_COUNT = 1; + public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; public static final int BLOCKING_FACTOR = 500; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; - public static final int CAM_INPUTS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; public static final int CAN_DEFAULT_BASE = 0x200; public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 57dd098e9d..9132b9877d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Aug 15 21:21:41 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,15 +12,15 @@ public class TsOutputs { public static final int AFTERSTART_HOLD_CURVE_SIZE = 8; public static final int AUX_ANALOG_INPUT_COUNT = 8; public static final int AUX_DIGITAL_VALVE_COUNT = 2; - public static final int BANKS_COUNT = 1; + public static final int BANKS_COUNT = 2; public static final int BARO_CORR_SIZE = 4; public static final int BLOCKING_FACTOR = 500; public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; - public static final int CAM_INPUTS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; + public static final int CAM_INPUTS_COUNT = 4; + public static final int CAM_INPUTS_COUNT_padding = 0; + public static final int CAMS_PER_BANK = 2; + public static final int CAMS_PER_BANK_padding = 0; public static final int CAN_DEFAULT_BASE = 0x200; public static final int CAN_ECU_SERIAL_RX_ID = 0x100; public static final int CAN_ECU_SERIAL_TX_ID = 0x102; @@ -734,13 +734,7 @@ public class TsOutputs { public static final Field GPPWMOUTPUT3 = Field.create("GPPWMOUTPUT3", 528, FieldType.INT8).setScale(0.5); public static final Field GPPWMOUTPUT4 = Field.create("GPPWMOUTPUT4", 529, FieldType.INT8).setScale(0.5); public static final Field RAWBATTERY = Field.create("RAWBATTERY", 530, FieldType.INT16).setScale(0.001); - public static final Field VVTSTATUS1_PTERM = Field.create("VVTSTATUS1_PTERM", 532, FieldType.FLOAT); - public static final Field VVTSTATUS1_ITERM = Field.create("VVTSTATUS1_ITERM", 536, FieldType.INT16).setScale(0.01); - public static final Field VVTSTATUS1_DTERM = Field.create("VVTSTATUS1_DTERM", 538, FieldType.INT16).setScale(0.01); - public static final Field VVTSTATUS1_OUTPUT = Field.create("VVTSTATUS1_OUTPUT", 540, FieldType.INT16).setScale(0.01); - public static final Field VVTSTATUS1_ERROR = Field.create("VVTSTATUS1_ERROR", 542, FieldType.INT16).setScale(0.01); - public static final Field VVTSTATUS1_RESETCOUNTER = Field.create("VVTSTATUS1_RESETCOUNTER", 544, FieldType.INT).setScale(1.0); - public static final Field UNUSEDATTHEEND = Field.create("UNUSEDATTHEEND", 548, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND = Field.create("UNUSEDATTHEEND", 532, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, ISIGNITIONENABLEDINDICATOR, @@ -1081,12 +1075,6 @@ public class TsOutputs { GPPWMOUTPUT3, GPPWMOUTPUT4, RAWBATTERY, - VVTSTATUS1_PTERM, - VVTSTATUS1_ITERM, - VVTSTATUS1_DTERM, - VVTSTATUS1_OUTPUT, - VVTSTATUS1_ERROR, - VVTSTATUS1_RESETCOUNTER, UNUSEDATTHEEND, }; } 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 06fc9bb1dd..7d7acfbe62 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,15 +1,11 @@ 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 Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT); public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT); public static final Field[] VALUES = { 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 4aa822bc82..2438fc14c7 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,15 +1,11 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Mon Aug 15 19:03:34 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/sensors//wideband_state.txt Mon Aug 15 21:21:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final int BANKS_COUNT = 1; - public static final int CAM_INPUTS_COUNT_padding = 3; - public static final int CAMS_PER_BANK = 1; - public static final int CAMS_PER_BANK_padding = 1; public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0); public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0); public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0);