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 07e1dccc1d..1e50cdf0a5 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 Wed Apr 20 00:07:31 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:24 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1536,7 +1536,11 @@ struct engine_configuration_s { /** * offset 722 */ - scaled_channel unused722; + brain_input_pin_e tcuInputSpeedSensorPin; + /** + * offset 723 + */ + uint8_t tcuInputSpeedSensorTeeth; /** * Voltage when the wastegate is closed. * You probably don't have one of these! @@ -3010,76 +3014,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_507_8 : 1 {}; + bool unusedBit_508_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_507_9 : 1 {}; + bool unusedBit_508_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_507_10 : 1 {}; + bool unusedBit_508_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_507_11 : 1 {}; + bool unusedBit_508_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_507_12 : 1 {}; + bool unusedBit_508_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_507_13 : 1 {}; + bool unusedBit_508_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_507_14 : 1 {}; + bool unusedBit_508_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_507_15 : 1 {}; + bool unusedBit_508_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_507_16 : 1 {}; + bool unusedBit_508_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_507_17 : 1 {}; + bool unusedBit_508_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_507_18 : 1 {}; + bool unusedBit_508_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_507_19 : 1 {}; + bool unusedBit_508_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_507_20 : 1 {}; + bool unusedBit_508_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_507_21 : 1 {}; + bool unusedBit_508_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_507_22 : 1 {}; + bool unusedBit_508_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_507_23 : 1 {}; + bool unusedBit_508_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_507_24 : 1 {}; + bool unusedBit_508_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_507_25 : 1 {}; + bool unusedBit_508_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_507_26 : 1 {}; + bool unusedBit_508_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_507_27 : 1 {}; + bool unusedBit_508_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_507_28 : 1 {}; + bool unusedBit_508_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_507_29 : 1 {}; + bool unusedBit_508_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_507_30 : 1 {}; + bool unusedBit_508_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_507_31 : 1 {}; + bool unusedBit_508_31 : 1 {}; /** ms * offset 1744 @@ -3979,7 +3983,7 @@ struct engine_configuration_s { /** * offset 4171 */ - uint8_t unusedFiller_4703; + uint8_t issFilterReciprocal; /** %/kPa * offset 4172 @@ -4678,4 +4682,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:31 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:24 UTC 2022 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 5ebb95170d..ece9a41f52 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 @@ -1130,6 +1130,7 @@ #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" #define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" +#define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" #define GAUGE_NAME_KNOCK_10 "knock 10" #define GAUGE_NAME_KNOCK_11 "knock 11" @@ -1562,6 +1563,7 @@ #define isManualSpinningMode_offset 1272 #define isMapAveragingEnabled_offset 1272 #define isSdCardEnabled_offset 748 +#define issFilterReciprocal_offset 4171 #define issue_294_31_offset 164 #define isVerboseAlternator_offset 748 #define isVerboseAuxPid1_offset 164 @@ -1951,7 +1953,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2949527698 +#define SIGNATURE_HASH 1964759764 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2126,6 +2128,8 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 +#define tcuInputSpeedSensorPin_offset 722 +#define tcuInputSpeedSensorTeeth_offset 723 #define tcuSolenoidTable_offset 17388 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 @@ -2529,7 +2533,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen_cypress.2949527698" +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen_cypress.1964759764" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2576,7 +2580,6 @@ #define unused17440_offset 17448 #define unused184_offset 184 #define unused28_offset 28 -#define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 #define unused_1484_bit_26_offset 1272 @@ -2586,31 +2589,30 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit_48_31_offset 164 -#define unusedBit_507_10_offset 1740 -#define unusedBit_507_11_offset 1740 -#define unusedBit_507_12_offset 1740 -#define unusedBit_507_13_offset 1740 -#define unusedBit_507_14_offset 1740 -#define unusedBit_507_15_offset 1740 -#define unusedBit_507_16_offset 1740 -#define unusedBit_507_17_offset 1740 -#define unusedBit_507_18_offset 1740 -#define unusedBit_507_19_offset 1740 -#define unusedBit_507_20_offset 1740 -#define unusedBit_507_21_offset 1740 -#define unusedBit_507_22_offset 1740 -#define unusedBit_507_23_offset 1740 -#define unusedBit_507_24_offset 1740 -#define unusedBit_507_25_offset 1740 -#define unusedBit_507_26_offset 1740 -#define unusedBit_507_27_offset 1740 -#define unusedBit_507_28_offset 1740 -#define unusedBit_507_29_offset 1740 -#define unusedBit_507_30_offset 1740 -#define unusedBit_507_31_offset 1740 -#define unusedBit_507_8_offset 1740 -#define unusedBit_507_9_offset 1740 -#define unusedFiller_4703_offset 4171 +#define unusedBit_508_10_offset 1740 +#define unusedBit_508_11_offset 1740 +#define unusedBit_508_12_offset 1740 +#define unusedBit_508_13_offset 1740 +#define unusedBit_508_14_offset 1740 +#define unusedBit_508_15_offset 1740 +#define unusedBit_508_16_offset 1740 +#define unusedBit_508_17_offset 1740 +#define unusedBit_508_18_offset 1740 +#define unusedBit_508_19_offset 1740 +#define unusedBit_508_20_offset 1740 +#define unusedBit_508_21_offset 1740 +#define unusedBit_508_22_offset 1740 +#define unusedBit_508_23_offset 1740 +#define unusedBit_508_24_offset 1740 +#define unusedBit_508_25_offset 1740 +#define unusedBit_508_26_offset 1740 +#define unusedBit_508_27_offset 1740 +#define unusedBit_508_28_offset 1740 +#define unusedBit_508_29_offset 1740 +#define unusedBit_508_30_offset 1740 +#define unusedBit_508_31_offset 1740 +#define unusedBit_508_8_offset 1740 +#define unusedBit_508_9_offset 1740 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 #define unusedTpsBins_offset 4594 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 7ee2259fe5..e8553337b0 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 Wed Apr 20 00:07:30 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:23 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1536,7 +1536,11 @@ struct engine_configuration_s { /** * offset 722 */ - scaled_channel unused722; + brain_input_pin_e tcuInputSpeedSensorPin; + /** + * offset 723 + */ + uint8_t tcuInputSpeedSensorTeeth; /** * Voltage when the wastegate is closed. * You probably don't have one of these! @@ -3010,76 +3014,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_507_8 : 1 {}; + bool unusedBit_508_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_507_9 : 1 {}; + bool unusedBit_508_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_507_10 : 1 {}; + bool unusedBit_508_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_507_11 : 1 {}; + bool unusedBit_508_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_507_12 : 1 {}; + bool unusedBit_508_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_507_13 : 1 {}; + bool unusedBit_508_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_507_14 : 1 {}; + bool unusedBit_508_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_507_15 : 1 {}; + bool unusedBit_508_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_507_16 : 1 {}; + bool unusedBit_508_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_507_17 : 1 {}; + bool unusedBit_508_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_507_18 : 1 {}; + bool unusedBit_508_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_507_19 : 1 {}; + bool unusedBit_508_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_507_20 : 1 {}; + bool unusedBit_508_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_507_21 : 1 {}; + bool unusedBit_508_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_507_22 : 1 {}; + bool unusedBit_508_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_507_23 : 1 {}; + bool unusedBit_508_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_507_24 : 1 {}; + bool unusedBit_508_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_507_25 : 1 {}; + bool unusedBit_508_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_507_26 : 1 {}; + bool unusedBit_508_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_507_27 : 1 {}; + bool unusedBit_508_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_507_28 : 1 {}; + bool unusedBit_508_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_507_29 : 1 {}; + bool unusedBit_508_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_507_30 : 1 {}; + bool unusedBit_508_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_507_31 : 1 {}; + bool unusedBit_508_31 : 1 {}; /** ms * offset 1744 @@ -3973,7 +3977,7 @@ struct engine_configuration_s { /** * offset 4143 */ - uint8_t unusedFiller_4703; + uint8_t issFilterReciprocal; /** %/kPa * offset 4144 @@ -4672,4 +4676,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21120); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Apr 20 00:07:30 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:23 UTC 2022 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 be2e9a41ba..7293a918ca 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1115,6 +1115,7 @@ #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" #define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" +#define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" #define GAUGE_NAME_KNOCK_10 "knock 10" #define GAUGE_NAME_KNOCK_11 "knock 11" @@ -1547,6 +1548,7 @@ #define isManualSpinningMode_offset 1272 #define isMapAveragingEnabled_offset 1272 #define isSdCardEnabled_offset 748 +#define issFilterReciprocal_offset 4143 #define issue_294_31_offset 164 #define isVerboseAlternator_offset 748 #define isVerboseAuxPid1_offset 164 @@ -1936,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1349252206 +#define SIGNATURE_HASH 2327713320 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2111,6 +2113,8 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3955 #define tcuEnabled_offset 896 +#define tcuInputSpeedSensorPin_offset 722 +#define tcuInputSpeedSensorTeeth_offset 723 #define tcuSolenoidTable_offset 17360 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3954 @@ -2514,7 +2518,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.21.kin.1349252206" +#define TS_SIGNATURE "rusEFI 2022.04.21.kin.2327713320" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2561,7 +2565,6 @@ #define unused17440_offset 17420 #define unused184_offset 184 #define unused28_offset 28 -#define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 #define unused_1484_bit_26_offset 1272 @@ -2571,31 +2574,30 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit_48_31_offset 164 -#define unusedBit_507_10_offset 1740 -#define unusedBit_507_11_offset 1740 -#define unusedBit_507_12_offset 1740 -#define unusedBit_507_13_offset 1740 -#define unusedBit_507_14_offset 1740 -#define unusedBit_507_15_offset 1740 -#define unusedBit_507_16_offset 1740 -#define unusedBit_507_17_offset 1740 -#define unusedBit_507_18_offset 1740 -#define unusedBit_507_19_offset 1740 -#define unusedBit_507_20_offset 1740 -#define unusedBit_507_21_offset 1740 -#define unusedBit_507_22_offset 1740 -#define unusedBit_507_23_offset 1740 -#define unusedBit_507_24_offset 1740 -#define unusedBit_507_25_offset 1740 -#define unusedBit_507_26_offset 1740 -#define unusedBit_507_27_offset 1740 -#define unusedBit_507_28_offset 1740 -#define unusedBit_507_29_offset 1740 -#define unusedBit_507_30_offset 1740 -#define unusedBit_507_31_offset 1740 -#define unusedBit_507_8_offset 1740 -#define unusedBit_507_9_offset 1740 -#define unusedFiller_4703_offset 4143 +#define unusedBit_508_10_offset 1740 +#define unusedBit_508_11_offset 1740 +#define unusedBit_508_12_offset 1740 +#define unusedBit_508_13_offset 1740 +#define unusedBit_508_14_offset 1740 +#define unusedBit_508_15_offset 1740 +#define unusedBit_508_16_offset 1740 +#define unusedBit_508_17_offset 1740 +#define unusedBit_508_18_offset 1740 +#define unusedBit_508_19_offset 1740 +#define unusedBit_508_20_offset 1740 +#define unusedBit_508_21_offset 1740 +#define unusedBit_508_22_offset 1740 +#define unusedBit_508_23_offset 1740 +#define unusedBit_508_24_offset 1740 +#define unusedBit_508_25_offset 1740 +#define unusedBit_508_26_offset 1740 +#define unusedBit_508_27_offset 1740 +#define unusedBit_508_28_offset 1740 +#define unusedBit_508_29_offset 1740 +#define unusedBit_508_30_offset 1740 +#define unusedBit_508_31_offset 1740 +#define unusedBit_508_8_offset 1740 +#define unusedBit_508_9_offset 1740 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4612 #define unusedTpsBins_offset 4566 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 89a72f5bb6..904dab8bd9 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_subaru_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:32 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:25 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1536,7 +1536,11 @@ struct engine_configuration_s { /** * offset 722 */ - scaled_channel unused722; + brain_input_pin_e tcuInputSpeedSensorPin; + /** + * offset 723 + */ + uint8_t tcuInputSpeedSensorTeeth; /** * Voltage when the wastegate is closed. * You probably don't have one of these! @@ -3010,76 +3014,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_507_8 : 1 {}; + bool unusedBit_508_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_507_9 : 1 {}; + bool unusedBit_508_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_507_10 : 1 {}; + bool unusedBit_508_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_507_11 : 1 {}; + bool unusedBit_508_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_507_12 : 1 {}; + bool unusedBit_508_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_507_13 : 1 {}; + bool unusedBit_508_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_507_14 : 1 {}; + bool unusedBit_508_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_507_15 : 1 {}; + bool unusedBit_508_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_507_16 : 1 {}; + bool unusedBit_508_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_507_17 : 1 {}; + bool unusedBit_508_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_507_18 : 1 {}; + bool unusedBit_508_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_507_19 : 1 {}; + bool unusedBit_508_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_507_20 : 1 {}; + bool unusedBit_508_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_507_21 : 1 {}; + bool unusedBit_508_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_507_22 : 1 {}; + bool unusedBit_508_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_507_23 : 1 {}; + bool unusedBit_508_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_507_24 : 1 {}; + bool unusedBit_508_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_507_25 : 1 {}; + bool unusedBit_508_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_507_26 : 1 {}; + bool unusedBit_508_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_507_27 : 1 {}; + bool unusedBit_508_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_507_28 : 1 {}; + bool unusedBit_508_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_507_29 : 1 {}; + bool unusedBit_508_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_507_30 : 1 {}; + bool unusedBit_508_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_507_31 : 1 {}; + bool unusedBit_508_31 : 1 {}; /** ms * offset 1744 @@ -3979,7 +3983,7 @@ struct engine_configuration_s { /** * offset 4171 */ - uint8_t unusedFiller_4703; + uint8_t issFilterReciprocal; /** %/kPa * offset 4172 @@ -4678,4 +4682,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:32 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:25 UTC 2022 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 dd8dc35873..a0ea3bf70b 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 @@ -1108,6 +1108,7 @@ #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" #define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" +#define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" #define GAUGE_NAME_KNOCK_10 "knock 10" #define GAUGE_NAME_KNOCK_11 "knock 11" @@ -1540,6 +1541,7 @@ #define isManualSpinningMode_offset 1272 #define isMapAveragingEnabled_offset 1272 #define isSdCardEnabled_offset 748 +#define issFilterReciprocal_offset 4171 #define issue_294_31_offset 164 #define isVerboseAlternator_offset 748 #define isVerboseAuxPid1_offset 164 @@ -1930,7 +1932,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 4102864559 +#define SIGNATURE_HASH 777608425 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2105,6 +2107,8 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 +#define tcuInputSpeedSensorPin_offset 722 +#define tcuInputSpeedSensorTeeth_offset 723 #define tcuSolenoidTable_offset 17388 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 @@ -2508,7 +2512,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.21.subaru_eg33_f7.4102864559" +#define TS_SIGNATURE "rusEFI 2022.04.21.subaru_eg33_f7.777608425" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2555,7 +2559,6 @@ #define unused17440_offset 17448 #define unused184_offset 184 #define unused28_offset 28 -#define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 #define unused_1484_bit_26_offset 1272 @@ -2565,31 +2568,30 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit_48_31_offset 164 -#define unusedBit_507_10_offset 1740 -#define unusedBit_507_11_offset 1740 -#define unusedBit_507_12_offset 1740 -#define unusedBit_507_13_offset 1740 -#define unusedBit_507_14_offset 1740 -#define unusedBit_507_15_offset 1740 -#define unusedBit_507_16_offset 1740 -#define unusedBit_507_17_offset 1740 -#define unusedBit_507_18_offset 1740 -#define unusedBit_507_19_offset 1740 -#define unusedBit_507_20_offset 1740 -#define unusedBit_507_21_offset 1740 -#define unusedBit_507_22_offset 1740 -#define unusedBit_507_23_offset 1740 -#define unusedBit_507_24_offset 1740 -#define unusedBit_507_25_offset 1740 -#define unusedBit_507_26_offset 1740 -#define unusedBit_507_27_offset 1740 -#define unusedBit_507_28_offset 1740 -#define unusedBit_507_29_offset 1740 -#define unusedBit_507_30_offset 1740 -#define unusedBit_507_31_offset 1740 -#define unusedBit_507_8_offset 1740 -#define unusedBit_507_9_offset 1740 -#define unusedFiller_4703_offset 4171 +#define unusedBit_508_10_offset 1740 +#define unusedBit_508_11_offset 1740 +#define unusedBit_508_12_offset 1740 +#define unusedBit_508_13_offset 1740 +#define unusedBit_508_14_offset 1740 +#define unusedBit_508_15_offset 1740 +#define unusedBit_508_16_offset 1740 +#define unusedBit_508_17_offset 1740 +#define unusedBit_508_18_offset 1740 +#define unusedBit_508_19_offset 1740 +#define unusedBit_508_20_offset 1740 +#define unusedBit_508_21_offset 1740 +#define unusedBit_508_22_offset 1740 +#define unusedBit_508_23_offset 1740 +#define unusedBit_508_24_offset 1740 +#define unusedBit_508_25_offset 1740 +#define unusedBit_508_26_offset 1740 +#define unusedBit_508_27_offset 1740 +#define unusedBit_508_28_offset 1740 +#define unusedBit_508_29_offset 1740 +#define unusedBit_508_30_offset 1740 +#define unusedBit_508_31_offset 1740 +#define unusedBit_508_8_offset 1740 +#define unusedBit_508_9_offset 1740 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 #define unusedTpsBins_offset 4594 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index cbd02756ae..d0ed3f29bd 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -285,6 +285,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 0ce7569b0b..5038f7d127 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -355,6 +355,7 @@ boostStatus_errorGauge = boostStatus_error,"boostStatus_ error", "", -327.0,327. boostStatus_resetCounterGauge = boostStatus_resetCounter,"boostStatus_ resetCounter", "", 0.0,10000.0, 0.0,10000.0, 0.0,10000.0, 0,0 auxSpeed1Gauge = auxSpeed1,"aux speed 1", "s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 auxSpeed2Gauge = auxSpeed2,"aux speed 2", "s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +ISSValueGauge = ISSValue,"Input Shaft Speed", "RPM", 0.0,8000.0, 0.0,8000.0, 0.0,8000.0, 0,0 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd 3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -433,5 +434,3 @@ unusedAtTheEnd75Gauge = unusedAtTheEnd75,"unusedAtTheEnd 75", "", 0.0,0.0, 0.0,0 unusedAtTheEnd76Gauge = unusedAtTheEnd76,"unusedAtTheEnd 76", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd77Gauge = unusedAtTheEnd77,"unusedAtTheEnd 77", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd78Gauge = unusedAtTheEnd78,"unusedAtTheEnd 78", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd79Gauge = unusedAtTheEnd79,"unusedAtTheEnd 79", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd80Gauge = unusedAtTheEnd80,"unusedAtTheEnd 80", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index a5cded23b7..bdb11bb3be 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -355,86 +355,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 496654169b..98520f43fe 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -243,86 +243,85 @@ etbStatus("etbStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 532, 1.0, -1 boostStatus("boostStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 544, 1.0, -1.0, -1.0, ""), auxSpeed1("aux speed 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 556, 1.0, 0.0, 0.0, "s"), auxSpeed2("aux speed 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 558, 1.0, 0.0, 0.0, "s"), -unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 560, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 561, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 562, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 563, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 564, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 565, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 566, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 567, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 568, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 569, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 570, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 571, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 572, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 573, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 574, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 575, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 576, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 577, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 578, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 579, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 580, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 581, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 582, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 583, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 584, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 585, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 586, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 587, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 588, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 589, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 590, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 591, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 592, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 593, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 594, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 595, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 596, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 597, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 598, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 599, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 600, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 601, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 602, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 603, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 604, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 605, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 606, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 607, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 608, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 609, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 610, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 611, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 612, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 613, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 614, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 615, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 616, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 617, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 618, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 619, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 620, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 621, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd63("unusedAtTheEnd 63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 622, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd64("unusedAtTheEnd 64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 623, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd65("unusedAtTheEnd 65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 624, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd66("unusedAtTheEnd 66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 625, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd67("unusedAtTheEnd 67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 626, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd68("unusedAtTheEnd 68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 627, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd69("unusedAtTheEnd 69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 628, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd70("unusedAtTheEnd 70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 629, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd71("unusedAtTheEnd 71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 630, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd72("unusedAtTheEnd 72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 631, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd73("unusedAtTheEnd 73", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 632, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd74("unusedAtTheEnd 74", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 633, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd75("unusedAtTheEnd 75", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 634, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd76("unusedAtTheEnd 76", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 635, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd77("unusedAtTheEnd 77", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd78("unusedAtTheEnd 78", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd79("unusedAtTheEnd 79", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 638, 1.0, 0.0, 0.0, ""), -unusedAtTheEnd80("unusedAtTheEnd 80", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 639, 1.0, 0.0, 0.0, ""), +ISSValue("Input Shaft Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 560, 1.0, 0.0, 8000.0, "RPM"), +unusedAtTheEnd1("unusedAtTheEnd 1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 562, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd2("unusedAtTheEnd 2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 563, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd3("unusedAtTheEnd 3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 564, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd4("unusedAtTheEnd 4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 565, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd5("unusedAtTheEnd 5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 566, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd6("unusedAtTheEnd 6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 567, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd7("unusedAtTheEnd 7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 568, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd8("unusedAtTheEnd 8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 569, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd9("unusedAtTheEnd 9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 570, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd10("unusedAtTheEnd 10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 571, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd11("unusedAtTheEnd 11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 572, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd12("unusedAtTheEnd 12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 573, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd13("unusedAtTheEnd 13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 574, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd14("unusedAtTheEnd 14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 575, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd15("unusedAtTheEnd 15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 576, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd16("unusedAtTheEnd 16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 577, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd17("unusedAtTheEnd 17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 578, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd18("unusedAtTheEnd 18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 579, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd19("unusedAtTheEnd 19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 580, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd20("unusedAtTheEnd 20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 581, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd21("unusedAtTheEnd 21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 582, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd22("unusedAtTheEnd 22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 583, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd23("unusedAtTheEnd 23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 584, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd24("unusedAtTheEnd 24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 585, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd25("unusedAtTheEnd 25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 586, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd26("unusedAtTheEnd 26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 587, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd27("unusedAtTheEnd 27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 588, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd28("unusedAtTheEnd 28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 589, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd29("unusedAtTheEnd 29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 590, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd30("unusedAtTheEnd 30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 591, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd31("unusedAtTheEnd 31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 592, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd32("unusedAtTheEnd 32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 593, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd33("unusedAtTheEnd 33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 594, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd34("unusedAtTheEnd 34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 595, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd35("unusedAtTheEnd 35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 596, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd36("unusedAtTheEnd 36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 597, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd37("unusedAtTheEnd 37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 598, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd38("unusedAtTheEnd 38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 599, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd39("unusedAtTheEnd 39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 600, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd40("unusedAtTheEnd 40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 601, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd41("unusedAtTheEnd 41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 602, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd42("unusedAtTheEnd 42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 603, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd43("unusedAtTheEnd 43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 604, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd44("unusedAtTheEnd 44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 605, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd45("unusedAtTheEnd 45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 606, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd46("unusedAtTheEnd 46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 607, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd47("unusedAtTheEnd 47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 608, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd48("unusedAtTheEnd 48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 609, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd49("unusedAtTheEnd 49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 610, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd50("unusedAtTheEnd 50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 611, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd51("unusedAtTheEnd 51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 612, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd52("unusedAtTheEnd 52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 613, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd53("unusedAtTheEnd 53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 614, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd54("unusedAtTheEnd 54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 615, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd55("unusedAtTheEnd 55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 616, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd56("unusedAtTheEnd 56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 617, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd57("unusedAtTheEnd 57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 618, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd58("unusedAtTheEnd 58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 619, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd59("unusedAtTheEnd 59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 620, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd60("unusedAtTheEnd 60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 621, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd61("unusedAtTheEnd 61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 622, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd62("unusedAtTheEnd 62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 623, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd63("unusedAtTheEnd 63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 624, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd64("unusedAtTheEnd 64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 625, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd65("unusedAtTheEnd 65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 626, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd66("unusedAtTheEnd 66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 627, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd67("unusedAtTheEnd 67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 628, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd68("unusedAtTheEnd 68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 629, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd69("unusedAtTheEnd 69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 630, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd70("unusedAtTheEnd 70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 631, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd71("unusedAtTheEnd 71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 632, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd72("unusedAtTheEnd 72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 633, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd73("unusedAtTheEnd 73", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 634, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd74("unusedAtTheEnd 74", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 635, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd75("unusedAtTheEnd 75", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd76("unusedAtTheEnd 76", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd77("unusedAtTheEnd 77", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 638, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd78("unusedAtTheEnd 78", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 639, 1.0, 0.0, 0.0, ""), m_requested_pump("Computed requested pump duration in degrees (not including deadtime)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 640, 1.0, -1.0, -1.0, ""), fuel_requested_percent("fuel_requested_percent", SensorCategory.SENSOR_INPUTS, FieldType.INT, 644, 1.0, -1.0, -1.0, ""), fuel_requested_percent_pi("fuel_requested_percent_pi", SensorCategory.SENSOR_INPUTS, FieldType.INT, 648, 1.0, -1.0, -1.0, ""), diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index a77467e4e8..e784151ffe 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Apr 19 00:13:17 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1375,11 +1375,17 @@ struct output_channels_s { */ uint16_t auxSpeed2 = (uint16_t)0; /** + * @@GAUGE_NAME_ISS@@ + RPM * offset 560 */ - uint8_t unusedAtTheEnd[80]; + scaled_channel ISSValue = (uint16_t)0; + /** + * offset 562 + */ + uint8_t unusedAtTheEnd[78]; }; static_assert(sizeof(output_channels_s) == 640); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Apr 19 00:13:17 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index bb1fbdbfa7..6db82e3924 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 Wed Apr 20 00:07:35 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:27 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1536,7 +1536,11 @@ struct engine_configuration_s { /** * offset 722 */ - scaled_channel unused722; + brain_input_pin_e tcuInputSpeedSensorPin; + /** + * offset 723 + */ + uint8_t tcuInputSpeedSensorTeeth; /** * Voltage when the wastegate is closed. * You probably don't have one of these! @@ -3010,76 +3014,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1740 bit 8 */ - bool unusedBit_507_8 : 1 {}; + bool unusedBit_508_8 : 1 {}; /** offset 1740 bit 9 */ - bool unusedBit_507_9 : 1 {}; + bool unusedBit_508_9 : 1 {}; /** offset 1740 bit 10 */ - bool unusedBit_507_10 : 1 {}; + bool unusedBit_508_10 : 1 {}; /** offset 1740 bit 11 */ - bool unusedBit_507_11 : 1 {}; + bool unusedBit_508_11 : 1 {}; /** offset 1740 bit 12 */ - bool unusedBit_507_12 : 1 {}; + bool unusedBit_508_12 : 1 {}; /** offset 1740 bit 13 */ - bool unusedBit_507_13 : 1 {}; + bool unusedBit_508_13 : 1 {}; /** offset 1740 bit 14 */ - bool unusedBit_507_14 : 1 {}; + bool unusedBit_508_14 : 1 {}; /** offset 1740 bit 15 */ - bool unusedBit_507_15 : 1 {}; + bool unusedBit_508_15 : 1 {}; /** offset 1740 bit 16 */ - bool unusedBit_507_16 : 1 {}; + bool unusedBit_508_16 : 1 {}; /** offset 1740 bit 17 */ - bool unusedBit_507_17 : 1 {}; + bool unusedBit_508_17 : 1 {}; /** offset 1740 bit 18 */ - bool unusedBit_507_18 : 1 {}; + bool unusedBit_508_18 : 1 {}; /** offset 1740 bit 19 */ - bool unusedBit_507_19 : 1 {}; + bool unusedBit_508_19 : 1 {}; /** offset 1740 bit 20 */ - bool unusedBit_507_20 : 1 {}; + bool unusedBit_508_20 : 1 {}; /** offset 1740 bit 21 */ - bool unusedBit_507_21 : 1 {}; + bool unusedBit_508_21 : 1 {}; /** offset 1740 bit 22 */ - bool unusedBit_507_22 : 1 {}; + bool unusedBit_508_22 : 1 {}; /** offset 1740 bit 23 */ - bool unusedBit_507_23 : 1 {}; + bool unusedBit_508_23 : 1 {}; /** offset 1740 bit 24 */ - bool unusedBit_507_24 : 1 {}; + bool unusedBit_508_24 : 1 {}; /** offset 1740 bit 25 */ - bool unusedBit_507_25 : 1 {}; + bool unusedBit_508_25 : 1 {}; /** offset 1740 bit 26 */ - bool unusedBit_507_26 : 1 {}; + bool unusedBit_508_26 : 1 {}; /** offset 1740 bit 27 */ - bool unusedBit_507_27 : 1 {}; + bool unusedBit_508_27 : 1 {}; /** offset 1740 bit 28 */ - bool unusedBit_507_28 : 1 {}; + bool unusedBit_508_28 : 1 {}; /** offset 1740 bit 29 */ - bool unusedBit_507_29 : 1 {}; + bool unusedBit_508_29 : 1 {}; /** offset 1740 bit 30 */ - bool unusedBit_507_30 : 1 {}; + bool unusedBit_508_30 : 1 {}; /** offset 1740 bit 31 */ - bool unusedBit_507_31 : 1 {}; + bool unusedBit_508_31 : 1 {}; /** ms * offset 1744 @@ -3979,7 +3983,7 @@ struct engine_configuration_s { /** * offset 4171 */ - uint8_t unusedFiller_4703; + uint8_t issFilterReciprocal; /** %/kPa * offset 4172 @@ -4678,4 +4682,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Apr 20 00:07:35 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:27 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index cf0ec1e183..835d542a33 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1130,6 +1130,7 @@ #define GAUGE_NAME_IDLE_POSITION "Idle position sensor" #define GAUGE_NAME_IGNITION_LOAD "ign: load" #define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag" +#define GAUGE_NAME_ISS "Input Shaft Speed" #define GAUGE_NAME_KNOCK_1 "knock 1" #define GAUGE_NAME_KNOCK_10 "knock 10" #define GAUGE_NAME_KNOCK_11 "knock 11" @@ -1562,6 +1563,7 @@ #define isManualSpinningMode_offset 1272 #define isMapAveragingEnabled_offset 1272 #define isSdCardEnabled_offset 748 +#define issFilterReciprocal_offset 4171 #define issue_294_31_offset 164 #define isVerboseAlternator_offset 748 #define isVerboseAuxPid1_offset 164 @@ -1951,7 +1953,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 3940710040 +#define SIGNATURE_HASH 808948958 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2126,6 +2128,8 @@ #define tcuDownshiftButtonPin_offset 1579 #define tcuDownshiftButtonPinMode_offset 3983 #define tcuEnabled_offset 896 +#define tcuInputSpeedSensorPin_offset 722 +#define tcuInputSpeedSensorTeeth_offset 723 #define tcuSolenoidTable_offset 17388 #define tcuUpshiftButtonPin_offset 1578 #define tcuUpshiftButtonPinMode_offset 3982 @@ -2529,7 +2533,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.21.all.3940710040" +#define TS_SIGNATURE "rusEFI 2022.04.21.all.808948958" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2576,7 +2580,6 @@ #define unused17440_offset 17448 #define unused184_offset 184 #define unused28_offset 28 -#define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 #define unused_1484_bit_26_offset 1272 @@ -2586,31 +2589,30 @@ #define unused_1484_bit_30_offset 1272 #define unused_1484_bit_31_offset 1272 #define unusedBit_48_31_offset 164 -#define unusedBit_507_10_offset 1740 -#define unusedBit_507_11_offset 1740 -#define unusedBit_507_12_offset 1740 -#define unusedBit_507_13_offset 1740 -#define unusedBit_507_14_offset 1740 -#define unusedBit_507_15_offset 1740 -#define unusedBit_507_16_offset 1740 -#define unusedBit_507_17_offset 1740 -#define unusedBit_507_18_offset 1740 -#define unusedBit_507_19_offset 1740 -#define unusedBit_507_20_offset 1740 -#define unusedBit_507_21_offset 1740 -#define unusedBit_507_22_offset 1740 -#define unusedBit_507_23_offset 1740 -#define unusedBit_507_24_offset 1740 -#define unusedBit_507_25_offset 1740 -#define unusedBit_507_26_offset 1740 -#define unusedBit_507_27_offset 1740 -#define unusedBit_507_28_offset 1740 -#define unusedBit_507_29_offset 1740 -#define unusedBit_507_30_offset 1740 -#define unusedBit_507_31_offset 1740 -#define unusedBit_507_8_offset 1740 -#define unusedBit_507_9_offset 1740 -#define unusedFiller_4703_offset 4171 +#define unusedBit_508_10_offset 1740 +#define unusedBit_508_11_offset 1740 +#define unusedBit_508_12_offset 1740 +#define unusedBit_508_13_offset 1740 +#define unusedBit_508_14_offset 1740 +#define unusedBit_508_15_offset 1740 +#define unusedBit_508_16_offset 1740 +#define unusedBit_508_17_offset 1740 +#define unusedBit_508_18_offset 1740 +#define unusedBit_508_19_offset 1740 +#define unusedBit_508_20_offset 1740 +#define unusedBit_508_21_offset 1740 +#define unusedBit_508_22_offset 1740 +#define unusedBit_508_23_offset 1740 +#define unusedBit_508_24_offset 1740 +#define unusedBit_508_25_offset 1740 +#define unusedBit_508_26_offset 1740 +#define unusedBit_508_27_offset 1740 +#define unusedBit_508_28_offset 1740 +#define unusedBit_508_29_offset 1740 +#define unusedBit_508_30_offset 1740 +#define unusedBit_508_31_offset 1740 +#define unusedBit_508_8_offset 1740 +#define unusedBit_508_9_offset 1740 #define unusedMapAccelTaperBins_offset 1792 #define unusedShort_offset 4640 #define unusedTpsBins_offset 4594 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 395e4cdcc9..165efdc5ef 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3940710040 -#define TS_SIGNATURE "rusEFI 2022.04.21.all.3940710040" +#define SIGNATURE_HASH 808948958 +#define TS_SIGNATURE "rusEFI 2022.04.21.all.808948958" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 9207abf078..42c37eb136 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4156664775 -#define TS_SIGNATURE "rusEFI 2022.04.21.alphax-2chan.4156664775" +#define SIGNATURE_HASH 756304257 +#define TS_SIGNATURE "rusEFI 2022.04.21.alphax-2chan.756304257" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 86d4b2f394..dd4ede5af1 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1666296172 -#define TS_SIGNATURE "rusEFI 2022.04.21.alphax-4chan.1666296172" +#define SIGNATURE_HASH 3112454954 +#define TS_SIGNATURE "rusEFI 2022.04.21.alphax-4chan.3112454954" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index d2ad296b87..9ed7967fc9 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4129850303 -#define TS_SIGNATURE "rusEFI 2022.04.21.atlas.4129850303" +#define SIGNATURE_HASH 754803193 +#define TS_SIGNATURE "rusEFI 2022.04.21.atlas.754803193" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 59b824b1be..92d874cd49 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3353214962 -#define TS_SIGNATURE "rusEFI 2022.04.21.core8.3353214962" +#define SIGNATURE_HASH 487071156 +#define TS_SIGNATURE "rusEFI 2022.04.21.core8.487071156" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 5e15b2b185..c46d4d162c 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3940710040 -#define TS_SIGNATURE "rusEFI 2022.04.21.f429-discovery.3940710040" +#define SIGNATURE_HASH 808948958 +#define TS_SIGNATURE "rusEFI 2022.04.21.f429-discovery.808948958" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 14584db261..43ab6de89f 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2201743017 -#define TS_SIGNATURE "rusEFI 2022.04.21.frankenso_na6.2201743017" +#define SIGNATURE_HASH 1508773103 +#define TS_SIGNATURE "rusEFI 2022.04.21.frankenso_na6.1508773103" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 60a1199243..fa2347fbea 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3183272333 -#define TS_SIGNATURE "rusEFI 2022.04.21.harley81.3183272333" +#define SIGNATURE_HASH 1734935499 +#define TS_SIGNATURE "rusEFI 2022.04.21.harley81.1734935499" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 6c1993953e..0abdab5b63 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2688089093 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen-nb1.2688089093" +#define SIGNATURE_HASH 2062360131 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen-nb1.2062360131" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 0ef5b80e05..f8e0be2791 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3075821798 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen121nissan.3075821798" +#define SIGNATURE_HASH 1837150880 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen121nissan.1837150880" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 3db1e6b6c5..ceb3e88d13 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3031112975 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen121vag.3031112975" +#define SIGNATURE_HASH 1853816649 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen121vag.1853816649" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 566c344acd..6240872484 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4101010421 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen128.4101010421" +#define SIGNATURE_HASH 782602675 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen128.782602675" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 152cd1cdad..243e092909 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 856123320 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen154hyundai.856123320" +#define SIGNATURE_HASH 3922888190 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen154hyundai.3922888190" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 8f3b354d16..3bd4475b02 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 263473656 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen72.263473656" +#define SIGNATURE_HASH 3579947966 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen72.3579947966" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 42ceb56071..494dd5c5e8 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1800669726 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen81.1800669726" +#define SIGNATURE_HASH 2978080856 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen81.2978080856" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index ac1de09830..5d2b929189 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3804209093 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen88bmw.3804209093" +#define SIGNATURE_HASH 946503043 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen88bmw.946503043" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index edc404c3c5..9576e0a3c5 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1313095413 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellenNA6.1313095413" +#define SIGNATURE_HASH 2492587187 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellenNA6.2492587187" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f2bfde484e..fda0252169 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3864384780 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellenNA8_96.3864384780" +#define SIGNATURE_HASH 1015035722 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellenNA8_96.1015035722" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index d523731e36..3595d769c2 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 2949527698 -#define TS_SIGNATURE "rusEFI 2022.04.21.hellen_cypress.2949527698" +#define SIGNATURE_HASH 1964759764 +#define TS_SIGNATURE "rusEFI 2022.04.21.hellen_cypress.1964759764" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index b232dc416a..936dbb4cf3 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 1349252206 -#define TS_SIGNATURE "rusEFI 2022.04.21.kin.1349252206" +#define SIGNATURE_HASH 2327713320 +#define TS_SIGNATURE "rusEFI 2022.04.21.kin.2327713320" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ff7720ceca..aef528fc7a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2244131059 -#define TS_SIGNATURE "rusEFI 2022.04.21.mre_f4.2244131059" +#define SIGNATURE_HASH 1595366069 +#define TS_SIGNATURE "rusEFI 2022.04.21.mre_f4.1595366069" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index c1e2429913..284e496e11 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2244131059 -#define TS_SIGNATURE "rusEFI 2022.04.21.mre_f7.2244131059" +#define SIGNATURE_HASH 1595366069 +#define TS_SIGNATURE "rusEFI 2022.04.21.mre_f7.1595366069" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 59a952c8af..539511f943 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3121131390 -#define TS_SIGNATURE "rusEFI 2022.04.21.prometheus_405.3121131390" +#define SIGNATURE_HASH 1625115960 +#define TS_SIGNATURE "rusEFI 2022.04.21.prometheus_405.1625115960" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2248ee17cd..e912b067b1 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3121131390 -#define TS_SIGNATURE "rusEFI 2022.04.21.prometheus_469.3121131390" +#define SIGNATURE_HASH 1625115960 +#define TS_SIGNATURE "rusEFI 2022.04.21.prometheus_469.1625115960" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 55a30e4739..3063b76870 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3426479897 -#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_f4.3426479897" +#define SIGNATURE_HASH 384699743 +#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_f4.384699743" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 20e97d0c5e..17972f2c52 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3426479897 -#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_f7.3426479897" +#define SIGNATURE_HASH 384699743 +#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_f7.384699743" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f20d604115..c5309d05aa 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3426479897 -#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_h7.3426479897" +#define SIGNATURE_HASH 384699743 +#define TS_SIGNATURE "rusEFI 2022.04.21.proteus_h7.384699743" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 73ef9cfa05..30b15715af 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 4102864559 -#define TS_SIGNATURE "rusEFI 2022.04.21.subaru_eg33_f7.4102864559" +#define SIGNATURE_HASH 777608425 +#define TS_SIGNATURE "rusEFI 2022.04.21.subaru_eg33_f7.777608425" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index d9206e05be..8508c563bc 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 116604617 -#define TS_SIGNATURE "rusEFI 2022.04.21.tdg-pdm8.116604617" +#define SIGNATURE_HASH 3693534351 +#define TS_SIGNATURE "rusEFI 2022.04.21.tdg-pdm8.3693534351" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index b7875af37f..db81d9fcf5 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -498,5 +498,7 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.auxSpeed1; if (strEqualCaseInsensitive(name, "auxSpeed2")) return engine->outputChannels.auxSpeed2; + if (strEqualCaseInsensitive(name, "ISSValue")) + return engine->outputChannels.ISSValue; return EFI_ERROR_CODE; } diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index e15355b6e7..ba1cb03ddc 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -240,6 +240,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->acIdleExtraOffset; if (strEqualCaseInsensitive(name, "finalGearRatio")) return engineConfiguration->finalGearRatio; + if (strEqualCaseInsensitive(name, "tcuInputSpeedSensorTeeth")) + return engineConfiguration->tcuInputSpeedSensorTeeth; if (strEqualCaseInsensitive(name, "wastegatePositionMin")) return engineConfiguration->wastegatePositionMin; if (strEqualCaseInsensitive(name, "wastegatePositionMax")) @@ -934,6 +936,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->hpfpPumpVolume; if (strEqualCaseInsensitive(name, "hpfpActivationAngle")) return engineConfiguration->hpfpActivationAngle; + if (strEqualCaseInsensitive(name, "issFilterReciprocal")) + return engineConfiguration->issFilterReciprocal; if (strEqualCaseInsensitive(name, "hpfpPidP")) return engineConfiguration->hpfpPidP; if (strEqualCaseInsensitive(name, "hpfpPidI")) @@ -1561,6 +1565,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->finalGearRatio = (int)value; return; } + if (strEqualCaseInsensitive(name, "tcuInputSpeedSensorTeeth")) + { + engineConfiguration->tcuInputSpeedSensorTeeth = (int)value; + return; + } if (strEqualCaseInsensitive(name, "wastegatePositionMin")) { engineConfiguration->wastegatePositionMin = (int)value; @@ -3296,6 +3305,11 @@ void setConfigValueByName(const char *name, float value) { engineConfiguration->hpfpActivationAngle = (int)value; return; } + if (strEqualCaseInsensitive(name, "issFilterReciprocal")) + { + engineConfiguration->issFilterReciprocal = (int)value; + return; + } if (strEqualCaseInsensitive(name, "hpfpPidP")) { engineConfiguration->hpfpPidP = (int)value; diff --git a/firmware/controllers/sensors/auto_generated_sensor.cpp b/firmware/controllers/sensors/auto_generated_sensor.cpp index d047f31260..7350528c77 100644 --- a/firmware/controllers/sensors/auto_generated_sensor.cpp +++ b/firmware/controllers/sensors/auto_generated_sensor.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "sensor_type.h" -// was generated automatically by rusEFI tool from sensor_type.h // by enum2string.jar tool on Tue Mar 29 06:12:06 UTC 2022 +// was generated automatically by rusEFI tool from sensor_type.h // by enum2string.jar tool on Thu Apr 21 13:11:41 UTC 2022 // see also gen_config_and_enums.bat @@ -63,6 +63,8 @@ case SensorType::Iat: return "Iat"; case SensorType::IdlePosition: return "IdlePosition"; +case SensorType::InputShaftSpeed: + return "InputShaftSpeed"; case SensorType::Invalid: return "Invalid"; case SensorType::Lambda1: diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index a11a4d37a8..8866cedc17 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.all.3940710040" + signature = "rusEFI 2022.04.21.all.808948958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.all.3940710040" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.all.808948958" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:22 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -7004,7 +7008,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7017,6 +7021,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7025,9 +7034,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7035,11 +7041,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 41c89949f3..c55d53cfb9 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.alphax-2chan.4156664775" + signature = "rusEFI 2022.04.21.alphax-2chan.756304257" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.alphax-2chan.4156664775" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.alphax-2chan.756304257" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:45 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C7 - CAM Hall/Digital","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C2/C3 Crank Sensor VR","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C3 - Crank+ (hall)","INVALID","C2 - Crank- (hall)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index a22769a468..533c5c109d 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.alphax-4chan.1666296172" + signature = "rusEFI 2022.04.21.alphax-4chan.3112454954" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.alphax-4chan.1666296172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.alphax-4chan.3112454954" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:47 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C7 - CAM Hall/Digital","E7 - Flex","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C2/C3 Crank Sensor VR","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C3 - Crank+ (hall)","INVALID","C2 - Crank- (hall)","E6 - Cam+ (hall)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E5/E6 Cam Sensor VR", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6979,7 +6983,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6992,6 +6996,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7000,9 +7009,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7010,11 +7016,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index e2322d842d..7b6a8eb4d8 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.atlas.4129850303" + signature = "rusEFI 2022.04.21.atlas.754803193" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.atlas.4129850303" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.atlas.754803193" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:19 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6996,7 +7000,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7009,6 +7013,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7017,9 +7026,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7027,11 +7033,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7896e22170..b16685e368 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.core8.3353214962" + signature = "rusEFI 2022.04.21.core8.487071156" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.core8.3353214962" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.core8.487071156" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:09 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Camshaft Sensor VR+/Hall","Crank Sensor VR+/Hall", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6998,7 +7002,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7011,6 +7015,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7019,9 +7028,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7029,11 +7035,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 7b2439f793..f2c3da0bde 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.f429-discovery.3940710040" + signature = "rusEFI 2022.04.21.f429-discovery.808948958" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.f429-discovery.3940710040" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.f429-discovery.808948958" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:18 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -7004,7 +7008,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7017,6 +7021,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7025,9 +7034,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7035,11 +7041,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 5e3290c5d6..90c81ed57c 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.frankenso_na6.2201743017" + signature = "rusEFI 2022.04.21.frankenso_na6.1508773103" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.frankenso_na6.2201743017" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.frankenso_na6.1508773103" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:10 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -7004,7 +7008,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7017,6 +7021,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7025,9 +7034,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7035,11 +7041,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index cdcb24d19e..f678d3f229 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.harley81.3183272333" + signature = "rusEFI 2022.04.21.harley81.1734935499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.harley81.3183272333" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.harley81.1734935499" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:49 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","11 Crank VR-","INVALID","INVALID","INVALID","INVALID","51 - VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6981,7 +6985,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6994,6 +6998,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7002,9 +7011,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7012,11 +7018,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index d6cfe6042a..d5212acd7e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen-nb1.2688089093" + signature = "rusEFI 2022.04.21.hellen-nb1.2062360131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen-nb1.2688089093" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen-nb1.2062360131" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:03 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2H - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2J - CRANK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4B - DIGITAL/FLEX","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2D - VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6979,7 +6983,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6992,6 +6996,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7000,9 +7009,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7010,11 +7016,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index d2b028da40..a5141e1294 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen121nissan.3075821798" + signature = "rusEFI 2022.04.21.hellen121nissan.1837150880" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen121nissan.3075821798" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen121nissan.1837150880" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:54 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","14 - Cam Left","33 - Cam Right","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","13 - Crank", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index aca4756c70..8a310f02c6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen121vag.3031112975" + signature = "rusEFI 2022.04.21.hellen121vag.1853816649" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen121vag.3031112975" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen121vag.1853816649" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:52 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","86 - CAM1","87 - CAM2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","82 - VR","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","54 - VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 473b63a6ea..c829fe7898 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen128.4101010421" + signature = "rusEFI 2022.04.21.hellen128.782602675" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen128.4101010421" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen128.782602675" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:50 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","C24 - PPS1","E31 - TPS1","INVALID","E40 - IN_CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E34 - TPS2","E37 - Crank Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 5b8b400562..2aed2067e7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen154hyundai.856123320" + signature = "rusEFI 2022.04.21.hellen154hyundai.3922888190" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen154hyundai.856123320" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen154hyundai.3922888190" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:24:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:56 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Cam - K62","Cam - K15","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Crank - K17","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","K40 VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index f8c64720c3..0c014f65ba 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen72.263473656" + signature = "rusEFI 2022.04.21.hellen72.3579947966" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen72.263473656" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen72.3579947966" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:59 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3V - CAM (A19)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3Y - CRANK (A24)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3T - VSS (D5)", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6979,7 +6983,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6992,6 +6996,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7000,9 +7009,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7010,11 +7016,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index ba29caafbb..e76e5fce1c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen81.1800669726" + signature = "rusEFI 2022.04.21.hellen81.2978080856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen81.1800669726" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen81.2978080856" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:01 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","79 - IN_CAM","77 - IN_AUX4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","74 - IN_AUX1","15 - IN_CRANK (A24)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","75 - IN_AUX2","76 - IN_AUX3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","59 - IN_VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6977,7 +6981,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6990,6 +6994,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6998,9 +7007,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7008,11 +7014,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 8dee52e75a..4f848407df 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen88bmw.3804209093" + signature = "rusEFI 2022.04.21.hellen88bmw.946503043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen88bmw.3804209093" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen88bmw.946503043" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:11:57 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","17 - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16 - CRANK", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 00045f9e19..0339e9cacb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellenNA6.1313095413" + signature = "rusEFI 2022.04.21.hellenNA6.2492587187" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellenNA6.1313095413" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellenNA6.2492587187" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:04 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3E - CRANK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2L - Flex Fuel","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1M - VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6979,7 +6983,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6992,6 +6996,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7000,9 +7009,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7010,11 +7016,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index f5cfe59f59..c6e5350018 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellenNA8_96.3864384780" + signature = "rusEFI 2022.04.21.hellenNA8_96.1015035722" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellenNA8_96.3864384780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellenNA8_96.1015035722" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:05 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3F - CRANK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4B - DIGITAL/FLEX","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1M - VSS", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6979,7 +6983,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6992,6 +6996,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7000,9 +7009,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7010,11 +7016,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 66bb55b93a..4500e2f206 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.hellen_cypress.2949527698" + signature = "rusEFI 2022.04.21.hellen_cypress.1964759764" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.hellen_cypress.2949527698" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.hellen_cypress.1964759764" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Apr 21 04:25:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:24 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -7004,7 +7008,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7017,6 +7021,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7025,9 +7034,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7035,11 +7041,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 92eea59654..5d2a8e38f5 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.kin.1349252206" + signature = "rusEFI 2022.04.21.kin.2327713320" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.kin.1349252206" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.kin.2327713320" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Apr 21 04:25:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Apr 21 13:12:23 UTC 2022 pageSize = 21120 page = 1 @@ -363,7 +363,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -804,30 +805,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1218,7 +1219,7 @@ hpfpPeakPos = scalar, U08, 4138, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4139, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4140, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4142, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4143, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4143, "", 1, 0 hpfpPidP = scalar, U16, 4144, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4146, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4148, "kPa/s", 1, 0, 0, 65000, 0 @@ -2507,86 +2508,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4035,6 +4035,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4456,6 +4457,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4810,7 +4812,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6964,7 +6968,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6977,6 +6981,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6985,9 +6994,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -6995,11 +7001,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 91f5e0b7a6..89878689bd 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.mre_f4.2244131059" + signature = "rusEFI 2022.04.21.mre_f4.1595366069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.mre_f4.2244131059" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.mre_f4.1595366069" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:08 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","24 - AN temp 3","22 - AN temp 4","INVALID","25 - Hall Cam","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","45 - VR/Hall Crank", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 1af429117f..f2e104f0c2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.mre_f7.2244131059" + signature = "rusEFI 2022.04.21.mre_f7.1595366069" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.mre_f7.2244131059" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.mre_f7.1595366069" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:07 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","24 - AN temp 3","22 - AN temp 4","INVALID","25 - Hall Cam","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","45 - VR/Hall Crank", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6978,7 +6982,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6991,6 +6995,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6999,9 +7008,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7009,11 +7015,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 8f59fe5a18..cdf2ff0de8 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.prometheus_405.3121131390" + signature = "rusEFI 2022.04.21.prometheus_405.1625115960" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.prometheus_405.3121131390" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.prometheus_405.1625115960" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:13 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4847,7 +4849,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6999,7 +7003,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7012,6 +7016,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7020,9 +7029,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7030,11 +7036,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index febb3a8626..e5bec52ee6 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.prometheus_469.3121131390" + signature = "rusEFI 2022.04.21.prometheus_469.1625115960" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.prometheus_469.3121131390" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.prometheus_469.1625115960" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:12 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4847,7 +4849,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6999,7 +7003,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7012,6 +7016,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7020,9 +7029,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7030,11 +7036,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3c77687b6b..dac97443a8 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.proteus_f4.3426479897" + signature = "rusEFI 2022.04.21.proteus_f4.384699743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.proteus_f4.3426479897" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.proteus_f4.384699743" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:15 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 5","Digital 4","Digital 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6969,7 +6973,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6982,6 +6986,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6990,9 +6999,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7000,11 +7006,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 1f043dd8ea..ee295d8f7f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.proteus_f7.3426479897" + signature = "rusEFI 2022.04.21.proteus_f7.384699743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.proteus_f7.3426479897" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.proteus_f7.384699743" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:14 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 5","Digital 4","Digital 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6969,7 +6973,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6982,6 +6986,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6990,9 +6999,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7000,11 +7006,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index e2c79ad348..cfff7e36e2 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.proteus_h7.3426479897" + signature = "rusEFI 2022.04.21.proteus_h7.384699743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.proteus_h7.3426479897" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.proteus_h7.384699743" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:16 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Digital 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","VR 1","VR 2","INVALID","INVALID","Digital 2","Digital 3","Digital 5","Digital 4","Digital 6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6969,7 +6973,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -6982,6 +6986,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -6990,9 +6999,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7000,11 +7006,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 0cc542ef41..7b7691a089 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.subaru_eg33_f7.4102864559" + signature = "rusEFI 2022.04.21.subaru_eg33_f7.777608425" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.subaru_eg33_f7.4102864559" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.subaru_eg33_f7.777608425" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:25 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","B11 - Speed Din","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","A08 - Crank 2 VR+","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","A08 - Crank 1 VR+","INVALID","A07 - Cam VR+", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -6993,7 +6997,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7006,6 +7010,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7014,9 +7023,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7024,11 +7030,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 76449d510e..59153707ff 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.21.tdg-pdm8.116604617" + signature = "rusEFI 2022.04.21.tdg-pdm8.3693534351" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.21.tdg-pdm8.116604617" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.21.tdg-pdm8.3693534351" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 04:25:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:20 UTC 2022 pageSize = 21148 page = 1 @@ -366,7 +366,8 @@ canRxPin = bits, U08, 717, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", throttlePedalUpPinMode = bits, U08, 718, [0:1], "DEFAULT", "PULLUP", "PULLDOWN", "INVALID" acIdleExtraOffset = scalar, U08, 719, "%", 1, 0, 0, 100, 0 finalGearRatio = scalar, U16, 720, "ratio", 0.01, 0, 0, 10, 2 -unused722 = scalar, U16, 722, "", 1, 0, 0, 0, 0 +tcuInputSpeedSensorPin = bits, U08, 722, [0:7], "NONE", "INVALID", "INVALID", "PA1", "PA2", "PA3", "INVALID", "PA5", "PA6", "PA7", "PA8", "PA9", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA15", "INVALID", "INVALID", "INVALID", "PB3", "PB4", "PB5", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "PC7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "PE6", "INVALID", "INVALID", "PE9", "INVALID", "PE11", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +tcuInputSpeedSensorTeeth = scalar, U08, 723, "", 1, 0 wastegatePositionMin = scalar, U16, 724, "mv", 1, 0, 0, 5000, 0 wastegatePositionMax = scalar, U16, 726, "mv", 1, 0, 0, 5000, 0 idlePositionMin = scalar, U16, 728, "mv", 1, 0, 0, 5000, 0 @@ -813,30 +814,30 @@ unused1127 = bits, U32, 1740, [4:4], "false", "true" unused1128 = bits, U32, 1740, [5:5], "false", "true" unused1129 = bits, U32, 1740, [6:6], "false", "true" unused1130 = bits, U32, 1740, [7:7], "false", "true" -unusedBit_507_8 = bits, U32, 1740, [8:8], "false", "true" -unusedBit_507_9 = bits, U32, 1740, [9:9], "false", "true" -unusedBit_507_10 = bits, U32, 1740, [10:10], "false", "true" -unusedBit_507_11 = bits, U32, 1740, [11:11], "false", "true" -unusedBit_507_12 = bits, U32, 1740, [12:12], "false", "true" -unusedBit_507_13 = bits, U32, 1740, [13:13], "false", "true" -unusedBit_507_14 = bits, U32, 1740, [14:14], "false", "true" -unusedBit_507_15 = bits, U32, 1740, [15:15], "false", "true" -unusedBit_507_16 = bits, U32, 1740, [16:16], "false", "true" -unusedBit_507_17 = bits, U32, 1740, [17:17], "false", "true" -unusedBit_507_18 = bits, U32, 1740, [18:18], "false", "true" -unusedBit_507_19 = bits, U32, 1740, [19:19], "false", "true" -unusedBit_507_20 = bits, U32, 1740, [20:20], "false", "true" -unusedBit_507_21 = bits, U32, 1740, [21:21], "false", "true" -unusedBit_507_22 = bits, U32, 1740, [22:22], "false", "true" -unusedBit_507_23 = bits, U32, 1740, [23:23], "false", "true" -unusedBit_507_24 = bits, U32, 1740, [24:24], "false", "true" -unusedBit_507_25 = bits, U32, 1740, [25:25], "false", "true" -unusedBit_507_26 = bits, U32, 1740, [26:26], "false", "true" -unusedBit_507_27 = bits, U32, 1740, [27:27], "false", "true" -unusedBit_507_28 = bits, U32, 1740, [28:28], "false", "true" -unusedBit_507_29 = bits, U32, 1740, [29:29], "false", "true" -unusedBit_507_30 = bits, U32, 1740, [30:30], "false", "true" -unusedBit_507_31 = bits, U32, 1740, [31:31], "false", "true" +unusedBit_508_8 = bits, U32, 1740, [8:8], "false", "true" +unusedBit_508_9 = bits, U32, 1740, [9:9], "false", "true" +unusedBit_508_10 = bits, U32, 1740, [10:10], "false", "true" +unusedBit_508_11 = bits, U32, 1740, [11:11], "false", "true" +unusedBit_508_12 = bits, U32, 1740, [12:12], "false", "true" +unusedBit_508_13 = bits, U32, 1740, [13:13], "false", "true" +unusedBit_508_14 = bits, U32, 1740, [14:14], "false", "true" +unusedBit_508_15 = bits, U32, 1740, [15:15], "false", "true" +unusedBit_508_16 = bits, U32, 1740, [16:16], "false", "true" +unusedBit_508_17 = bits, U32, 1740, [17:17], "false", "true" +unusedBit_508_18 = bits, U32, 1740, [18:18], "false", "true" +unusedBit_508_19 = bits, U32, 1740, [19:19], "false", "true" +unusedBit_508_20 = bits, U32, 1740, [20:20], "false", "true" +unusedBit_508_21 = bits, U32, 1740, [21:21], "false", "true" +unusedBit_508_22 = bits, U32, 1740, [22:22], "false", "true" +unusedBit_508_23 = bits, U32, 1740, [23:23], "false", "true" +unusedBit_508_24 = bits, U32, 1740, [24:24], "false", "true" +unusedBit_508_25 = bits, U32, 1740, [25:25], "false", "true" +unusedBit_508_26 = bits, U32, 1740, [26:26], "false", "true" +unusedBit_508_27 = bits, U32, 1740, [27:27], "false", "true" +unusedBit_508_28 = bits, U32, 1740, [28:28], "false", "true" +unusedBit_508_29 = bits, U32, 1740, [29:29], "false", "true" +unusedBit_508_30 = bits, U32, 1740, [30:30], "false", "true" +unusedBit_508_31 = bits, U32, 1740, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1744, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1745, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1746, "ms", 5.0, 0, 0, 2000, 1 @@ -1240,7 +1241,7 @@ hpfpPeakPos = scalar, U08, 4166, "deg", 1, 0, 0, 255, 0 hpfpMinAngle = scalar, U08, 4167, "deg", 1, 0, 0, 255, 0 hpfpPumpVolume = scalar, U16, 4168, "cc", 0.001, 0, 0, 65, 3 hpfpActivationAngle = scalar, U08, 4170, "deg", 1, 0, 0, 255, 0 -unusedFiller_4703 = scalar, U08, 4171, "", 1, 0, 0, 255, 0 +issFilterReciprocal = scalar, U08, 4171, "", 1, 0 hpfpPidP = scalar, U16, 4172, "%/kPa", 0.001, 0, 0, 65, 3 hpfpPidI = scalar, U16, 4174, "%/kPa/lobe", 1.0E-5, 0, 0, 0.65, 5 hpfpTargetDecay = scalar, U16, 4176, "kPa/s", 1, 0, 0, 65000, 0 @@ -2548,86 +2549,85 @@ boostStatus_error = scalar, S16, 550, "", 0.01, 0 boostStatus_resetCounter = scalar, U32, 552, "", 1, 0 auxSpeed1 = scalar, U16, 556, "s", 1, 0 auxSpeed2 = scalar, U16, 558, "s", 1, 0 -unusedAtTheEnd1 = scalar, U08, 560, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 561, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 562, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 563, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 564, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 565, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 566, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 567, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 568, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 569, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 570, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 571, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 572, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 573, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 574, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 575, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 576, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 577, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 578, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 579, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 580, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 581, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 582, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 583, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 584, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 585, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 586, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 587, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 588, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 589, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 590, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 591, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 592, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 593, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 594, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 595, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 596, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 597, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 598, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 599, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 600, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 601, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 602, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 603, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 604, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 605, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 606, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 607, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 608, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 609, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 610, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 611, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 612, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 613, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 614, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 615, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 616, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 617, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 618, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 619, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 620, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 621, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 622, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 623, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 624, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 625, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 626, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 627, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 628, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 629, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 630, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 631, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 632, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 633, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 634, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 635, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 636, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 637, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 638, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 639, "", 1, 0 +ISSValue = scalar, U16, 560, "RPM", 1, 0 +unusedAtTheEnd1 = scalar, U08, 562, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 563, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 564, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 565, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 566, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 567, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 568, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 569, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 570, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 571, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 572, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 573, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 574, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 575, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 576, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 577, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 578, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 579, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 580, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 581, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 582, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 583, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 584, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 585, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 586, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 587, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 588, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 589, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 590, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 591, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 592, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 593, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 594, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 595, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 596, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 597, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 598, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 599, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 600, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 601, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 602, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 603, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 604, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 605, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 606, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 607, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 608, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 609, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 610, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 611, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 612, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 613, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 614, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 615, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 616, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 617, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 618, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 619, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 620, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 621, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 622, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 623, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 624, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 625, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 626, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 627, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 628, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 629, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 630, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 631, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 632, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 633, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 634, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 635, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 636, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 637, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 638, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 639, "", 1, 0 ; total TS size = 640 m_requested_pump = scalar, F32, 640, "", 1, 0 fuel_requested_percent = scalar, F32, 644, "", 1, 0 @@ -4076,6 +4076,7 @@ gaugeCategory = Transmission currentGearGauge = tcuCurrentGear, "Current Gear", "gear", -1, 10, -1, -1, 10, 10, 0, 0 detectedGearGauge = detectedGear, "Detected Gear", "gear", 0, 8, 0, 0, 8, 8, 0, 0 speedToRpmRatioGauge = speedToRpmRatio, "Gearbox Ratio", "", 0, 100, 0, 0, 100, 100, 4, 4 + ISSGauge = ISSValue, "Input Shaft Speed", "RPM", 0, {rpmHardLimit + 2000}, 200, {cranking_rpm}, {rpmHardLimit - 500}, {rpmHardLimit}, 0, 0 gaugeCategory = Knock knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 @@ -4497,6 +4498,7 @@ entry = boostStatus_error, "boostStatus_error", float, "%.3f" entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" entry = auxSpeed1, "aux speed 1", int, "%d" entry = auxSpeed2, "aux speed 2", int, "%d" +entry = ISSValue, "Input Shaft Speed", int, "%d" entry = m_requested_pump, "Computed requested pump duration in degrees (not including deadtime)", float, "%.3f" entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" @@ -4851,7 +4853,9 @@ menuDialog = main subMenu = std_separator subMenu = tcuControls, "Transmission Settings" - subMenu = tcuSolenoidTableTbl, "TCU Solenoids" + subMenu = gearControls, "Gear Selection Settings" + subMenu = inputSpeedSensor, "Input Speed Sensor" + subMenu = tcuSolenoidTableTbl, "Shift Solenoids" subMenu = tccCurves, "TCC Lock/Unlock Speed" subMenu = pcPerGearDialog, "Line Pressure Per Gear" subMenu = pcPerShiftDialog, "Line Pressure Per Shift" @@ -7004,7 +7008,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Gear Controller" gearControllerMode, { tcuEnabled } field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } - dialog = solenoidPanel, "Shift Solenoids" + dialog = shiftSolenoidPanel, "Shift Solenoids" field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } @@ -7017,6 +7021,11 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == 1 || transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } + field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } + + dialog = otherSolenoidPanel, "Other Solenoids" field = "TCC On/Off Solenoid Pin" tcu_tcc_onoff_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC On/Off Solenoid Pin Mode" tcu_tcc_onoff_solenoid_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "TCC PWM Solenoid Pin" tcu_tcc_pwm_solenoid, { tcuEnabled && (transmissionControllerMode == 2) } @@ -7025,9 +7034,6 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Pressure Control Solenoid Pin" tcu_pc_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Pin Mode" tcu_pc_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } field = "Pressure Control Solenoid Frequency" tcu_pc_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == 2) } - field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == 2) } dialog = buttonShiftInputPanel, "Switch/Button Shift" field = "Upshift Pin" tcuUpshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } @@ -7035,11 +7041,22 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Downshift Pin" tcuDownshiftButtonPin, { tcuEnabled && gearControllerMode == 1 } field = "Downshift Pin Mode" tcuDownshiftButtonPinMode, { tcuEnabled && gearControllerMode == 1 } - dialog = tcuControls, "Transmission Settings" + dialog = inputSpeedSensorPanel, "Input Speed Sensor" + field = "Input Pin", tcuInputSpeedSensorPin + field = "Filter parameter", issFilterReciprocal, { tcuInputSpeedSensorPin != 0 } + field = "Tooth Count", tcuInputSpeedSensorTeeth + +dialog = tcuControls, "Transmission Settings" panel = transmissionPanel - panel = solenoidPanel + panel = shiftSolenoidPanel + panel = otherSolenoidPanel + + dialog = gearControls, "Gear Selection Settings" panel = buttonShiftInputPanel + dialog = inputSpeedSensor, "Input Speed Sensor" + panel = inputSpeedSensorPanel + dialog = tccCurves, "TCC Lock/Unlock Speed" panel = tccLockCurve diff --git a/java_console/io/src/main/java/com/rusefi/enums/SensorType.java b/java_console/io/src/main/java/com/rusefi/enums/SensorType.java index 8bce49e41d..56168ae80c 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/SensorType.java +++ b/java_console/io/src/main/java/com/rusefi/enums/SensorType.java @@ -50,5 +50,6 @@ public enum SensorType { AuxLinear2, AuxSpeed1, AuxSpeed2, + InputShaftSpeed, PlaceholderLast, } 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 26f7f34171..0d1beccfd4 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 Thu Apr 21 04:25:27 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Apr 21 13:12:27 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1098,6 +1098,7 @@ public class Fields { public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; + public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; public static final String GAUGE_NAME_KNOCK_10 = "knock 10"; public static final String GAUGE_NAME_KNOCK_11 = "knock 11"; @@ -1512,6 +1513,7 @@ public class Fields { public static final int isManualSpinningMode_offset = 1272; public static final int isMapAveragingEnabled_offset = 1272; public static final int isSdCardEnabled_offset = 748; + public static final int issFilterReciprocal_offset = 4171; public static final int issue_294_31_offset = 164; public static final int isVerboseAlternator_offset = 748; public static final int isVerboseAuxPid1_offset = 164; @@ -1877,6 +1879,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; + public static final int SIGNATURE_HASH = 808948958; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2044,6 +2047,8 @@ public class Fields { public static final int tcuDownshiftButtonPin_offset = 1579; public static final int tcuDownshiftButtonPinMode_offset = 3983; public static final int tcuEnabled_offset = 896; + public static final int tcuInputSpeedSensorPin_offset = 722; + public static final int tcuInputSpeedSensorTeeth_offset = 723; public static final int tcuSolenoidTable_offset = 17388; public static final int tcuUpshiftButtonPin_offset = 1578; public static final int tcuUpshiftButtonPinMode_offset = 3982; @@ -2392,7 +2397,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.04.21.all.3940710040"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.21.all.808948958"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1000; @@ -2436,7 +2441,6 @@ public class Fields { public static final int unused17440_offset = 17448; public static final int unused184_offset = 184; public static final int unused28_offset = 28; - public static final int unused722_offset = 722; public static final int unused_1484_bit_24_offset = 1272; public static final int unused_1484_bit_25_offset = 1272; public static final int unused_1484_bit_26_offset = 1272; @@ -2446,31 +2450,30 @@ public class Fields { public static final int unused_1484_bit_30_offset = 1272; public static final int unused_1484_bit_31_offset = 1272; public static final int unusedBit_48_31_offset = 164; - public static final int unusedBit_507_10_offset = 1740; - public static final int unusedBit_507_11_offset = 1740; - public static final int unusedBit_507_12_offset = 1740; - public static final int unusedBit_507_13_offset = 1740; - public static final int unusedBit_507_14_offset = 1740; - public static final int unusedBit_507_15_offset = 1740; - public static final int unusedBit_507_16_offset = 1740; - public static final int unusedBit_507_17_offset = 1740; - public static final int unusedBit_507_18_offset = 1740; - public static final int unusedBit_507_19_offset = 1740; - public static final int unusedBit_507_20_offset = 1740; - public static final int unusedBit_507_21_offset = 1740; - public static final int unusedBit_507_22_offset = 1740; - public static final int unusedBit_507_23_offset = 1740; - public static final int unusedBit_507_24_offset = 1740; - public static final int unusedBit_507_25_offset = 1740; - public static final int unusedBit_507_26_offset = 1740; - public static final int unusedBit_507_27_offset = 1740; - public static final int unusedBit_507_28_offset = 1740; - public static final int unusedBit_507_29_offset = 1740; - public static final int unusedBit_507_30_offset = 1740; - public static final int unusedBit_507_31_offset = 1740; - public static final int unusedBit_507_8_offset = 1740; - public static final int unusedBit_507_9_offset = 1740; - public static final int unusedFiller_4703_offset = 4171; + public static final int unusedBit_508_10_offset = 1740; + public static final int unusedBit_508_11_offset = 1740; + public static final int unusedBit_508_12_offset = 1740; + public static final int unusedBit_508_13_offset = 1740; + public static final int unusedBit_508_14_offset = 1740; + public static final int unusedBit_508_15_offset = 1740; + public static final int unusedBit_508_16_offset = 1740; + public static final int unusedBit_508_17_offset = 1740; + public static final int unusedBit_508_18_offset = 1740; + public static final int unusedBit_508_19_offset = 1740; + public static final int unusedBit_508_20_offset = 1740; + public static final int unusedBit_508_21_offset = 1740; + public static final int unusedBit_508_22_offset = 1740; + public static final int unusedBit_508_23_offset = 1740; + public static final int unusedBit_508_24_offset = 1740; + public static final int unusedBit_508_25_offset = 1740; + public static final int unusedBit_508_26_offset = 1740; + public static final int unusedBit_508_27_offset = 1740; + public static final int unusedBit_508_28_offset = 1740; + public static final int unusedBit_508_29_offset = 1740; + public static final int unusedBit_508_30_offset = 1740; + public static final int unusedBit_508_31_offset = 1740; + public static final int unusedBit_508_8_offset = 1740; + public static final int unusedBit_508_9_offset = 1740; public static final int unusedMapAccelTaperBins_offset = 1792; public static final int unusedShort_offset = 4640; public static final int unusedTpsBins_offset = 4594; @@ -2883,7 +2886,8 @@ public class Fields { public static final Field THROTTLEPEDALUPPINMODE = Field.create("THROTTLEPEDALUPPINMODE", 718, FieldType.INT8, pin_input_mode_e).setScale(1.0); public static final Field ACIDLEEXTRAOFFSET = Field.create("ACIDLEEXTRAOFFSET", 719, FieldType.INT8).setScale(1.0); public static final Field FINALGEARRATIO = Field.create("FINALGEARRATIO", 720, FieldType.INT16).setScale(0.01); - public static final Field UNUSED722 = Field.create("UNUSED722", 722, FieldType.INT16).setScale(1.0); + public static final Field TCUINPUTSPEEDSENSORPIN = Field.create("TCUINPUTSPEEDSENSORPIN", 722, FieldType.INT8, brain_input_pin_e).setScale(1.0); + public static final Field TCUINPUTSPEEDSENSORTEETH = Field.create("TCUINPUTSPEEDSENSORTEETH", 723, FieldType.INT8).setScale(1.0); public static final Field WASTEGATEPOSITIONMIN = Field.create("WASTEGATEPOSITIONMIN", 724, FieldType.INT16).setScale(1.0); public static final Field WASTEGATEPOSITIONMAX = Field.create("WASTEGATEPOSITIONMAX", 726, FieldType.INT16).setScale(1.0); public static final Field IDLEPOSITIONMIN = Field.create("IDLEPOSITIONMIN", 728, FieldType.INT16).setScale(1.0); @@ -3338,30 +3342,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 1740, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 1740, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 1740, FieldType.BIT, 7); - public static final Field UNUSEDBIT_507_8 = Field.create("UNUSEDBIT_507_8", 1740, FieldType.BIT, 8); - public static final Field UNUSEDBIT_507_9 = Field.create("UNUSEDBIT_507_9", 1740, FieldType.BIT, 9); - public static final Field UNUSEDBIT_507_10 = Field.create("UNUSEDBIT_507_10", 1740, FieldType.BIT, 10); - public static final Field UNUSEDBIT_507_11 = Field.create("UNUSEDBIT_507_11", 1740, FieldType.BIT, 11); - public static final Field UNUSEDBIT_507_12 = Field.create("UNUSEDBIT_507_12", 1740, FieldType.BIT, 12); - public static final Field UNUSEDBIT_507_13 = Field.create("UNUSEDBIT_507_13", 1740, FieldType.BIT, 13); - public static final Field UNUSEDBIT_507_14 = Field.create("UNUSEDBIT_507_14", 1740, FieldType.BIT, 14); - public static final Field UNUSEDBIT_507_15 = Field.create("UNUSEDBIT_507_15", 1740, FieldType.BIT, 15); - public static final Field UNUSEDBIT_507_16 = Field.create("UNUSEDBIT_507_16", 1740, FieldType.BIT, 16); - public static final Field UNUSEDBIT_507_17 = Field.create("UNUSEDBIT_507_17", 1740, FieldType.BIT, 17); - public static final Field UNUSEDBIT_507_18 = Field.create("UNUSEDBIT_507_18", 1740, FieldType.BIT, 18); - public static final Field UNUSEDBIT_507_19 = Field.create("UNUSEDBIT_507_19", 1740, FieldType.BIT, 19); - public static final Field UNUSEDBIT_507_20 = Field.create("UNUSEDBIT_507_20", 1740, FieldType.BIT, 20); - public static final Field UNUSEDBIT_507_21 = Field.create("UNUSEDBIT_507_21", 1740, FieldType.BIT, 21); - public static final Field UNUSEDBIT_507_22 = Field.create("UNUSEDBIT_507_22", 1740, FieldType.BIT, 22); - public static final Field UNUSEDBIT_507_23 = Field.create("UNUSEDBIT_507_23", 1740, FieldType.BIT, 23); - public static final Field UNUSEDBIT_507_24 = Field.create("UNUSEDBIT_507_24", 1740, FieldType.BIT, 24); - public static final Field UNUSEDBIT_507_25 = Field.create("UNUSEDBIT_507_25", 1740, FieldType.BIT, 25); - public static final Field UNUSEDBIT_507_26 = Field.create("UNUSEDBIT_507_26", 1740, FieldType.BIT, 26); - public static final Field UNUSEDBIT_507_27 = Field.create("UNUSEDBIT_507_27", 1740, FieldType.BIT, 27); - public static final Field UNUSEDBIT_507_28 = Field.create("UNUSEDBIT_507_28", 1740, FieldType.BIT, 28); - public static final Field UNUSEDBIT_507_29 = Field.create("UNUSEDBIT_507_29", 1740, FieldType.BIT, 29); - public static final Field UNUSEDBIT_507_30 = Field.create("UNUSEDBIT_507_30", 1740, FieldType.BIT, 30); - public static final Field UNUSEDBIT_507_31 = Field.create("UNUSEDBIT_507_31", 1740, FieldType.BIT, 31); + public static final Field UNUSEDBIT_508_8 = Field.create("UNUSEDBIT_508_8", 1740, FieldType.BIT, 8); + public static final Field UNUSEDBIT_508_9 = Field.create("UNUSEDBIT_508_9", 1740, FieldType.BIT, 9); + public static final Field UNUSEDBIT_508_10 = Field.create("UNUSEDBIT_508_10", 1740, FieldType.BIT, 10); + public static final Field UNUSEDBIT_508_11 = Field.create("UNUSEDBIT_508_11", 1740, FieldType.BIT, 11); + public static final Field UNUSEDBIT_508_12 = Field.create("UNUSEDBIT_508_12", 1740, FieldType.BIT, 12); + public static final Field UNUSEDBIT_508_13 = Field.create("UNUSEDBIT_508_13", 1740, FieldType.BIT, 13); + public static final Field UNUSEDBIT_508_14 = Field.create("UNUSEDBIT_508_14", 1740, FieldType.BIT, 14); + public static final Field UNUSEDBIT_508_15 = Field.create("UNUSEDBIT_508_15", 1740, FieldType.BIT, 15); + public static final Field UNUSEDBIT_508_16 = Field.create("UNUSEDBIT_508_16", 1740, FieldType.BIT, 16); + public static final Field UNUSEDBIT_508_17 = Field.create("UNUSEDBIT_508_17", 1740, FieldType.BIT, 17); + public static final Field UNUSEDBIT_508_18 = Field.create("UNUSEDBIT_508_18", 1740, FieldType.BIT, 18); + public static final Field UNUSEDBIT_508_19 = Field.create("UNUSEDBIT_508_19", 1740, FieldType.BIT, 19); + public static final Field UNUSEDBIT_508_20 = Field.create("UNUSEDBIT_508_20", 1740, FieldType.BIT, 20); + public static final Field UNUSEDBIT_508_21 = Field.create("UNUSEDBIT_508_21", 1740, FieldType.BIT, 21); + public static final Field UNUSEDBIT_508_22 = Field.create("UNUSEDBIT_508_22", 1740, FieldType.BIT, 22); + public static final Field UNUSEDBIT_508_23 = Field.create("UNUSEDBIT_508_23", 1740, FieldType.BIT, 23); + public static final Field UNUSEDBIT_508_24 = Field.create("UNUSEDBIT_508_24", 1740, FieldType.BIT, 24); + public static final Field UNUSEDBIT_508_25 = Field.create("UNUSEDBIT_508_25", 1740, FieldType.BIT, 25); + public static final Field UNUSEDBIT_508_26 = Field.create("UNUSEDBIT_508_26", 1740, FieldType.BIT, 26); + public static final Field UNUSEDBIT_508_27 = Field.create("UNUSEDBIT_508_27", 1740, FieldType.BIT, 27); + public static final Field UNUSEDBIT_508_28 = Field.create("UNUSEDBIT_508_28", 1740, FieldType.BIT, 28); + public static final Field UNUSEDBIT_508_29 = Field.create("UNUSEDBIT_508_29", 1740, FieldType.BIT, 29); + public static final Field UNUSEDBIT_508_30 = Field.create("UNUSEDBIT_508_30", 1740, FieldType.BIT, 30); + public static final Field UNUSEDBIT_508_31 = Field.create("UNUSEDBIT_508_31", 1740, FieldType.BIT, 31); public static final Field BENCHTESTOFFTIME = Field.create("BENCHTESTOFFTIME", 1744, FieldType.INT8).setScale(5.0); public static final Field BENCHTESTCOUNT = Field.create("BENCHTESTCOUNT", 1745, FieldType.INT8).setScale(1.0); public static final Field BENCHTESTONTIME = Field.create("BENCHTESTONTIME", 1746, FieldType.INT8).setScale(5.0); @@ -3771,7 +3775,7 @@ public class Fields { public static final Field HPFPMINANGLE = Field.create("HPFPMINANGLE", 4167, FieldType.INT8).setScale(1.0); public static final Field HPFPPUMPVOLUME = Field.create("HPFPPUMPVOLUME", 4168, FieldType.INT16).setScale(0.001); public static final Field HPFPACTIVATIONANGLE = Field.create("HPFPACTIVATIONANGLE", 4170, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDFILLER_4703 = Field.create("UNUSEDFILLER_4703", 4171, FieldType.INT8).setScale(1.0); + public static final Field ISSFILTERRECIPROCAL = Field.create("ISSFILTERRECIPROCAL", 4171, FieldType.INT8).setScale(1.0); public static final Field HPFPPIDP = Field.create("HPFPPIDP", 4172, FieldType.INT16).setScale(0.001); public static final Field HPFPPIDI = Field.create("HPFPPIDI", 4174, FieldType.INT16).setScale(1.0E-5); public static final Field HPFPTARGETDECAY = Field.create("HPFPTARGETDECAY", 4176, FieldType.INT16).setScale(1.0); @@ -4232,7 +4236,8 @@ public class Fields { THROTTLEPEDALUPPINMODE, ACIDLEEXTRAOFFSET, FINALGEARRATIO, - UNUSED722, + TCUINPUTSPEEDSENSORPIN, + TCUINPUTSPEEDSENSORTEETH, WASTEGATEPOSITIONMIN, WASTEGATEPOSITIONMAX, IDLEPOSITIONMIN, @@ -4679,30 +4684,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_507_8, - UNUSEDBIT_507_9, - UNUSEDBIT_507_10, - UNUSEDBIT_507_11, - UNUSEDBIT_507_12, - UNUSEDBIT_507_13, - UNUSEDBIT_507_14, - UNUSEDBIT_507_15, - UNUSEDBIT_507_16, - UNUSEDBIT_507_17, - UNUSEDBIT_507_18, - UNUSEDBIT_507_19, - UNUSEDBIT_507_20, - UNUSEDBIT_507_21, - UNUSEDBIT_507_22, - UNUSEDBIT_507_23, - UNUSEDBIT_507_24, - UNUSEDBIT_507_25, - UNUSEDBIT_507_26, - UNUSEDBIT_507_27, - UNUSEDBIT_507_28, - UNUSEDBIT_507_29, - UNUSEDBIT_507_30, - UNUSEDBIT_507_31, + UNUSEDBIT_508_8, + UNUSEDBIT_508_9, + UNUSEDBIT_508_10, + UNUSEDBIT_508_11, + UNUSEDBIT_508_12, + UNUSEDBIT_508_13, + UNUSEDBIT_508_14, + UNUSEDBIT_508_15, + UNUSEDBIT_508_16, + UNUSEDBIT_508_17, + UNUSEDBIT_508_18, + UNUSEDBIT_508_19, + UNUSEDBIT_508_20, + UNUSEDBIT_508_21, + UNUSEDBIT_508_22, + UNUSEDBIT_508_23, + UNUSEDBIT_508_24, + UNUSEDBIT_508_25, + UNUSEDBIT_508_26, + UNUSEDBIT_508_27, + UNUSEDBIT_508_28, + UNUSEDBIT_508_29, + UNUSEDBIT_508_30, + UNUSEDBIT_508_31, BENCHTESTOFFTIME, BENCHTESTCOUNT, BENCHTESTONTIME, @@ -5106,7 +5111,7 @@ public class Fields { HPFPMINANGLE, HPFPPUMPVOLUME, HPFPACTIVATIONANGLE, - UNUSEDFILLER_4703, + ISSFILTERRECIPROCAL, HPFPPIDP, HPFPPIDI, HPFPTARGETDECAY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 6e1f0f0e20..a9797e1644 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Apr 18 16:27:08 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Thu Apr 21 13:11:43 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -187,6 +187,7 @@ public class TsOutputs { public static final String GAUGE_NAME_IDLE_POSITION = "Idle position sensor"; public static final String GAUGE_NAME_IGNITION_LOAD = "ign: load"; public static final String GAUGE_NAME_INJECTOR_LAG = "fuel: injector lag"; + public static final String GAUGE_NAME_ISS = "Input Shaft Speed"; public static final String GAUGE_NAME_KNOCK_1 = "knock 1"; public static final String GAUGE_NAME_KNOCK_10 = "knock 10"; public static final String GAUGE_NAME_KNOCK_11 = "knock 11"; @@ -744,86 +745,85 @@ public class TsOutputs { public static final Field BOOSTSTATUS_RESETCOUNTER = Field.create("BOOSTSTATUS_RESETCOUNTER", 552, FieldType.INT).setScale(1.0); public static final Field AUXSPEED1 = Field.create("AUXSPEED1", 556, FieldType.INT16).setScale(1.0); public static final Field AUXSPEED2 = Field.create("AUXSPEED2", 558, FieldType.INT16).setScale(1.0); - public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 560, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 561, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 562, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 563, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 564, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 565, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 566, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 567, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 568, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 569, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 570, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 571, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 572, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 573, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 574, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 575, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 576, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 577, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 578, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 579, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 580, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 581, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 582, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 583, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 584, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 585, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 586, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 587, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 588, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 589, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 590, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 591, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 592, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 593, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 594, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 595, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 596, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 597, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 598, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 599, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 600, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 601, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 602, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 603, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 604, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 605, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 606, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 607, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 608, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 609, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 610, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 611, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 612, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 613, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 614, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 615, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 616, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 617, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 618, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 619, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 620, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 621, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 622, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 623, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 624, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 625, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 626, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 627, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 628, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 629, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 630, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 631, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 632, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 633, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 634, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 635, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 636, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 637, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND79 = Field.create("UNUSEDATTHEEND79", 638, FieldType.INT8).setScale(1.0); - public static final Field UNUSEDATTHEEND80 = Field.create("UNUSEDATTHEEND80", 639, FieldType.INT8).setScale(1.0); + public static final Field ISSVALUE = Field.create("ISSVALUE", 560, FieldType.INT16).setScale(1.0); + public static final Field UNUSEDATTHEEND1 = Field.create("UNUSEDATTHEEND1", 562, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND2 = Field.create("UNUSEDATTHEEND2", 563, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND3 = Field.create("UNUSEDATTHEEND3", 564, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND4 = Field.create("UNUSEDATTHEEND4", 565, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND5 = Field.create("UNUSEDATTHEEND5", 566, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND6 = Field.create("UNUSEDATTHEEND6", 567, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND7 = Field.create("UNUSEDATTHEEND7", 568, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND8 = Field.create("UNUSEDATTHEEND8", 569, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND9 = Field.create("UNUSEDATTHEEND9", 570, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND10 = Field.create("UNUSEDATTHEEND10", 571, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND11 = Field.create("UNUSEDATTHEEND11", 572, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND12 = Field.create("UNUSEDATTHEEND12", 573, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND13 = Field.create("UNUSEDATTHEEND13", 574, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND14 = Field.create("UNUSEDATTHEEND14", 575, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND15 = Field.create("UNUSEDATTHEEND15", 576, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND16 = Field.create("UNUSEDATTHEEND16", 577, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND17 = Field.create("UNUSEDATTHEEND17", 578, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND18 = Field.create("UNUSEDATTHEEND18", 579, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND19 = Field.create("UNUSEDATTHEEND19", 580, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND20 = Field.create("UNUSEDATTHEEND20", 581, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND21 = Field.create("UNUSEDATTHEEND21", 582, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND22 = Field.create("UNUSEDATTHEEND22", 583, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND23 = Field.create("UNUSEDATTHEEND23", 584, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND24 = Field.create("UNUSEDATTHEEND24", 585, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND25 = Field.create("UNUSEDATTHEEND25", 586, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND26 = Field.create("UNUSEDATTHEEND26", 587, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND27 = Field.create("UNUSEDATTHEEND27", 588, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND28 = Field.create("UNUSEDATTHEEND28", 589, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND29 = Field.create("UNUSEDATTHEEND29", 590, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND30 = Field.create("UNUSEDATTHEEND30", 591, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND31 = Field.create("UNUSEDATTHEEND31", 592, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND32 = Field.create("UNUSEDATTHEEND32", 593, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND33 = Field.create("UNUSEDATTHEEND33", 594, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND34 = Field.create("UNUSEDATTHEEND34", 595, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND35 = Field.create("UNUSEDATTHEEND35", 596, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND36 = Field.create("UNUSEDATTHEEND36", 597, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND37 = Field.create("UNUSEDATTHEEND37", 598, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND38 = Field.create("UNUSEDATTHEEND38", 599, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND39 = Field.create("UNUSEDATTHEEND39", 600, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND40 = Field.create("UNUSEDATTHEEND40", 601, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND41 = Field.create("UNUSEDATTHEEND41", 602, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND42 = Field.create("UNUSEDATTHEEND42", 603, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND43 = Field.create("UNUSEDATTHEEND43", 604, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND44 = Field.create("UNUSEDATTHEEND44", 605, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND45 = Field.create("UNUSEDATTHEEND45", 606, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND46 = Field.create("UNUSEDATTHEEND46", 607, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND47 = Field.create("UNUSEDATTHEEND47", 608, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND48 = Field.create("UNUSEDATTHEEND48", 609, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND49 = Field.create("UNUSEDATTHEEND49", 610, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND50 = Field.create("UNUSEDATTHEEND50", 611, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND51 = Field.create("UNUSEDATTHEEND51", 612, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND52 = Field.create("UNUSEDATTHEEND52", 613, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND53 = Field.create("UNUSEDATTHEEND53", 614, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND54 = Field.create("UNUSEDATTHEEND54", 615, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND55 = Field.create("UNUSEDATTHEEND55", 616, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND56 = Field.create("UNUSEDATTHEEND56", 617, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND57 = Field.create("UNUSEDATTHEEND57", 618, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND58 = Field.create("UNUSEDATTHEEND58", 619, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND59 = Field.create("UNUSEDATTHEEND59", 620, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND60 = Field.create("UNUSEDATTHEEND60", 621, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND61 = Field.create("UNUSEDATTHEEND61", 622, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND62 = Field.create("UNUSEDATTHEEND62", 623, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND63 = Field.create("UNUSEDATTHEEND63", 624, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND64 = Field.create("UNUSEDATTHEEND64", 625, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND65 = Field.create("UNUSEDATTHEEND65", 626, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND66 = Field.create("UNUSEDATTHEEND66", 627, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND67 = Field.create("UNUSEDATTHEEND67", 628, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND68 = Field.create("UNUSEDATTHEEND68", 629, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND69 = Field.create("UNUSEDATTHEEND69", 630, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND70 = Field.create("UNUSEDATTHEEND70", 631, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND71 = Field.create("UNUSEDATTHEEND71", 632, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND72 = Field.create("UNUSEDATTHEEND72", 633, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND73 = Field.create("UNUSEDATTHEEND73", 634, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND74 = Field.create("UNUSEDATTHEEND74", 635, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND75 = Field.create("UNUSEDATTHEEND75", 636, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND76 = Field.create("UNUSEDATTHEEND76", 637, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND77 = Field.create("UNUSEDATTHEEND77", 638, FieldType.INT8).setScale(1.0); + public static final Field UNUSEDATTHEEND78 = Field.create("UNUSEDATTHEEND78", 639, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, ISIGNITIONENABLEDINDICATOR, @@ -1182,6 +1182,7 @@ public class TsOutputs { BOOSTSTATUS_RESETCOUNTER, AUXSPEED1, AUXSPEED2, + ISSVALUE, UNUSEDATTHEEND1, UNUSEDATTHEEND2, UNUSEDATTHEEND3, @@ -1260,7 +1261,5 @@ public class TsOutputs { UNUSEDATTHEEND76, UNUSEDATTHEEND77, UNUSEDATTHEEND78, - UNUSEDATTHEEND79, - UNUSEDATTHEEND80, }; }