float ETB bins for now

This commit is contained in:
rusefi 2019-01-07 19:30:35 -05:00
parent 12810e00a0
commit 54adb0cade
5 changed files with 29 additions and 26 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 06 03:15:03 PST 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -2210,22 +2210,23 @@ typedef struct {
tChargeMode_e tChargeMode;
/**
* target TPS value, 0 to 100%
* TOOD: use int8 data date once we template interpolation method
* offset 4116
*/
uint8_t etbBiasBins[ETB_BIAS_CURVE_LENGTH];
float etbBiasBins[ETB_BIAS_CURVE_LENGTH];
/**
* PWM bias, 0 to 100%
* offset 4124
* offset 4148
*/
float etbBiasValues[ETB_BIAS_CURVE_LENGTH];
/**
* offset 4156
* offset 4180
*/
float hip9011Gain;
/**
* offset 4160
* offset 4184
*/
int unusedEnd[580];
int unusedEnd[574];
/** total size 6480*/
} engine_configuration_s;
@ -2472,4 +2473,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 06 03:15:03 PST 2019
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019

View File

@ -1595,12 +1595,12 @@
#define tChargeMode_offset_hex 1010
#define etbBiasBins_offset 4116
#define etbBiasBins_offset_hex 1014
#define etbBiasValues_offset 4124
#define etbBiasValues_offset_hex 101c
#define hip9011Gain_offset 4156
#define hip9011Gain_offset_hex 103c
#define unusedEnd_offset 4160
#define unusedEnd_offset_hex 1040
#define etbBiasValues_offset 4148
#define etbBiasValues_offset_hex 1034
#define hip9011Gain_offset 4180
#define hip9011Gain_offset_hex 1054
#define unusedEnd_offset 4184
#define unusedEnd_offset_hex 1058
#define cltCrankingCorrBins_offset 6480
#define cltCrankingCorrBins_offset_hex 1950
#define cltCrankingCorr_offset 6512

View File

@ -930,11 +930,11 @@ custom tChargeMode_e 4 bits, U32, @OFFSET@, [0:0], @@tChargeMode_e_enum@@
tChargeMode_e tChargeMode;
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] etbBiasBins;target TPS value, 0 to 100%\nTOOD: use int8 data date once we template interpolation method;"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, -100, 100.0, 2
float hip9011Gain;
int[580] unusedEnd;
int[574] unusedEnd;
end_struct

View File

@ -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 Sun Jan 06 03:15:03 PST 2019
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019
pageSize = 20000
page = 1
@ -798,10 +798,10 @@ 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"
etbBiasBins = array, U08, 4116, [8], "target TPS position", 1, 0.0, 0, 100.0, 0
etbBiasValues = array, F32, 4124, [8], "ETB duty cycle bias", 1, 0.0, -100, 100.0, 2
;no TS info - skipping hip9011Gain offset 4156
;no TS info - skipping unusedEnd offset 4160
etbBiasBins = array, F32, 4116, [8], "target TPS position", 1, 0.0, 0, 100.0, 0
etbBiasValues = array, F32, 4148, [8], "ETB duty cycle bias", 1, 0.0, -100, 100.0, 2
;no TS info - skipping hip9011Gain offset 4180
;no TS info - skipping unusedEnd offset 4184
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

View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 06 03:15:03 PST 2019
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 07 19:25:33 EST 2019
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -1055,10 +1055,12 @@ public class Fields {
public static final int tChargeMode_offset_hex = 1010;
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 hip9011Gain_offset = 4156;
public static final int unusedEnd_offset = 4160;
public static final int unusedEnd_offset_hex = 1040;
public static final int etbBiasValues_offset = 4148;
public static final int etbBiasValues_offset_hex = 1034;
public static final int hip9011Gain_offset = 4180;
public static final int hip9011Gain_offset_hex = 1054;
public static final int unusedEnd_offset = 4184;
public static final int unusedEnd_offset_hex = 1058;
public static final int cltCrankingCorrBins_offset = 6480;
public static final int cltCrankingCorrBins_offset_hex = 1950;
public static final int cltCrankingCorr_offset = 6512;
@ -1901,7 +1903,7 @@ public class Fields {
public static final Field TCHARGEAIRDECRLIMIT = Field.create("TCHARGEAIRDECRLIMIT", 4108, FieldType.FLOAT);
public static final String[] tChargeMode_e = {"RPM+TPS (Default)", "Air Mass Interpolation"};
public static final Field TCHARGEMODE = Field.create("TCHARGEMODE", 4112, FieldType.INT, tChargeMode_e);
public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 4156, FieldType.FLOAT);
public static final Field HIP9011GAIN = Field.create("HIP9011GAIN", 4180, FieldType.FLOAT);
public static final Field FSIOFORMULAS1 = Field.create("FSIOFORMULAS1", 6672, FieldType.INT);
public static final Field FSIOFORMULAS2 = Field.create("FSIOFORMULAS2", 6872, FieldType.INT);
public static final Field FSIOFORMULAS3 = Field.create("FSIOFORMULAS3", 7072, FieldType.INT);