This commit is contained in:
rusefi 2020-04-18 12:20:18 -04:00
parent 9cb08365a2
commit c3113032a3
11 changed files with 46 additions and 35 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 21:13:57 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 18 11:22:09 EDT 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -2586,7 +2586,7 @@ struct engine_configuration_s {
/**
* offset 2432
*/
float postCrankingTargetClt;
float unused2432;
/**
* Fuel multiplier taper, see also postCrankingDurationSec
* offset 2436
@ -3340,4 +3340,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 21:13:57 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 18 11:22:09 EDT 2020

View File

@ -1677,8 +1677,6 @@
#define postCrankingDurationSec_offset_hex 988
#define postCrankingFactor_offset 2436
#define postCrankingFactor_offset_hex 984
#define postCrankingTargetClt_offset 2432
#define postCrankingTargetClt_offset_hex 980
#define primeInjFalloffTemperature_offset 1486
#define primeInjFalloffTemperature_offset_hex 5ce
#define primingSquirtDurationMs_offset 96
@ -2152,6 +2150,8 @@
#define unused1059_offset_hex f7c
#define unused1234234_offset 2042
#define unused1234234_offset_hex 7fa
#define unused2432_offset 2432
#define unused2432_offset_hex 980
#define unused_1484_bit_24_offset 1476
#define unused_1484_bit_24_offset_hex 5c4
#define unused_1484_bit_25_offset 1476

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 21:13:41 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:21:53 EDT 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -2586,7 +2586,7 @@ struct engine_configuration_s {
/**
* offset 2432
*/
float postCrankingTargetClt;
float unused2432;
/**
* Fuel multiplier taper, see also postCrankingDurationSec
* offset 2436
@ -3340,4 +3340,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 21:13:41 EDT 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:21:53 EDT 2020

View File

@ -1677,8 +1677,6 @@
#define postCrankingDurationSec_offset_hex 988
#define postCrankingFactor_offset 2436
#define postCrankingFactor_offset_hex 984
#define postCrankingTargetClt_offset 2432
#define postCrankingTargetClt_offset_hex 980
#define primeInjFalloffTemperature_offset 1486
#define primeInjFalloffTemperature_offset_hex 5ce
#define primingSquirtDurationMs_offset 96
@ -2152,6 +2150,8 @@
#define unused1059_offset_hex f7c
#define unused1234234_offset 2042
#define unused1234234_offset_hex 7fa
#define unused2432_offset 2432
#define unused2432_offset_hex 980
#define unused_1484_bit_24_offset 1476
#define unused_1484_bit_24_offset_hex 5c4
#define unused_1484_bit_25_offset 1476

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 16 20:32:26 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:21:53 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 16 20:32:33 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:22:00 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Wed Apr 15 21:13:57 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 18 11:22:09 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
@ -1515,6 +1515,11 @@ fileVersion = { 20200310 }
;
TPS2Value = scalar, S16, 220, "%",{1/100}, 0
rawTps1Primary = scalar, U16, 222, "V",{1/1000}, 0.0
rawPpsPrimary = scalar, U16, 224, "V",{1/1000}, 0.0
rawClt = scalar, U16, 226, "V",{1/1000}, 0.0
rawIat = scalar, U16, 228, "V",{1/1000}, 0.0
rawOilPressure = scalar, U16, 230, "V",{1/1000}, 0.0
;
; see TunerStudioOutputChannels struct
@ -2126,6 +2131,12 @@ gaugeCategory = Throttle Body (incl. ETB)
etbErrorGauge = etb1Error, "ETB position error", "%", -20, 20, -10, -5, 5, 10, 2, 0
etbDutyCycleGauge = etb1DutyCycle, "ETB duty cycle", "%", -100, 100, -75, -50, 50, 75, 0, 0
gaugeCategory = Sensors - Raw
rawTps1PrimaryGauge = rawTps1Primary, "Raw TPS 1 Primary", "volts", 0, 5, 0, 0, 5, 5, 3, 0
rawPpsPrimaryGauge = rawPpsPrimary , "Raw Pedal Primary", "volts", 0, 5, 0, 0, 5, 5, 3, 0
rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0
rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0
rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0
[WueAnalyze]
@ -2451,6 +2462,7 @@ menuDialog = main
menu = "&Advanced"
subMenu = boostDialog, "Boost Control"
subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 }
subMenu = mc33Dialog, "GDI Dreams"
subMenu = std_separator
subMenu = fsioInputsDialog, "FSIO inputs"
subMenu = auxPidDialog, "Aux PID"
@ -2885,7 +2897,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Down (WOT) voltage", throttlePedalWOTVoltage
dialog = mc33, "MC33"
dialog = mc33Dialog, "GDI Dreams"
field = mc33816_cs, mc33816_cs
field = mc33816_rstb, mc33816_rstb
field = mc33816_flag0, mc33816_flag0
@ -2903,7 +2915,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Throttle Up switch", throttlePedalUpPin
field = "Brake pedal switch", brakePedalPin
field = "A/C switch", acSwitchAdc
field = "MC33816", mc33
dialog = triggerInputComparator, "Built-in Comparator Settings (Kinetis-only)"
field = "Comparator Center Point Voltage", triggerCompCenterVolt

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 16 20:32:30 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:21:58 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 16 20:32:36 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:22:03 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2

View File

@ -89,7 +89,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 16 20:32:40 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:22:06 EDT 2020
pageSize = 20000
page = 1
@ -848,7 +848,7 @@ page = 1
;no TS info - skipping autoTuneCltThreshold offset 2420
;no TS info - skipping autoTuneTpsRocThreshold offset 2424
;no TS info - skipping autoTuneTpsQuietPeriod offset 2428
postCrankingTargetClt = scalar, F32, 2432, "C", 1, 0, 0, 100, 0
;no TS info - skipping unused2432 offset 2432
postCrankingFactor = scalar, F32, 2436, "mult", 1, 0, 0, 100, 4
postCrankingDurationSec = scalar, F32, 2440, "seconds", 1, 0, 0, 100, 2
auxTempSensor1_tempC_1 = scalar, F32, 2444, "*C", 1, 0, -40, 200, 1
@ -1046,7 +1046,7 @@ page = 1
boostRpmBins = array, U08, 6320, [8], "RPM", 50, 0, 0.0, 12000.0, 0
boostTableClosedLoop = array, U08, 6328, [8x8],"", 2, 0 , 0, 3000, 0
boostTpsBins = array, U08, 6392, [8], "%", 2, 0.0, 0, 100.0, 2
pedalToTpsTable = array, U08, 6400, [8x8],"deg", 1, 0, -720, 720, 2
pedalToTpsTable = array, U08, 6400, [8x8],"%", 1, 0, 0, 100, 0
pedalToTpsPedalBins = array, U08, 6464, [8], "%", 1, 0, 0.0, 120.0, 0
pedalToTpsRpmBins = array, U08, 6472, [8], "RPM", 50, 0, 0.0, 12000.0, 0
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed Apr 15 21:13:41 EDT 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 18 11:21:53 EDT 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1108,8 +1108,6 @@ public class Fields {
public static final int postCrankingDurationSec_offset_hex = 988;
public static final int postCrankingFactor_offset = 2436;
public static final int postCrankingFactor_offset_hex = 984;
public static final int postCrankingTargetClt_offset = 2432;
public static final int postCrankingTargetClt_offset_hex = 980;
public static final int primeInjFalloffTemperature_offset = 1486;
public static final int primingSquirtDurationMs_offset = 96;
public static final int primingSquirtDurationMs_offset_hex = 60;
@ -1428,6 +1426,8 @@ public class Fields {
public static final int uartConsoleSerialSpeed_offset = 2076;
public static final int unused1059_offset = 3964;
public static final int unused1234234_offset = 2042;
public static final int unused2432_offset = 2432;
public static final int unused2432_offset_hex = 980;
public static final int unused_1484_bit_24_offset = 1476;
public static final int unused_1484_bit_25_offset = 1476;
public static final int unused_1484_bit_26_offset = 1476;
@ -2285,7 +2285,7 @@ public class Fields {
public static final Field AUTOTUNECLTTHRESHOLD = Field.create("AUTOTUNECLTTHRESHOLD", 2420, FieldType.FLOAT);
public static final Field AUTOTUNETPSROCTHRESHOLD = Field.create("AUTOTUNETPSROCTHRESHOLD", 2424, FieldType.FLOAT);
public static final Field AUTOTUNETPSQUIETPERIOD = Field.create("AUTOTUNETPSQUIETPERIOD", 2428, FieldType.FLOAT);
public static final Field POSTCRANKINGTARGETCLT = Field.create("POSTCRANKINGTARGETCLT", 2432, FieldType.FLOAT);
public static final Field UNUSED2432 = Field.create("UNUSED2432", 2432, FieldType.FLOAT);
public static final Field POSTCRANKINGFACTOR = Field.create("POSTCRANKINGFACTOR", 2436, FieldType.FLOAT);
public static final Field POSTCRANKINGDURATIONSEC = Field.create("POSTCRANKINGDURATIONSEC", 2440, FieldType.FLOAT);
public static final Field AUXTEMPSENSOR1_TEMPC_1 = Field.create("AUXTEMPSENSOR1_TEMPC_1", 2444, FieldType.FLOAT);
@ -3204,7 +3204,7 @@ public class Fields {
AUTOTUNECLTTHRESHOLD,
AUTOTUNETPSROCTHRESHOLD,
AUTOTUNETPSQUIETPERIOD,
POSTCRANKINGTARGETCLT,
UNUSED2432,
POSTCRANKINGFACTOR,
POSTCRANKINGDURATIONSEC,
AUXTEMPSENSOR1_TEMPC_1,