From e34940fd6dcacf860c435c73b9e5a2b81988cdf9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 21:00:34 -0400 Subject: [PATCH] [Feature Request] Transmission Control #1454 two bytes of progress --- .../engine_configuration_generated_structures.h | 11 +++++------ .../engine_configuration_generated_structures.h | 11 +++++------ .../src/com/rusefi/config/generated/Fields.java | 14 +++++++------- 3 files changed, 17 insertions(+), 19 deletions(-) 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 1dd2bc27e8..4ac5b6461b 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 kineris_gen_config.bat integration/rusefi_config.txt Sat May 23 19:22:14 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 20:38:54 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,6 +1923,7 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** + * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -2395,15 +2396,13 @@ struct engine_configuration_s { */ brain_pin_e auxValves[AUX_DIGITAL_VALVE_COUNT]; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1818 */ - brain_pin_e unusedConsoleSerialTxPin; + switch_input_pin_e tcuUpshiftButtonPin; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1819 */ - brain_pin_e unusedConsoleSerialRxPin; + switch_input_pin_e tcuDownshiftButtonPin; /** * Knock sensor output knock detection threshold depending on current RPM * offset 1820 @@ -3523,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 23 19:22:14 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 20:38:54 EDT 2020 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 32f3ff25bd..bb85547651 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,6 +1923,7 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** + * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -2395,15 +2396,13 @@ struct engine_configuration_s { */ brain_pin_e auxValves[AUX_DIGITAL_VALVE_COUNT]; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1818 */ - brain_pin_e unusedConsoleSerialTxPin; + switch_input_pin_e tcuUpshiftButtonPin; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1819 */ - brain_pin_e unusedConsoleSerialRxPin; + switch_input_pin_e tcuDownshiftButtonPin; /** * Knock sensor output knock detection threshold depending on current RPM * offset 1820 @@ -3523,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 23 10:54:57 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 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 19ce82d391..3b8f6379f0 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 gen_config.bat integration\rusefi_config.txt Thu May 28 17:58:11 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1131,6 +1131,8 @@ public class Fields { public static final int tcu_solenoid7_offset = 1198; public static final int tcu_solenoid8_offset = 1199; public static final int TCU_SOLENOID_COUNT = 8; + public static final int tcuDownshiftButtonPin_offset = 1819; + public static final int tcuUpshiftButtonPin_offset = 1818; public static final int test557pin_offset = 3101; public static final int throttlePedalPositionAdcChannel_offset = 580; public static final int throttlePedalPositionSecondAdcChannel_offset = 683; @@ -1316,8 +1318,6 @@ public class Fields { public static final int unusedBit_283_30_offset = 976; public static final int unusedBit_283_31_offset = 976; public static final int unusedBit_34_31_offset = 76; - public static final int unusedConsoleSerialRxPin_offset = 1819; - public static final int unusedConsoleSerialTxPin_offset = 1818; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHere_offset = 761; public static final int unusedHereWeHave_offset = 1464; @@ -2085,8 +2085,8 @@ public class Fields { public static final Field BINARYSERIALRXPIN = Field.create("BINARYSERIALRXPIN", 1815, FieldType.INT8, brain_pin_e); public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 1816, FieldType.INT8, brain_pin_e); public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 1817, FieldType.INT8, brain_pin_e); - public static final Field UNUSEDCONSOLESERIALTXPIN = Field.create("UNUSEDCONSOLESERIALTXPIN", 1818, FieldType.INT8, brain_pin_e); - public static final Field UNUSEDCONSOLESERIALRXPIN = Field.create("UNUSEDCONSOLESERIALRXPIN", 1819, FieldType.INT8, brain_pin_e); + public static final Field TCUUPSHIFTBUTTONPIN = Field.create("TCUUPSHIFTBUTTONPIN", 1818, FieldType.INT8, switch_input_pin_e); + public static final Field TCUDOWNSHIFTBUTTONPIN = Field.create("TCUDOWNSHIFTBUTTONPIN", 1819, FieldType.INT8, switch_input_pin_e); public static final Field THROTTLEPEDALUPVOLTAGE = Field.create("THROTTLEPEDALUPVOLTAGE", 1884, FieldType.FLOAT); public static final Field THROTTLEPEDALWOTVOLTAGE = Field.create("THROTTLEPEDALWOTVOLTAGE", 1888, FieldType.FLOAT); public static final Field STARTUPFUELPUMPDURATION = Field.create("STARTUPFUELPUMPDURATION", 1892, FieldType.INT16); @@ -3078,8 +3078,8 @@ public class Fields { BINARYSERIALRXPIN, AUXVALVES1, AUXVALVES2, - UNUSEDCONSOLESERIALTXPIN, - UNUSEDCONSOLESERIALRXPIN, + TCUUPSHIFTBUTTONPIN, + TCUDOWNSHIFTBUTTONPIN, THROTTLEPEDALUPVOLTAGE, THROTTLEPEDALWOTVOLTAGE, STARTUPFUELPUMPDURATION,