diff --git a/firmware/config/engines/mazda/mazda_miata_vvt.cpp b/firmware/config/engines/mazda/mazda_miata_vvt.cpp index 1225330cae..78c08b0976 100644 --- a/firmware/config/engines/mazda/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda/mazda_miata_vvt.cpp @@ -59,6 +59,7 @@ #include "mre_meta.h" +#if HW_HELLEN static const float injectorLagBins[VBAT_INJECTOR_CURVE_SIZE] = { 6.0, 8.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0 @@ -388,150 +389,7 @@ static void setMazdaMiataEngineNB2Defaults() { engineConfiguration->driveWheelRevPerKm = 538; engineConfiguration->finalGearRatio = 3.909; } - -// MAZDA_MIATA_2003 -void setMazdaMiata2003EngineConfiguration() { - setFrankensoConfiguration(); - - setMazdaMiataEngineNB2Defaults(); - -// engineConfiguration->triggerInputPins[0] = Gpio::A8; // custom Frankenso wiring in order to use SPI1 for accelerometer - engineConfiguration->triggerInputPins[0] = Gpio::A5; // board still not modified - engineConfiguration->triggerInputPins[1] = Gpio::Unassigned; - engineConfiguration->camInputs[0] = Gpio::C6; - -// engineConfiguration->is_enabled_spi_1 = true; - - engineConfiguration->alternatorControlPin = Gpio::E10; - engineConfiguration->alternatorControlPinMode = OM_OPENDRAIN; - -// engineConfiguration->vehicleSpeedSensorInputPin = Gpio::A8; - - engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control - - // high-side driver with +12v VP jumper - engineConfiguration->tachOutputPin = Gpio::E8; // tachometer - - // set global_trigger_offset_angle 0 - engineConfiguration->globalTriggerAngleOffset = 0; - - // enable trigger_details - engineConfiguration->verboseTriggerSynchDetails = false; - - // set cranking_timing_angle 10 - engineConfiguration->crankingTimingAngle = 10; - -/** - * Saab attempt - * Saab coil on #1 PD8 extra blue wire - * Miata coil on #2 PC9 - orange ECU wire "2&3" - * Saab coil on #3 PD9 extra white wire - * Miata coil on #4 PE14 - white ECU wire "1&4" - */ - - engineConfiguration->ignitionPins[0] = Gpio::E14; - engineConfiguration->ignitionPins[1] = Gpio::Unassigned; - engineConfiguration->ignitionPins[2] = Gpio::C9; - engineConfiguration->ignitionPins[3] = Gpio::Unassigned; - - - - engineConfiguration->malfunctionIndicatorPin = Gpio::D5; - - -// engineConfiguration->malfunctionIndicatorPin = Gpio::D9; -// engineConfiguration->malfunctionIndicatorPinMode = OM_INVERTED; - - // todo: blue jumper wire - what is it?! - // Frankenso analog #6 pin 3R, W56 (5th lower row pin from the end) top <> W45 bottom jumper, not OEM - - - // see setFrankensoConfiguration - // map.sensor.hwChannel = EFI_ADC_0; W53 - - /** - * PA4 Wideband O2 Sensor - */ - // todo: re-wire the board to use "Frankenso analog #7 pin 3J, W48 top <>W48 bottom jumper, not OEM" - //engineConfiguration->afr.hwChannel = EFI_ADC_3; // PA3 - engineConfiguration->afr.hwChannel = EFI_ADC_4; - - // - /** - * Combined RPM, CLT and VBATT warning light - * - * to test - * set_fsio_setting 2 1800 - * set_fsio_setting 3 65 - * set_fsio_setting 4 15 - */ - engineConfiguration->scriptSetting[1] = 6500; // #2 RPM threshold - engineConfiguration->scriptSetting[2] = 105; // #3 CLT threshold - engineConfiguration->scriptSetting[3] = 12.0; // #4 voltage threshold - - // enable auto_idle - // set idle_p 0.05 - // set idle_i 0 - // set idle_d 0 - // set debug_mode 3 - // set idle_rpm 1700 - // see setDefaultIdleParameters - - engineConfiguration->adcVcc = 3.3f; - engineConfiguration->vbattDividerCoeff = 8.80f; - - // by the way NB2 MAF internal diameter is about 2.5 inches / 63mm - // 1K pull-down to read current from this MAF - engineConfiguration->mafAdcChannel = EFI_ADC_6; // PA6 W46 <> W46 - - engineConfiguration->throttlePedalUpVoltage = 0.65f; - - - // TLE7209 two-wire ETB control - // PWM - engineConfiguration->etb_use_two_wires = true; - - engineConfiguration->etbIo[0].controlPin = Gpio::Unassigned; - - // - engineConfiguration->etbIo[0].directionPin1 = Gpio::E12; // orange - // - engineConfiguration->etbIo[0].directionPin2 = Gpio::C7; // white/blue - - // set_analog_input_pin tps PC3 - engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; // PC3 blue - - // set_analog_input_pin pps PA2 -/* a step back - Frankenso does not use ETB - engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_2; -*/ - - //set etb_p 12 - engineConfiguration->etb.pFactor = 12; // a bit lower p-factor seems to work better on TLE9201? MRE? - engineConfiguration->etb.iFactor = 0; - engineConfiguration->etb.dFactor = 0; - engineConfiguration->etb.offset = 40; - engineConfiguration->etb.minValue = -60; - engineConfiguration->etb.maxValue = 50; - - config->crankingFuelCoef[0] = 2.8; // base cranking fuel adjustment coefficient - config->crankingFuelBins[0] = -20; // temperature in C - config->crankingFuelCoef[1] = 2.2; - config->crankingFuelBins[1] = -10; - config->crankingFuelCoef[2] = 1.8; - config->crankingFuelBins[2] = 5; - config->crankingFuelCoef[3] = 1.5; - config->crankingFuelBins[3] = 30; - - config->crankingFuelCoef[4] = 1.0; - config->crankingFuelBins[4] = 35; - config->crankingFuelCoef[5] = 1.0; - config->crankingFuelBins[5] = 50; - config->crankingFuelCoef[6] = 1.0; - config->crankingFuelBins[6] = 65; - config->crankingFuelCoef[7] = 1.0; - config->crankingFuelBins[7] = 90; -} +#endif // HW_HELLEN /** * https://github.com/rusefi/rusefi/wiki/HOWTO-TCU-A42DE-on-Proteus diff --git a/firmware/config/engines/mazda/mazda_miata_vvt.h b/firmware/config/engines/mazda/mazda_miata_vvt.h index 459bd0bb4d..94762abe91 100644 --- a/firmware/config/engines/mazda/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda/mazda_miata_vvt.h @@ -11,13 +11,6 @@ #include "engine_configuration.h" -/** - * Primary rusEfi test mule https://rusefi.com/forum/viewtopic.php?f=3&t=1095 - * MAZDA_MIATA_2003 - * set engine_type 47 - */ -void setMazdaMiata2003EngineConfiguration(); - /** * https://github.com/rusefi/rusefi/wiki/Mazda-Miata-2001 * set engine_type 1 diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index fe6b3efa01..9aaa283b48 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -978,9 +978,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::DODGE_RAM: setDodgeRam1996(); break; - case engine_type_e::FRANKENSO_MAZDA_MIATA_2003: - setMazdaMiata2003EngineConfiguration(); - break; case engine_type_e::TEST_ENGINE_VVT: setTestVVTEngineConfiguration(); break; diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 2ec9be4cb9..37f83fa444 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -120,10 +120,7 @@ enum class engine_type_e : uint16_t { DODGE_NEON_2003_CRANK = 46, - /** - * proper NB2 setup, 2003 red test mule car - */ - FRANKENSO_MAZDA_MIATA_2003 = 47, + UNUSED47 = 47, // todo: add wastegate case into HW CI TEST_DC_WASTEGATE_DISCOVERY = 48,