From adf0a97ffcfc4cd6f56e4f1f6fe45bbb4f16dc4b Mon Sep 17 00:00:00 2001
From: shadowm60 <shadowm60@gmail.com>
Date: Wed, 9 Dec 2020 04:08:59 +0200
Subject: [PATCH] Prepare configurations for SW knock detection (#2046)

* Prepare configurations

- Configurations needed for base noise
- TS usability for base noise definition

* Update rusefi_config.txt

wrong data ype used for base noise
---
 firmware/integration/rusefi_config.txt |  4 +++-
 firmware/tunerstudio/rusefi.input      | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 835a43cf73..3b799d9b0a 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1455,8 +1455,10 @@ uint8_t[4] unusedsw;;"units", 1, 0, -20, 100, 0
 
 	pin_output_mode_e[TCU_SOLENOID_COUNT iterate] tcu_solenoid_mode;
 
+	int8_t[IGN_RPM_COUNT] knockBaseNoise;;"dB", 1.0, 0, -30.0, 0, 2
+
 ! just a reminder that 'int' and 'float' are 4 bytes each
-	int[369] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
+	int[365] mainUnusedEnd;;"units", 1, 0, -20, 100, 0
 
 ! end of engine_configuration_s
 end_struct
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index a21df51f53..a6e271e66c 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -540,6 +540,14 @@ enable2ndByteCanID = false
       yAxis       =  0,  8, 10
       xBins       = knockNoiseRpmBins, RPMValue
       yBins       = knockNoise
+      gauge       = RPMGauge
+
+	curve = swKnockThresholdCurve, "Engine knock threshold RPM based"
+      columnLabel = "RPM", "Threshold dB"
+      xAxis       =  0, 8000, 10
+      yAxis       =  -30,  0, 10
+      xBins       = ignitionRpmBins,  RPMValue
+      yBins       = knockBaseNoise
       gauge       = RPMGauge
 
 	curve = narrowToWideOxygenCurve, "Narrow to Wideband approximation"
@@ -2554,7 +2562,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Pin mode",				malfunctionIndicatorPinMode	
 		field = "Warning Period",									warningPeriod
 
-	dialog = softwareKnock, "Software Knock"
+	dialog = softwareKnockCfg, "Configuration"
 		field = "Enable",				enableSoftwareKnock
 		field = "Knock filter frequency",	knockBandCustom, {enableSoftwareKnock}
 		field = ""
@@ -2572,6 +2580,10 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Cylinder 11",			knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11}
 		field = "Cylinder 12",			knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12}
 
+	dialog = softwareKnock, "Software Knock", border
+		panel = softwareKnockCfg, West
+		panel = swKnockThresholdCurve, Center
+
 ;			Engine->hip9011 Settings
 	dialog = hipFunction, "HIP9011 Settings (knock decoder)"
 		field = "Enabled",								isHip9011Enabled