From 36047e7f3da06225a7e74377cf6d9693d2f751b4 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 9 Dec 2018 10:19:47 -0500
Subject: [PATCH] ETB bias curve by TPS

---
 ...ngine_configuration_generated_structures.h |  16 +++++++++++++---
 firmware/controllers/algo/rusefi_generated.h  |   9 +++++++--
 firmware/integration/rusefi_config.txt        |   8 +++++++-
 firmware/tunerstudio/rusefi.ini               |   6 ++++--
 .../models/src/com/rusefi/config/Fields.java  |   9 ++++++---
 java_tools/ConfigDefinition.jar               | Bin 33015 -> 33635 bytes
 .../src/com/rusefi/TypesHelper.java           |  15 +++++++++++----
 7 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index 8c977556f8..a2e41a5d7f 100644
--- a/firmware/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:21:24 EST 2018
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 09 10:18:27 EST 2018
 // begin
 #ifndef ENGINE_CONFIGURATION_GENERATED_H_
 #define ENGINE_CONFIGURATION_GENERATED_H_
@@ -2181,9 +2181,19 @@ typedef struct {
 	 */
 	tChargeMode_e tChargeMode;
 	/**
+	 * target TPS value, 0 to 100%
 	 * offset 4116
 	 */
-	int unusedEnd[591];
+	uint8_t etbBiasBins[ETB_BIAS_CURVE_LENGTH];
+	/**
+	 * PWM bias, 0 to 100%
+	 * offset 4124
+	 */
+	float etbBiasValues[ETB_BIAS_CURVE_LENGTH];
+	/**
+	 * offset 4156
+	 */
+	int unusedEnd[581];
 	/** total size 6480*/
 } engine_configuration_s;
 
