From b087f328f7a91655285f72de2b766e864f46c9dd Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 11 Mar 2021 21:16:24 -0800 Subject: [PATCH] default config, UI tweaks (#2444) * s * fix this while we're at it Co-authored-by: Matthew Kennedy --- .../config/boards/hellen/hellen72/prepend.txt | 1 + .../boards/me7_pnp/board_configuration.cpp | 17 ----------------- firmware/config/boards/microrusefi/prepend.txt | 1 + .../boards/nucleo_f767/board_configuration.cpp | 11 ----------- .../boards/prometheus/board_configuration.cpp | 3 --- firmware/config/boards/proteus/prepend.txt | 1 + .../boards/subaru_eg33/board_configuration.cpp | 7 ------- firmware/config/engines/test_engine.cpp | 5 ----- .../controllers/algo/engine_configuration.cpp | 3 --- firmware/controllers/bench_test.cpp | 2 +- firmware/integration/rusefi_config.txt | 1 + firmware/tunerstudio/rusefi.input | 16 ++++++++-------- 12 files changed, 13 insertions(+), 55 deletions(-) diff --git a/firmware/config/boards/hellen/hellen72/prepend.txt b/firmware/config/boards/hellen/hellen72/prepend.txt index c7723511d1..66045a7623 100644 --- a/firmware/config/boards/hellen/hellen72/prepend.txt +++ b/firmware/config/boards/hellen/hellen72/prepend.txt @@ -16,6 +16,7 @@ #define ts_show_tunerstudio_port false #define ts_show_can2 false #define ts_show_software_knock true +#define ts_show_hardware_simulator false #define show_test_presets false #define show_Frankenso_presets false diff --git a/firmware/config/boards/me7_pnp/board_configuration.cpp b/firmware/config/boards/me7_pnp/board_configuration.cpp index 4bfe834c47..a101e79ac6 100644 --- a/firmware/config/boards/me7_pnp/board_configuration.cpp +++ b/firmware/config/boards/me7_pnp/board_configuration.cpp @@ -44,22 +44,9 @@ void setBoardConfigurationOverrides(void) { // NOT USED engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE; - engineConfiguration->displayMode = DM_NONE; - engineConfiguration->HD44780_rs = GPIO_UNASSIGNED; - engineConfiguration->HD44780_e = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db4 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db5 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db6 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db7 = GPIO_UNASSIGNED; for (int i = 0; i < DIGIPOT_COUNT; i++) { engineConfiguration->digitalPotentiometerChipSelect[i] = GPIO_UNASSIGNED; } - engineConfiguration->triggerSimulatorPins[1] = GPIO_UNASSIGNED; - engineConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; - engineConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; - engineConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; - engineConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; - engineConfiguration->max31855spiDevice = SPI_NONE; engineConfiguration->warningLedPin = GPIO_UNASSIGNED; engineConfiguration->runningLedPin = GPIO_UNASSIGNED; engineConfiguration->useStepperIdle = false; @@ -67,10 +54,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED; engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED; engineConfiguration->stepperEnablePinMode = OM_DEFAULT; - engineConfiguration->injectionPins[8] = GPIO_UNASSIGNED; - engineConfiguration->injectionPins[9] = GPIO_UNASSIGNED; - engineConfiguration->injectionPins[10] = GPIO_UNASSIGNED; - engineConfiguration->injectionPins[11] = GPIO_UNASSIGNED; engineConfiguration->isHip9011Enabled = false; } diff --git a/firmware/config/boards/microrusefi/prepend.txt b/firmware/config/boards/microrusefi/prepend.txt index 2eefade3be..ca89f8a97b 100644 --- a/firmware/config/boards/microrusefi/prepend.txt +++ b/firmware/config/boards/microrusefi/prepend.txt @@ -18,6 +18,7 @@ #define ts_show_main_relay_microRusEFI_message true #define ts_show_can2 false #define ts_show_software_knock true +#define ts_show_hardware_simulator false #define show_test_presets false #define show_Frankenso_presets false diff --git a/firmware/config/boards/nucleo_f767/board_configuration.cpp b/firmware/config/boards/nucleo_f767/board_configuration.cpp index f9a539bd8c..f529872b9a 100644 --- a/firmware/config/boards/nucleo_f767/board_configuration.cpp +++ b/firmware/config/boards/nucleo_f767/board_configuration.cpp @@ -53,14 +53,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_NONE; // not used - engineConfiguration->externalKnockSenseAdc = EFI_ADC_NONE; - engineConfiguration->displayMode = DM_NONE; - engineConfiguration->HD44780_rs = GPIO_UNASSIGNED; - engineConfiguration->HD44780_e = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db4 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db5 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db6 = GPIO_UNASSIGNED; - engineConfiguration->HD44780_db7 = GPIO_UNASSIGNED; for (int i = 0; i < DIGIPOT_COUNT ; i++) { engineConfiguration->digitalPotentiometerChipSelect[i] = GPIO_UNASSIGNED; } @@ -70,9 +62,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; - engineConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; - engineConfiguration->max31855spiDevice = SPI_NONE; - ///////////////////////////////////////////////////////// engineConfiguration->is_enabled_spi_1 = false; engineConfiguration->is_enabled_spi_2 = false; diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 3a6074df42..e2c4405ba2 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -217,9 +217,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; - engineConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; - engineConfiguration->max31855spiDevice = SPI_NONE; - ///////////////////////////////////////////////////////// engineConfiguration->is_enabled_spi_1 = true; diff --git a/firmware/config/boards/proteus/prepend.txt b/firmware/config/boards/proteus/prepend.txt index 4646bd0c5b..ed85ffd42a 100644 --- a/firmware/config/boards/proteus/prepend.txt +++ b/firmware/config/boards/proteus/prepend.txt @@ -12,6 +12,7 @@ #define ts_show_tunerstudio_port false #define ts_show_can2 false #define ts_show_software_knock true +#define ts_show_hardware_simulator false #define show_Frankenso_presets false #define show_Hellen_presets false diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp index 92b2e3a522..31c0f966d2 100644 --- a/firmware/config/boards/subaru_eg33/board_configuration.cpp +++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp @@ -166,9 +166,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->digitalPotentiometerChipSelect[3] = GPIO_UNASSIGNED; engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED; - engineConfiguration->digitalPotentiometerSpiDevice = SPI_NONE; - engineConfiguration->max31855spiDevice = SPI_NONE; - ///////////////////////////////////////////////////////// engineConfiguration->is_enabled_spi_1 = true; @@ -229,10 +226,6 @@ void setBoardConfigurationOverrides(void) { engineConfiguration->triggerSimulatorPinModes[1] = OM_DEFAULT; engineConfiguration->triggerSimulatorPinModes[2] = OM_DEFAULT; - engineConfiguration->logicAnalyzerPins[0] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[2] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[3] = GPIO_UNASSIGNED; //!!!!!!!!!!!!!!!!!!! //engineConfiguration->silentTriggerError = true; diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index 026cdd2d95..4884980bde 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -51,11 +51,6 @@ void setTestEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; // #4 engineConfiguration->ignitionPins[4] = GPIO_UNASSIGNED; // #5 engineConfiguration->ignitionPins[5] = GPIO_UNASSIGNED; // #6 - - engineConfiguration->logicAnalyzerPins[0] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[2] = GPIO_UNASSIGNED; - engineConfiguration->logicAnalyzerPins[3] = GPIO_UNASSIGNED; } void setTestVVTEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 748f69e60e..36d581afec 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1093,9 +1093,6 @@ void setDefaultFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->triggerInputPins[0] = GPIOC_6; engineConfiguration->triggerInputPins[1] = GPIOA_5; - //engineConfiguration->logicAnalyzerPins[1] = GPIOE_5; // GPIOE_5 is a popular option (if available) - - // set this to SPI_DEVICE_3 to enable stimulation //engineConfiguration->digitalPotentiometerSpiDevice = SPI_DEVICE_3; engineConfiguration->digitalPotentiometerChipSelect[0] = GPIOD_7; diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index 36ef3c662a..4fb29c9c78 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -89,7 +89,7 @@ static void runBench(brain_pin_e brainPin, OutputPin *output, float delayMs, flo return; } - scheduleMsg(logger, "Running bench: ON_TIME=%.2f us OFF_TIME=%.2f us Counter=%d", onTimeUs, offTimeUs, count); + scheduleMsg(logger, "Running bench: ON_TIME=%d us OFF_TIME=%d us Counter=%d", onTimeUs, offTimeUs, count); scheduleMsg(logger, "output on %s", hwPortname(brainPin)); chThdSleepMicroseconds(delayUs); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ded0b27ff7..d1c9ed9b08 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1954,6 +1954,7 @@ end_struct #define ts_show_auxserial_pins true #define ts_show_can2 true #define ts_show_software_knock false +#define ts_show_hardware_simulator true #define show_test_presets true #define show_Frankenso_presets true diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3a291f12c7..490bb306ec 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3391,7 +3391,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency commandButton = "Enable internal trigger simulation", cmd_enable_self_stim - commandButton = "Enable external trigger simulation", cmd_enable_ext_stim + commandButton = "Enable external trigger simulation", cmd_enable_ext_stim @@if_ts_show_hardware_simulator commandButton = "Disable trigger simulation", cmd_disable_self_stim ; field = "" ; field = "digipot spi", digitalPotentiometerSpiDevice @@ -3399,13 +3399,13 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" ; field = "digipot CS #1", digitalPotentiometerChipSelect2 ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 - field = "" - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 + field = ""@@if_ts_show_hardware_simulator + field = "trigger stimulator pin #1", triggerSimulatorPins1@@if_ts_show_hardware_simulator + field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1@@if_ts_show_hardware_simulator + field = "trigger stimulator pin #2", triggerSimulatorPins2@@if_ts_show_hardware_simulator + field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2@@if_ts_show_hardware_simulator + field = "trigger stimulator pin #3", triggerSimulatorPins3@@if_ts_show_hardware_simulator + field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3@@if_ts_show_hardware_simulator field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2