rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RIP WarmupAfr

This commit is contained in:
rusefi 2019-07-18 18:27:32 -04:00
parent 21d1b25c5e
commit 0f03030455
7 changed files with 40 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jul 12 14:02:49 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:35 EDT 2019
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
#define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -738,7 +738,7 @@ struct board_configuration_s {
bool unusedAnotherOne : 1;
/**
offset 144 bit 14 */
bool useWarmupPidAfr : 1;
bool unusedOldWarmupAfr : 1;
/**
* +This will cause the alternator to be operated in a basic on or off mode, this is the simplest alternator control.
offset 144 bit 15 */
@ -1787,7 +1787,7 @@ struct engine_configuration_s {
/**
* offset 1756
*/
pid_s warmupAfrPid;
uint8_t unusedFormerWarmupAfrPid[20];
/**
* kPa value which is too low to be true
* offset 1776
@ -1990,18 +1990,9 @@ struct engine_configuration_s {
*/
debug_mode_e debugMode;
/**
* CLT-based target AFR for PID-based control
* offset 2096
*/
float warmupTargetAfrBins[WARMUP_TARGET_AFR_SIZE];
/**
* offset 2112
*/
float warmupTargetAfr[WARMUP_TARGET_AFR_SIZE];
/**
* offset 2128
*/
float warmupAfrThreshold;
uint32_t unused_former_warmup_target_afr[9];
/**
* kPa value at which we need to cut fuel and spark, 0 if not enabled
* offset 2132
@ -2815,4 +2806,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Jul 12 14:02:49 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:35 EDT 2019

33
firmware/controllers/generated/rusefi_generated.h
View File

@ -435,7 +435,7 @@
#define cylinderBore_offset_hex 198
#define cylindersCount_offset 400
#define cylindersCount_offset_hex 190
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
#define debugMode_offset 2092
#define debugMode_offset_hex 82c
#define DIGIPOT_COUNT 4
@ -1822,14 +1822,20 @@
#define unused_bit_1472_30_offset_hex 5b8
#define unused_board_984_31_offset 744
#define unused_board_984_31_offset_hex 2e8
#define unused_former_warmup_target_afr_offset 2096
#define unused_former_warmup_target_afr_offset_hex 830
#define unusedAnotherOne_offset 744
#define unusedAnotherOne_offset_hex 2e8
#define unusedAtBoardConfigurationEnd_offset 980
#define unusedAtBoardConfigurationEnd_offset_hex 3d4
#define unusedFormerWarmupAfrPid_offset 1756
#define unusedFormerWarmupAfrPid_offset_hex 6dc
#define unusedh_offset 1471
#define unusedh_offset_hex 5bf
#define unusedMa2_offset 710
#define unusedMa2_offset_hex 2c6
#define unusedOldWarmupAfr_offset 744
#define unusedOldWarmupAfr_offset_hex 2e8
#define unusedSpiPadding2_offset 804
#define unusedSpiPadding2_offset_hex 324
#define unusedSpiPadding3_offset 4036
@ -1910,8 +1916,6 @@
#define useTPSAdvanceTable_offset_hex 5c4
#define useTPSBasedVeTable_offset 744
#define useTPSBasedVeTable_offset_hex 2e8
#define useWarmupPidAfr_offset 744
#define useWarmupPidAfr_offset_hex 2e8
#define VBAT_INJECTOR_CURVE_SIZE 8
#define vbattAdcChannel_offset 513
#define vbattAdcChannel_offset_hex 201
@ -1940,29 +1944,6 @@
#define vvtMode_offset_hex 918
#define vvtOffset_offset 2052
#define vvtOffset_offset_hex 804
#define WARMUP_TARGET_AFR_SIZE 4
#define warmupAfrPid_dFactor_offset 1764
#define warmupAfrPid_dFactor_offset_hex 6e4
#define warmupAfrPid_iFactor_offset 1760
#define warmupAfrPid_iFactor_offset_hex 6e0
#define warmupAfrPid_maxValue_offset 1774
#define warmupAfrPid_maxValue_offset_hex 6ee
#define warmupAfrPid_minValue_offset 1772
#define warmupAfrPid_minValue_offset_hex 6ec
#define warmupAfrPid_offset 1756
#define warmupAfrPid_offset_hex 6dc
#define warmupAfrPid_offset_offset 1768
#define warmupAfrPid_offset_offset_hex 6e8
#define warmupAfrPid_periodMs_offset 1770
#define warmupAfrPid_periodMs_offset_hex 6ea
#define warmupAfrPid_pFactor_offset 1756
#define warmupAfrPid_pFactor_offset_hex 6dc
#define warmupAfrThreshold_offset 2128
#define warmupAfrThreshold_offset_hex 850
#define warmupTargetAfr_offset 2112
#define warmupTargetAfr_offset_hex 840
#define warmupTargetAfrBins_offset 2096
#define warmupTargetAfrBins_offset_hex 830
#define warningLedPin_offset 2041
#define warningLedPin_offset_hex 7f9
#define warningPeriod_offset 1498

43
firmware/tunerstudio/rusefi.ini
View File

@ -82,7 +82,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 integration\rusefi_config.txt Fri Jul 12 14:23:06 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:35 EDT 2019
pageSize = 20000
page = 1
@ -344,7 +344,7 @@ page = 1
useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true"
useLcdScreen = bits, U32, 744, [12:12], "false", "true"
unusedAnotherOne = bits, U32, 744, [13:13], "false", "true"
useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true"
unusedOldWarmupAfr = bits, U32, 744, [14:14], "false", "true"
onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true"
isCJ125Enabled = bits, U32, 744, [16:16], "false", "true"
vvtCamSensorUseRise = bits, U32, 744, [17:17], "false", "true"
@ -608,13 +608,7 @@ page = 1
etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0
etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0
etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_pFactor = scalar, F32, 1756, "", 1, 0, -10000, 10000, 7
warmupAfrPid_iFactor = scalar, F32, 1760, "", 1, 0, -10000, 10000, 7
warmupAfrPid_dFactor = scalar, F32, 1764, "", 1, 0, -10000, 10000, 7
warmupAfrPid_offset = scalar, S16, 1768, "", 1, 0, -1000, 1000, 0
warmupAfrPid_periodMs = scalar, S16, 1770, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_minValue = scalar, S16, 1772, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_maxValue = scalar, S16, 1774, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping unusedFormerWarmupAfrPid offset 1756
mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2
mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2
step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2
@ -663,10 +657,8 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
warmupTargetAfrBins = array, F32, 2096, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2112, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2128, "temperature", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1541,18 +1533,6 @@ fileVersion = { 20190701 }
yBins = crankingAdvance
gauge = RPMGauge
curve = warmupTargetAfrCurve, "CLT-based target AFR"
columnLabel = "Coolant", "Correction"
#if CELSIUS
xAxis = -40, 120, 10
#else
xAxis = -40, 250, 10
#endif
yAxis = 0, 50, 10
xBins = warmupTargetAfrBins, coolant
yBins = warmupTargetAfr
gauge = CLTGauge
curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
columnLabel = "Coolant", "AFR Offset"
#if CELSIUS
@ -2230,7 +2210,6 @@ menuDialog = main
# EXPERIMENTAL FEATURES
subMenu = parkingLot, "Experimental/Broken"
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target"
subMenu = smLaunchControl, "Launch control"
subMenu = std_separator
@ -3094,16 +3073,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#% duty = Pterm + Iterm + Dterm + offset%"
dialog = warmupFuelDialog, "Warmup fuel closed-loop", yAxis
field = "use automatic Pid Afr control", useWarmupPidAfr
field = "warmup temperature Threshold", warmupAfrThreshold
field = "wa offset", warmupAfrPid_offset
field = "wa P factor", warmupAfrPid_pFactor
field = "wa I factor", warmupAfrPid_iFactor
field = "wa D factor", warmupAfrPid_dFactor
field = "#correction = Pterm + Iterm + Dterm + offset"
dialog = energySystems, "Battery and Alternator Settings", yAxis
panel = batteryDialog
panel = alternator
@ -3568,8 +3537,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "Target temperature", postCrankingTargetClt
panel = warmupFuelDialog
[Tools]
;addTool = toolName, PanelName

43
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -82,7 +82,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 integration\rusefi_config.txt Fri Jul 12 14:23:12 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:39 EDT 2019
pageSize = 20000
page = 1
@ -344,7 +344,7 @@ page = 1
useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true"
useLcdScreen = bits, U32, 744, [12:12], "false", "true"
unusedAnotherOne = bits, U32, 744, [13:13], "false", "true"
useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true"
unusedOldWarmupAfr = bits, U32, 744, [14:14], "false", "true"
onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true"
isCJ125Enabled = bits, U32, 744, [16:16], "false", "true"
vvtCamSensorUseRise = bits, U32, 744, [17:17], "false", "true"
@ -608,13 +608,7 @@ page = 1
etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0
etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0
etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_pFactor = scalar, F32, 1756, "", 1, 0, -10000, 10000, 7
warmupAfrPid_iFactor = scalar, F32, 1760, "", 1, 0, -10000, 10000, 7
warmupAfrPid_dFactor = scalar, F32, 1764, "", 1, 0, -10000, 10000, 7
warmupAfrPid_offset = scalar, S16, 1768, "", 1, 0, -1000, 1000, 0
warmupAfrPid_periodMs = scalar, S16, 1770, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_minValue = scalar, S16, 1772, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_maxValue = scalar, S16, 1774, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping unusedFormerWarmupAfrPid offset 1756
mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2
mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2
step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2
@ -663,10 +657,8 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
warmupTargetAfrBins = array, F32, 2096, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2112, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2128, "temperature", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1541,18 +1533,6 @@ fileVersion = { 20190701 }
yBins = crankingAdvance
gauge = RPMGauge
curve = warmupTargetAfrCurve, "CLT-based target AFR"
columnLabel = "Coolant", "Correction"
#if CELSIUS
xAxis = -40, 120, 10
#else
xAxis = -40, 250, 10
#endif
yAxis = 0, 50, 10
xBins = warmupTargetAfrBins, coolant
yBins = warmupTargetAfr
gauge = CLTGauge
curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
columnLabel = "Coolant", "AFR Offset"
#if CELSIUS
@ -2230,7 +2210,6 @@ menuDialog = main
# EXPERIMENTAL FEATURES
subMenu = parkingLot, "Experimental/Broken"
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target"
subMenu = smLaunchControl, "Launch control"
subMenu = std_separator
@ -3094,16 +3073,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#% duty = Pterm + Iterm + Dterm + offset%"
dialog = warmupFuelDialog, "Warmup fuel closed-loop", yAxis
field = "use automatic Pid Afr control", useWarmupPidAfr
field = "warmup temperature Threshold", warmupAfrThreshold
field = "wa offset", warmupAfrPid_offset
field = "wa P factor", warmupAfrPid_pFactor
field = "wa I factor", warmupAfrPid_iFactor
field = "wa D factor", warmupAfrPid_dFactor
field = "#correction = Pterm + Iterm + Dterm + offset"
dialog = energySystems, "Battery and Alternator Settings", yAxis
panel = batteryDialog
panel = alternator
@ -3568,8 +3537,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "Target temperature", postCrankingTargetClt
panel = warmupFuelDialog
[Tools]
;addTool = toolName, PanelName

43
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -82,7 +82,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 integration\rusefi_config.txt Fri Jul 12 14:23:09 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:37 EDT 2019
pageSize = 20000
page = 1
@ -344,7 +344,7 @@ page = 1
useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true"
useLcdScreen = bits, U32, 744, [12:12], "false", "true"
unusedAnotherOne = bits, U32, 744, [13:13], "false", "true"
useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true"
unusedOldWarmupAfr = bits, U32, 744, [14:14], "false", "true"
onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true"
isCJ125Enabled = bits, U32, 744, [16:16], "false", "true"
vvtCamSensorUseRise = bits, U32, 744, [17:17], "false", "true"
@ -608,13 +608,7 @@ page = 1
etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0
etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0
etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_pFactor = scalar, F32, 1756, "", 1, 0, -10000, 10000, 7
warmupAfrPid_iFactor = scalar, F32, 1760, "", 1, 0, -10000, 10000, 7
warmupAfrPid_dFactor = scalar, F32, 1764, "", 1, 0, -10000, 10000, 7
warmupAfrPid_offset = scalar, S16, 1768, "", 1, 0, -1000, 1000, 0
warmupAfrPid_periodMs = scalar, S16, 1770, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_minValue = scalar, S16, 1772, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_maxValue = scalar, S16, 1774, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping unusedFormerWarmupAfrPid offset 1756
mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2
mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2
step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2
@ -663,10 +657,8 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
warmupTargetAfrBins = array, F32, 2096, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2112, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2128, "temperature", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1541,18 +1533,6 @@ fileVersion = { 20190701 }
yBins = crankingAdvance
gauge = RPMGauge
curve = warmupTargetAfrCurve, "CLT-based target AFR"
columnLabel = "Coolant", "Correction"
#if CELSIUS
xAxis = -40, 120, 10
#else
xAxis = -40, 250, 10
#endif
yAxis = 0, 50, 10
xBins = warmupTargetAfrBins, coolant
yBins = warmupTargetAfr
gauge = CLTGauge
curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
columnLabel = "Coolant", "AFR Offset"
#if CELSIUS
@ -2224,7 +2204,6 @@ menuDialog = main
# EXPERIMENTAL FEATURES
subMenu = parkingLot, "Experimental/Broken"
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target"
subMenu = smLaunchControl, "Launch control"
subMenu = std_separator
@ -3079,16 +3058,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#% duty = Pterm + Iterm + Dterm + offset%"
dialog = warmupFuelDialog, "Warmup fuel closed-loop", yAxis
field = "use automatic Pid Afr control", useWarmupPidAfr
field = "warmup temperature Threshold", warmupAfrThreshold
field = "wa offset", warmupAfrPid_offset
field = "wa P factor", warmupAfrPid_pFactor
field = "wa I factor", warmupAfrPid_iFactor
field = "wa D factor", warmupAfrPid_dFactor
field = "#correction = Pterm + Iterm + Dterm + offset"
dialog = energySystems, "Battery and Alternator Settings", yAxis
panel = batteryDialog
panel = alternator
@ -3552,8 +3521,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "Target temperature", postCrankingTargetClt
panel = warmupFuelDialog
[Tools]
;addTool = toolName, PanelName

43
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -82,7 +82,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 integration\rusefi_config.txt Fri Jul 12 14:23:15 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:41 EDT 2019
pageSize = 20000
page = 1
@ -344,7 +344,7 @@ page = 1
useTpicAdvancedMode = bits, U32, 744, [11:11], "false", "true"
useLcdScreen = bits, U32, 744, [12:12], "false", "true"
unusedAnotherOne = bits, U32, 744, [13:13], "false", "true"
useWarmupPidAfr = bits, U32, 744, [14:14], "false", "true"
unusedOldWarmupAfr = bits, U32, 744, [14:14], "false", "true"
onOffAlternatorLogic = bits, U32, 744, [15:15], "false", "true"
isCJ125Enabled = bits, U32, 744, [16:16], "false", "true"
vvtCamSensorUseRise = bits, U32, 744, [17:17], "false", "true"
@ -608,13 +608,7 @@ page = 1
etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0
etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0
etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_pFactor = scalar, F32, 1756, "", 1, 0, -10000, 10000, 7
warmupAfrPid_iFactor = scalar, F32, 1760, "", 1, 0, -10000, 10000, 7
warmupAfrPid_dFactor = scalar, F32, 1764, "", 1, 0, -10000, 10000, 7
warmupAfrPid_offset = scalar, S16, 1768, "", 1, 0, -1000, 1000, 0
warmupAfrPid_periodMs = scalar, S16, 1770, "ms", 1, 0, 0, 3000, 0
warmupAfrPid_minValue = scalar, S16, 1772, "", 1, 0, -30000, 30000.0, 0
warmupAfrPid_maxValue = scalar, S16, 1774, "", 1, 0, -30000, 30000.0, 0
;no TS info - skipping unusedFormerWarmupAfrPid offset 1756
mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2
mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2
step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2
@ -663,10 +657,8 @@ page = 1
tpsDecelEnleanmentThreshold = scalar, F32, 2080, "roc", 1, 0, 0, 200, 3
tpsDecelEnleanmentMultiplier = scalar, F32, 2084, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2088, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
warmupTargetAfrBins = array, F32, 2096, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2112, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2128, "temperature", 1, 0, 0, 200, 3
debugMode = bits, U32, 2092, [0:5], "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"
;no TS info - skipping unused_former_warmup_target_afr offset 2096
boostCutPressure = scalar, F32, 2132, "kPa", 1, 0, 0, 500, 0
mapAccelTaperBins = array, F32, 2136, [8], "counter", 1, 0, 0.0, 300, 0
mapAccelTaperMult = array, F32, 2168, [8], "mult", 1, 0, 0.0, 300, 2
@ -1541,18 +1533,6 @@ fileVersion = { 20190701 }
yBins = crankingAdvance
gauge = RPMGauge
curve = warmupTargetAfrCurve, "CLT-based target AFR"
columnLabel = "Coolant", "Correction"
#if CELSIUS
xAxis = -40, 120, 10
#else
xAxis = -40, 250, 10
#endif
yAxis = 0, 50, 10
xBins = warmupTargetAfrBins, coolant
yBins = warmupTargetAfr
gauge = CLTGauge
curve = wueAfrTargetOffsetCurve, "AFR Target Temperature Adjustment"
columnLabel = "Coolant", "AFR Offset"
#if CELSIUS
@ -2230,7 +2210,6 @@ menuDialog = main
# EXPERIMENTAL FEATURES
subMenu = parkingLot, "Experimental/Broken"
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target"
subMenu = smLaunchControl, "Launch control"
subMenu = std_separator
@ -3090,16 +3069,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "#% duty = Pterm + Iterm + Dterm + offset%"
dialog = warmupFuelDialog, "Warmup fuel closed-loop", yAxis
field = "use automatic Pid Afr control", useWarmupPidAfr
field = "warmup temperature Threshold", warmupAfrThreshold
field = "wa offset", warmupAfrPid_offset
field = "wa P factor", warmupAfrPid_pFactor
field = "wa I factor", warmupAfrPid_iFactor
field = "wa D factor", warmupAfrPid_dFactor
field = "#correction = Pterm + Iterm + Dterm + offset"
dialog = energySystems, "Battery and Alternator Settings", yAxis
panel = batteryDialog
panel = alternator
@ -3564,8 +3533,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex
field = "Target temperature", postCrankingTargetClt
panel = warmupFuelDialog
[Tools]
;addTool = toolName, PanelName

44
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jul 14 15:33:42 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Thu Jul 18 18:26:35 EDT 2019
import com.rusefi.config.*;
@ -1171,10 +1171,14 @@ public class Fields {
public static final int unused_bit_1472_29_offset = 1464;
public static final int unused_bit_1472_30_offset = 1464;
public static final int unused_board_984_31_offset = 744;
public static final int unused_former_warmup_target_afr_offset = 2096;
public static final int unused_former_warmup_target_afr_offset_hex = 830;
public static final int unusedAnotherOne_offset = 744;
public static final int unusedAtBoardConfigurationEnd_offset = 980;
public static final int unusedFormerWarmupAfrPid_offset = 1756;
public static final int unusedh_offset = 1471;
public static final int unusedMa2_offset = 710;
public static final int unusedOldWarmupAfr_offset = 744;
public static final int unusedSpiPadding2_offset = 804;
public static final int unusedSpiPadding2_offset_hex = 324;
public static final int unusedSpiPadding3_offset = 4036;
@ -1218,7 +1222,6 @@ public class Fields {
public static final int useTpicAdvancedMode_offset = 744;
public static final int useTPSAdvanceTable_offset = 1476;
public static final int useTPSBasedVeTable_offset = 744;
public static final int useWarmupPidAfr_offset = 744;
public static final int VBAT_INJECTOR_CURVE_SIZE = 8;
public static final int vbattAdcChannel_offset = 513;
public static final int vbattAdcChannel_offset_hex = 201;
@ -1239,21 +1242,6 @@ public class Fields {
public static final int vvtMode_offset_hex = 918;
public static final int vvtOffset_offset = 2052;
public static final int vvtOffset_offset_hex = 804;
public static final int WARMUP_TARGET_AFR_SIZE = 4;
public static final int warmupAfrPid_dFactor_offset = 1764;
public static final int warmupAfrPid_iFactor_offset = 1760;
public static final int warmupAfrPid_maxValue_offset = 1774;
public static final int warmupAfrPid_minValue_offset = 1772;
public static final int warmupAfrPid_offset = 1756;
public static final int warmupAfrPid_offset_offset = 1768;
public static final int warmupAfrPid_periodMs_offset = 1770;
public static final int warmupAfrPid_pFactor_offset = 1756;
public static final int warmupAfrThreshold_offset = 2128;
public static final int warmupAfrThreshold_offset_hex = 850;
public static final int warmupTargetAfr_offset = 2112;
public static final int warmupTargetAfr_offset_hex = 840;
public static final int warmupTargetAfrBins_offset = 2096;
public static final int warmupTargetAfrBins_offset_hex = 830;
public static final int warningLedPin_offset = 2041;
public static final int warningPeriod_offset = 1498;
public static final int wboHeaterPin_offset = 673;
@ -1513,7 +1501,7 @@ public class Fields {
public static final Field USETPICADVANCEDMODE = Field.create("USETPICADVANCEDMODE", 744, FieldType.BIT, 11);
public static final Field USELCDSCREEN = Field.create("USELCDSCREEN", 744, FieldType.BIT, 12);
public static final Field UNUSEDANOTHERONE = Field.create("UNUSEDANOTHERONE", 744, FieldType.BIT, 13);
public static final Field USEWARMUPPIDAFR = Field.create("USEWARMUPPIDAFR", 744, FieldType.BIT, 14);
public static final Field UNUSEDOLDWARMUPAFR = Field.create("UNUSEDOLDWARMUPAFR", 744, FieldType.BIT, 14);
public static final Field ONOFFALTERNATORLOGIC = Field.create("ONOFFALTERNATORLOGIC", 744, FieldType.BIT, 15);
public static final Field ISCJ125ENABLED = Field.create("ISCJ125ENABLED", 744, FieldType.BIT, 16);
public static final Field VVTCAMSENSORUSERISE = Field.create("VVTCAMSENSORUSERISE", 744, FieldType.BIT, 17);
@ -1771,13 +1759,6 @@ public class Fields {
public static final Field ETB_PERIODMS = Field.create("ETB_PERIODMS", 1750, FieldType.INT16);
public static final Field ETB_MINVALUE = Field.create("ETB_MINVALUE", 1752, FieldType.INT16);
public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1754, FieldType.INT16);
public static final Field WARMUPAFRPID_PFACTOR = Field.create("WARMUPAFRPID_PFACTOR", 1756, FieldType.FLOAT);
public static final Field WARMUPAFRPID_IFACTOR = Field.create("WARMUPAFRPID_IFACTOR", 1760, FieldType.FLOAT);
public static final Field WARMUPAFRPID_DFACTOR = Field.create("WARMUPAFRPID_DFACTOR", 1764, FieldType.FLOAT);
public static final Field WARMUPAFRPID_OFFSET = Field.create("WARMUPAFRPID_OFFSET", 1768, FieldType.INT16);
public static final Field WARMUPAFRPID_PERIODMS = Field.create("WARMUPAFRPID_PERIODMS", 1770, FieldType.INT16);
public static final Field WARMUPAFRPID_MINVALUE = Field.create("WARMUPAFRPID_MINVALUE", 1772, FieldType.INT16);
public static final Field WARMUPAFRPID_MAXVALUE = Field.create("WARMUPAFRPID_MAXVALUE", 1774, FieldType.INT16);
public static final Field MAPERRORDETECTIONTOOLOW = Field.create("MAPERRORDETECTIONTOOLOW", 1776, FieldType.FLOAT);
public static final Field MAPERRORDETECTIONTOOHIGH = Field.create("MAPERRORDETECTIONTOOHIGH", 1780, FieldType.FLOAT);
public static final Field STEP1RPMWINDOW = Field.create("STEP1RPMWINDOW", 1784, FieldType.INT);
@ -1822,9 +1803,8 @@ public class Fields {
public static final Field TPSDECELENLEANMENTTHRESHOLD = Field.create("TPSDECELENLEANMENTTHRESHOLD", 2080, FieldType.FLOAT);
public static final Field TPSDECELENLEANMENTMULTIPLIER = Field.create("TPSDECELENLEANMENTMULTIPLIER", 2084, FieldType.FLOAT);
public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2088, FieldType.FLOAT);
public static final String[] debug_mode_e = {"Alternator PID", "TPS acceleration enrichment", "Warmup PID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"};
public static final String[] debug_mode_e = {"Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "Aux Temperature", "ETB Logic"};
public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2092, FieldType.INT, debug_mode_e);
public static final Field WARMUPAFRTHRESHOLD = Field.create("WARMUPAFRTHRESHOLD", 2128, FieldType.FLOAT);
public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2132, FieldType.FLOAT);
public static final Field FSIOADC1 = Field.create("FSIOADC1", 2200, FieldType.INT8, adc_channel_e);
public static final Field FSIOADC2 = Field.create("FSIOADC2", 2201, FieldType.INT8, adc_channel_e);
@ -2290,7 +2270,7 @@ public class Fields {
USETPICADVANCEDMODE,
USELCDSCREEN,
UNUSEDANOTHERONE,
USEWARMUPPIDAFR,
UNUSEDOLDWARMUPAFR,
ONOFFALTERNATORLOGIC,
ISCJ125ENABLED,
VVTCAMSENSORUSERISE,
@ -2546,13 +2526,6 @@ public class Fields {
ETB_PERIODMS,
ETB_MINVALUE,
ETB_MAXVALUE,
WARMUPAFRPID_PFACTOR,
WARMUPAFRPID_IFACTOR,
WARMUPAFRPID_DFACTOR,
WARMUPAFRPID_OFFSET,
WARMUPAFRPID_PERIODMS,
WARMUPAFRPID_MINVALUE,
WARMUPAFRPID_MAXVALUE,
MAPERRORDETECTIONTOOLOW,
MAPERRORDETECTIONTOOHIGH,
STEP1RPMWINDOW,
@ -2598,7 +2571,6 @@ public class Fields {
TPSDECELENLEANMENTMULTIPLIER,
SLOWADCALPHA,
DEBUGMODE,
WARMUPAFRTHRESHOLD,
BOOSTCUTPRESSURE,
FSIOADC1,
FSIOADC2,