diff --git a/firmware/console/binary/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h index c62d9ac832..b54948a547 100644 --- a/firmware/console/binary/tunerstudio_configuration.h +++ b/firmware/console/binary/tunerstudio_configuration.h @@ -72,6 +72,7 @@ typedef struct { unsigned int clutchDownState : 1; // bit 12 unsigned int knockEverIndicator : 1; // bit 13 unsigned int knockNowIndicator : 1; // bit 14 + unsigned int brakePedalState : 1; // bit 15. 0 - not pressed, 1 = pressed float vehicleSpeedKph; // 76 unsigned int isTpsError : 1; // bit 0 unsigned int isCltError : 1; // bit 1 diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 4c7ecf7065..d053f0c8f5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -312,6 +312,8 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) { boardConfiguration->clutchDownPinMode = PI_PULLUP; boardConfiguration->clutchUpPin = GPIO_UNASSIGNED; boardConfiguration->clutchUpPinMode = PI_PULLUP; + engineConfiguration->brakePedalPin = GPIO_UNASSIGNED; + engineConfiguration->brakePedalPinMode = PI_PULLUP; boardConfiguration->gps_rx_pin = GPIO_UNASSIGNED; boardConfiguration->gps_tx_pin = GPIO_UNASSIGNED; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index e066ecf1ef..e0ba988f93 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 12 16:28:16 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1881,7 +1881,15 @@ typedef struct { /** * offset 2860 */ - int unused[47]; + brain_pin_e brakePedalPin; + /** + * offset 2864 + */ + pin_input_mode_e brakePedalPinMode; + /** + * offset 2868 + */ + int unused[45]; /** total size 3048*/ } engine_configuration_s; @@ -2096,4 +2104,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 12 16:28:16 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 9690c71b56..e644c7b052 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1379,8 +1379,12 @@ #define spi1MosiMode_offset_hex b24 #define spi1MisoMode_offset 2856 #define spi1MisoMode_offset_hex b28 -#define unused_offset 2860 -#define unused_offset_hex b2c +#define brakePedalPin_offset 2860 +#define brakePedalPin_offset_hex b2c +#define brakePedalPinMode_offset 2864 +#define brakePedalPinMode_offset_hex b30 +#define unused_offset 2868 +#define unused_offset_hex b34 #define le_formulas1_offset 3048 #define le_formulas1_offset_hex be8 #define le_formulas2_offset 3248 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9d4608dcb2..9bb90d51d8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -801,7 +801,9 @@ spi_device_e sdCardSpiDevice; pin_mode_e spi1SckMode; pin_mode_e spi1MosiMode; pin_mode_e spi1MisoMode; - int[47] unused; +brain_pin_e brakePedalPin + pin_input_mode_e brakePedalPinMode; + int[45] unused; end_struct diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 3544284106..3304131bcc 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:42:00 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 pageSize = 16376 page = 1 @@ -681,7 +681,9 @@ page = 1 spi1SckMode = bits, U32, 2848, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35" spi1MosiMode = bits, U32, 2852, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35" spi1MisoMode = bits, U32, 2856, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "PULLUP", "mode33", "mode34", "mode35" -;skipping unused offset 2860 + brakePedalPin = bits, U32, 2860, [0:6], "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", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + brakePedalPinMode = scalar, F32, 2864, "ms", 1, 0, 0, 200, 1 +;skipping unused offset 2868 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 461d15a768..75868a22fb 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 13 07:26:19 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -957,7 +957,9 @@ public class Fields { public static final int spi1SckMode_offset = 2848; public static final int spi1MosiMode_offset = 2852; public static final int spi1MisoMode_offset = 2856; - public static final int unused_offset = 2860; + public static final int brakePedalPin_offset = 2860; + public static final int brakePedalPinMode_offset = 2864; + public static final int unused_offset = 2868; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1672,6 +1674,8 @@ public class Fields { public static final Field SPI1SCKMODE = Field.create("SPI1SCKMODE", 2848, FieldType.INT, pin_mode_e); public static final Field SPI1MOSIMODE = Field.create("SPI1MOSIMODE", 2852, FieldType.INT, pin_mode_e); public static final Field SPI1MISOMODE = Field.create("SPI1MISOMODE", 2856, FieldType.INT, pin_mode_e); + public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2860, FieldType.INT, brain_pin_e); + public static final Field BRAKEPEDALPINMODE = Field.create("BRAKEPEDALPINMODE", 2864, FieldType.INT); public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT); public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT); public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);