diff --git a/firmware/controllers/actuators/electronic_throttle_generated.h b/firmware/controllers/actuators/electronic_throttle_generated.h index 577375d0ce..2f43174afc 100644 --- a/firmware/controllers/actuators/electronic_throttle_generated.h +++ b/firmware/controllers/actuators/electronic_throttle_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Fri Aug 26 01:07:49 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Nov 23 01:41:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -6,14 +6,17 @@ // start of electronic_throttle_s struct electronic_throttle_s { /** + * "ETB: idlePosition" * offset 0 */ float idlePosition = (float)0; /** + * "ETB: trim" * offset 4 */ float trim = (float)0; /** + * "ETB: luaAdjustment" * offset 8 */ float luaAdjustment = (float)0; @@ -31,103 +34,108 @@ struct electronic_throttle_s { */ float etbCurrentTarget = (float)0; /** - offset 24 bit 0 */ + % + * offset 24 + */ + float etbCurrentAdjustedTarget = (float)0; + /** + offset 28 bit 0 */ bool etbRevLimitActive : 1 {}; /** - offset 24 bit 1 */ - bool unusedBit_7_1 : 1 {}; + offset 28 bit 1 */ + bool unusedBit_8_1 : 1 {}; /** - offset 24 bit 2 */ - bool unusedBit_7_2 : 1 {}; + offset 28 bit 2 */ + bool unusedBit_8_2 : 1 {}; /** - offset 24 bit 3 */ - bool unusedBit_7_3 : 1 {}; + offset 28 bit 3 */ + bool unusedBit_8_3 : 1 {}; /** - offset 24 bit 4 */ - bool unusedBit_7_4 : 1 {}; + offset 28 bit 4 */ + bool unusedBit_8_4 : 1 {}; /** - offset 24 bit 5 */ - bool unusedBit_7_5 : 1 {}; + offset 28 bit 5 */ + bool unusedBit_8_5 : 1 {}; /** - offset 24 bit 6 */ - bool unusedBit_7_6 : 1 {}; + offset 28 bit 6 */ + bool unusedBit_8_6 : 1 {}; /** - offset 24 bit 7 */ - bool unusedBit_7_7 : 1 {}; + offset 28 bit 7 */ + bool unusedBit_8_7 : 1 {}; /** - offset 24 bit 8 */ - bool unusedBit_7_8 : 1 {}; + offset 28 bit 8 */ + bool unusedBit_8_8 : 1 {}; /** - offset 24 bit 9 */ - bool unusedBit_7_9 : 1 {}; + offset 28 bit 9 */ + bool unusedBit_8_9 : 1 {}; /** - offset 24 bit 10 */ - bool unusedBit_7_10 : 1 {}; + offset 28 bit 10 */ + bool unusedBit_8_10 : 1 {}; /** - offset 24 bit 11 */ - bool unusedBit_7_11 : 1 {}; + offset 28 bit 11 */ + bool unusedBit_8_11 : 1 {}; /** - offset 24 bit 12 */ - bool unusedBit_7_12 : 1 {}; + offset 28 bit 12 */ + bool unusedBit_8_12 : 1 {}; /** - offset 24 bit 13 */ - bool unusedBit_7_13 : 1 {}; + offset 28 bit 13 */ + bool unusedBit_8_13 : 1 {}; /** - offset 24 bit 14 */ - bool unusedBit_7_14 : 1 {}; + offset 28 bit 14 */ + bool unusedBit_8_14 : 1 {}; /** - offset 24 bit 15 */ - bool unusedBit_7_15 : 1 {}; + offset 28 bit 15 */ + bool unusedBit_8_15 : 1 {}; /** - offset 24 bit 16 */ - bool unusedBit_7_16 : 1 {}; + offset 28 bit 16 */ + bool unusedBit_8_16 : 1 {}; /** - offset 24 bit 17 */ - bool unusedBit_7_17 : 1 {}; + offset 28 bit 17 */ + bool unusedBit_8_17 : 1 {}; /** - offset 24 bit 18 */ - bool unusedBit_7_18 : 1 {}; + offset 28 bit 18 */ + bool unusedBit_8_18 : 1 {}; /** - offset 24 bit 19 */ - bool unusedBit_7_19 : 1 {}; + offset 28 bit 19 */ + bool unusedBit_8_19 : 1 {}; /** - offset 24 bit 20 */ - bool unusedBit_7_20 : 1 {}; + offset 28 bit 20 */ + bool unusedBit_8_20 : 1 {}; /** - offset 24 bit 21 */ - bool unusedBit_7_21 : 1 {}; + offset 28 bit 21 */ + bool unusedBit_8_21 : 1 {}; /** - offset 24 bit 22 */ - bool unusedBit_7_22 : 1 {}; + offset 28 bit 22 */ + bool unusedBit_8_22 : 1 {}; /** - offset 24 bit 23 */ - bool unusedBit_7_23 : 1 {}; + offset 28 bit 23 */ + bool unusedBit_8_23 : 1 {}; /** - offset 24 bit 24 */ - bool unusedBit_7_24 : 1 {}; + offset 28 bit 24 */ + bool unusedBit_8_24 : 1 {}; /** - offset 24 bit 25 */ - bool unusedBit_7_25 : 1 {}; + offset 28 bit 25 */ + bool unusedBit_8_25 : 1 {}; /** - offset 24 bit 26 */ - bool unusedBit_7_26 : 1 {}; + offset 28 bit 26 */ + bool unusedBit_8_26 : 1 {}; /** - offset 24 bit 27 */ - bool unusedBit_7_27 : 1 {}; + offset 28 bit 27 */ + bool unusedBit_8_27 : 1 {}; /** - offset 24 bit 28 */ - bool unusedBit_7_28 : 1 {}; + offset 28 bit 28 */ + bool unusedBit_8_28 : 1 {}; /** - offset 24 bit 29 */ - bool unusedBit_7_29 : 1 {}; + offset 28 bit 29 */ + bool unusedBit_8_29 : 1 {}; /** - offset 24 bit 30 */ - bool unusedBit_7_30 : 1 {}; + offset 28 bit 30 */ + bool unusedBit_8_30 : 1 {}; /** - offset 24 bit 31 */ - bool unusedBit_7_31 : 1 {}; + offset 28 bit 31 */ + bool unusedBit_8_31 : 1 {}; }; -static_assert(sizeof(electronic_throttle_s) == 28); +static_assert(sizeof(electronic_throttle_s) == 32); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Fri Aug 26 01:07:49 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Nov 23 01:41:35 UTC 2022 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 6742e385fa..2b2c2c3181 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_58787 -#define TS_SIGNATURE "rusEFI 2022.11.22.48way.snap_58787" +#define SIGNATURE_HASH snap_4949 +#define TS_SIGNATURE "rusEFI 2022.11.23.48way.snap_4949" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a56b6cca7d..2eea3a205f 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_60908 -#define TS_SIGNATURE "rusEFI 2022.11.22.all.snap_60908" +#define SIGNATURE_HASH snap_6938 +#define TS_SIGNATURE "rusEFI 2022.11.23.all.snap_6938" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 2b2d880fd8..7c5df8b502 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_28800 -#define TS_SIGNATURE "rusEFI 2022.11.22.alphax-2chan.snap_28800" +#define SIGNATURE_HASH snap_34422 +#define TS_SIGNATURE "rusEFI 2022.11.23.alphax-2chan.snap_34422" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 1fd5117a8c..d19a3c41aa 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_11875 -#define TS_SIGNATURE "rusEFI 2022.11.22.alphax-4chan.snap_11875" +#define SIGNATURE_HASH snap_55445 +#define TS_SIGNATURE "rusEFI 2022.11.23.alphax-4chan.snap_55445" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ae9ab1d520..83cd727cb5 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_6347 -#define TS_SIGNATURE "rusEFI 2022.11.22.atlas.snap_6347" +#define SIGNATURE_HASH snap_60989 +#define TS_SIGNATURE "rusEFI 2022.11.23.atlas.snap_60989" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index bd53883e72..3ea3d5b18b 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_48149 -#define TS_SIGNATURE "rusEFI 2022.11.22.core8.snap_48149" +#define SIGNATURE_HASH snap_19171 +#define TS_SIGNATURE "rusEFI 2022.11.23.core8.snap_19171" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 5ee2913b58..c2d13a8fe9 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_60908 -#define TS_SIGNATURE "rusEFI 2022.11.22.cypress.snap_60908" +#define SIGNATURE_HASH snap_6938 +#define TS_SIGNATURE "rusEFI 2022.11.23.cypress.snap_6938" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 5fcc703c4c..378d77a6c4 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_60908 -#define TS_SIGNATURE "rusEFI 2022.11.22.f407-discovery.snap_60908" +#define SIGNATURE_HASH snap_6938 +#define TS_SIGNATURE "rusEFI 2022.11.23.f407-discovery.snap_6938" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 773ee59bfb..052bd161de 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_60908 -#define TS_SIGNATURE "rusEFI 2022.11.22.f429-discovery.snap_60908" +#define SIGNATURE_HASH snap_6938 +#define TS_SIGNATURE "rusEFI 2022.11.23.f429-discovery.snap_6938" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 141c706302..8c72f068e9 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_4392 -#define TS_SIGNATURE "rusEFI 2022.11.22.frankenso_na6.snap_4392" +#define SIGNATURE_HASH snap_59358 +#define TS_SIGNATURE "rusEFI 2022.11.23.frankenso_na6.snap_59358" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index fe9e092afd..ba9a11b81b 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_43795 -#define TS_SIGNATURE "rusEFI 2022.11.22.harley81.snap_43795" +#define SIGNATURE_HASH snap_24037 +#define TS_SIGNATURE "rusEFI 2022.11.23.harley81.snap_24037" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 9551460d61..0a8fc2f62f 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_36584 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen-gm-e67.snap_36584" +#define SIGNATURE_HASH snap_30750 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen-gm-e67.snap_30750" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 381a750e5c..2e8a5c07d3 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_56352 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen-nb1.snap_56352" +#define SIGNATURE_HASH snap_10966 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen-nb1.snap_10966" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 64a1781a94..22dfdb9013 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_57488 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen121nissan.snap_57488" +#define SIGNATURE_HASH snap_5734 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen121nissan.snap_5734" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index b040b94d79..d7422ec5f2 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_31473 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen121vag.snap_31473" +#define SIGNATURE_HASH snap_35847 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen121vag.snap_35847" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 57d0079a3d..110e0df099 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_37079 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen128.snap_37079" +#define SIGNATURE_HASH snap_26145 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen128.snap_26145" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 7cd3d07bf9..9d836ade8c 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_55055 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen154hyundai.snap_55055" +#define SIGNATURE_HASH snap_8697 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen154hyundai.snap_8697" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 0db0986438..5e4ef4bda9 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_58215 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen72.snap_58215" +#define SIGNATURE_HASH snap_5521 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen72.snap_5521" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 8ef325e8de..59e2a48084 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_13798 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen81.snap_13798" +#define SIGNATURE_HASH snap_49936 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen81.snap_49936" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 3d239aca79..e4f7982ec9 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_65056 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellen88bmw.snap_65056" +#define SIGNATURE_HASH snap_2262 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellen88bmw.snap_2262" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index b679da2160..e9b244cfe6 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_23771 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellenNA6.snap_23771" +#define SIGNATURE_HASH snap_43565 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellenNA6.snap_43565" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index aff160f3b1..da6a21880c 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_23556 -#define TS_SIGNATURE "rusEFI 2022.11.22.hellenNA8_96.snap_23556" +#define SIGNATURE_HASH snap_43762 +#define TS_SIGNATURE "rusEFI 2022.11.23.hellenNA8_96.snap_43762" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 791bec9cd9..bbb95937f0 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_20256 -#define TS_SIGNATURE "rusEFI 2022.11.22.kin.snap_20256" +#define SIGNATURE_HASH snap_47574 +#define TS_SIGNATURE "rusEFI 2022.11.23.kin.snap_47574" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f98ceec552..355d21927a 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_35564 -#define TS_SIGNATURE "rusEFI 2022.11.22.mre_f4.snap_35564" +#define SIGNATURE_HASH snap_31770 +#define TS_SIGNATURE "rusEFI 2022.11.23.mre_f4.snap_31770" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a14b1120e7..8985e539d3 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_35564 -#define TS_SIGNATURE "rusEFI 2022.11.22.mre_f7.snap_35564" +#define SIGNATURE_HASH snap_31770 +#define TS_SIGNATURE "rusEFI 2022.11.23.mre_f7.snap_31770" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6dcc0581c1..9498b2f237 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_13322 -#define TS_SIGNATURE "rusEFI 2022.11.22.prometheus_405.snap_13322" +#define SIGNATURE_HASH snap_49916 +#define TS_SIGNATURE "rusEFI 2022.11.23.prometheus_405.snap_49916" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b578bd2988..73a1ab09f2 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_13322 -#define TS_SIGNATURE "rusEFI 2022.11.22.prometheus_469.snap_13322" +#define SIGNATURE_HASH snap_49916 +#define TS_SIGNATURE "rusEFI 2022.11.23.prometheus_469.snap_49916" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index b37f9ddc02..8cca8e4f77 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_10906 -#define TS_SIGNATURE "rusEFI 2022.11.22.proteus_f4.snap_10906" +#define SIGNATURE_HASH snap_56428 +#define TS_SIGNATURE "rusEFI 2022.11.23.proteus_f4.snap_56428" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index d62aee77a2..f7918fc61d 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_10906 -#define TS_SIGNATURE "rusEFI 2022.11.22.proteus_f7.snap_10906" +#define SIGNATURE_HASH snap_56428 +#define TS_SIGNATURE "rusEFI 2022.11.23.proteus_f7.snap_56428" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f960b95519..20290b3740 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_10906 -#define TS_SIGNATURE "rusEFI 2022.11.22.proteus_h7.snap_10906" +#define SIGNATURE_HASH snap_56428 +#define TS_SIGNATURE "rusEFI 2022.11.23.proteus_h7.snap_56428" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index f165a91ad0..eb5d7f2089 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_13366 -#define TS_SIGNATURE "rusEFI 2022.11.22.subaru_eg33_f7.snap_13366" +#define SIGNATURE_HASH snap_49856 +#define TS_SIGNATURE "rusEFI 2022.11.23.subaru_eg33_f7.snap_49856" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index b8ccfe779e..3afc535aab 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_9144 -#define TS_SIGNATURE "rusEFI 2022.11.22.tdg-pdm8.snap_9144" +#define SIGNATURE_HASH snap_54606 +#define TS_SIGNATURE "rusEFI 2022.11.23.tdg-pdm8.snap_54606" 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 b6b0c91375..c40deefcc6 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,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Fri Aug 26 01:07:49 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Nov 23 01:41:35 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -12,38 +12,39 @@ public class ElectronicThrottle { public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 12, FieldType.FLOAT); public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 16, FieldType.FLOAT); public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 20, FieldType.FLOAT); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 24, FieldType.BIT, 0); - public static final Field UNUSEDBIT_7_1 = Field.create("UNUSEDBIT_7_1", 24, FieldType.BIT, 1); - public static final Field UNUSEDBIT_7_2 = Field.create("UNUSEDBIT_7_2", 24, FieldType.BIT, 2); - public static final Field UNUSEDBIT_7_3 = Field.create("UNUSEDBIT_7_3", 24, FieldType.BIT, 3); - public static final Field UNUSEDBIT_7_4 = Field.create("UNUSEDBIT_7_4", 24, FieldType.BIT, 4); - public static final Field UNUSEDBIT_7_5 = Field.create("UNUSEDBIT_7_5", 24, FieldType.BIT, 5); - public static final Field UNUSEDBIT_7_6 = Field.create("UNUSEDBIT_7_6", 24, FieldType.BIT, 6); - public static final Field UNUSEDBIT_7_7 = Field.create("UNUSEDBIT_7_7", 24, FieldType.BIT, 7); - public static final Field UNUSEDBIT_7_8 = Field.create("UNUSEDBIT_7_8", 24, FieldType.BIT, 8); - public static final Field UNUSEDBIT_7_9 = Field.create("UNUSEDBIT_7_9", 24, FieldType.BIT, 9); - public static final Field UNUSEDBIT_7_10 = Field.create("UNUSEDBIT_7_10", 24, FieldType.BIT, 10); - public static final Field UNUSEDBIT_7_11 = Field.create("UNUSEDBIT_7_11", 24, FieldType.BIT, 11); - public static final Field UNUSEDBIT_7_12 = Field.create("UNUSEDBIT_7_12", 24, FieldType.BIT, 12); - public static final Field UNUSEDBIT_7_13 = Field.create("UNUSEDBIT_7_13", 24, FieldType.BIT, 13); - public static final Field UNUSEDBIT_7_14 = Field.create("UNUSEDBIT_7_14", 24, FieldType.BIT, 14); - public static final Field UNUSEDBIT_7_15 = Field.create("UNUSEDBIT_7_15", 24, FieldType.BIT, 15); - public static final Field UNUSEDBIT_7_16 = Field.create("UNUSEDBIT_7_16", 24, FieldType.BIT, 16); - public static final Field UNUSEDBIT_7_17 = Field.create("UNUSEDBIT_7_17", 24, FieldType.BIT, 17); - public static final Field UNUSEDBIT_7_18 = Field.create("UNUSEDBIT_7_18", 24, FieldType.BIT, 18); - public static final Field UNUSEDBIT_7_19 = Field.create("UNUSEDBIT_7_19", 24, FieldType.BIT, 19); - public static final Field UNUSEDBIT_7_20 = Field.create("UNUSEDBIT_7_20", 24, FieldType.BIT, 20); - public static final Field UNUSEDBIT_7_21 = Field.create("UNUSEDBIT_7_21", 24, FieldType.BIT, 21); - public static final Field UNUSEDBIT_7_22 = Field.create("UNUSEDBIT_7_22", 24, FieldType.BIT, 22); - public static final Field UNUSEDBIT_7_23 = Field.create("UNUSEDBIT_7_23", 24, FieldType.BIT, 23); - public static final Field UNUSEDBIT_7_24 = Field.create("UNUSEDBIT_7_24", 24, FieldType.BIT, 24); - public static final Field UNUSEDBIT_7_25 = Field.create("UNUSEDBIT_7_25", 24, FieldType.BIT, 25); - public static final Field UNUSEDBIT_7_26 = Field.create("UNUSEDBIT_7_26", 24, FieldType.BIT, 26); - public static final Field UNUSEDBIT_7_27 = Field.create("UNUSEDBIT_7_27", 24, FieldType.BIT, 27); - public static final Field UNUSEDBIT_7_28 = Field.create("UNUSEDBIT_7_28", 24, FieldType.BIT, 28); - public static final Field UNUSEDBIT_7_29 = Field.create("UNUSEDBIT_7_29", 24, FieldType.BIT, 29); - public static final Field UNUSEDBIT_7_30 = Field.create("UNUSEDBIT_7_30", 24, FieldType.BIT, 30); - public static final Field UNUSEDBIT_7_31 = Field.create("UNUSEDBIT_7_31", 24, FieldType.BIT, 31); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 24, FieldType.FLOAT); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 28, FieldType.BIT, 0); + public static final Field UNUSEDBIT_8_1 = Field.create("UNUSEDBIT_8_1", 28, FieldType.BIT, 1); + public static final Field UNUSEDBIT_8_2 = Field.create("UNUSEDBIT_8_2", 28, FieldType.BIT, 2); + public static final Field UNUSEDBIT_8_3 = Field.create("UNUSEDBIT_8_3", 28, FieldType.BIT, 3); + public static final Field UNUSEDBIT_8_4 = Field.create("UNUSEDBIT_8_4", 28, FieldType.BIT, 4); + public static final Field UNUSEDBIT_8_5 = Field.create("UNUSEDBIT_8_5", 28, FieldType.BIT, 5); + public static final Field UNUSEDBIT_8_6 = Field.create("UNUSEDBIT_8_6", 28, FieldType.BIT, 6); + public static final Field UNUSEDBIT_8_7 = Field.create("UNUSEDBIT_8_7", 28, FieldType.BIT, 7); + public static final Field UNUSEDBIT_8_8 = Field.create("UNUSEDBIT_8_8", 28, FieldType.BIT, 8); + public static final Field UNUSEDBIT_8_9 = Field.create("UNUSEDBIT_8_9", 28, FieldType.BIT, 9); + public static final Field UNUSEDBIT_8_10 = Field.create("UNUSEDBIT_8_10", 28, FieldType.BIT, 10); + public static final Field UNUSEDBIT_8_11 = Field.create("UNUSEDBIT_8_11", 28, FieldType.BIT, 11); + public static final Field UNUSEDBIT_8_12 = Field.create("UNUSEDBIT_8_12", 28, FieldType.BIT, 12); + public static final Field UNUSEDBIT_8_13 = Field.create("UNUSEDBIT_8_13", 28, FieldType.BIT, 13); + public static final Field UNUSEDBIT_8_14 = Field.create("UNUSEDBIT_8_14", 28, FieldType.BIT, 14); + public static final Field UNUSEDBIT_8_15 = Field.create("UNUSEDBIT_8_15", 28, FieldType.BIT, 15); + public static final Field UNUSEDBIT_8_16 = Field.create("UNUSEDBIT_8_16", 28, FieldType.BIT, 16); + public static final Field UNUSEDBIT_8_17 = Field.create("UNUSEDBIT_8_17", 28, FieldType.BIT, 17); + public static final Field UNUSEDBIT_8_18 = Field.create("UNUSEDBIT_8_18", 28, FieldType.BIT, 18); + public static final Field UNUSEDBIT_8_19 = Field.create("UNUSEDBIT_8_19", 28, FieldType.BIT, 19); + public static final Field UNUSEDBIT_8_20 = Field.create("UNUSEDBIT_8_20", 28, FieldType.BIT, 20); + public static final Field UNUSEDBIT_8_21 = Field.create("UNUSEDBIT_8_21", 28, FieldType.BIT, 21); + public static final Field UNUSEDBIT_8_22 = Field.create("UNUSEDBIT_8_22", 28, FieldType.BIT, 22); + public static final Field UNUSEDBIT_8_23 = Field.create("UNUSEDBIT_8_23", 28, FieldType.BIT, 23); + public static final Field UNUSEDBIT_8_24 = Field.create("UNUSEDBIT_8_24", 28, FieldType.BIT, 24); + public static final Field UNUSEDBIT_8_25 = Field.create("UNUSEDBIT_8_25", 28, FieldType.BIT, 25); + public static final Field UNUSEDBIT_8_26 = Field.create("UNUSEDBIT_8_26", 28, FieldType.BIT, 26); + public static final Field UNUSEDBIT_8_27 = Field.create("UNUSEDBIT_8_27", 28, FieldType.BIT, 27); + public static final Field UNUSEDBIT_8_28 = Field.create("UNUSEDBIT_8_28", 28, FieldType.BIT, 28); + public static final Field UNUSEDBIT_8_29 = Field.create("UNUSEDBIT_8_29", 28, FieldType.BIT, 29); + public static final Field UNUSEDBIT_8_30 = Field.create("UNUSEDBIT_8_30", 28, FieldType.BIT, 30); + public static final Field UNUSEDBIT_8_31 = Field.create("UNUSEDBIT_8_31", 28, FieldType.BIT, 31); public static final Field[] VALUES = { IDLEPOSITION, TRIM, @@ -51,37 +52,38 @@ public class ElectronicThrottle { ETBFEEDFORWARD, ETBINTEGRALERROR, ETBCURRENTTARGET, + ETBCURRENTADJUSTEDTARGET, ETBREVLIMITACTIVE, - UNUSEDBIT_7_1, - UNUSEDBIT_7_2, - UNUSEDBIT_7_3, - UNUSEDBIT_7_4, - UNUSEDBIT_7_5, - UNUSEDBIT_7_6, - UNUSEDBIT_7_7, - UNUSEDBIT_7_8, - UNUSEDBIT_7_9, - UNUSEDBIT_7_10, - UNUSEDBIT_7_11, - UNUSEDBIT_7_12, - UNUSEDBIT_7_13, - UNUSEDBIT_7_14, - UNUSEDBIT_7_15, - UNUSEDBIT_7_16, - UNUSEDBIT_7_17, - UNUSEDBIT_7_18, - UNUSEDBIT_7_19, - UNUSEDBIT_7_20, - UNUSEDBIT_7_21, - UNUSEDBIT_7_22, - UNUSEDBIT_7_23, - UNUSEDBIT_7_24, - UNUSEDBIT_7_25, - UNUSEDBIT_7_26, - UNUSEDBIT_7_27, - UNUSEDBIT_7_28, - UNUSEDBIT_7_29, - UNUSEDBIT_7_30, - UNUSEDBIT_7_31, + UNUSEDBIT_8_1, + UNUSEDBIT_8_2, + UNUSEDBIT_8_3, + UNUSEDBIT_8_4, + UNUSEDBIT_8_5, + UNUSEDBIT_8_6, + UNUSEDBIT_8_7, + UNUSEDBIT_8_8, + UNUSEDBIT_8_9, + UNUSEDBIT_8_10, + UNUSEDBIT_8_11, + UNUSEDBIT_8_12, + UNUSEDBIT_8_13, + UNUSEDBIT_8_14, + UNUSEDBIT_8_15, + UNUSEDBIT_8_16, + UNUSEDBIT_8_17, + UNUSEDBIT_8_18, + UNUSEDBIT_8_19, + UNUSEDBIT_8_20, + UNUSEDBIT_8_21, + UNUSEDBIT_8_22, + UNUSEDBIT_8_23, + UNUSEDBIT_8_24, + UNUSEDBIT_8_25, + UNUSEDBIT_8_26, + UNUSEDBIT_8_27, + UNUSEDBIT_8_28, + UNUSEDBIT_8_29, + UNUSEDBIT_8_30, + UNUSEDBIT_8_31, }; }