From 299ea0dc82b24fccdfd772138f118bcc29a89637 Mon Sep 17 00:00:00 2001
From: Andrey Gusakov <dron0gus@gmail.com>
Date: Thu, 27 Jun 2024 16:02:59 +0300
Subject: [PATCH] hip9011: fix reinitialization, typos

---
 firmware/hw_layer/hardware.cpp        |  4 ++--
 firmware/hw_layer/sensors/hip9011.cpp | 30 ++++++++++++++-------------
 firmware/hw_layer/sensors/hip9011.h   |  4 ++--
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index 76b90d7fdb..4c27cc217c 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -369,7 +369,7 @@ void applyNewHardwareSettings() {
 #endif /* EFI_AUX_SERIAL */
 
 #if EFI_HIP_9011
-	stopHip9001_pins();
+	stopHip9011_pins();
 #endif /* EFI_HIP_9011 */
 
 	stopHardware();
@@ -423,7 +423,7 @@ void applyNewHardwareSettings() {
 
 
 #if EFI_HIP_9011
-	startHip9001_pins();
+	startHip9011_pins();
 #endif /* EFI_HIP_9011 */
 
 
diff --git a/firmware/hw_layer/sensors/hip9011.cpp b/firmware/hw_layer/sensors/hip9011.cpp
index 183a7b8cf7..eeb90de7c2 100644
--- a/firmware/hw_layer/sensors/hip9011.cpp
+++ b/firmware/hw_layer/sensors/hip9011.cpp
@@ -97,9 +97,9 @@ static SPIConfig hipSpiCfg = {
 #ifdef _CHIBIOS_RT_CONF_VER_6_1_
 	.end_cb = NULL,
 #else
-        .slave = false,
-        .data_cb = NULL,
-        .error_cb = NULL,
+	.slave = false,
+	.data_cb = NULL,
+	.error_cb = NULL,
 #endif
 	.ssport = NULL,
 	.sspad = 0,
@@ -283,7 +283,7 @@ void hip9011_onFireEvent(uint8_t cylinderNumber, efitick_t nowNt) {
 		return;
 
 	/* We are not checking here for READY_TO_INTEGRATE state as
-	 * previous integration may be stil in progress, while
+	 * previous integration may be still in progress, while
 	 * we are scheduling next integration start only
 	 * knockDetectionWindowStart from now.
 	 * Check for correct state will be done at startIntegration () */
@@ -391,7 +391,7 @@ static int hip_init() {
 			 * Now we dont care for return value */
 			instance.hw->sendSyncCommand(SET_ADVANCED_MODE_CMD, &rx);
 			if (rx != SET_ADVANCED_MODE_REP) {
-				/* this is realy a communication problem */
+				/* this is really a communication problem */
 				return ret;
 			}
 		}
@@ -527,22 +527,20 @@ static msg_t hipThread(void *arg) {
 /* Exported functions.														*/
 /*==========================================================================*/
 
-void stopHip9001_pins() {
+void stopHip9011_pins() {
 	intHold.deInit();
 	Cs.deInit();
 #if EFI_PROD_CODE
+	spi = NULL;
 	hipSpiCfg.ssport = NULL;
 #endif
 }
 
-void startHip9001_pins() {
+void startHip9011_pins() {
 	intHold.initPin("hip int/hold", engineConfiguration->hip9011IntHoldPin, engineConfiguration->hip9011IntHoldPinMode);
+	intHold.setValue(1);
 	Cs.initPin("hip CS", engineConfiguration->hip9011CsPin, engineConfiguration->hip9011CsPinMode);
-}
-
-void initHip9011() {
-	if (!engineConfiguration->isHip9011Enabled)
-		return;
+	Cs.setValue(1);
 
 #if EFI_PROD_CODE
 	spi = getSpiDevice(engineConfiguration->hip9011SpiDevice);
@@ -550,12 +548,16 @@ void initHip9011() {
 		// error already reported
 		return;
 	}
-
 	hipSpiCfg.ssport = getHwPort("hip", engineConfiguration->hip9011CsPin);
 	hipSpiCfg.sspad = getHwPin("hip", engineConfiguration->hip9011CsPin);
 #endif /* EFI_PROD_CODE */
+}
 
-	startHip9001_pins();
+void initHip9011() {
+	if (!engineConfiguration->isHip9011Enabled)
+		return;
+
+	startHip9011_pins();
 
 	/* load settings */
 	instance.prescaler = engineConfiguration->hip9011PrescalerAndSDO;
diff --git a/firmware/hw_layer/sensors/hip9011.h b/firmware/hw_layer/sensors/hip9011.h
index 0a306f1541..e61d5673ae 100644
--- a/firmware/hw_layer/sensors/hip9011.h
+++ b/firmware/hw_layer/sensors/hip9011.h
@@ -11,8 +11,8 @@
 #define HIP_THREAD_PERIOD 100
 
 void initHip9011();
-void startHip9001_pins();
-void stopHip9001_pins();
+void startHip9011_pins();
+void stopHip9011_pins();
 #if HAL_USE_ADC
 void hipAdcCallback(float volts);
 #endif /* HAL_USE_ADC */