diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 30d4b40afd..d62bf60e7c 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri May 28 07:39:52 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -1311,6 +1311,35 @@ case TCHARGE_MODE_RPM_TPS: } return NULL; } +const char *getTcu_role_e(tcu_role_e value){ +switch(value) { +case ROLE_DOWNSHIFT: + return "ROLE_DOWNSHIFT"; +case ROLE_DRIVE: + return "ROLE_DRIVE"; +case ROLE_GEAR_1: + return "ROLE_GEAR_1"; +case ROLE_GEAR_2: + return "ROLE_GEAR_2"; +case ROLE_GEAR_3: + return "ROLE_GEAR_3"; +case ROLE_LOW: + return "ROLE_LOW"; +case ROLE_MANUAL: + return "ROLE_MANUAL"; +case ROLE_NEUTRAL: + return "ROLE_NEUTRAL"; +case ROLE_PARK: + return "ROLE_PARK"; +case ROLE_PARK_NEUTRAL: + return "ROLE_PARK_NEUTRAL"; +case ROLE_REVERSE: + return "ROLE_REVERSE"; +case ROLE_UPSHIFT: + return "ROLE_UPSHIFT"; + } + return NULL; +} const char *getTiming_mode_e(timing_mode_e value){ switch(value) { case Internal_ForceMyEnumIntSize_timing_mode: diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h index 10eba3e219..ab2eeafc5e 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat May 08 16:52:30 MSK 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -47,6 +47,7 @@ const char *getSensor_chart_e(sensor_chart_e value); const char *getSpi_device_e(spi_device_e value); const char *getSpi_speed_e(spi_speed_e value); const char *getTChargeMode_e(tChargeMode_e value); +const char *getTcu_role_e(tcu_role_e value); const char *getTiming_mode_e(timing_mode_e value); const char *getTle8888_mode_e(tle8888_mode_e value); const char *getTrigger_event_e(trigger_event_e value); 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 67371b2999..309cfc1371 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 Fri Jun 11 10:26:53 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:06 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1957,7 +1957,7 @@ struct engine_configuration_s { bool tcuEnabled : 1; /** offset 976 bit 29 */ - bool unusedBit_251_29 : 1; + bool tcuInputMode : 1; /** offset 976 bit 30 */ bool unusedBit_289_30 : 1; @@ -3790,13 +3790,10 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** + units * offset 4514 */ - pin_input_mode_e tcuUpshiftButtonPinMode; - /** - * offset 4515 - */ - pin_input_mode_e tcuDownshiftButtonPinMode; + int8_t unused1551[2]; /** * offset 4516 */ @@ -4215,4 +4212,4 @@ struct 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 Fri Jun 11 10:26:53 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:06 UTC 2021 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 eece08c340..3510bb15f1 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 @@ -1280,8 +1280,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 1279579099 +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1015850303 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1384,6 +1384,7 @@ #define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation" #define tChargeMode_offset 3884 #define TCU_GEAR_COUNT 10 +#define TCU_INPUT_COUNT 6 #define tcu_solenoid1_offset 1192 #define tcu_solenoid2_offset 1193 #define tcu_solenoid3_offset 1194 @@ -1397,12 +1398,12 @@ #define tcu_solenoid_mode4_offset 4520 #define tcu_solenoid_mode5_offset 4521 #define tcu_solenoid_mode6_offset 4522 +#define TCU_STATE_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 -#define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 +#define tcuInputMode_offset 976 #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 -#define tcuUpshiftButtonPinMode_offset 4514 #define tempHpfpDuration_offset 726 #define tempHpfpStart_offset 724 #define test557pin_offset 3101 @@ -1634,7 +1635,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen_cypress.1279579099" +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen_cypress.1015850303" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1698,6 +1699,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1551_offset 4514 #define unused1708_offset 1708 #define unused1756_offset 1756 #define unused2260_offset 2260 @@ -1731,7 +1733,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_29_offset 976 #define unusedBit_289_30_offset 976 #define unusedBit_289_31_offset 976 #define unusedBit_34_31_offset 76 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index afc49432cd..93b7cbd95a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri May 28 07:39:52 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -1107,6 +1107,35 @@ case TCHARGE_MODE_RPM_TPS: } return NULL; } +const char *getTcu_role_e(tcu_role_e value){ +switch(value) { +case ROLE_DOWNSHIFT: + return "ROLE_DOWNSHIFT"; +case ROLE_DRIVE: + return "ROLE_DRIVE"; +case ROLE_GEAR_1: + return "ROLE_GEAR_1"; +case ROLE_GEAR_2: + return "ROLE_GEAR_2"; +case ROLE_GEAR_3: + return "ROLE_GEAR_3"; +case ROLE_LOW: + return "ROLE_LOW"; +case ROLE_MANUAL: + return "ROLE_MANUAL"; +case ROLE_NEUTRAL: + return "ROLE_NEUTRAL"; +case ROLE_PARK: + return "ROLE_PARK"; +case ROLE_PARK_NEUTRAL: + return "ROLE_PARK_NEUTRAL"; +case ROLE_REVERSE: + return "ROLE_REVERSE"; +case ROLE_UPSHIFT: + return "ROLE_UPSHIFT"; + } + return NULL; +} const char *getTiming_mode_e(timing_mode_e value){ switch(value) { case Internal_ForceMyEnumIntSize_timing_mode: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h index cdf9c67a36..ab2eeafc5e 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat May 08 16:52:29 MSK 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -47,6 +47,7 @@ const char *getSensor_chart_e(sensor_chart_e value); const char *getSpi_device_e(spi_device_e value); const char *getSpi_speed_e(spi_speed_e value); const char *getTChargeMode_e(tChargeMode_e value); +const char *getTcu_role_e(tcu_role_e value); const char *getTiming_mode_e(timing_mode_e value); const char *getTle8888_mode_e(tle8888_mode_e value); const char *getTrigger_event_e(trigger_event_e value); 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 34903daa32..ae0709b211 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 Fri Jun 11 10:26:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:05 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1957,7 +1957,7 @@ struct engine_configuration_s { bool tcuEnabled : 1; /** offset 976 bit 29 */ - bool unusedBit_251_29 : 1; + bool tcuInputMode : 1; /** offset 976 bit 30 */ bool unusedBit_289_30 : 1; @@ -3784,13 +3784,10 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** + units * offset 4486 */ - pin_input_mode_e tcuUpshiftButtonPinMode; - /** - * offset 4487 - */ - pin_input_mode_e tcuDownshiftButtonPinMode; + int8_t unused1551[2]; /** * offset 4488 */ @@ -4209,4 +4206,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jun 11 10:26:51 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:05 UTC 2021 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 4f268e6833..964216e301 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1264,8 +1264,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 3017875239 +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3274271171 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1368,6 +1368,7 @@ #define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation" #define tChargeMode_offset 3856 #define TCU_GEAR_COUNT 10 +#define TCU_INPUT_COUNT 6 #define tcu_solenoid1_offset 1192 #define tcu_solenoid2_offset 1193 #define tcu_solenoid3_offset 1194 @@ -1381,12 +1382,12 @@ #define tcu_solenoid_mode4_offset 4492 #define tcu_solenoid_mode5_offset 4493 #define tcu_solenoid_mode6_offset 4494 +#define TCU_STATE_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 -#define tcuDownshiftButtonPinMode_offset 4487 #define tcuEnabled_offset 976 +#define tcuInputMode_offset 976 #define tcuSolenoidTable_offset 15108 #define tcuUpshiftButtonPin_offset 1818 -#define tcuUpshiftButtonPinMode_offset 4486 #define tempHpfpDuration_offset 726 #define tempHpfpStart_offset 724 #define test557pin_offset 3073 @@ -1618,7 +1619,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.11.kin.3017875239" +#define TS_SIGNATURE "rusEFI 2021.06.12.kin.3274271171" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1682,6 +1683,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1551_offset 4486 #define unused1708_offset 1708 #define unused1756_offset 1756 #define unused2260_offset 2252 @@ -1715,7 +1717,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2685 #define unusedAuxVoltage2_TODO_332_offset 2686 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_29_offset 976 #define unusedBit_289_30_offset 976 #define unusedBit_289_31_offset 976 #define unusedBit_34_31_offset 76 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp index 697c3c6a9b..3a85576b07 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri May 28 07:39:53 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:42 UTC 2021 // see also gen_config_and_enums.bat @@ -1307,6 +1307,35 @@ case TCHARGE_MODE_RPM_TPS: } return NULL; } +const char *getTcu_role_e(tcu_role_e value){ +switch(value) { +case ROLE_DOWNSHIFT: + return "ROLE_DOWNSHIFT"; +case ROLE_DRIVE: + return "ROLE_DRIVE"; +case ROLE_GEAR_1: + return "ROLE_GEAR_1"; +case ROLE_GEAR_2: + return "ROLE_GEAR_2"; +case ROLE_GEAR_3: + return "ROLE_GEAR_3"; +case ROLE_LOW: + return "ROLE_LOW"; +case ROLE_MANUAL: + return "ROLE_MANUAL"; +case ROLE_NEUTRAL: + return "ROLE_NEUTRAL"; +case ROLE_PARK: + return "ROLE_PARK"; +case ROLE_PARK_NEUTRAL: + return "ROLE_PARK_NEUTRAL"; +case ROLE_REVERSE: + return "ROLE_REVERSE"; +case ROLE_UPSHIFT: + return "ROLE_UPSHIFT"; + } + return NULL; +} const char *getTiming_mode_e(timing_mode_e value){ switch(value) { case Internal_ForceMyEnumIntSize_timing_mode: diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.h index 1e98561330..f928e49645 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat May 08 16:45:49 MSK 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:42 UTC 2021 // see also gen_config_and_enums.bat @@ -47,6 +47,7 @@ const char *getSensor_chart_e(sensor_chart_e value); const char *getSpi_device_e(spi_device_e value); const char *getSpi_speed_e(spi_speed_e value); const char *getTChargeMode_e(tChargeMode_e value); +const char *getTcu_role_e(tcu_role_e value); const char *getTiming_mode_e(timing_mode_e value); const char *getTle8888_mode_e(tle8888_mode_e value); const char *getTrigger_event_e(trigger_event_e value); diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index a19f57d334..e5cf47a151 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Jun 11 10:26:55 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:08 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1957,7 +1957,7 @@ struct engine_configuration_s { bool tcuEnabled : 1; /** offset 976 bit 29 */ - bool unusedBit_251_29 : 1; + bool tcuInputMode : 1; /** offset 976 bit 30 */ bool unusedBit_289_30 : 1; @@ -3790,13 +3790,10 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** + units * offset 4514 */ - pin_input_mode_e tcuUpshiftButtonPinMode; - /** - * offset 4515 - */ - pin_input_mode_e tcuDownshiftButtonPinMode; + int8_t unused1551[2]; /** * offset 4516 */ @@ -4215,4 +4212,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Jun 11 10:26:55 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:08 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 57b5613f19..6b74710c0a 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1280,8 +1280,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 2741241373 +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3551293689 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1384,6 +1384,7 @@ #define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation" #define tChargeMode_offset 3884 #define TCU_GEAR_COUNT 10 +#define TCU_INPUT_COUNT 6 #define tcu_solenoid1_offset 1192 #define tcu_solenoid2_offset 1193 #define tcu_solenoid3_offset 1194 @@ -1397,12 +1398,12 @@ #define tcu_solenoid_mode4_offset 4520 #define tcu_solenoid_mode5_offset 4521 #define tcu_solenoid_mode6_offset 4522 +#define TCU_STATE_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 -#define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 +#define tcuInputMode_offset 976 #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 -#define tcuUpshiftButtonPinMode_offset 4514 #define tempHpfpDuration_offset 726 #define tempHpfpStart_offset 724 #define test557pin_offset 3101 @@ -1634,7 +1635,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.06.11.subaru_eg33_f7.2741241373" +#define TS_SIGNATURE "rusEFI 2021.06.12.subaru_eg33_f7.3551293689" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1698,6 +1699,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1551_offset 4514 #define unused1708_offset 1708 #define unused1756_offset 1756 #define unused2260_offset 2260 @@ -1731,7 +1733,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_29_offset 976 #define unusedBit_289_30_offset 976 #define unusedBit_289_31_offset 976 #define unusedBit_34_31_offset 76 diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index e8bf8c819f..5f5b131c27 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri May 28 07:39:51 UTC 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -1283,6 +1283,35 @@ case TCHARGE_MODE_RPM_TPS: } return NULL; } +const char *getTcu_role_e(tcu_role_e value){ +switch(value) { +case ROLE_DOWNSHIFT: + return "ROLE_DOWNSHIFT"; +case ROLE_DRIVE: + return "ROLE_DRIVE"; +case ROLE_GEAR_1: + return "ROLE_GEAR_1"; +case ROLE_GEAR_2: + return "ROLE_GEAR_2"; +case ROLE_GEAR_3: + return "ROLE_GEAR_3"; +case ROLE_LOW: + return "ROLE_LOW"; +case ROLE_MANUAL: + return "ROLE_MANUAL"; +case ROLE_NEUTRAL: + return "ROLE_NEUTRAL"; +case ROLE_PARK: + return "ROLE_PARK"; +case ROLE_PARK_NEUTRAL: + return "ROLE_PARK_NEUTRAL"; +case ROLE_REVERSE: + return "ROLE_REVERSE"; +case ROLE_UPSHIFT: + return "ROLE_UPSHIFT"; + } + return NULL; +} const char *getTiming_mode_e(timing_mode_e value){ switch(value) { case Internal_ForceMyEnumIntSize_timing_mode: diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index cdf9c67a36..ab2eeafc5e 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -1,4 +1,4 @@ -// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat May 08 16:52:29 MSK 2021 +// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Jun 12 04:02:41 UTC 2021 // see also gen_config_and_enums.bat @@ -47,6 +47,7 @@ const char *getSensor_chart_e(sensor_chart_e value); const char *getSpi_device_e(spi_device_e value); const char *getSpi_speed_e(spi_speed_e value); const char *getTChargeMode_e(tChargeMode_e value); +const char *getTcu_role_e(tcu_role_e value); const char *getTiming_mode_e(timing_mode_e value); const char *getTle8888_mode_e(tle8888_mode_e value); const char *getTrigger_event_e(trigger_event_e value); diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 0302b99478..5d3facb01c 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 Fri Jun 11 10:26:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1957,7 +1957,7 @@ struct engine_configuration_s { bool tcuEnabled : 1; /** offset 976 bit 29 */ - bool unusedBit_251_29 : 1; + bool tcuInputMode : 1; /** offset 976 bit 30 */ bool unusedBit_289_30 : 1; @@ -3790,13 +3790,10 @@ struct engine_configuration_s { */ uint16_t mc33_t_hold_tot; /** + units * offset 4514 */ - pin_input_mode_e tcuUpshiftButtonPinMode; - /** - * offset 4515 - */ - pin_input_mode_e tcuDownshiftButtonPinMode; + int8_t unused1551[2]; /** * offset 4516 */ @@ -4215,4 +4212,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jun 11 10:26:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 633cb5caf5..2196c366ff 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 Fri Jun 11 10:26:25 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 84de2aedb7..3959b634d0 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 Fri Jun 11 10:26:25 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 6b2dcf9eb9..a983c931c8 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 Fri Jun 11 10:26:25 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index a7170f2a1a..dc7620c9c4 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 Fri Jun 11 10:26:25 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a969a8ad8e..32844dd990 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1277,8 +1277,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 238553099 +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 2129690351 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1381,6 +1381,7 @@ #define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation" #define tChargeMode_offset 3884 #define TCU_GEAR_COUNT 10 +#define TCU_INPUT_COUNT 6 #define tcu_solenoid1_offset 1192 #define tcu_solenoid2_offset 1193 #define tcu_solenoid3_offset 1194 @@ -1394,12 +1395,12 @@ #define tcu_solenoid_mode4_offset 4520 #define tcu_solenoid_mode5_offset 4521 #define tcu_solenoid_mode6_offset 4522 +#define TCU_STATE_COUNT 8 #define tcuDownshiftButtonPin_offset 1819 -#define tcuDownshiftButtonPinMode_offset 4515 #define tcuEnabled_offset 976 +#define tcuInputMode_offset 976 #define tcuSolenoidTable_offset 15136 #define tcuUpshiftButtonPin_offset 1818 -#define tcuUpshiftButtonPinMode_offset 4514 #define tempHpfpDuration_offset 726 #define tempHpfpStart_offset 724 #define test557pin_offset 3101 @@ -1631,7 +1632,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.06.11.all.238553099" +#define TS_SIGNATURE "rusEFI 2021.06.12.all.2129690351" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1695,6 +1696,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused1551_offset 4514 #define unused1708_offset 1708 #define unused1756_offset 1756 #define unused2260_offset 2260 @@ -1728,7 +1730,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_29_offset 976 #define unusedBit_289_30_offset 976 #define unusedBit_289_31_offset 976 #define unusedBit_34_31_offset 76 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 7d32a38417..aaaa9c0e3d 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 238553099 -#define TS_SIGNATURE "rusEFI 2021.06.11.all.238553099" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 2129690351 +#define TS_SIGNATURE "rusEFI 2021.06.12.all.2129690351" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index bb750f347e..c2ce791157 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 913737266 -#define TS_SIGNATURE "rusEFI 2021.06.11.frankenso_na6.913737266" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1186918614 +#define TS_SIGNATURE "rusEFI 2021.06.12.frankenso_na6.1186918614" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index aa5cfa967e..ed81903bb8 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 3327950904 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen121nissan.3327950904" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3063215836 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen121nissan.3063215836" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index d560ea69aa..94ffcb9590 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 337071341 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen121vag.337071341" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1692350985 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen121vag.1692350985" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 11df44c86a..0145cbad84 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 4190510319 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen128.4190510319" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 2299423243 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen128.2299423243" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 97a785eac5..54f68771b6 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 2697918336 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen72.2697918336" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3490087268 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen72.3490087268" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index ee872fa7a7..cb94ac7430 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 1093144470 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellenNA6.1093144470" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 836794738 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellenNA6.836794738" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 010a8782e7..fcce3474dc 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 1279579099 -#define TS_SIGNATURE "rusEFI 2021.06.11.hellen_cypress.1279579099" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1015850303 +#define TS_SIGNATURE "rusEFI 2021.06.12.hellen_cypress.1015850303" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a8a748ebb9..5d0c38cfce 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 3017875239 -#define TS_SIGNATURE "rusEFI 2021.06.11.kin.3017875239" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3274271171 +#define TS_SIGNATURE "rusEFI 2021.06.12.kin.3274271171" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d134f0864d..423fcbedfe 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 2364182801 -#define TS_SIGNATURE "rusEFI 2021.06.11.mre_f4.2364182801" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 4230146037 +#define TS_SIGNATURE "rusEFI 2021.06.12.mre_f4.4230146037" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6572666676..b7f3553e15 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 2364182801 -#define TS_SIGNATURE "rusEFI 2021.06.11.mre_f7.2364182801" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 4230146037 +#define TS_SIGNATURE "rusEFI 2021.06.12.mre_f7.4230146037" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 0994dd933f..f40ca9c79e 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 481167933 -#define TS_SIGNATURE "rusEFI 2021.06.11.prometheus_405.481167933" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1818655961 +#define TS_SIGNATURE "rusEFI 2021.06.12.prometheus_405.1818655961" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 257bbb27ad..c23059257b 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 481167933 -#define TS_SIGNATURE "rusEFI 2021.06.11.prometheus_469.481167933" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 1818655961 +#define TS_SIGNATURE "rusEFI 2021.06.12.prometheus_469.1818655961" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 9f868a4588..31bbdd9f4e 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 1737405712 -#define TS_SIGNATURE "rusEFI 2021.06.11.proteus_f4.1737405712" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 390513652 +#define TS_SIGNATURE "rusEFI 2021.06.12.proteus_f4.390513652" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index c9c9746825..402e696ad8 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 1737405712 -#define TS_SIGNATURE "rusEFI 2021.06.11.proteus_f7.1737405712" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 390513652 +#define TS_SIGNATURE "rusEFI 2021.06.12.proteus_f7.390513652" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index bdb974b4c9..87c2e8cd96 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.06.11 -#define SIGNATURE_HASH 2741241373 -#define TS_SIGNATURE "rusEFI 2021.06.11.subaru_eg33_f7.2741241373" +#define SIGNATURE_DATE 2021.06.12 +#define SIGNATURE_HASH 3551293689 +#define TS_SIGNATURE "rusEFI 2021.06.12.subaru_eg33_f7.3551293689" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d01b28b568..26a8c82a03 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 7ea20b8adb..ff9cab33f0 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 2021.06.11.all.238553099" + signature = "rusEFI 2021.06.12.all.2129690351" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.all.238553099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.all.2129690351" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 21b23ebbc1..42395bca22 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 2021.06.11.frankenso_na6.913737266" + signature = "rusEFI 2021.06.12.frankenso_na6.1186918614" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.frankenso_na6.913737266" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.frankenso_na6.1186918614" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:57 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 823d18d527..47de99bef2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.hellen121nissan.3327950904" + signature = "rusEFI 2021.06.12.hellen121nissan.3063215836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellen121nissan.3327950904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellen121nissan.3063215836" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:32 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:49 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index b15dd2450b..957a3e1a8f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.hellen121vag.337071341" + signature = "rusEFI 2021.06.12.hellen121vag.1692350985" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellen121vag.337071341" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellen121vag.1692350985" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 16:25:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:47 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index 2a5bddd90d..4637e43fc5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.hellen128.4190510319" + signature = "rusEFI 2021.06.12.hellen128.2299423243" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellen128.4190510319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellen128.2299423243" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:44 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c65b6fc0e5..33bde6d17e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.hellen72.2697918336" + signature = "rusEFI 2021.06.12.hellen72.3490087268" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellen72.2697918336" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellen72.3490087268" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:34 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:51 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 7b8eded77c..ae2f62afab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.hellenNA6.1093144470" + signature = "rusEFI 2021.06.12.hellenNA6.836794738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellenNA6.1093144470" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellenNA6.836794738" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:52 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index bca71156de..d88d485268 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 2021.06.11.hellen_cypress.1279579099" + signature = "rusEFI 2021.06.12.hellen_cypress.1015850303" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.hellen_cypress.1279579099" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.hellen_cypress.1015850303" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:53 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:06 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index c0f3aaeef6..7a23e4cb1b 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 2021.06.11.kin.3017875239" + signature = "rusEFI 2021.06.12.kin.3274271171" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.kin.3017875239" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.kin.3274271171" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jun 12 04:03:05 UTC 2021 pageSize = 19972 page = 1 @@ -562,7 +562,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "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", "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", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -1166,8 +1166,7 @@ mc33_t_peak_tot = scalar, U16, 4478, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4480, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4482, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4484, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4486, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4487, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4486, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4488, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4489, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4490, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0f5b246dea..055cc21332 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 2021.06.11.mre_f4.2364182801" + signature = "rusEFI 2021.06.12.mre_f4.4230146037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.mre_f4.2364182801" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.mre_f4.4230146037" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:40 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:56 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ec4ebcbd93..676ee26133 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 2021.06.11.mre_f7.2364182801" + signature = "rusEFI 2021.06.12.mre_f7.4230146037" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.mre_f7.2364182801" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.mre_f7.4230146037" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:54 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index e7ff3459ab..85a9e8222b 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 2021.06.11.prometheus_405.481167933" + signature = "rusEFI 2021.06.12.prometheus_405.1818655961" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.prometheus_405.481167933" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.prometheus_405.1818655961" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:00 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 39ea5dc117..7dc0a909b5 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 2021.06.11.prometheus_469.481167933" + signature = "rusEFI 2021.06.12.prometheus_469.1818655961" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.prometheus_469.481167933" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.prometheus_469.1818655961" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:59 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index aad5d7131b..90c95ba203 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 2021.06.11.proteus_f4.1737405712" + signature = "rusEFI 2021.06.12.proteus_f4.390513652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.proteus_f4.1737405712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.proteus_f4.390513652" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:03 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0b27d827cc..c3bc98f442 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 2021.06.11.proteus_f7.1737405712" + signature = "rusEFI 2021.06.12.proteus_f7.390513652" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.proteus_f7.1737405712" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.proteus_f7.390513652" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 Fri Jun 11 10:26:47 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:02 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index f58dc489c1..eadebdf3eb 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.06.11.subaru_eg33_f7.2741241373" + signature = "rusEFI 2021.06.12.subaru_eg33_f7.3551293689" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.06.11.subaru_eg33_f7.2741241373" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.06.12.subaru_eg33_f7.3551293689" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Jun 11 10:26:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:03:08 UTC 2021 pageSize = 20000 page = 1 @@ -565,7 +565,7 @@ knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" tcuEnabled = bits, U32, 976, [28:28], "false", "true" -unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" +tcuInputMode = bits, U32, 976, [29:29], "Analog", "Digital" unusedBit_289_30 = bits, U32, 976, [30:30], "false", "true" unusedBit_289_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "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", "PI0","PI1","PI2","PI3","PI4","PI5","PI6","PI7","PI8","PI9","PI10","PI11","PI12","PI13","PI14","PI15", "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", "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" @@ -1182,8 +1182,7 @@ mc33_t_peak_tot = scalar, U16, 4506, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_bypass = scalar, U16, 4508, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_off = scalar, U16, 4510, "us", 1.0, 0.0, 0, 10000, 0 mc33_t_hold_tot = scalar, U16, 4512, "us", 1.0, 0.0, 0, 10000, 0 -tcuUpshiftButtonPinMode = bits, U08, 4514, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" -tcuDownshiftButtonPinMode = bits, U08, 4515, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" +unused1551 = array, S08, 4514, [2], "units", 1.0, 0, -20, 100, 0; acSwitchMode = bits, U08, 4516, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" tcu_solenoid_mode1 = bits, U08, 4517, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode2 = bits, U08, 4518, [0:1], "default", "default inverted", "open collector", "open collector inverted" 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 441af54573..16bcb60c02 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 Fri Jun 11 10:26:25 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jun 12 04:02:42 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1232,7 +1232,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 = 238553099; + public static final int SIGNATURE_HASH = 2129690351; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1331,6 +1331,7 @@ public class Fields { public static final int tChargeMinRpmMinTps_offset = 2232; public static final int tChargeMode_offset = 3884; public static final int TCU_GEAR_COUNT = 10; + public static final int TCU_INPUT_COUNT = 6; public static final int tcu_solenoid1_offset = 1192; public static final int tcu_solenoid2_offset = 1193; public static final int tcu_solenoid3_offset = 1194; @@ -1344,12 +1345,12 @@ public class Fields { public static final int tcu_solenoid_mode4_offset = 4520; public static final int tcu_solenoid_mode5_offset = 4521; public static final int tcu_solenoid_mode6_offset = 4522; + public static final int TCU_STATE_COUNT = 8; public static final int tcuDownshiftButtonPin_offset = 1819; - public static final int tcuDownshiftButtonPinMode_offset = 4515; public static final int tcuEnabled_offset = 976; + public static final int tcuInputMode_offset = 976; public static final int tcuSolenoidTable_offset = 15136; public static final int tcuUpshiftButtonPin_offset = 1818; - public static final int tcuUpshiftButtonPinMode_offset = 4514; public static final int tempHpfpDuration_offset = 726; public static final int tempHpfpStart_offset = 724; public static final int test557pin_offset = 3101; @@ -1534,7 +1535,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 2021.06.11.all.238553099"; + public static final String TS_SIGNATURE = "rusEFI 2021.06.12.all.2129690351"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1595,6 +1596,7 @@ public class Fields { public static final int unused1476b20_offset = 1476; public static final int unused1476b3_offset = 1476; public static final int unused1476b8_offset = 1476; + public static final int unused1551_offset = 4514; public static final int unused1708_offset = 1708; public static final int unused1756_offset = 1756; public static final int unused2260_offset = 2260; @@ -1628,7 +1630,6 @@ public class Fields { public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_251_29_offset = 976; public static final int unusedBit_289_30_offset = 976; public static final int unusedBit_289_31_offset = 976; public static final int unusedBit_34_31_offset = 76; @@ -2218,7 +2219,7 @@ public class Fields { public static final Field KNOCKBANKCYL11 = Field.create("KNOCKBANKCYL11", 976, FieldType.BIT, 26); public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 976, FieldType.BIT, 27); public static final Field TCUENABLED = Field.create("TCUENABLED", 976, FieldType.BIT, 28); - public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29); + public static final Field TCUINPUTMODE = Field.create("TCUINPUTMODE", 976, FieldType.BIT, 29); public static final Field UNUSEDBIT_289_30 = Field.create("UNUSEDBIT_289_30", 976, FieldType.BIT, 30); public static final Field UNUSEDBIT_289_31 = Field.create("UNUSEDBIT_289_31", 976, FieldType.BIT, 31); public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 980, FieldType.INT8, brain_pin_e); @@ -2785,8 +2786,6 @@ public class Fields { public static final Field MC33_T_BYPASS = Field.create("MC33_T_BYPASS", 4508, FieldType.INT16); public static final Field MC33_T_HOLD_OFF = Field.create("MC33_T_HOLD_OFF", 4510, FieldType.INT16); public static final Field MC33_T_HOLD_TOT = Field.create("MC33_T_HOLD_TOT", 4512, FieldType.INT16); - public static final Field TCUUPSHIFTBUTTONPINMODE = Field.create("TCUUPSHIFTBUTTONPINMODE", 4514, FieldType.INT8, pin_input_mode_e); - public static final Field TCUDOWNSHIFTBUTTONPINMODE = Field.create("TCUDOWNSHIFTBUTTONPINMODE", 4515, FieldType.INT8, pin_input_mode_e); public static final Field ACSWITCHMODE = Field.create("ACSWITCHMODE", 4516, FieldType.INT8, pin_input_mode_e); public static final Field TCU_SOLENOID_MODE1 = Field.create("TCU_SOLENOID_MODE1", 4517, FieldType.INT8, pin_output_mode_e); public static final Field TCU_SOLENOID_MODE2 = Field.create("TCU_SOLENOID_MODE2", 4518, FieldType.INT8, pin_output_mode_e); @@ -3319,7 +3318,7 @@ public class Fields { KNOCKBANKCYL11, KNOCKBANKCYL12, TCUENABLED, - UNUSEDBIT_251_29, + TCUINPUTMODE, UNUSEDBIT_289_30, UNUSEDBIT_289_31, ETBIO1_DIRECTIONPIN1, @@ -3876,8 +3875,6 @@ public class Fields { MC33_T_BYPASS, MC33_T_HOLD_OFF, MC33_T_HOLD_TOT, - TCUUPSHIFTBUTTONPINMODE, - TCUDOWNSHIFTBUTTONPINMODE, ACSWITCHMODE, TCU_SOLENOID_MODE1, TCU_SOLENOID_MODE2, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 0486fb0517..883b1b2600 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +