From 9810bd2d933312dc13ec5e646aca2402311a1f0d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 3 Jun 2015 09:05:11 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine.h | 2 ++ firmware/controllers/settings.cpp | 4 ++++ firmware/hw_layer/HIP9011.cpp | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 16bee1a74c..cc0d0e39dd 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -209,6 +209,8 @@ public: */ int knockCount; + bool_t knockDebug; + efitimeus_t timeOfLastKnockEvent; /** diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 870d8e4faa..38b94f4274 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -839,6 +839,10 @@ static void enableOrDisable(const char *param, bool isEnabled) { boardConfiguration->isHip9011Enabled = isEnabled; } else if (strEqualCaseInsensitive(param, "altdebug")) { boardConfiguration->isVerboseAlternator = isEnabled; + } else if (strEqualCaseInsensitive(param, "tpic_advanced_mode")) { + boardConfiguration->useTpicAdvancedMode = isEnabled; + } else if (strEqualCaseInsensitive(param, "knockdebug")) { + engine->knockDebug = isEnabled; } else if (strEqualCaseInsensitive(param, "altcontrol")) { engineConfiguration->isAlternatorControlEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "sd")) { diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp index 26094c16db..b01ead7885 100644 --- a/firmware/hw_layer/HIP9011.cpp +++ b/firmware/hw_layer/HIP9011.cpp @@ -200,6 +200,16 @@ static void intHoldCallback(trigger_event_e ckpEventType, uint32_t index DECLARE engine->m.hipCbTime = GET_TIMESTAMP() - engine->m.beforeHipCb; } +static void setMaxKnockSubDeg(int value){ + engineConfiguration->maxKnockSubDeg = value; + showHipInfo(); +} + +static void setKnockThresh(float value){ + engineConfiguration->knockVThreshold = value; + showHipInfo(); +} + static void setPrescalerAndSDO(int value) { engineConfiguration->hip9011PrescalerAndSDO = value; } @@ -362,6 +372,8 @@ void initHip9011(Logging *sharedLogger) { addConsoleActionF("set_gain", setGain); addConsoleActionF("set_band", setBand); addConsoleActionI("set_hip_prescalerandsdo", setPrescalerAndSDO); + addConsoleActionF("set_knock_threshold", setKnockThresh); + addConsoleActionI("set_max_knock_sub_deg", setMaxKnockSubDeg); chThdCreateStatic(hipTreadStack, sizeof(hipTreadStack), NORMALPRIO, (tfunc_t) hipThread, NULL); }