diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 73b8440a86..35fd87c9f3 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -129,6 +129,18 @@ bool_t Engine::stopPins() {
 	return result;
 }
 
+void Engine::printKnockState(void) {
+	scheduleMsg(&logger, "knock now=%s/ever=%s", boolToString(knockNow), boolToString(knockEver));
+}
+
+void Engine::setKnockNow(bool_t isKnockNow) {
+	this->knockNow = isKnockNow;
+	knockEver |= isKnockNow;
+	if (isKnockNow) {
+		timeOfLastKnockEvent = getTimeNowUs();
+	}
+}
+
 void Engine::watchdog() {
 #if EFI_ENGINE_CONTROL
 	if (isRunningPwmTest)
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index a6e48e5a18..cd5477518a 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -204,6 +204,8 @@ public:
 	 */
 	bool_t knockEver;
 
+	efitimeus_t timeOfLastKnockEvent;
+
 	/**
 	 * are we running any kind of functional test? this affect
 	 * some areas
@@ -277,6 +279,9 @@ public:
 
 	monitoring_timestamps_s m;
 
+	void setKnockNow(bool_t isKnockNow);
+	void printKnockState(void);
+
 private:
 	/**
 	 * By the way:
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index de356446b8..157b8293b5 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -483,7 +483,7 @@ static void getKnockInfo(void) {
 	adc_channel_e hwChannel = engineConfiguration->externalKnockSenseAdc;
 	scheduleMsg(&logger, "externalKnockSenseAdc on ADC", getPinNameByAdcChannel(hwChannel, pinNameBuffer));
 
-	scheduleMsg(&logger, "knock now=%s/ever=%s", boolToString(engine->knockNow), boolToString(engine->knockEver));
+	engine->printKnockState();
 }
 
 void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp
index 286a18cb5b..22c7adda75 100644
--- a/firmware/controllers/trigger/main_trigger_callback.cpp
+++ b/firmware/controllers/trigger/main_trigger_callback.cpp
@@ -354,8 +354,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL
 	if (eventIndex == engineConfiguration->ignMathCalculateAtIndex) {
 		if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) {
 			float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc);
-			engine->knockNow = externalKnockValue > 2.5;
-			engine->knockEver |= engine->knockNow;
+			engine->setKnockNow(externalKnockValue > 2.5);
 		}
 
 		engine->m.beforeIgnitionMath = GET_TIMESTAMP();
diff --git a/firmware/hw_layer/HIP9011.cpp b/firmware/hw_layer/HIP9011.cpp
index 0f15107899..856f686973 100644
--- a/firmware/hw_layer/HIP9011.cpp
+++ b/firmware/hw_layer/HIP9011.cpp
@@ -58,12 +58,10 @@ static int settingUpdateCount = 0;
 static int totalKnockEventsCount = 0;
 static int currentPrescaler;
 
-static efitimeus_t timeOfLastKnockEvent = 0;
-
 /**
  * Int/Hold pin is controlled from scheduler callbacks which are set according to current RPM
  *
- * The following state make sure that we only have SPI communication while not integrating and that we take
+ * The following state makes sure that we only have SPI communication while not integrating and that we take
  * a good ADC reading after integrating.
  *
  * Once integtation window is over, we wait for the 2nd ADC callback and then initiate SPI communication if needed
@@ -119,7 +117,10 @@ static void showHipInfo(void) {
 	}
 
 	printSpiState(logger, boardConfiguration);
-	scheduleMsg(logger, "bore=%fmm freq=%fkHz PaSDO=%d", engineConfiguration->cylinderBore, getBand(),
+	scheduleMsg(logger, "enabled=%s state=%d bore=%fmm freq=%fkHz PaSDO=%d",
+			boolToString(boardConfiguration->isHip9011Enabled),
+			state,
+			engineConfiguration->cylinderBore, getBand(),
 			engineConfiguration->hip9011PrescalerAndSDO);
 
 	scheduleMsg(logger, "band_index=%d gain %f/index=%d", currentBandIndex, boardConfiguration->hip9011Gain, currentGainIndex);
@@ -223,9 +224,10 @@ void hipAdcCallback(adcsample_t value) {
 	if (state == WAITING_FOR_ADC_TO_SKIP) {
 		state = WAITING_FOR_RESULT_ADC;
 	} else if (state == WAITING_FOR_RESULT_ADC) {
-		if (adcToVoltsDivided(value) > engineConfiguration->hipThreshold) {
+		bool isKnockNow = adcToVoltsDivided(value) > engineConfiguration->hipThreshold;
+		engine->setKnockNow(isKnockNow);
+		if (isKnockNow) {
 			totalKnockEventsCount++;
-			timeOfLastKnockEvent = getTimeNowUs();
 		}
 
 		int integratorIndex = getIntegrationIndexByRpm(engine->rpmCalculator.rpmValue);
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 23c3e4c895..5df2240ea6 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -529,7 +529,7 @@ custom idle_mode_e 4 bits,    U32,   @OFFSET@, [0:0], "false", "true"
 
 
 float idleStepperReactionTime;;"ms",      1,      0,       1, 300,      0
-	float hipThreshold;
+	float hipThreshold;;"V",      1,      0,       1, 5,      2
 
 custom pin_input_mode_e 4 scalar, F32,	@OFFSET@,	"ms", 1, 0, 0, 200, 1	
 	pin_input_mode_e[LE_COMMAND_COUNT iterate] fsioInputModes;
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index ab61cdd020..2dbbcf21de 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -291,5 +291,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20150530;
+	return 20150531;
 }