diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 8400457a8c..2c780e9b9b 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -72,35 +72,6 @@ static const uint8_t miataNA8_maf_advance_table[16][16] = { {/*0 engineLoad=1.2 +29, /*12 5760.0*/+28, /*13 6173.0*/+28, /*14 6586.0*/+27, /*15 7000.0*/+27 } }; #endif -static void commonMiataNa() { - engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_MIATA_NA; - engineConfiguration->engineChartSize = 100; - - engineConfiguration->triggerInputPins[0] = Gpio::C6; // 2G YEL/BLU - engineConfiguration->triggerInputPins[1] = Gpio::A5; // 2E White CKP - - engineConfiguration->ignitionMode = IM_WASTED_SPARK; - - engineConfiguration->idle.solenoidFrequency = 160; - - // Frankenstein: high side #1 is PE8 - // Frankenstein: high side #2 is PE10 - // Frankenstein: high side #3 is PE12 - // Frankenstein: high side #4 is PE14 - // Frankenstein: high side #5 is PC9 - // Frankenstein: high side #6 is PC7 - - engineConfiguration->ignitionPins[0] = Gpio::E12; // Frankenstein: high side #3 - engineConfiguration->ignitionPins[1] = Gpio::E14; // Frankenstein: high side #4 - engineConfiguration->ignitionPins[2] = Gpio::Unassigned; - engineConfiguration->ignitionPins[3] = Gpio::Unassigned; - - engineConfiguration->cranking.baseFuel = 24; - - setCommonNTCSensor(&engineConfiguration->clt, 2700); - setCommonNTCSensor(&engineConfiguration->iat, 2700); -} - void common079721_2351() { engineConfiguration->engineChartSize = 300; @@ -132,42 +103,3 @@ void common079721_2351() { engineConfiguration->clt.adcChannel = EFI_ADC_11; } - -/** - * Tom tomiata, Frankenstein board - */ -void setFrankensteinMiata1996() { - commonMiataNa(); - engineConfiguration->displacement = 1.839; - -#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT - copyTable(config->ignitionTable, miataNA8_maf_advance_table); -#endif - - // upside down - engineConfiguration->triggerInputPins[0] = Gpio::A5; - engineConfiguration->triggerInputPins[1] = Gpio::C6; - - engineConfiguration->fuelPumpPin = Gpio::E4; - engineConfiguration->idle.solenoidPin = Gpio::E5; - - engineConfiguration->mafAdcChannel = EFI_ADC_1; - engineConfiguration->clt.adcChannel = EFI_ADC_11; - engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; - - engineConfiguration->ignitionPins[0] = Gpio::E12; // Frankenstein: high side #3 - engineConfiguration->ignitionPins[1] = Gpio::Unassigned; - engineConfiguration->ignitionPins[2] = Gpio::E14; // Frankenstein: high side #4 - engineConfiguration->ignitionPins[3] = Gpio::Unassigned; - - // harness is sequential but we have a limited board - engineConfiguration->crankingInjectionMode = IM_BATCH; - engineConfiguration->injectionMode = IM_BATCH; - - engineConfiguration->injectionPins[0] = Gpio::B9; // Frankenstein: low side - out #12 - engineConfiguration->injectionPins[1] = Gpio::B8; // Frankenstein: low side - out #11 - engineConfiguration->injectionPins[2] = Gpio::Unassigned; - engineConfiguration->injectionPins[3] = Gpio::Unassigned; - engineConfiguration->injectionPins[4] = Gpio::Unassigned; - engineConfiguration->injectionPins[5] = Gpio::Unassigned; -} diff --git a/firmware/config/engines/mazda_miata.h b/firmware/config/engines/mazda_miata.h index f41fc421b3..ecc77462a9 100644 --- a/firmware/config/engines/mazda_miata.h +++ b/firmware/config/engines/mazda_miata.h @@ -14,4 +14,3 @@ #include "engine_configuration.h" void common079721_2351(); -void setFrankensteinMiata1996(); diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h index 81a6a77d91..f6325e8839 100644 --- a/firmware/config/engines/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda_miata_1_6.h @@ -14,8 +14,6 @@ */ void setMiataNA6_MAP_Frankenso(); -void setMiataNA6_MAP_MRE(); - void miataNAcommonEngineSettings(); /** diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 6846f4fd72..004c182cd3 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -685,8 +685,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e break; case engine_type_e::ET_UNUSED_20: case engine_type_e::ET_UNUSED_66: - setMiataNA6_MAP_MRE(); - break; case engine_type_e::MRE_BODY_CONTROL: mreBCM(); break; @@ -861,9 +859,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::FORD_ESCORT_GT: setFordEscortGt(); break; - case engine_type_e::MIATA_1996: - setFrankensteinMiata1996(); - break; + case engine_type_e::ET_UNUSED_21: case engine_type_e::CITROEN_TU3JP: setCitroenBerlingoTU3JPConfiguration(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 7789bee68d..451b8d5bbc 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -50,7 +50,7 @@ enum class engine_type_e : uint32_t { // Frankenso board FRANKENSO_MIATA_NA6_MAP = 41, ET_UNUSED_20 = 20, - MIATA_1996 = 21, + ET_UNUSED_21 = 21, FORD_ESCORT_GT = 14,