diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 172e2e4a0b..9a62bbaaee 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -309,7 +309,7 @@ static void setCommonMazdaNB() { // second harmonic (aka double) is usually quieter background noise // 13.8 - engineConfiguration->knockBandCustom = 2 * HIP9011_BAND(engineConfiguration->cylinderBore); + engineConfiguration->knockBandCustom = 13.8; // set tps_min 90 engineConfiguration->tpsMin = 100; // convert 12to10 bit (ADC/4) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index dd854de21e..98b1f8fb8c 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -88,10 +88,6 @@ #include "electronic_throttle.h" #endif -#if EFI_HIP_9011 -#include "hip9011.h" -#endif - #include "hardware.h" #if EFI_PROD_CODE @@ -606,9 +602,8 @@ static void setDefaultEngineConfiguration() { engineConfiguration->acIdleRpmBump = 200; - /* these two are used for HIP9011 only - * Currently this is offset from fire event, not TDC */ - /* TODO: convert to offset from TDC */ + // Currently this is offset from fire event, not TDC + // TODO: convert to offset from TDC engineConfiguration->knockDetectionWindowStart = 15.0 + 5.0; engineConfiguration->knockDetectionWindowEnd = 15.0 + 45.0; @@ -630,8 +625,6 @@ static void setDefaultEngineConfiguration() { // https://github.com/rusefi/rusefi/issues/4030 engineConfiguration->mapErrorDetectionTooHigh = 410; - engineConfiguration->hip9011Gain = 1; - engineConfiguration->isEngineControlEnabled = true; #endif // EFI_ENGINE_CONTROL #include "default_script.lua" diff --git a/firmware/controllers/engine_cycle/knock_controller.cpp b/firmware/controllers/engine_cycle/knock_controller.cpp index d56d144edd..e6bd26e709 100644 --- a/firmware/controllers/engine_cycle/knock_controller.cpp +++ b/firmware/controllers/engine_cycle/knock_controller.cpp @@ -8,9 +8,6 @@ #include "pch.h" #include "knock_logic.h" - -#include "hip9011.h" - void KnockController::onConfigurationChange(engine_configuration_s const * previousConfig) { KnockControllerBase::onConfigurationChange(previousConfig); @@ -158,14 +155,10 @@ static void startKnockSampling(Engine* engine) { void Engine::onSparkFireKnockSense(uint8_t cylinderNumber, efitick_t nowNt) { cylinderNumberCopy = cylinderNumber; -#if EFI_HIP_9011 || EFI_SOFTWARE_KNOCK +#if EFI_SOFTWARE_KNOCK scheduleByAngle(nullptr, nowNt, /*angle*/engineConfiguration->knockDetectionWindowStart, { startKnockSampling, engine }); #else UNUSED(nowNt); #endif - -#if EFI_HIP_9011 - hip9011_onFireEvent(cylinderNumber, nowNt); -#endif } diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index fdcb718068..9187d9fcab 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -676,16 +676,12 @@ static void enableOrDisable(const char *param, bool isEnabled) { } else if (strEqualCaseInsensitive(param, "two_wire_wasted_spark")) { engineConfiguration->twoWireBatchIgnition = isEnabled; incrementGlobalConfigurationVersion(); - } else if (strEqualCaseInsensitive(param, "HIP9011")) { - engineConfiguration->isHip9011Enabled = isEnabled; } else if (strEqualCaseInsensitive(param, "verbose_idle")) { engineConfiguration->isVerboseIAC = isEnabled; } else if (strEqualCaseInsensitive(param, "auxdebug1")) { engineConfiguration->isVerboseAuxPid1 = isEnabled; } else if (strEqualCaseInsensitive(param, "altdebug")) { engineConfiguration->isVerboseAlternator = isEnabled; - } else if (strEqualCaseInsensitive(param, "tpic_advanced_mode")) { - engineConfiguration->useTpicAdvancedMode = isEnabled; } else if (strEqualCaseInsensitive(param, "altcontrol")) { engineConfiguration->isAlternatorControlEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "sd")) { @@ -790,8 +786,6 @@ static void getValue(const char *paramStr) { efiPrintf("is_enabled_spi_3=%s", boolToString(engineConfiguration->is_enabled_spi_3)); } else if (strEqualCaseInsensitive(paramStr, "invertCamVVTSignal")) { efiPrintf("invertCamVVTSignal=%s", boolToString(engineConfiguration->invertCamVVTSignal)); - } else if (strEqualCaseInsensitive(paramStr, "isHip9011Enabled")) { - efiPrintf("isHip9011Enabled=%d", engineConfiguration->isHip9011Enabled); } else if (strEqualCaseInsensitive(paramStr, CMD_DATE)) { printDateTime(); } else { diff --git a/firmware/controllers/thread_priority.h b/firmware/controllers/thread_priority.h index fe0b7472b2..60e08a53f6 100644 --- a/firmware/controllers/thread_priority.h +++ b/firmware/controllers/thread_priority.h @@ -38,7 +38,6 @@ // These can get starved without too much adverse effect #define PRIO_AUX_SERIAL NORMALPRIO #define PRIO_KNOCK_PROCESS (NORMALPRIO - 10) -#define PRIO_HIP9011 (NORMALPRIO - 10) // These are intentionally low priority so they can't get in the way of anything else #define PRIO_FLASH_WRITE LOWPRIO + 20 diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 0cea371c4f..68c88abdc8 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -13,7 +13,6 @@ #include "main_trigger_callback.h" #include "listener_array.h" #include "tooth_logger.h" -#include "hip9011.h" #include "logic_analyzer.h" #include "local_version_holder.h"