From f456799310f43f3228ce5da1d4d8c21ab7f51fa8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 2 May 2020 22:06:11 -0400 Subject: [PATCH] reducing confusion? --- firmware/controllers/algo/engine_configuration.cpp | 2 -- firmware/integration/rusefi_config.txt | 4 ++-- firmware/tunerstudio/rusefi.input | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index bff36419d5..bff122ee79 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -367,8 +367,6 @@ void setDefaultBasePins(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->useSerialPort = true; engineConfiguration->binarySerialTxPin = GPIOC_10; engineConfiguration->binarySerialRxPin = GPIOC_11; - engineConfiguration->consoleSerialTxPin = GPIOC_10; - engineConfiguration->consoleSerialRxPin = GPIOC_11; engineConfiguration->tunerStudioSerialSpeed = TS_DEFAULT_SPEED; engineConfiguration->uartConsoleSerialSpeed = 115200; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 42ebe2ee44..eaf5a567b7 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1032,8 +1032,8 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ brain_pin_e binarySerialRxPin; brain_pin_e[AUX_DIGITAL_VALVE_COUNT iterate] auxValves - brain_pin_e consoleSerialTxPin; todo: finish pin migration from hard-coded to configurable? - brain_pin_e consoleSerialRxPin;todo: finish pin migration from hard-coded to configurable? + brain_pin_e unusedConsoleSerialTxPin; todo: finish pin migration from hard-coded to configurable? + brain_pin_e unusedConsoleSerialRxPin;todo: finish pin migration from hard-coded to configurable? float[ENGINE_NOISE_CURVE_SIZE] knockNoise;Knock sensor output knock detection threshold depending on current RPM;"v", 1, 0, 0.0, 10, 2 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 9854d80876..693e29d5f4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2480,8 +2480,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = tsPort, "TunerStudio Port" field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "Use UART/TTL serial?", useSerialPort - field = "RX pin", binarySerialRxPin, {useSerialPort == 1} field = "TX pin", binarySerialTxPin, {useSerialPort == 1} + field = "RX pin", binarySerialRxPin, {useSerialPort == 1} field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed dialog = canBus, "CAN Bus"