From 97a557a57e668d3335dc3f454b459098544eef78 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 6 Jun 2019 19:20:00 -0400 Subject: [PATCH] hiding GPS --- firmware/config/boards/microrusefi/prepend.txt | 1 + firmware/controllers/algo/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 1 + firmware/tunerstudio/rusefi.ini | 10 +++++----- firmware/tunerstudio/rusefi.input | 8 ++++---- firmware/tunerstudio/rusefi_frankenso.ini | 10 +++++----- firmware/tunerstudio/rusefi_microrusefi.ini | 7 ++----- firmware/tunerstudio/rusefi_prometheus.ini | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index be1de5e491..7639f8adc1 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -4,3 +4,4 @@ #define ts_show_lcd false #define ts_show_joystick false #define ts_show_egt false +#define ts_show_gps false diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 46e5c2a17c..d58c9b7435 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1760,6 +1760,7 @@ #define ts_show_egt true #define ts_show_etb true #define ts_show_full_pinout true +#define ts_show_gps true #define ts_show_hip9011 true #define ts_show_joystick true #define ts_show_lcd true diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 15340933c8..eb2b5b3339 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1212,4 +1212,5 @@ end_struct #define ts_show_lcd true #define ts_show_joystick true #define ts_show_egt true +#define ts_show_gps true diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 85d562ed4f..6af93291d7 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:54 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 06 19:19:21 EDT 2019 pageSize = 20000 page = 1 @@ -2618,8 +2618,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin + field = "GPS RX", gps_rx_pin + field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} @@ -3074,7 +3074,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode - dialog = gpsReceiver, "GPS Receiver" + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin @@ -3098,7 +3098,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = tsPort panel = canBus panel = sdCard - panel = gpsReceiver + panel = gpsReceiver panel = tle8888 dialog = joystickPanel, "Joystick" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 77efeb66cf..cdbd5dfea4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1684,8 +1684,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin + field = "GPS RX", gps_rx_pin @@if_ts_show_gps + field = "GPS TX", gps_tx_pin @@if_ts_show_gps field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} @@ -2140,7 +2140,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode - dialog = gpsReceiver, "GPS Receiver" + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin @@ -2164,7 +2164,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = tsPort panel = canBus panel = sdCard - panel = gpsReceiver + panel = gpsReceiver @@if_ts_show_gps panel = tle8888 dialog = joystickPanel, "Joystick" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 79ab38231a..ac2efc9ead 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:59 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 06 19:19:26 EDT 2019 pageSize = 20000 page = 1 @@ -2618,8 +2618,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin + field = "GPS RX", gps_rx_pin + field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} @@ -3074,7 +3074,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode - dialog = gpsReceiver, "GPS Receiver" + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin @@ -3098,7 +3098,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = tsPort panel = canBus panel = sdCard - panel = gpsReceiver + panel = gpsReceiver panel = tle8888 dialog = joystickPanel, "Joystick" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 200ad9bbb9..c42a1cf6f8 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:35:56 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 06 19:19:23 EDT 2019 pageSize = 20000 page = 1 @@ -2611,8 +2611,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} @@ -3067,7 +3065,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode - dialog = gpsReceiver, "GPS Receiver" + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin @@ -3091,7 +3089,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = tsPort panel = canBus panel = sdCard - panel = gpsReceiver panel = tle8888 dialog = joystickPanel, "Joystick" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index b82f6465ad..3c77881726 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -72,7 +72,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Wed Jun 05 21:36:01 EDT 2019 +; this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jun 06 19:19:28 EDT 2019 pageSize = 20000 page = 1 @@ -2615,8 +2615,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin + field = "GPS RX", gps_rx_pin + field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} @@ -3071,7 +3071,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode - dialog = gpsReceiver, "GPS Receiver" + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin @@ -3095,7 +3095,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = tsPort panel = canBus panel = sdCard - panel = gpsReceiver + panel = gpsReceiver panel = tle8888 dialog = joystickPanel, "Joystick"