diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 1e6e72876d..279ef5885e 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -126,88 +126,6 @@ void setBMW_M73_TwoCoilUnitTest() { m73engine(); } -// BMW_M73_M -// set engine_type 24 -void setEngineBMW_M73_Manhattan() { - m73engine(); - - /** -Nucleo boards - first step is to confirm that I can blink via each pin -going clockwise from top-right corner - -Gpio::A10 USD ID -Gpio::A11 USD DM -Gpio::A12 USD DP - -E_4: running - -Good GPIO: -Gpio::C9 ETB#1 -Gpio::C8 ETB#1 -Gpio::B8 ETB#2 -Gpio::B9 ETB#2 -Gpio::C5 -Gpio::A7 -Gpio::A6 - */ - - - engineConfiguration->fuelPumpPin = Gpio::Unassigned; - engineConfiguration->idle.solenoidPin = Gpio::Unassigned; - engineConfiguration->fanPin = Gpio::Unassigned; - - /** - * Yellow op-amp board - * - * AN5 tested pull-down 1M PA3 TPS1 orange wire - * AN6 tested pull-down 1M PA4 TPS2 - * AN7 tested pull-down 1M PA6 PPS - * AN8 tested no pull-down / no pull-up - */ - - - // For example TLE7209 - two control wires: - // PWM on both wires - one to open, another to close - // ETB motor NEG pin # - white wire - OUT 1 - // green input wire - engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_6; - // set_analog_input_pin tps PA3 - engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; // PA3 - // set_analog_input_pin tps2 PA4 - engineConfiguration->tps2_1AdcChannel = EFI_ADC_4; // PA4 - - // PWM pin - engineConfiguration->etbIo[0].controlPin = Gpio::Unassigned; - // DIR pin - engineConfiguration->etbIo[0].directionPin1 = Gpio::C8; - engineConfiguration->etbIo[0].directionPin2 = Gpio::C9; - engineConfiguration->etb_use_two_wires = true; - - // PWM pin - engineConfiguration->etbIo[1].controlPin = Gpio::Unassigned; - // DIR pin - engineConfiguration->etbIo[1].directionPin1 = Gpio::B9; - engineConfiguration->etbIo[1].directionPin2 = Gpio::B8; - - engineConfiguration->tps2Min = engineConfiguration->tpsMin; - engineConfiguration->tps2Max = engineConfiguration->tpsMax; - - - engineConfiguration->injectionPins[0] = Gpio::Unassigned; - engineConfiguration->injectionPins[1] = Gpio::Unassigned; - engineConfiguration->injectionPins[2] = Gpio::Unassigned; - engineConfiguration->injectionPins[3] = Gpio::Unassigned; - engineConfiguration->injectionPins[4] = Gpio::Unassigned; - engineConfiguration->injectionPins[5] = Gpio::Unassigned; - - engineConfiguration->injectionPins[6] = Gpio::Unassigned; - engineConfiguration->injectionPins[7] = Gpio::Unassigned; - engineConfiguration->injectionPins[8] = Gpio::Unassigned; - engineConfiguration->injectionPins[9] = Gpio::Unassigned; - engineConfiguration->injectionPins[10] = Gpio::Unassigned; - engineConfiguration->injectionPins[11] = Gpio::Unassigned; -} - /** * set engine_type 63 * diff --git a/firmware/config/engines/bmw_m73.h b/firmware/config/engines/bmw_m73.h index 1f6b3ff952..409fd81c4a 100644 --- a/firmware/config/engines/bmw_m73.h +++ b/firmware/config/engines/bmw_m73.h @@ -12,8 +12,7 @@ void m73engine(); void setBMW_M73_TwoCoilUnitTest(); -// set engine_type 24 -void setEngineBMW_M73_Manhattan(); + // set engine_type 63 void setEngineBMW_M73_Proteus(); diff --git a/firmware/config/engines/bmw_n73.cpp b/firmware/config/engines/bmw_n73.cpp deleted file mode 100644 index 63cec3d8cb..0000000000 --- a/firmware/config/engines/bmw_n73.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * bmw_n73.cpp - * - * @date Oct 2, 2021 - * @author Andrey Belomutskiy, (c) 2012-2021 - */ - -#include "pch.h" - -#include "bmw_n73.h" -#include "lua_lib.h" - -void setEngineProteusBMW_N73_GDI() { - -} - -/** - * set engine_type 9 - */ -void setEngineProteusGearboxManInTheMiddle() { -#include "bmw_6hp_mim.lua" -} diff --git a/firmware/config/engines/bmw_n73.h b/firmware/config/engines/bmw_n73.h deleted file mode 100644 index 8b70a0e479..0000000000 --- a/firmware/config/engines/bmw_n73.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * bmw_n73.h - * - * @date Oct 2, 2021 - * @author Andrey Belomutskiy, (c) 2012-2021 - */ - -#pragma once - -void setEngineProteusBMW_N73_GDI(); - -void setEngineProteusGearboxManInTheMiddle(); - diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 6bc7e49ac4..637fd3bcb1 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -6,7 +6,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73_mre.cpp \ $(PROJECT_DIR)/config/engines/f136.cpp \ - $(PROJECT_DIR)/config/engines/bmw_n73.cpp \ $(PROJECT_DIR)/config/engines/mazda/mazda_miata.cpp \ $(PROJECT_DIR)/config/engines/mazda/mazda_miata_base_maps.cpp \ $(PROJECT_DIR)/config/engines/mazda/mazda_miata_1_6.cpp \ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f6d6f5edfc..fe6b3efa01 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -37,7 +37,6 @@ #include "bmw_m52.h" #include "bmw_m73.h" -#include "bmw_n73.h" #include "canam.h" #include "custom_engine.h" @@ -797,9 +796,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::HONDA_OBD2A: setProteusHondaOBD2A(); break; - case engine_type_e::PROTEUS_E65_6H_MAN_IN_THE_MIDDLE: - setEngineProteusGearboxManInTheMiddle(); - break; case engine_type_e::PROTEUS_STIM_QC: proteusStimQc(); break; @@ -850,7 +846,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e #endif // HW_HELLEN_4CHAN #if HW_HELLEN_8CHAN - case engine_type_e::UNUSED_97: case engine_type_e::GM_SBC: setGmSbc(); break; @@ -936,9 +931,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::FRANKENSO_QA_ENGINE: setFrankensoBoardTestConfiguration(); break; - case engine_type_e::BMW_M73_M: - setEngineBMW_M73_Manhattan(); - break; case engine_type_e::DODGE_NEON_1995: setDodgeNeon1995EngineConfiguration(); break; @@ -965,7 +957,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setEepromTestConfiguration(); #endif break; - case engine_type_e::ET_UNUSED_56: case engine_type_e::MITSUBISHI_3A92: setMitsubishi3A92(); break; @@ -984,15 +975,12 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::FORD_ESCORT_GT: setFordEscortGt(); break; - case engine_type_e::UNUSED_21: - case engine_type_e::UNUSED_65: case engine_type_e::DODGE_RAM: setDodgeRam1996(); break; case engine_type_e::FRANKENSO_MAZDA_MIATA_2003: setMazdaMiata2003EngineConfiguration(); break; - case engine_type_e::ET_UNUSED_55: case engine_type_e::TEST_ENGINE_VVT: setTestVVTEngineConfiguration(); break; @@ -1002,7 +990,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::SACHS: setSachs(); break; - case engine_type_e::ET_UNUSED_35: case engine_type_e::TOYOTA_2JZ_GTE_VVTi: setToyota_2jz_vics(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index a8a95d432c..2ec9be4cb9 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -45,7 +45,7 @@ enum class engine_type_e : uint16_t { */ GY6_139QMB = 8, - PROTEUS_E65_6H_MAN_IN_THE_MIDDLE = 9, + UNUSED9 = 9, MAZDA_MIATA_NA96 = 10, FORD_COYOTE = 11, MITSUBISHI_3A92 = 12, @@ -71,7 +71,7 @@ enum class engine_type_e : uint16_t { * microRusEFI used as Body Control Module BCM BCU */ MRE_BODY_CONTROL = 23, - BMW_M73_M = 24, + UNUSED24 = 24, /** * See also MRE_SECONDARY_CAN @@ -194,7 +194,7 @@ enum class engine_type_e : uint16_t { SIMULATOR_CONFIG = 92, - PROTEUS_N73 = 93, + UNUSED93 = 93, HELLEN_NB1_36 = 94,