@@ -2429,4 +2439,4 @@ typedef struct {
 
 #endif
 // end
-// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:21:24 EST 2018
+// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 09 10:18:27 EST 2018
diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h
index f6c149f938..a93f6e3198 100644
--- a/firmware/controllers/algo/rusefi_generated.h
+++ b/firmware/controllers/algo/rusefi_generated.h
@@ -17,6 +17,7 @@
 #define BLOCKING_FACTOR 400
 #define FSIO_ANALOG_INPUT_COUNT 4
 #define SERVO_COUNT 8
+#define ETB_BIAS_CURVE_LENGTH 8
 #define TS_OUTPUT_SIZE 356
 #define TS_FILE_VERSION 20171101
 #define WARMUP_TARGET_AFR_SIZE 4
@@ -1586,8 +1587,12 @@
 #define tChargeAirDecrLimit_offset_hex 100c
 #define tChargeMode_offset 4112
 #define tChargeMode_offset_hex 1010
-#define unusedEnd_offset 4116
-#define unusedEnd_offset_hex 1014
+#define etbBiasBins_offset 4116
+#define etbBiasBins_offset_hex 1014
+#define etbBiasValues_offset 4124
+#define etbBiasValues_offset_hex 101c
+#define unusedEnd_offset 4156
+#define unusedEnd_offset_hex 103c
 #define cltCrankingCorrBins_offset 6480
 #define cltCrankingCorrBins_offset_hex 1950
 #define cltCrankingCorr_offset 6512
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 691dff3223..6a8375e129 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -53,6 +53,8 @@ struct_no_prefix engine_configuration_s
 
 #define SERVO_COUNT 8
 
+#define ETB_BIAS_CURVE_LENGTH 8
+
 ! this is here so that rusEfi console can access it, too
 #define TS_OUTPUT_SIZE 356
 
@@ -924,7 +926,11 @@ float tChargeAirDecrLimit;;"tChange Decrement Limit, deg/sec",        1,     0,
 custom tChargeMode_e 4 bits,    U32,   @OFFSET@, [0:0], @@tChargeMode_e_enum@@
 tChargeMode_e tChargeMode;
 	
-	int[591] unusedEnd;
+	
+		uint8_t[ETB_BIAS_CURVE_LENGTH] etbBiasBins;target TPS value, 0 to 100%;"target TPS position",   1,   0.0,        0,  100.0,   0
+		float[ETB_BIAS_CURVE_LENGTH] etbBiasValues;PWM bias, 0 to 100%;"ETB duty cycle bias",   1,   0.0,        0,  100.0,   2
+	
+	int[581] unusedEnd;
 	
 
 end_struct
diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini
index 1c97db3904..9ccd36d183 100644
--- a/firmware/tunerstudio/rusefi.ini
+++ b/firmware/tunerstudio/rusefi.ini
@@ -63,7 +63,7 @@ enable2ndByteCanID = false
 
 ; see PAGE_0_SIZE in C source code    
 ; CONFIG_DEFINITION_START
-; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:22:22 EST 2018
+; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 09 10:18:27 EST 2018
 
 pageSize            = 20000
 page = 1
@@ -795,7 +795,9 @@ page = 1
 	tChargeAirIncrLimit				= scalar, F32,	4104,	"tChange Increment Limit, deg/sec", 1, 0, 0.0, 100.0, 1
 	tChargeAirDecrLimit				= scalar, F32,	4108,	"tChange Decrement Limit, deg/sec", 1, 0, 0.0, 100.0, 1
 	tChargeMode					 = bits, U32, 4112, [0:0], "RPM+TPS (Default)", "Air Mass Interpolation"
-;no TS info - skipping unusedEnd offset 4116
+	etbBiasBins						= array, U8,	4116,	[8],	"target TPS position", 1, 0.0, 0, 100.0, 0
+	etbBiasValues					= array, F32,	4124,	[8],	"ETB duty cycle bias", 1, 0.0, 0, 100.0, 2
+;no TS info - skipping unusedEnd offset 4156
 	cltCrankingCorrBins				= array, F32,	6480,	[8],	"C", 1, 0, -100.0, 250.0, 2
 	cltCrankingCorr					= array, F32,	6512,	[8],	"%", 1, 0, 0.0, 500.0, 2
 	idleAdvanceBins					= array, F32,	6544,	[8],	"RPM", 1, 0, 0.0, 18000, 2
diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java
index 4e2a7efb99..596f1966c9 100644
--- a/java_console/models/src/com/rusefi/config/Fields.java
+++ b/java_console/models/src/com/rusefi/config/Fields.java
@@ -1,11 +1,12 @@
 package com.rusefi.config;
 
-// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Nov 29 23:22:22 EST 2018
+// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 09 10:18:27 EST 2018
 public class Fields {
 	public static final int LE_COMMAND_LENGTH = 200;
 	public static final int BLOCKING_FACTOR = 400;
 	public static final int FSIO_ANALOG_INPUT_COUNT = 4;
 	public static final int SERVO_COUNT = 8;
+	public static final int ETB_BIAS_CURVE_LENGTH = 8;
 	public static final int TS_OUTPUT_SIZE = 356;
 	public static final int TS_FILE_VERSION = 20171101;
 	public static final int WARMUP_TARGET_AFR_SIZE = 4;
@@ -1049,8 +1050,10 @@ public class Fields {
 	public static final int tChargeAirDecrLimit_offset = 4108;
 	public static final int tChargeMode_offset = 4112;
 	public static final int tChargeMode_offset_hex = 1010;
-	public static final int unusedEnd_offset = 4116;
-	public static final int unusedEnd_offset_hex = 1014;
+	public static final int etbBiasBins_offset = 4116;
+	public static final int etbBiasBins_offset_hex = 1014;
+	public static final int etbBiasValues_offset = 4124;
+	public static final int unusedEnd_offset = 4156;
 	public static final int cltCrankingCorrBins_offset = 6480;
 	public static final int cltCrankingCorrBins_offset_hex = 1950;
 	public static final int cltCrankingCorr_offset = 6512;
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 7bfb01b0a237a5391d9593f36e68c432d5815513..78664eea51940bbcbf01d1dea368cea96b4d2fd5 100644
GIT binary patch
delta 15356
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

delta 14775
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
HE6o1`#aVnb

diff --git a/java_tools/configuration_definition/src/com/rusefi/TypesHelper.java b/java_tools/configuration_definition/src/com/rusefi/TypesHelper.java
index 0124b15547..ae1b1b53c6 100644
--- a/java_tools/configuration_definition/src/com/rusefi/TypesHelper.java
+++ b/java_tools/configuration_definition/src/com/rusefi/TypesHelper.java
@@ -1,5 +1,9 @@
 package com.rusefi;
 
+import static com.rusefi.ConfigStructure.INT_16_T;
+import static com.rusefi.ConfigStructure.UINT8_T;
+import static com.rusefi.ConfigStructure.UINT_16_T;
+
 /**
  * 1/22/15
  */
@@ -12,9 +16,9 @@ public class TypesHelper {
             return ConfigDefinition.structures.get(type).totalSize;
         if (ConfigDefinition.tsCustomSize.containsKey(type))
             return ConfigDefinition.tsCustomSize.get(type);
-        if (type.equals(ConfigStructure.UINT8_T))
+        if (type.equals(UINT8_T))
             return 1;
-        if (type.equals(ConfigStructure.INT_16_T) || type.equals(ConfigStructure.UINT_16_T)) {
+        if (type.equals(INT_16_T) || type.equals(UINT_16_T)) {
             return 2;
         }
         return 4;
@@ -27,10 +31,13 @@ public class TypesHelper {
             return "U32";
         if ("int32_t".equals(type) || "int".equals(type))
             return "S32";
-        if ("int16_t".equals(type))
+        if (INT_16_T.equals(type))
             return "S16";
-        if ("uint16_t".equals(type))
+        if (UINT_16_T.equals(type))
             return "U16";
+        if (UINT8_T.equals(type))
+            return "U8";
+        System.out.println("No TS type convesion for " + type);
         return type;
     }