From e17915254cc75bd73668f3e8de455c4200266e4b Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 16 Jan 2024 20:32:23 -0500 Subject: [PATCH] only: dead MRE miata --- .../config/engines/mazda/mazda_miata_1_6.cpp | 66 ------------------- .../config/engines/mazda/mazda_miata_1_6.h | 2 - .../controllers/algo/engine_configuration.cpp | 4 +- firmware/controllers/algo/engine_types.h | 2 +- 4 files changed, 2 insertions(+), 72 deletions(-) diff --git a/firmware/config/engines/mazda/mazda_miata_1_6.cpp b/firmware/config/engines/mazda/mazda_miata_1_6.cpp index 4d387458ee..609d13478e 100644 --- a/firmware/config/engines/mazda/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda/mazda_miata_1_6.cpp @@ -267,72 +267,6 @@ void setMiataNA6_MAP_Frankenso() { engineConfiguration->ignitionPins[3] = Gpio::Unassigned; } - -/** - * set engine_type 66 - */ -void setMiataNA6_MAP_MRE() { - miataNAcommonEngineSettings(); - - engineConfiguration->triggerInputPins[0] = Gpio::A5; - engineConfiguration->triggerInputPins[1] = Gpio::C6; - engineConfiguration->camInputs[0] = Gpio::Unassigned; - - engineConfiguration->fuelPumpPin = Gpio::Unassigned; - - engineConfiguration->useIacTableForCoasting = true; - engineConfiguration->idlePidDeactivationTpsThreshold = 90; - - engineConfiguration->idleRpmPid.pFactor = 0.01; - engineConfiguration->idleRpmPid.iFactor = 0.02; - engineConfiguration->idle_derivativeFilterLoss = 0.1; - engineConfiguration->idle_antiwindupFreq = 0.1; - engineConfiguration->idleRpmPid.dFactor = 0.002; - engineConfiguration->acIdleExtraOffset = 15; - engineConfiguration->idleRpmPid.minValue = -7; - engineConfiguration->idleRpmPid.maxValue = 35; - engineConfiguration->idleRpmPid.periodMs = 40; - engineConfiguration->idlerpmpid_iTermMin = -6; - engineConfiguration->idlerpmpid_iTermMax = 30; - engineConfiguration->pidExtraForLowRpm = 25; - engineConfiguration->idlePidRpmDeadZone = 25; - engineConfiguration->idlePidRpmUpperLimit = 1000; - - engineConfiguration->useIdleTimingPidControl = true; - engineConfiguration->idleTimingPid.pFactor = 0.05; - engineConfiguration->idleTimingPid.iFactor = 0.0; - engineConfiguration->idleTimingPid.dFactor = 0.0; - engineConfiguration->idleTimingPid.minValue = -13; - engineConfiguration->idleTimingPid.maxValue = 13; - - // EFI_ADC_3: "22 - AN temp 4" - engineConfiguration->acSwitch = Gpio::A3; - -#if HW_MICRO_RUSEFI - // todo: ask Stefan to clarify this - engineConfiguration->tps1_1AdcChannel = MRE_IN_ANALOG_VOLT_2; // "26 - AN volt 2" - engineConfiguration->tpsMin = 0; - engineConfiguration->tpsMax = 982; - - engineConfiguration->map.sensor.hwChannel = MRE_IN_ANALOG_VOLT_5; // "20 - AN volt 5" - - engineConfiguration->mafAdcChannel = MRE_IN_ANALOG_VOLT_9; // "40 - AN volt 9" -#endif // HW_MICRO_RUSEFI - - -#if (BOARD_TLE8888_COUNT > 0) - // Gpio::G1: "Clutch Switch" - engineConfiguration->clutchDownPin = Gpio::G1; - - engineConfiguration->fanPin = Gpio::Unassigned; - - - // Gpio::TLE8888_PIN_23: "33 - GP Out 3" - engineConfiguration->malfunctionIndicatorPin = MRE_GPOUT_3; - -#endif /* BOARD_TLE8888_COUNT */ -} - void setHellenNA94() { miataNAcommonEngineSettings(); strcpy(engineConfiguration->engineCode, "94"); diff --git a/firmware/config/engines/mazda/mazda_miata_1_6.h b/firmware/config/engines/mazda/mazda_miata_1_6.h index 6cec33c4ce..6b8cb88507 100644 --- a/firmware/config/engines/mazda/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda/mazda_miata_1_6.h @@ -14,8 +14,6 @@ */ void setMiataNA6_MAP_Frankenso(); -void setMiataNA6_MAP_MRE(); - /** * set engine_type 20 */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index f1781e0957..f487993a1e 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -734,9 +734,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e setEngineBMW_M73_microRusEfi(); break; case engine_type_e::UNUSED_20: - case engine_type_e::MRE_MIATA_NA6_MAP: - setMiataNA6_MAP_MRE(); - break; + case engine_type_e::ET_UNUSED_65: case engine_type_e::MRE_BODY_CONTROL: mreBCM(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 0d5511ad0c..3f04fad6a3 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -148,7 +148,7 @@ enum class engine_type_e : uint16_t { PROTEUS_BMW_M73 = 63, DODGE_RAM = 64, UNUSED_65 = 65, - MRE_MIATA_NA6_MAP = 66, + ET_UNUSED_65 = 66, PROTEUS_MIATA_NB2 = 67, MRE_M111 = 68,