From 885d28e0e40ffb5eaf3f4125bf74b28af3e0926e Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 3 Nov 2020 17:20:50 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 8 +++---- .../controllers/algo/rusefi_generated.h | 10 +++++---- ...ngine_configuration_generated_structures.h | 8 +++---- .../controllers/algo/rusefi_generated.h | 10 +++++---- ...ngine_configuration_generated_structures.h | 8 +++---- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 10 +++++---- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.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 ++-- firmware/tunerstudio/generated/cache.zip | Bin 958209 -> 958339 bytes firmware/tunerstudio/generated/rusefi.ini | 10 ++++----- .../generated/rusefi_frankenso_na6.ini | 10 ++++----- .../generated/rusefi_hellen_cypress.ini | 10 ++++----- .../tunerstudio/generated/rusefi_kinetis.ini | 10 ++++----- .../tunerstudio/generated/rusefi_mre_f4.ini | 10 ++++----- .../tunerstudio/generated/rusefi_mre_f7.ini | 10 ++++----- .../generated/rusefi_prometheus_405.ini | 10 ++++----- .../generated/rusefi_prometheus_469.ini | 10 ++++----- .../generated/rusefi_proteus_f4.ini | 10 ++++----- .../generated/rusefi_proteus_f7.ini | 10 ++++----- .../com/rusefi/config/generated/Fields.java | 21 ++++++++++-------- java_console/rusefi.xml | 2 +- 33 files changed, 117 insertions(+), 108 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index bfe61d0171..8222bb532f 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:11 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:32 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1024,11 +1024,11 @@ struct engine_configuration_s { /** * offset 541 */ - pin_output_mode_e boostControlPinMode; + uint8_t unused541; /** * offset 542 */ - pin_output_mode_e alternatorControlPinMode; + uint8_t unused542; /** * See hasMafSensor * offset 543 @@ -3755,4 +3755,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:11 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:32 UTC 2020 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index a66e192958..01cabf2f56 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -59,7 +59,7 @@ #define alternatorControl_periodMs_offset 1730 #define alternatorControl_pFactor_offset 1716 #define alternatorControlPin_offset 665 -#define alternatorControlPinMode_offset 542 +#define alternatorControlPinMode_offset 666 #define alternatorOffAboveTps_offset 2028 #define alternatorPwmFrequency_offset 2256 #define ambiguousOperationMode_offset 488 @@ -156,7 +156,7 @@ #define BOOST_LOAD_COUNT 8 #define BOOST_RPM_COUNT 8 #define boostControlPin_offset 988 -#define boostControlPinMode_offset 541 +#define boostControlPinMode_offset 989 #define boostCutPressure_offset 2132 #define boostPid_dFactor_offset 1000 #define boostPid_iFactor_offset 996 @@ -1208,7 +1208,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 654766653 +#define SIGNATURE_HASH 4062995634 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1526,7 +1526,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.03.hellen_cypress.654766653" +#define TS_SIGNATURE "rusEFI 2020.11.03.hellen_cypress.4062995634" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1561,6 +1561,8 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused541_offset 541 +#define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 #define unused744b4_offset 744 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 2056885285..56f2dd31c8 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:10 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:30 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1024,11 +1024,11 @@ struct engine_configuration_s { /** * offset 541 */ - pin_output_mode_e boostControlPinMode; + uint8_t unused541; /** * offset 542 */ - pin_output_mode_e alternatorControlPinMode; + uint8_t unused542; /** * See hasMafSensor * offset 543 @@ -3755,4 +3755,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:10 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:30 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index c23b3cae6f..f2e11691a1 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -59,7 +59,7 @@ #define alternatorControl_periodMs_offset 1730 #define alternatorControl_pFactor_offset 1716 #define alternatorControlPin_offset 665 -#define alternatorControlPinMode_offset 542 +#define alternatorControlPinMode_offset 666 #define alternatorOffAboveTps_offset 2028 #define alternatorPwmFrequency_offset 2256 #define ambiguousOperationMode_offset 488 @@ -156,7 +156,7 @@ #define BOOST_LOAD_COUNT 8 #define BOOST_RPM_COUNT 8 #define boostControlPin_offset 988 -#define boostControlPinMode_offset 541 +#define boostControlPinMode_offset 989 #define boostCutPressure_offset 2132 #define boostPid_dFactor_offset 1000 #define boostPid_iFactor_offset 996 @@ -1208,7 +1208,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 1981466823 +#define SIGNATURE_HASH 2737856072 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1526,7 +1526,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.03.kin.1981466823" +#define TS_SIGNATURE "rusEFI 2020.11.03.kin.2737856072" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1561,6 +1561,8 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused541_offset 541 +#define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 #define unused744b4_offset 744 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index dbd9e7fa08..5241880dcf 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1024,11 +1024,11 @@ struct engine_configuration_s { /** * offset 541 */ - pin_output_mode_e boostControlPinMode; + uint8_t unused541; /** * offset 542 */ - pin_output_mode_e alternatorControlPinMode; + uint8_t unused542; /** * See hasMafSensor * offset 543 @@ -3755,4 +3755,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index e25cc8f505..e96bd19243 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index e77caee018..97e0970270 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index f01ec31c14..affde96426 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index e030ff3478..267e82a128 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e42df73e59..ebf7e21fa3 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -59,7 +59,7 @@ #define alternatorControl_periodMs_offset 1730 #define alternatorControl_pFactor_offset 1716 #define alternatorControlPin_offset 665 -#define alternatorControlPinMode_offset 542 +#define alternatorControlPinMode_offset 666 #define alternatorOffAboveTps_offset 2028 #define alternatorPwmFrequency_offset 2256 #define ambiguousOperationMode_offset 488 @@ -156,7 +156,7 @@ #define BOOST_LOAD_COUNT 8 #define BOOST_RPM_COUNT 8 #define boostControlPin_offset 988 -#define boostControlPinMode_offset 541 +#define boostControlPinMode_offset 989 #define boostCutPressure_offset 2132 #define boostPid_dFactor_offset 1000 #define boostPid_iFactor_offset 996 @@ -1208,7 +1208,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 4009186558 +#define SIGNATURE_HASH 1004388977 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1526,7 +1526,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.11.03.all.4009186558" +#define TS_SIGNATURE "rusEFI 2020.11.03.all.1004388977" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1561,6 +1561,8 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused541_offset 541 +#define unused542_offset 542 #define unused6312_offset 6312 #define unused744b25_offset 744 #define unused744b4_offset 744 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e766baf34f..4e66e4750f 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 4009186558 -#define TS_SIGNATURE "rusEFI 2020.11.03.all.4009186558" +#define SIGNATURE_HASH 1004388977 +#define TS_SIGNATURE "rusEFI 2020.11.03.all.1004388977" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index bc12bcf125..6cd92a05e6 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 2022171909 -#define TS_SIGNATURE "rusEFI 2020.11.03.frankenso_na6.2022171909" +#define SIGNATURE_HASH 2913825674 +#define TS_SIGNATURE "rusEFI 2020.11.03.frankenso_na6.2913825674" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 18572c6bcc..6c503e520d 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 654766653 -#define TS_SIGNATURE "rusEFI 2020.11.03.hellen_cypress.654766653" +#define SIGNATURE_HASH 4062995634 +#define TS_SIGNATURE "rusEFI 2020.11.03.hellen_cypress.4062995634" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index eb73bc107b..c6e6dd8454 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 1981466823 -#define TS_SIGNATURE "rusEFI 2020.11.03.kin.1981466823" +#define SIGNATURE_HASH 2737856072 +#define TS_SIGNATURE "rusEFI 2020.11.03.kin.2737856072" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c2c3c0fae0..ebacd6dd92 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 2262629520 -#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f4.2262629520" +#define SIGNATURE_HASH 1408657951 +#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f4.1408657951" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 28e0c37311..08bacbf1aa 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 2262629520 -#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f7.2262629520" +#define SIGNATURE_HASH 1408657951 +#define TS_SIGNATURE "rusEFI 2020.11.03.mre_f7.1408657951" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 5e9ddf0395..537a5b6c63 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 2888782511 -#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_405.2888782511" +#define SIGNATURE_HASH 2030421024 +#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_405.2030421024" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index eee02624ce..34f35c3428 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 2888782511 -#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_469.2888782511" +#define SIGNATURE_HASH 2030421024 +#define TS_SIGNATURE "rusEFI 2020.11.03.prometheus_469.2030421024" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e00a61b401..7122df7c6c 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 660413984 -#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f4.660413984" +#define SIGNATURE_HASH 4067920047 +#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f4.4067920047" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index da25bb17e2..b4ff3b9d3d 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.11.03 -#define SIGNATURE_HASH 660413984 -#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f7.660413984" +#define SIGNATURE_HASH 4067920047 +#define TS_SIGNATURE "rusEFI 2020.11.03.proteus_f7.4067920047" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index a3ba580b0434c823210a29e004fb187faf4f3e81..0b8c772c4d450a793d5c9691df7bcad7a3ed9f53 100644 GIT binary patch delta 143378 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 z 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鍠Uz|jFm2OJ%6bimO8M+Y1oaCE@Y0Y?WM9dLBO(E鍠U zz|jFm2OJ%6bimO8M+Y1oaCE@Y0Y?WM9dLBO(E鍠Uz|jFm2OJ%6bimR5mmJ+j zI22ZkCHW_6`|aqi3;gw127eZk>aiXpAY2zHo3Lyt{>|WWEfC?f)ew=0;NZ~E;I8ZG zO;|#I9!UEPtt1J1^DmSxK^@}5fYJd<2Phq&bb!(UN(U$%pmc!J0ZIob9iVi8(g8{bC>@}5fYJd<2Phq& zbb!(UN(U$%pmc!J0ZIob9iVi8(g8{bC>@}5fYJd<2Phq&bb!(UN(U(2e~Hp|u?eu2>YRAq)Lbxu7^$|Xi1gjQm4@Okt8qs>Mq z(5ZFH1Q8A{1_cg|77iWm-yd%wx;PwGg8w`SGKsrh+bi^XZI2`r3PEHz)ck4kZU#$2|@mUyeMcn0f!2n1EPz^;rXYsWjqcQ;#>qW zv|@)t1i2;RF#l86;Lon}NMz{7V`N_9>(}@XC*r<75u$R`zgDtLxPFiR-nH`QyZs-N z@IyHXI9vpUf167Xvv+FRKG_r`P=9p!l9Pb>vQluMS~KaqVfH_od3{6pLX5zF%u1v zAx2<-{tIUw7y~H2xe39tV<4!;vNUhw{%s5Z3abmuWbn|5X1u z2|{%~B$b9k{dFsRq}6QBzG{7{k|#{f16`H9Lh<*ey0KpFd+Q<*C+US zH~xIb|Dh2+tHlJQs=pp|M&?Ej;0GHm~v?q{s&pU?6CnXaQ86FTt4A^YFw$Uijxn(kf| zCY0oN-T3Q4@;~GKL-()oM5-~9lQ{o9-aqvH8c(X`U#tGS4Tb;S^_Q&F>n9}hU#=dv zJQkd@qnn+#BV>h+NKblwX?_y&Kd1b;05lYaLjjKfA zl7Bfv_3N}O90k6AI_T#ov+HAieQ5mUpo~T=XcZYr9CB#F`gIHZ=i$&o*7bc)27S%K zVdMRK`7f&ddg#ACNDv{dY#c#?pP%6W9Q67V`>#jH`zCCt8Wo8Ux`B%H`}z6v=K6>3 zZ`s#3S8Cg@ZW>5428RUFc!tBw_n)mcIzNZ}pINQ{GHYe`zZYQmedF&v!=d@7m-p+b kBi(}yz3;*1p#I+%g?#Vooa=x6KMW|OLI3~& diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 1f945bbd39..07e873ca36 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.all.4009186558" + signature = "rusEFI 2020.11.03.all.1004388977" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.all.4009186558" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.all.1004388977" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index f792ab308f..f520db8a66 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.frankenso_na6.2022171909" + signature = "rusEFI 2020.11.03.frankenso_na6.2913825674" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.frankenso_na6.2022171909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.frankenso_na6.2913825674" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:21 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index db1d54feb2..9b60d5dbd8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.hellen_cypress.654766653" + signature = "rusEFI 2020.11.03.hellen_cypress.4062995634" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.hellen_cypress.654766653" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.hellen_cypress.4062995634" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:32 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "Disabled", "P10 (B_0)", "P11 (B_1)", "P12 (B_2)", "P13 (B_3)", "P14 (B_4)", "P15 (B_5)", "P16 (B_6)", "P17 (B_7)", "P18 (B_8)", "P19 (B_9)", "P1A (B_10)", "P1B (B_11)", "P1C (B_12)", "P1D (B_13)", "P1E (B_14)", "P1F (B_15)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "P2A (C_10)", "P29 (C_9)", "P28 (C_8)", "P27 (C_7)", "P25 (C_5)", "P24 (C_4)", "P23 (C_3)", "P22 (C_2)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index c209b2b2f5..a7bb8f6f7b 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.kin.1981466823" + signature = "rusEFI 2020.11.03.kin.2737856072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.kin.1981466823" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.kin.2737856072" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 16:39:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Nov 03 17:20:30 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bf8e4c82dd..12d9c57f7e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.mre_f4.2262629520" + signature = "rusEFI 2020.11.03.mre_f4.1408657951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.mre_f4.2262629520" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.mre_f4.1408657951" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:20 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ebab4bdff5..f01ba257cf 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.mre_f7.2262629520" + signature = "rusEFI 2020.11.03.mre_f7.1408657951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.mre_f7.2262629520" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.mre_f7.1408657951" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:16 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8","40 - AN volt 9","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6","30 - AN volt 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a2fe6220d1..2547a1fca4 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.prometheus_405.2888782511" + signature = "rusEFI 2020.11.03.prometheus_405.2030421024" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.prometheus_405.2888782511" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.prometheus_405.2030421024" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:25 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 78a5a0ec76..931b385f7d 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.prometheus_469.2888782511" + signature = "rusEFI 2020.11.03.prometheus_469.2030421024" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.prometheus_469.2888782511" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.prometheus_469.2030421024" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:23 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","Analog 3O","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 50a6d96e47..bf5adc5cc4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.proteus_f4.660413984" + signature = "rusEFI 2020.11.03.proteus_f4.4067920047" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.proteus_f4.660413984" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.proteus_f4.4067920047" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:28 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 3215dfba6a..b2abf14774 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.11.03.proteus_f7.660413984" + signature = "rusEFI 2020.11.03.proteus_f7.4067920047" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.11.03.proteus_f7.660413984" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.11.03.proteus_f7.4067920047" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:39:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:26 UTC 2020 pageSize = 20000 page = 1 @@ -229,8 +229,8 @@ page = 1 trigger_customTotalToothCount = scalar, S32, 532, "number", 1.0, 0.0, 0, 500.0, 0 trigger_customSkippedToothCount = scalar, S32, 536, "number", 1.0, 0.0, 0, 500.0, 0 hip9011SpiDevice = bits,U32, 540, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" - boostControlPinMode = bits, U08, 541, [0:1], "default", "default inverted", "open collector", "open collector inverted" - alternatorControlPinMode = bits, U08, 542, [0:1], "default", "default inverted", "open collector", "open collector inverted" + unused541 = scalar, U08, 541, "unit", 1.0, 0, 0, 100, 0 + unused542 = scalar, U08, 542, "unit", 1.0, 0, 0, 100, 0 mafAdcChannel = bits, U08, 543, [0:5] "NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" globalFuelCorrection = scalar, F32, 544, "coef", 1.0, 0.0, 0, 1000.0, 2 adcVcc = scalar, F32, 548, "volts", 1.0, 0.0, 0, 6.0, 3 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 4eddc5d63a..03ef90f334 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 16:38:56 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Nov 03 17:20:09 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -58,7 +58,7 @@ public class Fields { public static final int alternatorControl_periodMs_offset = 1730; public static final int alternatorControl_pFactor_offset = 1716; public static final int alternatorControlPin_offset = 665; - public static final int alternatorControlPinMode_offset = 542; + public static final int alternatorControlPinMode_offset = 666; public static final int alternatorOffAboveTps_offset = 2028; public static final int alternatorPwmFrequency_offset = 2256; public static final int ambiguousOperationMode_offset = 488; @@ -153,7 +153,7 @@ public class Fields { public static final int BOOST_LOAD_COUNT = 8; public static final int BOOST_RPM_COUNT = 8; public static final int boostControlPin_offset = 988; - public static final int boostControlPinMode_offset = 541; + public static final int boostControlPinMode_offset = 989; public static final int boostCutPressure_offset = 2132; public static final int boostPid_dFactor_offset = 1000; public static final int boostPid_iFactor_offset = 996; @@ -1163,6 +1163,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1004388977; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1430,7 +1431,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.11.03.all.4009186558"; + public static final String TS_SIGNATURE = "rusEFI 2020.11.03.all.1004388977"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; @@ -1462,6 +1463,8 @@ public class Fields { public static final int unused2508_offset = 2508; public static final int unused2536_offset = 2536; public static final int unused3328_offset = 3328; + public static final int unused541_offset = 541; + public static final int unused542_offset = 542; public static final int unused6312_offset = 6312; public static final int unused744b25_offset = 744; public static final int unused744b4_offset = 744; @@ -1723,9 +1726,8 @@ public class Fields { public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = Field.create("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 532, FieldType.INT); public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = Field.create("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 536, FieldType.INT); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 540, FieldType.INT8); - public static final String[] pin_output_mode_e = {"default", "default inverted", "open collector", "open collector inverted"}; - public static final Field BOOSTCONTROLPINMODE = Field.create("BOOSTCONTROLPINMODE", 541, FieldType.INT8, pin_output_mode_e); - public static final Field ALTERNATORCONTROLPINMODE = Field.create("ALTERNATORCONTROLPINMODE", 542, FieldType.INT8, pin_output_mode_e); + public static final Field UNUSED541 = Field.create("UNUSED541", 541, FieldType.INT8); + public static final Field UNUSED542 = Field.create("UNUSED542", 542, FieldType.INT8); public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 543, FieldType.INT8, adc_channel_e); public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 544, FieldType.FLOAT); public static final Field ADCVCC = Field.create("ADCVCC", 548, FieldType.FLOAT); @@ -1743,6 +1745,7 @@ public class Fields { public static final Field THROTTLEPEDALPOSITIONADCCHANNEL = Field.create("THROTTLEPEDALPOSITIONADCCHANNEL", 580, FieldType.INT8, adc_channel_e); public static final String[] brain_pin_e = {"NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; public static final Field TLE6240_CS = Field.create("TLE6240_CS", 581, FieldType.INT8, brain_pin_e); + public static final String[] pin_output_mode_e = {"default", "default inverted", "open collector", "open collector inverted"}; public static final Field TLE6240_CSPINMODE = Field.create("TLE6240_CSPINMODE", 582, FieldType.INT8, pin_output_mode_e); public static final String[] switch_input_pin_e = {"NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"}; public static final Field THROTTLEPEDALUPPIN = Field.create("THROTTLEPEDALUPPIN", 583, FieldType.INT8, switch_input_pin_e); @@ -2799,8 +2802,8 @@ public class Fields { TRIGGER_CUSTOMTOTALTOOTHCOUNT, TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT, HIP9011SPIDEVICE, - BOOSTCONTROLPINMODE, - ALTERNATORCONTROLPINMODE, + UNUSED541, + UNUSED542, MAFADCCHANNEL, GLOBALFUELCORRECTION, ADCVCC, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 270461a14d..f4e16fd161 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +