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 969bf2d782..f083369f9f 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 integration/rusefi_config.txt Sun Feb 02 13:12:38 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Feb 04 00:55:30 EST 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -590,7 +590,7 @@ struct engine_configuration_s { bool etb_use_two_wires : 1; /** offset 76 bit 13 */ - bool unusedHereo_wires : 1; + bool isDoubleSolenoidIdle : 1; /** offset 76 bit 14 */ bool showSdCardWarning : 1; @@ -1421,9 +1421,14 @@ struct engine_configuration_s { */ pin_output_mode_e starterRelayPinMode; /** + * Some Subaru and some Mazda use double-solenoid idle air valve * offset 810 */ - uint8_t unuseduartPadding1[2]; + brain_pin_e secondSolenoidPin; + /** + * offset 811 + */ + uint8_t unuseduartPadding1; /** * offset 812 */ @@ -1581,94 +1586,94 @@ struct engine_configuration_s { bool todoClutchDownPinInverted : 1; /** offset 976 bit 2 */ - bool unusedBit_249_2 : 1; + bool unusedBit_250_2 : 1; /** offset 976 bit 3 */ - bool unusedBit_249_3 : 1; + bool unusedBit_250_3 : 1; /** offset 976 bit 4 */ - bool unusedBit_249_4 : 1; + bool unusedBit_250_4 : 1; /** offset 976 bit 5 */ - bool unusedBit_249_5 : 1; + bool unusedBit_250_5 : 1; /** offset 976 bit 6 */ - bool unusedBit_249_6 : 1; + bool unusedBit_250_6 : 1; /** offset 976 bit 7 */ - bool unusedBit_249_7 : 1; + bool unusedBit_250_7 : 1; /** offset 976 bit 8 */ - bool unusedBit_249_8 : 1; + bool unusedBit_250_8 : 1; /** offset 976 bit 9 */ - bool unusedBit_249_9 : 1; + bool unusedBit_250_9 : 1; /** offset 976 bit 10 */ - bool unusedBit_249_10 : 1; + bool unusedBit_250_10 : 1; /** offset 976 bit 11 */ - bool unusedBit_249_11 : 1; + bool unusedBit_250_11 : 1; /** offset 976 bit 12 */ - bool unusedBit_249_12 : 1; + bool unusedBit_250_12 : 1; /** offset 976 bit 13 */ - bool unusedBit_249_13 : 1; + bool unusedBit_250_13 : 1; /** offset 976 bit 14 */ - bool unusedBit_249_14 : 1; + bool unusedBit_250_14 : 1; /** offset 976 bit 15 */ - bool unusedBit_249_15 : 1; + bool unusedBit_250_15 : 1; /** offset 976 bit 16 */ - bool unusedBit_249_16 : 1; + bool unusedBit_250_16 : 1; /** offset 976 bit 17 */ - bool unusedBit_249_17 : 1; + bool unusedBit_250_17 : 1; /** offset 976 bit 18 */ - bool unusedBit_249_18 : 1; + bool unusedBit_250_18 : 1; /** offset 976 bit 19 */ - bool unusedBit_249_19 : 1; + bool unusedBit_250_19 : 1; /** offset 976 bit 20 */ - bool unusedBit_249_20 : 1; + bool unusedBit_250_20 : 1; /** offset 976 bit 21 */ - bool unusedBit_249_21 : 1; + bool unusedBit_250_21 : 1; /** offset 976 bit 22 */ - bool unusedBit_249_22 : 1; + bool unusedBit_250_22 : 1; /** offset 976 bit 23 */ - bool unusedBit_249_23 : 1; + bool unusedBit_250_23 : 1; /** offset 976 bit 24 */ - bool unusedBit_249_24 : 1; + bool unusedBit_250_24 : 1; /** offset 976 bit 25 */ - bool unusedBit_249_25 : 1; + bool unusedBit_250_25 : 1; /** offset 976 bit 26 */ - bool unusedBit_249_26 : 1; + bool unusedBit_250_26 : 1; /** offset 976 bit 27 */ - bool unusedBit_249_27 : 1; + bool unusedBit_250_27 : 1; /** offset 976 bit 28 */ - bool unusedBit_249_28 : 1; + bool unusedBit_250_28 : 1; /** offset 976 bit 29 */ - bool unusedBit_249_29 : 1; + bool unusedBit_250_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_249_30 : 1; + bool unusedBit_250_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_249_31 : 1; + bool unusedBit_250_31 : 1; /** * offset 980 */ @@ -3212,4 +3217,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Feb 02 13:12:38 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Feb 04 00:55:30 EST 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index eb67d06fe6..7656defff2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1337,6 +1337,8 @@ #define isCJ125Enabled_offset_hex 2e8 #define isCylinderCleanupEnabled_offset 1476 #define isCylinderCleanupEnabled_offset_hex 5c4 +#define isDoubleSolenoidIdle_offset 76 +#define isDoubleSolenoidIdle_offset_hex 4c #define isEngineChartEnabled_offset 1464 #define isEngineChartEnabled_offset_hex 5b8 #define isEngineControlEnabled_offset 744 @@ -1684,6 +1686,8 @@ #define sdCardPeriodMs_offset_hex 324 #define sdCardSpiDevice_offset 2592 #define sdCardSpiDevice_offset_hex a20 +#define secondSolenoidPin_offset 810 +#define secondSolenoidPin_offset_hex 32a #define secondTriggerChannelEnabled_offset 1476 #define secondTriggerChannelEnabled_offset_hex 5c4 #define sensor_chart_e_enum "none", "trigger", "MAP", "RPM ACCEL", "DETAILED RPM", "Fast Aux1", "INVALID", "INVALID" @@ -2076,66 +2080,66 @@ #define unusedAtOldBoardConfigurationEnd_offset_hex 41c #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 -#define unusedBit_249_10_offset 976 -#define unusedBit_249_10_offset_hex 3d0 -#define unusedBit_249_11_offset 976 -#define unusedBit_249_11_offset_hex 3d0 -#define unusedBit_249_12_offset 976 -#define unusedBit_249_12_offset_hex 3d0 -#define unusedBit_249_13_offset 976 -#define unusedBit_249_13_offset_hex 3d0 -#define unusedBit_249_14_offset 976 -#define unusedBit_249_14_offset_hex 3d0 -#define unusedBit_249_15_offset 976 -#define unusedBit_249_15_offset_hex 3d0 -#define unusedBit_249_16_offset 976 -#define unusedBit_249_16_offset_hex 3d0 -#define unusedBit_249_17_offset 976 -#define unusedBit_249_17_offset_hex 3d0 -#define unusedBit_249_18_offset 976 -#define unusedBit_249_18_offset_hex 3d0 -#define unusedBit_249_19_offset 976 -#define unusedBit_249_19_offset_hex 3d0 -#define unusedBit_249_20_offset 976 -#define unusedBit_249_20_offset_hex 3d0 -#define unusedBit_249_21_offset 976 -#define unusedBit_249_21_offset_hex 3d0 -#define unusedBit_249_22_offset 976 -#define unusedBit_249_22_offset_hex 3d0 -#define unusedBit_249_23_offset 976 -#define unusedBit_249_23_offset_hex 3d0 -#define unusedBit_249_24_offset 976 -#define unusedBit_249_24_offset_hex 3d0 -#define unusedBit_249_25_offset 976 -#define unusedBit_249_25_offset_hex 3d0 -#define unusedBit_249_26_offset 976 -#define unusedBit_249_26_offset_hex 3d0 -#define unusedBit_249_27_offset 976 -#define unusedBit_249_27_offset_hex 3d0 -#define unusedBit_249_28_offset 976 -#define unusedBit_249_28_offset_hex 3d0 -#define unusedBit_249_29_offset 976 -#define unusedBit_249_29_offset_hex 3d0 -#define unusedBit_249_2_offset 976 -#define unusedBit_249_2_offset_hex 3d0 -#define unusedBit_249_30_offset 976 -#define unusedBit_249_30_offset_hex 3d0 -#define unusedBit_249_31_offset 976 -#define unusedBit_249_31_offset_hex 3d0 -#define unusedBit_249_3_offset 976 -#define unusedBit_249_3_offset_hex 3d0 -#define unusedBit_249_4_offset 976 -#define unusedBit_249_4_offset_hex 3d0 -#define unusedBit_249_5_offset 976 -#define unusedBit_249_5_offset_hex 3d0 -#define unusedBit_249_6_offset 976 -#define unusedBit_249_6_offset_hex 3d0 -#define unusedBit_249_7_offset 976 -#define unusedBit_249_7_offset_hex 3d0 -#define unusedBit_249_8_offset 976 -#define unusedBit_249_8_offset_hex 3d0 -#define unusedBit_249_9_offset 976 -#define unusedBit_249_9_offset_hex 3d0 +#define unusedBit_250_10_offset 976 +#define unusedBit_250_10_offset_hex 3d0 +#define unusedBit_250_11_offset 976 +#define unusedBit_250_11_offset_hex 3d0 +#define unusedBit_250_12_offset 976 +#define unusedBit_250_12_offset_hex 3d0 +#define unusedBit_250_13_offset 976 +#define unusedBit_250_13_offset_hex 3d0 +#define unusedBit_250_14_offset 976 +#define unusedBit_250_14_offset_hex 3d0 +#define unusedBit_250_15_offset 976 +#define unusedBit_250_15_offset_hex 3d0 +#define unusedBit_250_16_offset 976 +#define unusedBit_250_16_offset_hex 3d0 +#define unusedBit_250_17_offset 976 +#define unusedBit_250_17_offset_hex 3d0 +#define unusedBit_250_18_offset 976 +#define unusedBit_250_18_offset_hex 3d0 +#define unusedBit_250_19_offset 976 +#define unusedBit_250_19_offset_hex 3d0 +#define unusedBit_250_20_offset 976 +#define unusedBit_250_20_offset_hex 3d0 +#define unusedBit_250_21_offset 976 +#define unusedBit_250_21_offset_hex 3d0 +#define unusedBit_250_22_offset 976 +#define unusedBit_250_22_offset_hex 3d0 +#define unusedBit_250_23_offset 976 +#define unusedBit_250_23_offset_hex 3d0 +#define unusedBit_250_24_offset 976 +#define unusedBit_250_24_offset_hex 3d0 +#define unusedBit_250_25_offset 976 +#define unusedBit_250_25_offset_hex 3d0 +#define unusedBit_250_26_offset 976 +#define unusedBit_250_26_offset_hex 3d0 +#define unusedBit_250_27_offset 976 +#define unusedBit_250_27_offset_hex 3d0 +#define unusedBit_250_28_offset 976 +#define unusedBit_250_28_offset_hex 3d0 +#define unusedBit_250_29_offset 976 +#define unusedBit_250_29_offset_hex 3d0 +#define unusedBit_250_2_offset 976 +#define unusedBit_250_2_offset_hex 3d0 +#define unusedBit_250_30_offset 976 +#define unusedBit_250_30_offset_hex 3d0 +#define unusedBit_250_31_offset 976 +#define unusedBit_250_31_offset_hex 3d0 +#define unusedBit_250_3_offset 976 +#define unusedBit_250_3_offset_hex 3d0 +#define unusedBit_250_4_offset 976 +#define unusedBit_250_4_offset_hex 3d0 +#define unusedBit_250_5_offset 976 +#define unusedBit_250_5_offset_hex 3d0 +#define unusedBit_250_6_offset 976 +#define unusedBit_250_6_offset_hex 3d0 +#define unusedBit_250_7_offset 976 +#define unusedBit_250_7_offset_hex 3d0 +#define unusedBit_250_8_offset 976 +#define unusedBit_250_8_offset_hex 3d0 +#define unusedBit_250_9_offset 976 +#define unusedBit_250_9_offset_hex 3d0 #define unusedBit_34_31_offset 76 #define unusedBit_34_31_offset_hex 4c #define unusedErrorPin_offset 2040 @@ -2144,8 +2148,6 @@ #define unusedFlexFuelSensor_offset_hex c1c #define unusedFormerWarmupAfrPid_offset 1772 #define unusedFormerWarmupAfrPid_offset_hex 6ec -#define unusedHereo_wires_offset 76 -#define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 #define unusedOldWarmupAfr_offset_hex 2e8 #define unusedSomething_offset 1784 @@ -2158,8 +2160,8 @@ #define unusedSpiPadding7_offset_hex fa5 #define unusedSpiPadding8_offset 4009 #define unusedSpiPadding8_offset_hex fa9 -#define unuseduartPadding1_offset 810 -#define unuseduartPadding1_offset_hex 32a +#define unuseduartPadding1_offset 811 +#define unuseduartPadding1_offset_hex 32b #define unusuedsw_offset 4020 #define unusuedsw_offset_hex fb4 #define unusuedvref_offset 4016 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 243c6f276d..8768b8a7ed 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 integration\rusefi_config.txt Sun Feb 02 13:12:23 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 00:55:12 EST 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -590,7 +590,7 @@ struct engine_configuration_s { bool etb_use_two_wires : 1; /** offset 76 bit 13 */ - bool unusedHereo_wires : 1; + bool isDoubleSolenoidIdle : 1; /** offset 76 bit 14 */ bool showSdCardWarning : 1; @@ -1421,9 +1421,14 @@ struct engine_configuration_s { */ pin_output_mode_e starterRelayPinMode; /** + * Some Subaru and some Mazda use double-solenoid idle air valve * offset 810 */ - uint8_t unuseduartPadding1[2]; + brain_pin_e secondSolenoidPin; + /** + * offset 811 + */ + uint8_t unuseduartPadding1; /** * offset 812 */ @@ -1581,94 +1586,94 @@ struct engine_configuration_s { bool todoClutchDownPinInverted : 1; /** offset 976 bit 2 */ - bool unusedBit_249_2 : 1; + bool unusedBit_250_2 : 1; /** offset 976 bit 3 */ - bool unusedBit_249_3 : 1; + bool unusedBit_250_3 : 1; /** offset 976 bit 4 */ - bool unusedBit_249_4 : 1; + bool unusedBit_250_4 : 1; /** offset 976 bit 5 */ - bool unusedBit_249_5 : 1; + bool unusedBit_250_5 : 1; /** offset 976 bit 6 */ - bool unusedBit_249_6 : 1; + bool unusedBit_250_6 : 1; /** offset 976 bit 7 */ - bool unusedBit_249_7 : 1; + bool unusedBit_250_7 : 1; /** offset 976 bit 8 */ - bool unusedBit_249_8 : 1; + bool unusedBit_250_8 : 1; /** offset 976 bit 9 */ - bool unusedBit_249_9 : 1; + bool unusedBit_250_9 : 1; /** offset 976 bit 10 */ - bool unusedBit_249_10 : 1; + bool unusedBit_250_10 : 1; /** offset 976 bit 11 */ - bool unusedBit_249_11 : 1; + bool unusedBit_250_11 : 1; /** offset 976 bit 12 */ - bool unusedBit_249_12 : 1; + bool unusedBit_250_12 : 1; /** offset 976 bit 13 */ - bool unusedBit_249_13 : 1; + bool unusedBit_250_13 : 1; /** offset 976 bit 14 */ - bool unusedBit_249_14 : 1; + bool unusedBit_250_14 : 1; /** offset 976 bit 15 */ - bool unusedBit_249_15 : 1; + bool unusedBit_250_15 : 1; /** offset 976 bit 16 */ - bool unusedBit_249_16 : 1; + bool unusedBit_250_16 : 1; /** offset 976 bit 17 */ - bool unusedBit_249_17 : 1; + bool unusedBit_250_17 : 1; /** offset 976 bit 18 */ - bool unusedBit_249_18 : 1; + bool unusedBit_250_18 : 1; /** offset 976 bit 19 */ - bool unusedBit_249_19 : 1; + bool unusedBit_250_19 : 1; /** offset 976 bit 20 */ - bool unusedBit_249_20 : 1; + bool unusedBit_250_20 : 1; /** offset 976 bit 21 */ - bool unusedBit_249_21 : 1; + bool unusedBit_250_21 : 1; /** offset 976 bit 22 */ - bool unusedBit_249_22 : 1; + bool unusedBit_250_22 : 1; /** offset 976 bit 23 */ - bool unusedBit_249_23 : 1; + bool unusedBit_250_23 : 1; /** offset 976 bit 24 */ - bool unusedBit_249_24 : 1; + bool unusedBit_250_24 : 1; /** offset 976 bit 25 */ - bool unusedBit_249_25 : 1; + bool unusedBit_250_25 : 1; /** offset 976 bit 26 */ - bool unusedBit_249_26 : 1; + bool unusedBit_250_26 : 1; /** offset 976 bit 27 */ - bool unusedBit_249_27 : 1; + bool unusedBit_250_27 : 1; /** offset 976 bit 28 */ - bool unusedBit_249_28 : 1; + bool unusedBit_250_28 : 1; /** offset 976 bit 29 */ - bool unusedBit_249_29 : 1; + bool unusedBit_250_29 : 1; /** offset 976 bit 30 */ - bool unusedBit_249_30 : 1; + bool unusedBit_250_30 : 1; /** offset 976 bit 31 */ - bool unusedBit_249_31 : 1; + bool unusedBit_250_31 : 1; /** * offset 980 */ @@ -3212,4 +3217,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:23 EST 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 00:55:12 EST 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 1754a3b3e4..85f8585ee0 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1337,6 +1337,8 @@ #define isCJ125Enabled_offset_hex 2e8 #define isCylinderCleanupEnabled_offset 1476 #define isCylinderCleanupEnabled_offset_hex 5c4 +#define isDoubleSolenoidIdle_offset 76 +#define isDoubleSolenoidIdle_offset_hex 4c #define isEngineChartEnabled_offset 1464 #define isEngineChartEnabled_offset_hex 5b8 #define isEngineControlEnabled_offset 744 @@ -1684,6 +1686,8 @@ #define sdCardPeriodMs_offset_hex 324 #define sdCardSpiDevice_offset 2592 #define sdCardSpiDevice_offset_hex a20 +#define secondSolenoidPin_offset 810 +#define secondSolenoidPin_offset_hex 32a #define secondTriggerChannelEnabled_offset 1476 #define secondTriggerChannelEnabled_offset_hex 5c4 #define sensor_chart_e_enum "none", "trigger", "MAP", "RPM ACCEL", "DETAILED RPM", "Fast Aux1", "INVALID", "INVALID" @@ -2076,66 +2080,66 @@ #define unusedAtOldBoardConfigurationEnd_offset_hex 41c #define unusedBit4_1476_offset 1476 #define unusedBit4_1476_offset_hex 5c4 -#define unusedBit_249_10_offset 976 -#define unusedBit_249_10_offset_hex 3d0 -#define unusedBit_249_11_offset 976 -#define unusedBit_249_11_offset_hex 3d0 -#define unusedBit_249_12_offset 976 -#define unusedBit_249_12_offset_hex 3d0 -#define unusedBit_249_13_offset 976 -#define unusedBit_249_13_offset_hex 3d0 -#define unusedBit_249_14_offset 976 -#define unusedBit_249_14_offset_hex 3d0 -#define unusedBit_249_15_offset 976 -#define unusedBit_249_15_offset_hex 3d0 -#define unusedBit_249_16_offset 976 -#define unusedBit_249_16_offset_hex 3d0 -#define unusedBit_249_17_offset 976 -#define unusedBit_249_17_offset_hex 3d0 -#define unusedBit_249_18_offset 976 -#define unusedBit_249_18_offset_hex 3d0 -#define unusedBit_249_19_offset 976 -#define unusedBit_249_19_offset_hex 3d0 -#define unusedBit_249_20_offset 976 -#define unusedBit_249_20_offset_hex 3d0 -#define unusedBit_249_21_offset 976 -#define unusedBit_249_21_offset_hex 3d0 -#define unusedBit_249_22_offset 976 -#define unusedBit_249_22_offset_hex 3d0 -#define unusedBit_249_23_offset 976 -#define unusedBit_249_23_offset_hex 3d0 -#define unusedBit_249_24_offset 976 -#define unusedBit_249_24_offset_hex 3d0 -#define unusedBit_249_25_offset 976 -#define unusedBit_249_25_offset_hex 3d0 -#define unusedBit_249_26_offset 976 -#define unusedBit_249_26_offset_hex 3d0 -#define unusedBit_249_27_offset 976 -#define unusedBit_249_27_offset_hex 3d0 -#define unusedBit_249_28_offset 976 -#define unusedBit_249_28_offset_hex 3d0 -#define unusedBit_249_29_offset 976 -#define unusedBit_249_29_offset_hex 3d0 -#define unusedBit_249_2_offset 976 -#define unusedBit_249_2_offset_hex 3d0 -#define unusedBit_249_30_offset 976 -#define unusedBit_249_30_offset_hex 3d0 -#define unusedBit_249_31_offset 976 -#define unusedBit_249_31_offset_hex 3d0 -#define unusedBit_249_3_offset 976 -#define unusedBit_249_3_offset_hex 3d0 -#define unusedBit_249_4_offset 976 -#define unusedBit_249_4_offset_hex 3d0 -#define unusedBit_249_5_offset 976 -#define unusedBit_249_5_offset_hex 3d0 -#define unusedBit_249_6_offset 976 -#define unusedBit_249_6_offset_hex 3d0 -#define unusedBit_249_7_offset 976 -#define unusedBit_249_7_offset_hex 3d0 -#define unusedBit_249_8_offset 976 -#define unusedBit_249_8_offset_hex 3d0 -#define unusedBit_249_9_offset 976 -#define unusedBit_249_9_offset_hex 3d0 +#define unusedBit_250_10_offset 976 +#define unusedBit_250_10_offset_hex 3d0 +#define unusedBit_250_11_offset 976 +#define unusedBit_250_11_offset_hex 3d0 +#define unusedBit_250_12_offset 976 +#define unusedBit_250_12_offset_hex 3d0 +#define unusedBit_250_13_offset 976 +#define unusedBit_250_13_offset_hex 3d0 +#define unusedBit_250_14_offset 976 +#define unusedBit_250_14_offset_hex 3d0 +#define unusedBit_250_15_offset 976 +#define unusedBit_250_15_offset_hex 3d0 +#define unusedBit_250_16_offset 976 +#define unusedBit_250_16_offset_hex 3d0 +#define unusedBit_250_17_offset 976 +#define unusedBit_250_17_offset_hex 3d0 +#define unusedBit_250_18_offset 976 +#define unusedBit_250_18_offset_hex 3d0 +#define unusedBit_250_19_offset 976 +#define unusedBit_250_19_offset_hex 3d0 +#define unusedBit_250_20_offset 976 +#define unusedBit_250_20_offset_hex 3d0 +#define unusedBit_250_21_offset 976 +#define unusedBit_250_21_offset_hex 3d0 +#define unusedBit_250_22_offset 976 +#define unusedBit_250_22_offset_hex 3d0 +#define unusedBit_250_23_offset 976 +#define unusedBit_250_23_offset_hex 3d0 +#define unusedBit_250_24_offset 976 +#define unusedBit_250_24_offset_hex 3d0 +#define unusedBit_250_25_offset 976 +#define unusedBit_250_25_offset_hex 3d0 +#define unusedBit_250_26_offset 976 +#define unusedBit_250_26_offset_hex 3d0 +#define unusedBit_250_27_offset 976 +#define unusedBit_250_27_offset_hex 3d0 +#define unusedBit_250_28_offset 976 +#define unusedBit_250_28_offset_hex 3d0 +#define unusedBit_250_29_offset 976 +#define unusedBit_250_29_offset_hex 3d0 +#define unusedBit_250_2_offset 976 +#define unusedBit_250_2_offset_hex 3d0 +#define unusedBit_250_30_offset 976 +#define unusedBit_250_30_offset_hex 3d0 +#define unusedBit_250_31_offset 976 +#define unusedBit_250_31_offset_hex 3d0 +#define unusedBit_250_3_offset 976 +#define unusedBit_250_3_offset_hex 3d0 +#define unusedBit_250_4_offset 976 +#define unusedBit_250_4_offset_hex 3d0 +#define unusedBit_250_5_offset 976 +#define unusedBit_250_5_offset_hex 3d0 +#define unusedBit_250_6_offset 976 +#define unusedBit_250_6_offset_hex 3d0 +#define unusedBit_250_7_offset 976 +#define unusedBit_250_7_offset_hex 3d0 +#define unusedBit_250_8_offset 976 +#define unusedBit_250_8_offset_hex 3d0 +#define unusedBit_250_9_offset 976 +#define unusedBit_250_9_offset_hex 3d0 #define unusedBit_34_31_offset 76 #define unusedBit_34_31_offset_hex 4c #define unusedErrorPin_offset 2040 @@ -2144,8 +2148,6 @@ #define unusedFlexFuelSensor_offset_hex c1c #define unusedFormerWarmupAfrPid_offset 1772 #define unusedFormerWarmupAfrPid_offset_hex 6ec -#define unusedHereo_wires_offset 76 -#define unusedHereo_wires_offset_hex 4c #define unusedOldWarmupAfr_offset 744 #define unusedOldWarmupAfr_offset_hex 2e8 #define unusedSomething_offset 1784 @@ -2158,8 +2160,8 @@ #define unusedSpiPadding7_offset_hex fa5 #define unusedSpiPadding8_offset 4009 #define unusedSpiPadding8_offset_hex fa9 -#define unuseduartPadding1_offset 810 -#define unuseduartPadding1_offset_hex 32a +#define unuseduartPadding1_offset 811 +#define unuseduartPadding1_offset_hex 32b #define unusuedsw_offset 4020 #define unusuedsw_offset_hex fb4 #define unusuedvref_offset 4016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b1f673e005..6f8105a82d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -323,7 +323,7 @@ bit useBiQuadAnalogFiltering; bit cj125isUaDivided; bit cj125isLsu49; bit etb_use_two_wires; -bit unusedHereo_wires; +bit isDoubleSolenoidIdle; bit showSdCardWarning; bit cj125isUrDivided;looks like 3v range should be enough, divider not needed bit useTLE8888_hall_mode; @@ -674,7 +674,8 @@ custom uart_device_e 1 bits,U32, @OFFSET@, [0:7], "Off", "UART1", "UART2", "UA brain_pin_e debugMapAveraging; brain_pin_e starterRelayPin; pin_output_mode_e starterRelayPinMode; - uint8_t[2] unuseduartPadding1; + brain_pin_e secondSolenoidPin;Some Subaru and some Mazda use double-solenoid idle air valve + uint8_t[1] unuseduartPadding1; int mapMinBufferLength;;"count", 1, 0, 0, 24, 0 int16_t idlePidDeactivationTpsThreshold;;"%", 1, 0, 0, 100.0, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 1e6ad83180..ba021803da 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:23 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 01:02:34 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2832,6 +2833,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3114,6 +3116,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3133,6 +3136,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f008b88829..aa0a68549b 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1709,6 +1709,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -1991,6 +1992,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -2010,6 +2012,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 9b60bd85c1..95c706dc31 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:29 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 01:02:41 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2832,6 +2833,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3114,6 +3116,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3133,6 +3136,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 0e75886069..125b2dc43c 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Feb 02 13:12:38 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Tue Feb 04 00:55:30 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" @@ -2832,6 +2833,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3114,6 +3116,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, !useStepperIdle && isDoubleSolenoidIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3133,6 +3136,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 1311ac80b4..ff6be7d53f 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:26 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 01:02:37 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2825,6 +2826,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3098,6 +3100,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3117,6 +3120,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index d8fdeec3d1..0c17328e53 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:32 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 01:02:44 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2828,6 +2829,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3110,6 +3112,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3129,6 +3132,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 0ee0133cb0..5d2721dadd 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Feb 02 13:12:35 EST 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 01:02:48 EST 2020 pageSize = 20000 page = 1 @@ -107,7 +107,7 @@ page = 1 cj125isUaDivided = bits, U32, 76, [10:10], "false", "true" cj125isLsu49 = bits, U32, 76, [11:11], "false", "true" etb_use_two_wires = bits, U32, 76, [12:12], "false", "true" - unusedHereo_wires = bits, U32, 76, [13:13], "false", "true" + isDoubleSolenoidIdle = bits, U32, 76, [13:13], "false", "true" showSdCardWarning = bits, U32, 76, [14:14], "false", "true" cj125isUrDivided = bits, U32, 76, [15:15], "false", "true" useTLE8888_hall_mode = bits, U32, 76, [16:16], "false", "true" @@ -451,7 +451,8 @@ page = 1 debugMapAveraging = bits, U08, 807, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPin = bits, U08, 808, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" starterRelayPinMode = bits, U08, 809, [0:7], "default", "default inverted", "open collector", "open collector inverted" -;no TS info - skipping unuseduartPadding1 offset 810 + secondSolenoidPin = bits, U08, 810, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +;no TS info - skipping unuseduartPadding1 offset 811 mapMinBufferLength = scalar, S32, 812, "count", 1, 0, 0, 24, 0 idlePidDeactivationTpsThreshold = scalar, S16, 816, "%", 1, 0, 0, 100.0, 0 stepperParkingExtraSteps = scalar, S16, 818, "%", 1, 0, 0, 3000.0, 0 @@ -534,36 +535,36 @@ page = 1 ;no TS info - skipping unused offset 972 todoClutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" todoClutchDownPinInverted= bits, U32, 976, [1:1], "false", "true" - unusedBit_249_2 = bits, U32, 976, [2:2], "false", "true" - unusedBit_249_3 = bits, U32, 976, [3:3], "false", "true" - unusedBit_249_4 = bits, U32, 976, [4:4], "false", "true" - unusedBit_249_5 = bits, U32, 976, [5:5], "false", "true" - unusedBit_249_6 = bits, U32, 976, [6:6], "false", "true" - unusedBit_249_7 = bits, U32, 976, [7:7], "false", "true" - unusedBit_249_8 = bits, U32, 976, [8:8], "false", "true" - unusedBit_249_9 = bits, U32, 976, [9:9], "false", "true" - unusedBit_249_10 = bits, U32, 976, [10:10], "false", "true" - unusedBit_249_11 = bits, U32, 976, [11:11], "false", "true" - unusedBit_249_12 = bits, U32, 976, [12:12], "false", "true" - unusedBit_249_13 = bits, U32, 976, [13:13], "false", "true" - unusedBit_249_14 = bits, U32, 976, [14:14], "false", "true" - unusedBit_249_15 = bits, U32, 976, [15:15], "false", "true" - unusedBit_249_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_249_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_249_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_249_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_249_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_249_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_249_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_249_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_249_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_249_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_249_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_249_27 = bits, U32, 976, [27:27], "false", "true" - unusedBit_249_28 = bits, U32, 976, [28:28], "false", "true" - unusedBit_249_29 = bits, U32, 976, [29:29], "false", "true" - unusedBit_249_30 = bits, U32, 976, [30:30], "false", "true" - unusedBit_249_31 = bits, U32, 976, [31:31], "false", "true" + unusedBit_250_2 = bits, U32, 976, [2:2], "false", "true" + unusedBit_250_3 = bits, U32, 976, [3:3], "false", "true" + unusedBit_250_4 = bits, U32, 976, [4:4], "false", "true" + unusedBit_250_5 = bits, U32, 976, [5:5], "false", "true" + unusedBit_250_6 = bits, U32, 976, [6:6], "false", "true" + unusedBit_250_7 = bits, U32, 976, [7:7], "false", "true" + unusedBit_250_8 = bits, U32, 976, [8:8], "false", "true" + unusedBit_250_9 = bits, U32, 976, [9:9], "false", "true" + unusedBit_250_10 = bits, U32, 976, [10:10], "false", "true" + unusedBit_250_11 = bits, U32, 976, [11:11], "false", "true" + unusedBit_250_12 = bits, U32, 976, [12:12], "false", "true" + unusedBit_250_13 = bits, U32, 976, [13:13], "false", "true" + unusedBit_250_14 = bits, U32, 976, [14:14], "false", "true" + unusedBit_250_15 = bits, U32, 976, [15:15], "false", "true" + unusedBit_250_16 = bits, U32, 976, [16:16], "false", "true" + unusedBit_250_17 = bits, U32, 976, [17:17], "false", "true" + unusedBit_250_18 = bits, U32, 976, [18:18], "false", "true" + unusedBit_250_19 = bits, U32, 976, [19:19], "false", "true" + unusedBit_250_20 = bits, U32, 976, [20:20], "false", "true" + unusedBit_250_21 = bits, U32, 976, [21:21], "false", "true" + unusedBit_250_22 = bits, U32, 976, [22:22], "false", "true" + unusedBit_250_23 = bits, U32, 976, [23:23], "false", "true" + unusedBit_250_24 = bits, U32, 976, [24:24], "false", "true" + unusedBit_250_25 = bits, U32, 976, [25:25], "false", "true" + unusedBit_250_26 = bits, U32, 976, [26:26], "false", "true" + unusedBit_250_27 = bits, U32, 976, [27:27], "false", "true" + unusedBit_250_28 = bits, U32, 976, [28:28], "false", "true" + unusedBit_250_29 = bits, U32, 976, [29:29], "false", "true" + unusedBit_250_30 = bits, U32, 976, [30:30], "false", "true" + unusedBit_250_31 = bits, U32, 976, [31:31], "false", "true" etbIo1_directionPin1 = bits, U08, 980, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_directionPin2 = bits, U08, 981, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" etbIo1_controlPin1 = bits, U08, 982, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -2832,6 +2833,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Dizzy out Pin", dizzySparkOutputPin field = "O2 heater pin", o2heaterPin field = "Idle Solenoid Pin", idle_solenoidPin + field = "Second Idle Solenoid Pin", secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir Mode", stepperDirectionPinMode field = "Idle Stepper Step", idle_stepperStepPin @@ -3114,6 +3116,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle + field = "Second Idle Solenoid Pin", secondSolenoidPin, { !useStepperIdle && isDoubleSolenoidIdle } field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = idleStepper, "Stepper" @@ -3133,6 +3136,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = idlehw, "", yAxis field = "!ECU reboot needed to apply these settings" field = "Use Stepper", useStepperIdle + field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType dialog = idlePidSettings, "PID IAC Control" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 84c1ea3816..35a54f9a26 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/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 integration\rusefi_config.txt Sun Feb 02 13:12:23 EST 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Feb 04 00:55:12 EST 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -889,6 +889,7 @@ public class Fields { public static final int isBoostControlEnabled_offset = 1476; public static final int isCJ125Enabled_offset = 744; public static final int isCylinderCleanupEnabled_offset = 1476; + public static final int isDoubleSolenoidIdle_offset = 76; public static final int isEngineChartEnabled_offset = 1464; public static final int isEngineControlEnabled_offset = 744; public static final int isFastAdcEnabled_offset = 744; @@ -1121,6 +1122,7 @@ public class Fields { public static final int sdCardPeriodMs_offset = 804; public static final int sdCardPeriodMs_offset_hex = 324; public static final int sdCardSpiDevice_offset = 2592; + public static final int secondSolenoidPin_offset = 810; public static final int secondTriggerChannelEnabled_offset = 1476; public static final int sensorChartFrequency_offset = 520; public static final int sensorChartFrequency_offset_hex = 208; @@ -1372,48 +1374,47 @@ public class Fields { public static final int unusedAnotherOne_offset = 744; public static final int unusedAtOldBoardConfigurationEnd_offset = 1052; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_249_10_offset = 976; - public static final int unusedBit_249_11_offset = 976; - public static final int unusedBit_249_12_offset = 976; - public static final int unusedBit_249_13_offset = 976; - public static final int unusedBit_249_14_offset = 976; - public static final int unusedBit_249_15_offset = 976; - public static final int unusedBit_249_16_offset = 976; - public static final int unusedBit_249_17_offset = 976; - public static final int unusedBit_249_18_offset = 976; - public static final int unusedBit_249_19_offset = 976; - public static final int unusedBit_249_20_offset = 976; - public static final int unusedBit_249_21_offset = 976; - public static final int unusedBit_249_22_offset = 976; - public static final int unusedBit_249_23_offset = 976; - public static final int unusedBit_249_24_offset = 976; - public static final int unusedBit_249_25_offset = 976; - public static final int unusedBit_249_26_offset = 976; - public static final int unusedBit_249_27_offset = 976; - public static final int unusedBit_249_28_offset = 976; - public static final int unusedBit_249_29_offset = 976; - public static final int unusedBit_249_2_offset = 976; - public static final int unusedBit_249_30_offset = 976; - public static final int unusedBit_249_31_offset = 976; - public static final int unusedBit_249_3_offset = 976; - public static final int unusedBit_249_4_offset = 976; - public static final int unusedBit_249_5_offset = 976; - public static final int unusedBit_249_6_offset = 976; - public static final int unusedBit_249_7_offset = 976; - public static final int unusedBit_249_8_offset = 976; - public static final int unusedBit_249_9_offset = 976; + public static final int unusedBit_250_10_offset = 976; + public static final int unusedBit_250_11_offset = 976; + public static final int unusedBit_250_12_offset = 976; + public static final int unusedBit_250_13_offset = 976; + public static final int unusedBit_250_14_offset = 976; + public static final int unusedBit_250_15_offset = 976; + public static final int unusedBit_250_16_offset = 976; + public static final int unusedBit_250_17_offset = 976; + public static final int unusedBit_250_18_offset = 976; + public static final int unusedBit_250_19_offset = 976; + public static final int unusedBit_250_20_offset = 976; + public static final int unusedBit_250_21_offset = 976; + public static final int unusedBit_250_22_offset = 976; + public static final int unusedBit_250_23_offset = 976; + public static final int unusedBit_250_24_offset = 976; + public static final int unusedBit_250_25_offset = 976; + public static final int unusedBit_250_26_offset = 976; + public static final int unusedBit_250_27_offset = 976; + public static final int unusedBit_250_28_offset = 976; + public static final int unusedBit_250_29_offset = 976; + public static final int unusedBit_250_2_offset = 976; + public static final int unusedBit_250_30_offset = 976; + public static final int unusedBit_250_31_offset = 976; + public static final int unusedBit_250_3_offset = 976; + public static final int unusedBit_250_4_offset = 976; + public static final int unusedBit_250_5_offset = 976; + public static final int unusedBit_250_6_offset = 976; + public static final int unusedBit_250_7_offset = 976; + public static final int unusedBit_250_8_offset = 976; + public static final int unusedBit_250_9_offset = 976; public static final int unusedBit_34_31_offset = 76; public static final int unusedErrorPin_offset = 2040; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedFormerWarmupAfrPid_offset = 1772; - public static final int unusedHereo_wires_offset = 76; public static final int unusedOldWarmupAfr_offset = 744; public static final int unusedSomething_offset = 1784; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2713; public static final int unusedSpiPadding7_offset = 4005; public static final int unusedSpiPadding8_offset = 4009; - public static final int unuseduartPadding1_offset = 810; + public static final int unuseduartPadding1_offset = 811; public static final int unusuedsw_offset = 4020; public static final int unusuedvref_offset = 4016; public static final int useAdvanceCorrectionsForCranking_offset = 1476; @@ -1494,7 +1495,7 @@ public class Fields { public static final Field CJ125ISUADIVIDED = Field.create("CJ125ISUADIVIDED", 76, FieldType.BIT, 10); public static final Field CJ125ISLSU49 = Field.create("CJ125ISLSU49", 76, FieldType.BIT, 11); public static final Field ETB_USE_TWO_WIRES = Field.create("ETB_USE_TWO_WIRES", 76, FieldType.BIT, 12); - public static final Field UNUSEDHEREO_WIRES = Field.create("UNUSEDHEREO_WIRES", 76, FieldType.BIT, 13); + public static final Field ISDOUBLESOLENOIDIDLE = Field.create("ISDOUBLESOLENOIDIDLE", 76, FieldType.BIT, 13); public static final Field SHOWSDCARDWARNING = Field.create("SHOWSDCARDWARNING", 76, FieldType.BIT, 14); public static final Field CJ125ISURDIVIDED = Field.create("CJ125ISURDIVIDED", 76, FieldType.BIT, 15); public static final Field USETLE8888_HALL_MODE = Field.create("USETLE8888_HALL_MODE", 76, FieldType.BIT, 16); @@ -1835,6 +1836,8 @@ public class Fields { public static final Field DEBUGMAPAVERAGING = Field.create("DEBUGMAPAVERAGING", 807, FieldType.INT8, brain_pin_e); public static final Field STARTERRELAYPIN = Field.create("STARTERRELAYPIN", 808, FieldType.INT8, brain_pin_e); public static final Field STARTERRELAYPINMODE = Field.create("STARTERRELAYPINMODE", 809, FieldType.INT8, pin_output_mode_e); + public static final Field SECONDSOLENOIDPIN = Field.create("SECONDSOLENOIDPIN", 810, FieldType.INT8, brain_pin_e); + public static final Field UNUSEDUARTPADDING1 = Field.create("UNUSEDUARTPADDING1", 811, FieldType.INT8); public static final Field MAPMINBUFFERLENGTH = Field.create("MAPMINBUFFERLENGTH", 812, FieldType.INT); public static final Field IDLEPIDDEACTIVATIONTPSTHRESHOLD = Field.create("IDLEPIDDEACTIVATIONTPSTHRESHOLD", 816, FieldType.INT16); public static final Field STEPPERPARKINGEXTRASTEPS = Field.create("STEPPERPARKINGEXTRASTEPS", 818, FieldType.INT16); @@ -1919,36 +1922,36 @@ public class Fields { public static final Field UNUSED = Field.create("UNUSED", 972, FieldType.FLOAT); public static final Field TODOCLUTCHUPPININVERTED = Field.create("TODOCLUTCHUPPININVERTED", 976, FieldType.BIT, 0); public static final Field TODOCLUTCHDOWNPININVERTED = Field.create("TODOCLUTCHDOWNPININVERTED", 976, FieldType.BIT, 1); - public static final Field UNUSEDBIT_249_2 = Field.create("UNUSEDBIT_249_2", 976, FieldType.BIT, 2); - public static final Field UNUSEDBIT_249_3 = Field.create("UNUSEDBIT_249_3", 976, FieldType.BIT, 3); - public static final Field UNUSEDBIT_249_4 = Field.create("UNUSEDBIT_249_4", 976, FieldType.BIT, 4); - public static final Field UNUSEDBIT_249_5 = Field.create("UNUSEDBIT_249_5", 976, FieldType.BIT, 5); - public static final Field UNUSEDBIT_249_6 = Field.create("UNUSEDBIT_249_6", 976, FieldType.BIT, 6); - public static final Field UNUSEDBIT_249_7 = Field.create("UNUSEDBIT_249_7", 976, FieldType.BIT, 7); - public static final Field UNUSEDBIT_249_8 = Field.create("UNUSEDBIT_249_8", 976, FieldType.BIT, 8); - public static final Field UNUSEDBIT_249_9 = Field.create("UNUSEDBIT_249_9", 976, FieldType.BIT, 9); - public static final Field UNUSEDBIT_249_10 = Field.create("UNUSEDBIT_249_10", 976, FieldType.BIT, 10); - public static final Field UNUSEDBIT_249_11 = Field.create("UNUSEDBIT_249_11", 976, FieldType.BIT, 11); - public static final Field UNUSEDBIT_249_12 = Field.create("UNUSEDBIT_249_12", 976, FieldType.BIT, 12); - public static final Field UNUSEDBIT_249_13 = Field.create("UNUSEDBIT_249_13", 976, FieldType.BIT, 13); - public static final Field UNUSEDBIT_249_14 = Field.create("UNUSEDBIT_249_14", 976, FieldType.BIT, 14); - public static final Field UNUSEDBIT_249_15 = Field.create("UNUSEDBIT_249_15", 976, FieldType.BIT, 15); - public static final Field UNUSEDBIT_249_16 = Field.create("UNUSEDBIT_249_16", 976, FieldType.BIT, 16); - public static final Field UNUSEDBIT_249_17 = Field.create("UNUSEDBIT_249_17", 976, FieldType.BIT, 17); - public static final Field UNUSEDBIT_249_18 = Field.create("UNUSEDBIT_249_18", 976, FieldType.BIT, 18); - public static final Field UNUSEDBIT_249_19 = Field.create("UNUSEDBIT_249_19", 976, FieldType.BIT, 19); - public static final Field UNUSEDBIT_249_20 = Field.create("UNUSEDBIT_249_20", 976, FieldType.BIT, 20); - public static final Field UNUSEDBIT_249_21 = Field.create("UNUSEDBIT_249_21", 976, FieldType.BIT, 21); - public static final Field UNUSEDBIT_249_22 = Field.create("UNUSEDBIT_249_22", 976, FieldType.BIT, 22); - public static final Field UNUSEDBIT_249_23 = Field.create("UNUSEDBIT_249_23", 976, FieldType.BIT, 23); - public static final Field UNUSEDBIT_249_24 = Field.create("UNUSEDBIT_249_24", 976, FieldType.BIT, 24); - public static final Field UNUSEDBIT_249_25 = Field.create("UNUSEDBIT_249_25", 976, FieldType.BIT, 25); - public static final Field UNUSEDBIT_249_26 = Field.create("UNUSEDBIT_249_26", 976, FieldType.BIT, 26); - public static final Field UNUSEDBIT_249_27 = Field.create("UNUSEDBIT_249_27", 976, FieldType.BIT, 27); - public static final Field UNUSEDBIT_249_28 = Field.create("UNUSEDBIT_249_28", 976, FieldType.BIT, 28); - public static final Field UNUSEDBIT_249_29 = Field.create("UNUSEDBIT_249_29", 976, FieldType.BIT, 29); - public static final Field UNUSEDBIT_249_30 = Field.create("UNUSEDBIT_249_30", 976, FieldType.BIT, 30); - public static final Field UNUSEDBIT_249_31 = Field.create("UNUSEDBIT_249_31", 976, FieldType.BIT, 31); + public static final Field UNUSEDBIT_250_2 = Field.create("UNUSEDBIT_250_2", 976, FieldType.BIT, 2); + public static final Field UNUSEDBIT_250_3 = Field.create("UNUSEDBIT_250_3", 976, FieldType.BIT, 3); + public static final Field UNUSEDBIT_250_4 = Field.create("UNUSEDBIT_250_4", 976, FieldType.BIT, 4); + public static final Field UNUSEDBIT_250_5 = Field.create("UNUSEDBIT_250_5", 976, FieldType.BIT, 5); + public static final Field UNUSEDBIT_250_6 = Field.create("UNUSEDBIT_250_6", 976, FieldType.BIT, 6); + public static final Field UNUSEDBIT_250_7 = Field.create("UNUSEDBIT_250_7", 976, FieldType.BIT, 7); + public static final Field UNUSEDBIT_250_8 = Field.create("UNUSEDBIT_250_8", 976, FieldType.BIT, 8); + public static final Field UNUSEDBIT_250_9 = Field.create("UNUSEDBIT_250_9", 976, FieldType.BIT, 9); + public static final Field UNUSEDBIT_250_10 = Field.create("UNUSEDBIT_250_10", 976, FieldType.BIT, 10); + public static final Field UNUSEDBIT_250_11 = Field.create("UNUSEDBIT_250_11", 976, FieldType.BIT, 11); + public static final Field UNUSEDBIT_250_12 = Field.create("UNUSEDBIT_250_12", 976, FieldType.BIT, 12); + public static final Field UNUSEDBIT_250_13 = Field.create("UNUSEDBIT_250_13", 976, FieldType.BIT, 13); + public static final Field UNUSEDBIT_250_14 = Field.create("UNUSEDBIT_250_14", 976, FieldType.BIT, 14); + public static final Field UNUSEDBIT_250_15 = Field.create("UNUSEDBIT_250_15", 976, FieldType.BIT, 15); + public static final Field UNUSEDBIT_250_16 = Field.create("UNUSEDBIT_250_16", 976, FieldType.BIT, 16); + public static final Field UNUSEDBIT_250_17 = Field.create("UNUSEDBIT_250_17", 976, FieldType.BIT, 17); + public static final Field UNUSEDBIT_250_18 = Field.create("UNUSEDBIT_250_18", 976, FieldType.BIT, 18); + public static final Field UNUSEDBIT_250_19 = Field.create("UNUSEDBIT_250_19", 976, FieldType.BIT, 19); + public static final Field UNUSEDBIT_250_20 = Field.create("UNUSEDBIT_250_20", 976, FieldType.BIT, 20); + public static final Field UNUSEDBIT_250_21 = Field.create("UNUSEDBIT_250_21", 976, FieldType.BIT, 21); + public static final Field UNUSEDBIT_250_22 = Field.create("UNUSEDBIT_250_22", 976, FieldType.BIT, 22); + public static final Field UNUSEDBIT_250_23 = Field.create("UNUSEDBIT_250_23", 976, FieldType.BIT, 23); + public static final Field UNUSEDBIT_250_24 = Field.create("UNUSEDBIT_250_24", 976, FieldType.BIT, 24); + public static final Field UNUSEDBIT_250_25 = Field.create("UNUSEDBIT_250_25", 976, FieldType.BIT, 25); + public static final Field UNUSEDBIT_250_26 = Field.create("UNUSEDBIT_250_26", 976, FieldType.BIT, 26); + public static final Field UNUSEDBIT_250_27 = Field.create("UNUSEDBIT_250_27", 976, FieldType.BIT, 27); + public static final Field UNUSEDBIT_250_28 = Field.create("UNUSEDBIT_250_28", 976, FieldType.BIT, 28); + public static final Field UNUSEDBIT_250_29 = Field.create("UNUSEDBIT_250_29", 976, FieldType.BIT, 29); + public static final Field UNUSEDBIT_250_30 = Field.create("UNUSEDBIT_250_30", 976, FieldType.BIT, 30); + public static final Field UNUSEDBIT_250_31 = Field.create("UNUSEDBIT_250_31", 976, FieldType.BIT, 31); public static final Field ETBIO1_DIRECTIONPIN1 = Field.create("ETBIO1_DIRECTIONPIN1", 980, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_DIRECTIONPIN2 = Field.create("ETBIO1_DIRECTIONPIN2", 981, FieldType.INT8, brain_pin_e); public static final Field ETBIO1_CONTROLPIN1 = Field.create("ETBIO1_CONTROLPIN1", 982, FieldType.INT8, brain_pin_e); @@ -2400,7 +2403,7 @@ public class Fields { CJ125ISUADIVIDED, CJ125ISLSU49, ETB_USE_TWO_WIRES, - UNUSEDHEREO_WIRES, + ISDOUBLESOLENOIDIDLE, SHOWSDCARDWARNING, CJ125ISURDIVIDED, USETLE8888_HALL_MODE, @@ -2731,6 +2734,8 @@ public class Fields { DEBUGMAPAVERAGING, STARTERRELAYPIN, STARTERRELAYPINMODE, + SECONDSOLENOIDPIN, + UNUSEDUARTPADDING1, MAPMINBUFFERLENGTH, IDLEPIDDEACTIVATIONTPSTHRESHOLD, STEPPERPARKINGEXTRASTEPS, @@ -2813,36 +2818,36 @@ public class Fields { UNUSED, TODOCLUTCHUPPININVERTED, TODOCLUTCHDOWNPININVERTED, - UNUSEDBIT_249_2, - UNUSEDBIT_249_3, - UNUSEDBIT_249_4, - UNUSEDBIT_249_5, - UNUSEDBIT_249_6, - UNUSEDBIT_249_7, - UNUSEDBIT_249_8, - UNUSEDBIT_249_9, - UNUSEDBIT_249_10, - UNUSEDBIT_249_11, - UNUSEDBIT_249_12, - UNUSEDBIT_249_13, - UNUSEDBIT_249_14, - UNUSEDBIT_249_15, - UNUSEDBIT_249_16, - UNUSEDBIT_249_17, - UNUSEDBIT_249_18, - UNUSEDBIT_249_19, - UNUSEDBIT_249_20, - UNUSEDBIT_249_21, - UNUSEDBIT_249_22, - UNUSEDBIT_249_23, - UNUSEDBIT_249_24, - UNUSEDBIT_249_25, - UNUSEDBIT_249_26, - UNUSEDBIT_249_27, - UNUSEDBIT_249_28, - UNUSEDBIT_249_29, - UNUSEDBIT_249_30, - UNUSEDBIT_249_31, + UNUSEDBIT_250_2, + UNUSEDBIT_250_3, + UNUSEDBIT_250_4, + UNUSEDBIT_250_5, + UNUSEDBIT_250_6, + UNUSEDBIT_250_7, + UNUSEDBIT_250_8, + UNUSEDBIT_250_9, + UNUSEDBIT_250_10, + UNUSEDBIT_250_11, + UNUSEDBIT_250_12, + UNUSEDBIT_250_13, + UNUSEDBIT_250_14, + UNUSEDBIT_250_15, + UNUSEDBIT_250_16, + UNUSEDBIT_250_17, + UNUSEDBIT_250_18, + UNUSEDBIT_250_19, + UNUSEDBIT_250_20, + UNUSEDBIT_250_21, + UNUSEDBIT_250_22, + UNUSEDBIT_250_23, + UNUSEDBIT_250_24, + UNUSEDBIT_250_25, + UNUSEDBIT_250_26, + UNUSEDBIT_250_27, + UNUSEDBIT_250_28, + UNUSEDBIT_250_29, + UNUSEDBIT_250_30, + UNUSEDBIT_250_31, ETBIO1_DIRECTIONPIN1, ETBIO1_DIRECTIONPIN2, ETBIO1_CONTROLPIN1,