From da36d0ca5af8e5a061b6c6ecf58e1045b75e1681 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Fri, 25 Feb 2022 20:28:09 -0500
Subject: [PATCH] BMW 6HP gatewy #3954

---
 firmware/integration/rusefi_config.txt | 12 ++++++++----
 firmware/tunerstudio/rusefi.input      | 17 ++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 9ccf339d94..0ef1543942 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -133,7 +133,7 @@ struct_no_prefix engine_configuration_s
 
 #define NARROW_BAND_WIDE_BAND_CONVERSION_SIZE 8
 
-#define TORQUE_CURVE_SIZE 8
+#define TORQUE_CURVE_SIZE 6
 #define CLT_CURVE_SIZE 16
 #define CLT_LIMITER_CURVE_SIZE 4
 #define CRANKING_CLT_IDLE_CURVE_SIZE 8
@@ -1490,8 +1490,8 @@ int8_t[MAX_CYLINDER_COUNT iterate] fuelTrim;;"Percent", @@PERCENT_TRIM_BYTE_PACK
         uint16_t[HPFP_COMPENSATION_SIZE] autoscale hpfpCompensationLoadBins;;"cc/lobe", 0.001, 0, 0, 65, 3
         uint8_t[HPFP_COMPENSATION_SIZE] autoscale hpfpCompensationRpmBins;;"RPM", @@RPM_1_BYTE_PACKING_MULT@@, 0, 0, 12500, 0
 
-        uint8_t[TORQUE_CURVE_SIZE] autoscale torqueValues;;"Nm", 10, 0, 0, 255, 0
-        uint16_t[TORQUE_CURVE_SIZE] torqueRpmBins;;"RPM", 1, 0, 0, 65000, 0
+        uint8_t[8] unusedSSValues;;"Nm", 10, 0, 0, 255, 0
+        uint16_t[8] unusedRpmBins;;"RPM", 1, 0, 0, 65000, 0
 
 	output_pin_e[4 iterate] stepper_raw_output;
 
@@ -1510,7 +1510,11 @@ int8_t[WWAE_TABLE_SIZE] wwMapBins;;"kPa", 1, 0, 0, 250, 0
 uint8_t[WWAE_TABLE_SIZE] autoscale wwTauMapValues;;"", 0.01, 0, 0, 2.5, 2
 uint8_t[WWAE_TABLE_SIZE] autoscale wwBetaMapValues;;"", 0.01, 0, 0, 2.5, 2
 
-uint8_t[330] mainUnusedEnd;;"units", 1, 0, 0, 1, 0
+uint8_t[TORQUE_CURVE_SIZE x TORQUE_CURVE_SIZE] autoscale torqueTable;;"Nm", 10, 0, 0, 255, 0
+        uint16_t[TORQUE_CURVE_SIZE] torqueRpmBins;;"RPM", 1, 0, 0, 65000, 0
+        uint16_t[TORQUE_CURVE_SIZE] torqueLoadBins;;"Load", 1, 0, 0, 65000, 0
+
+uint8_t[270] mainUnusedEnd;;"units", 1, 0, 0, 1, 0
 
 ! end of engine_configuration_s
 end_struct
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 1dff71f747..9d28e0f960 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -318,14 +318,6 @@ enable2ndByteCanID = false
       yAxis       =  0,  8, 10
       xBins       = knockNoiseRpmBins, RPMValue
       yBins       = knockNoise
-      gauge       = RPMGauge
-
-	curve = torqueCurve, "Engine Torque"
-      columnLabel = "RPM", "Nm"
-      xAxis       =  0, 8000, 9
-      yAxis       =  0,  8, 10
-      xBins       = torqueRpmBins, RPMValue
-      yBins       = torqueValues
       gauge       = RPMGauge
 
 	curve = swKnockThresholdCurve, "Engine knock threshold RPM based"
@@ -738,6 +730,13 @@ enable2ndByteCanID = false
       gridOrient  = 250,   0, 340 ; Space 123 rotation of grid in degrees.
       upDownLabel = "(RICHER)", "(LEANER)"
 
+	curve = torqueTableTbl, torqueTableMap, "Engine Torque"
+      xBins       = torqueRpmBins, RPMValue
+      yBins       = torqueLoadBins
+      zBins       = torqueTable
+      gauge       = RPMGauge
+
+
    table = veTableTbl,  veTableMap,  "VE Table",   1
       ;       constant, variable
       xBins       = veRpmBins,  RPMValue
@@ -3735,7 +3734,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Always use instant RPM",				alwaysInstantRpm
 		panel = mapCamDialog
 		panel = allTriggerDebug
-		panel = torqueCurve
+		panel = torqueTableTbl
 
        help = helpGeneral, "rusEFI General Help"
         webHelp = @@MAIN_HELP_URL@@