From 81c050a75b20e787382e93f29b10517e61f5dc16 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 16 Jan 2024 11:53:09 -0500 Subject: [PATCH] only: dead ET camaro --- .../config/engines/chevrolet_camaro_4.cpp | 86 ------------------- firmware/config/engines/chevrolet_camaro_4.h | 12 --- firmware/config/engines/engines.mk | 1 - .../controllers/algo/engine_configuration.cpp | 5 +- firmware/controllers/algo/engine_types.h | 2 +- .../tests/trigger/test_trigger_decoder.cpp | 2 - 6 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 firmware/config/engines/chevrolet_camaro_4.cpp delete mode 100644 firmware/config/engines/chevrolet_camaro_4.h diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp deleted file mode 100644 index 7ab2ccb359..0000000000 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * @file chevrolet_camaro_4.cpp - * - * CAMARO_4 - * set engine_type 35 - * - * @date Oct 16, 2015 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "pch.h" - -#include "chevrolet_camaro_4.h" -#include "custom_engine.h" - -void setCamaro4() { - setFrankensoConfiguration(); - - - setAlgorithm(LM_SPEED_DENSITY); - - engineConfiguration->displacement = 5.7; - engineConfiguration->cylindersCount = 8; - strcpy(engineConfiguration->engineMake, ENGINE_MAKE_GM); - - engineConfiguration->firingOrder = FO_1_8_7_2_6_5_4_3; - engineConfiguration->triggerInputPins[0] = Gpio::A5; - engineConfiguration->triggerInputPins[1] = Gpio::C6; - - engineConfiguration->injectionMode = IM_BATCH; - - // set ignition_mode 2 - engineConfiguration->ignitionMode = IM_WASTED_SPARK; - - setCrankOperationMode(); - engineConfiguration->trigger.type = trigger_type_e::TT_GM_24x; - - engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; // PA0 - - engineConfiguration->mafAdcChannel = EFI_ADC_NONE; - - - engineConfiguration->tps1_1AdcChannel = EFI_ADC_2; - - // todo: move this into trigger definition - // set global_trigger_offset_angle 50 - engineConfiguration->globalTriggerAngleOffset = 50; - - engineConfiguration->iat.adcChannel = EFI_ADC_11; - - engineConfiguration->clt.adcChannel = EFI_ADC_12; - engineConfiguration->clt.config.bias_resistor = 2700; - - engineConfiguration->vbattAdcChannel = EFI_ADC_14; - - engineConfiguration->afr.hwChannel = EFI_ADC_13; - - - engineConfiguration->idle.solenoidPin = Gpio::Unassigned; - engineConfiguration->fuelPumpPin = Gpio::Unassigned; - - engineConfiguration->injectionPins[0] = Gpio::E6; - engineConfiguration->injectionPins[1] = Gpio::E5; - engineConfiguration->injectionPins[2] = Gpio::D7; - engineConfiguration->injectionPins[3] = Gpio::C13; - engineConfiguration->injectionPins[4] = Gpio::E3; - engineConfiguration->injectionPins[5] = Gpio::E4; - engineConfiguration->injectionPins[6] = Gpio::D3; - engineConfiguration->injectionPins[7] = Gpio::E2; - - - engineConfiguration->ignitionPins[0] = Gpio::C9; - engineConfiguration->ignitionPins[1] = Gpio::C7; - engineConfiguration->ignitionPins[2] = Gpio::E14; - engineConfiguration->ignitionPins[3] = Gpio::E12; - engineConfiguration->ignitionPins[4] = Gpio::E10; - engineConfiguration->ignitionPins[5] = Gpio::E8; - engineConfiguration->ignitionPins[6] = Gpio::D9; - engineConfiguration->ignitionPins[7] = Gpio::D8; - - engineConfiguration->fuelPumpPin = Gpio::B8; - engineConfiguration->fanPin = Gpio::Unassigned; - engineConfiguration->mainRelayPin = Gpio::D5; -} - - diff --git a/firmware/config/engines/chevrolet_camaro_4.h b/firmware/config/engines/chevrolet_camaro_4.h deleted file mode 100644 index 21d8afbf64..0000000000 --- a/firmware/config/engines/chevrolet_camaro_4.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * @file chevrolet_camaro_4.h - * - * @date Oct 16, 2015 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once -#include "engine_configuration.h" - -void setCamaro4(); - diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 4163903dd5..3dfeb545af 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -36,7 +36,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/vw.cpp \ $(PROJECT_DIR)/config/engines/vw_b6.cpp \ $(PROJECT_DIR)/config/engines/canam.cpp \ - $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ $(PROJECT_DIR)/config/engines/toyota_1NZ_FE.cpp \ $(PROJECT_DIR)/config/engines/ford_festiva.cpp \ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 479cc4ea41..e94edf642d 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -75,7 +75,6 @@ #include "sachs.h" #include "vw.h" #include "vw_b6.h" -#include "chevrolet_camaro_4.h" #include "toyota_jzs147.h" #include "toyota_1NZ_FE.h" #include "mitsubishi_3A92.h" @@ -1011,9 +1010,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case engine_type_e::SACHS: setSachs(); break; - case engine_type_e::CAMARO_4: - setCamaro4(); - 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 7d1bb717fb..e6255e8f39 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -96,7 +96,7 @@ enum class engine_type_e : uint16_t { HELLEN_NA6 = 34, - CAMARO_4 = 35, + ET_UNUSED_35 = 35, HELLEN_128_MERCEDES_4_CYL = 36, diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index 6e52eb6574..4f57d6bd66 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -366,8 +366,6 @@ TEST(trigger, testTriggerDecoder) { testTriggerDecoder2("test1+1", engine_type_e::DEFAULT_FRANKENSO, 0, 0.7500, 0.2500); - testTriggerDecoder2("CAMARO_4", engine_type_e::CAMARO_4, 40, 0.5, 0); - testTriggerDecoder2("neon NGC4", engine_type_e::DODGE_NEON_2003_CRANK, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP); {