diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d538f6f0f5..d78cbf8d6e 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 Tue Oct 11 21:20:18 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Oct 13 14:12:25 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -660,7 +660,11 @@ typedef struct { /** * offset 572 */ - int unusedJoy[5]; + uart_device_e consoleUartDevice; + /** + * offset 576 + */ + int unusedJoy[4]; /** * This pin is used for debugging - snap a logic analyzer on it and see if it's ever high * offset 592 @@ -1968,4 +1972,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Oct 11 21:20:18 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Oct 13 14:12:25 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 4d00bdbcf8..fe70bff673 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -388,6 +388,17 @@ typedef enum { Force_4b_cranking_ignition_mode = ENUM_32_BITS, } cranking_ignition_mode_e; +typedef enum { + UART_NONE = 0, + UART_DEVICE_1 = 1, + UART_DEVICE_2 = 2, + UART_DEVICE_3 = 3, + UART_DEVICE_4 = 4, + + Force_4b_uart_device = ENUM_32_BITS, +} uart_device_e; + + typedef enum { SPI_NONE = 0, SPI_DEVICE_1 = 1, diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 61c1a337d3..1fb6a44bed 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -504,7 +504,8 @@ #define gpioPinModes14_offset 1184 #define gpioPinModes15_offset 1188 #define gpioPinModes16_offset 1192 -#define unusedJoy_offset 1196 +#define consoleUartDevice_offset 1196 +#define unusedJoy_offset 1200 #define triggerErrorPin_offset 1216 #define triggerErrorPinMode_offset 1220 #define acRelayPin_offset 1224 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index e3c27f9c0c..cf1ecab72a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -511,7 +511,11 @@ bit is_enabled_spi_2 brain_pin_e[LE_COMMAND_COUNT iterate] fsioPins; pin_output_mode_e[LE_COMMAND_COUNT iterate] gpioPinModes; - int[5] unusedJoy; +custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3" + uart_device_e consoleUartDevice; + brain_pin_e console_rx_pin; + brain_pin_e console_tx_pin; + int[2] unusedJoy; brain_pin_e triggerErrorPin;This pin is used for debugging - snap a logic analyzer on it and see if it's ever high diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 04ac551b8a..1e53494cce 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,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 Tue Oct 11 21:20:18 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Oct 13 14:12:25 EDT 2016 pageSize = 16376 page = 1 @@ -340,7 +340,8 @@ page = 1 gpioPinModes14 = bits, U32, 1184, [0:1], "default", "default inverted", "open collector", "open collector inverted" gpioPinModes15 = bits, U32, 1188, [0:1], "default", "default inverted", "open collector", "open collector inverted" gpioPinModes16 = bits, U32, 1192, [0:1], "default", "default inverted", "open collector", "open collector inverted" -;skipping unusedJoy offset 1196 + consoleUartDevice = bits,U32, 1196, [0:1], "Off", "UART1", "UART2", "UART3" +;skipping unusedJoy offset 1200 triggerErrorPin = bits, U32, 1216, [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" triggerErrorPinMode = bits, U32, 1220, [0:1], "default", "default inverted", "open collector", "open collector inverted" acRelayPin = bits, U32, 1224, [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" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index aa232a879c..1c90065d44 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 Tue Oct 11 21:20:18 EDT 2016 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Oct 13 14:12:25 EDT 2016 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -508,7 +508,8 @@ public class Fields { public static final int gpioPinModes14_offset = 1184; public static final int gpioPinModes15_offset = 1188; public static final int gpioPinModes16_offset = 1192; - public static final int unusedJoy_offset = 1196; + public static final int consoleUartDevice_offset = 1196; + public static final int unusedJoy_offset = 1200; public static final int triggerErrorPin_offset = 1216; public static final int triggerErrorPinMode_offset = 1220; public static final int acRelayPin_offset = 1224; @@ -1259,6 +1260,7 @@ public class Fields { public static final Field GPIOPINMODES14 = Field.create("GPIOPINMODES14", 1184, FieldType.INT, pin_output_mode_e); public static final Field GPIOPINMODES15 = Field.create("GPIOPINMODES15", 1188, FieldType.INT, pin_output_mode_e); public static final Field GPIOPINMODES16 = Field.create("GPIOPINMODES16", 1192, FieldType.INT, pin_output_mode_e); + public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 1196, FieldType.INT); public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e); public static final Field TRIGGERERRORPINMODE = Field.create("TRIGGERERRORPINMODE", 1220, FieldType.INT, pin_output_mode_e); public static final Field ACRELAYPIN = Field.create("ACRELAYPIN", 1224, FieldType.INT, brain_pin_e);