diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 1cd6af7855..85e8c2d7ce 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -355,91 +355,6 @@ void setL9779TestConfiguration() { engineConfiguration->l9779_cs = Gpio::D5; } -// TLE8888_BENCH_ENGINE -// todo: remove this? this was used to play with "secret" red boards prior to MRE reality -// set engine_type 59 -void setTle8888TestConfiguration() { - engineConfiguration->cylindersCount = 8; - engineConfiguration->firingOrder = FO_1_8_7_2_6_5_4_3; - engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; - engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL; - -#if defined(STM32_HAS_GPIOG) && STM32_HAS_GPIOG - engineConfiguration->ignitionPins[0] = Gpio::G3; - engineConfiguration->ignitionPins[1] = Gpio::G4; - engineConfiguration->ignitionPins[2] = Gpio::G5; - engineConfiguration->ignitionPins[3] = Gpio::G6; - engineConfiguration->ignitionPins[4] = Gpio::G7; - engineConfiguration->ignitionPins[5] = Gpio::G8; -#endif /* STM32_HAS_GPIOG */ - engineConfiguration->ignitionPins[6] = Gpio::C6; - engineConfiguration->ignitionPins[7] = Gpio::C7; - -#if (BOARD_TLE8888_COUNT > 0) - engineConfiguration->tle8888spiDevice = SPI_DEVICE_1; - engineConfiguration->tle8888_cs = Gpio::D5; - - // PB3 is nicely both SWO and SPI1 SCK so logic analyzer could be used on SWO header - engineConfiguration->spi1mosiPin = Gpio::B5; - engineConfiguration->spi1misoPin = Gpio::B4; - engineConfiguration->spi1sckPin = Gpio::B3; // please note that this pin is also SWO/SWD - Single Wire debug Output - engineConfiguration->is_enabled_spi_1 = true; - engineConfiguration->debugMode = DBG_TLE8888; - - engineConfiguration->fuelPumpPin = Gpio::TLE8888_PIN_20; -#endif /* BOARD_TLE8888_COUNT */ - - engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_9; // PB1 // just any non-empty value for now - // ETB #1 top one - closer to 121 connector - // DIS PF12 - // EN PF13 - // IN1 PF15 - // IN2 PF14 - // SF PF11 -#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF - engineConfiguration->etbIo[0].directionPin1 = Gpio::F15; - engineConfiguration->etbIo[0].directionPin2 = Gpio::F14; - engineConfiguration->etbIo[0].disablePin = Gpio::F12; -#endif /* STM32_HAS_GPIOF */ - engineConfiguration->etb_use_two_wires = true; - engineConfiguration->isHip9011Enabled = false; - - // ETB #2 - // DIS PE5 - // EN PE6 - // IN1 PE2 - // IN2 PE4 - // SF PE3 - - engineConfiguration->etbIo[0].directionPin1 = Gpio::E2; - engineConfiguration->etbIo[0].directionPin2 = Gpio::E4; - engineConfiguration->etbIo[0].disablePin = Gpio::E5; - - - engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3 - engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; // PA7 - -// engineConfiguration->etb.pFactor = 1.07; -// engineConfiguration->etb.iFactor = 0.18; -// engineConfiguration->etb.dFactor = 0.24; -// engineConfiguration->etb.offset = 80; - - engineConfiguration->etb.pFactor = 22; - engineConfiguration->etb.iFactor = 0; - engineConfiguration->etb.dFactor = 0; - engineConfiguration->etb.offset = 0; - - engineConfiguration->etb_iTermMin = -300; - engineConfiguration->etb_iTermMax = 300; - - // VAG test ETB, no divider on red board - direct 3v TPS sensor - // set tps_min 332 - engineConfiguration->tpsMin = 332; - // by the way this ETB has default position of ADC=74 which is about 4% - // set tps_max 540 - engineConfiguration->tpsMax = 799; -} - #if HW_PROTEUS /* * set engine_type 96 diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index 1e45b6d70e..45c55a3393 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -13,7 +13,6 @@ void runSchedulingPrecisionTestIfNeeded(void); void setDiscoveryPdm(); void setFrankensoBoardTestConfiguration(); void setEtbTestConfiguration(); -void setTle8888TestConfiguration(); void setL9779TestConfiguration(); void setEepromTestConfiguration(); diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f909379ec4..91366eea05 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -942,9 +942,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setEepromTestConfiguration(); #endif break; - case engine_type_e::TLE8888_BENCH_ENGINE: - setTle8888TestConfiguration(); - break; + case engine_type_e::UNUSED_59: case engine_type_e::FRANKENSO_MAZDA_MIATA_NA8: setFrankensoMazdaMiataNA8Configuration(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 04e97c7b7e..a3507e9950 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -152,7 +152,7 @@ enum class engine_type_e : uint16_t { ETB_BENCH_ENGINE = 58, - TLE8888_BENCH_ENGINE = 59, + UNUSED_59 = 59, L9779_BENCH_ENGINE = 60,