diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index d70247e07c..8083c5acee 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -381,7 +381,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // engineConfiguration->clutchUpPin = GPIOA_14; // note SWCLK - conflict with SWD engineConfiguration->clutchUpPinMode = PI_PULLUP; - engineConfiguration->activateAuxPid1 = true; engineConfiguration->auxPidPins[0] = GPIOD_5; // playing with AUX PID for alternator engineConfiguration->auxPidFrequency[0] = 300; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 6771c5098f..fe6c7210fd 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -276,8 +276,6 @@ void setMazdaNB2VVTSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->auxPid[0].offset = 33; engineConfiguration->auxPid[0].minValue = 24; engineConfiguration->auxPid[0].maxValue = 44; - - engineConfiguration->activateAuxPid1 = true; // todo: remove this field? } static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index 7708e94fd6..62463b0cc5 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -166,7 +166,6 @@ void vag_18_Turbo(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // VVT Settings - engineConfiguration->activateAuxPid1 = true; engineConfiguration->auxPidFrequency[0] = 300; engineConfiguration->fsio_setting[0] = 0.0; engineConfiguration->auxPid[0].pFactor = 2; diff --git a/firmware/controllers/actuators/vvt_pid.cpp b/firmware/controllers/actuators/vvt_pid.cpp index 3d501939d5..932165c907 100644 --- a/firmware/controllers/actuators/vvt_pid.cpp +++ b/firmware/controllers/actuators/vvt_pid.cpp @@ -36,20 +36,6 @@ static fsio8_Map3D_u8t vvtTable2("vvt#2"); static Logging *logger; -static bool isEnabled(int index) { - // todo: implement bit arrays for configuration - switch(index) { - case 0: - return engineConfiguration->activateAuxPid1; - case 1: - return engineConfiguration->activateAuxPid2; - case 2: - return engineConfiguration->activateAuxPid3; - default: - return engineConfiguration->activateAuxPid4; - } -} - class AuxPidController : public PeriodicTimerController { public: @@ -114,10 +100,6 @@ private: static AuxPidController instances[CAM_INPUTS_COUNT]; static void turnAuxPidOn(int index) { - if (!isEnabled(index)) { - return; - } - if (!isBrainPinValid(engineConfiguration->auxPidPins[index])) { return; } @@ -126,7 +108,8 @@ static void turnAuxPidOn(int index) { &engine->executor, engineConfiguration->auxPidPins[index], &instances[index].auxOutputPin, - engineConfiguration->auxPidFrequency[index], 0.1); + // todo: do we need two separate frequencies? + engineConfiguration->auxPidFrequency[0], 0.1); } void startAuxPins() {