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

date & fresh integration

This commit is contained in:
rusefi 2019-12-22 08:24:47 -05:00
parent 9645130527
commit 253f68cb61
7 changed files with 812 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -819,6 +819,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20191221; return 20191222;
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

280
firmware/tunerstudio/rusefi.ini
View File

@ -44,7 +44,7 @@ enable2ndByteCanID = false
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:18 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 22 08:21:58 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1248,141 +1248,177 @@ fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c" ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 220
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm",{1/100}, 0
speedToRpmRatio = scalar, S16, 8, "value",{1/100}, 0
vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "deg C", 1, 0.0 coolant = scalar, S16, 12, "deg C",{1/100}, 0.0
#else #else
coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 coolant = scalar, S16, 12, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "deg C", 1, 0.0 intake = scalar, S16, 14, "deg C",{1/100}, 0.0
#else #else
intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 intake = scalar, S16, 14, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
TPSValue = scalar, F32, 12, "%", 1, 0 ; todo: aux1
MAFValue = scalar, F32, 16, "V", 1, 0 ; todo: aux2
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 ; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",,{1/1000},, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0
engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",,{1/1000},, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg",{1/50}, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false"; ; fuel math
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; chargeAirMass = scalar, U16, 44, "g",0.001, 0
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; baseFuel = scalar, U16, 50, "ms",{1/300}, 0
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; fuelRunning = scalar, U16, 52, "ms",{1/300}, 0
ind_fan = bits, U32, 72, [6:6], "true", "false"; actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0
ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0
ind_check_engine= bits, U32, 72, [8:8], "true", "false"; veValue = scalar, U08, 57, "ratio", 0.5, 0
needBurn = bits, U32, 72, [9:9], "true", "false"; injectionOffset = scalar, S16, 58, "deg",{1/50}, 0
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; tCharge = scalar, U16, 60, "deg C",{1/100}, 0.0
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false"; ; Corrections
ind_clt_error = bits, U32, 80, [1:1], "true", "false"; injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
ind_map_error = bits, U32, 80, [2:2], "true", "false"; iatCorrection = scalar, U16, 64, "%",{1/100}, 0
ind_iat_error = bits, U32, 80, [3:3], "true", "false"; cltCorrection = scalar, U16, 66, "%",{1/100}, 0
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; baroCorrection = scalar, U16, 68, "%",{1/100}, 0
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
lastErrorCode = scalar,U16, 240, "error", 1, 0 ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
internalMcuTemperature = scalar,F32, 244, "C", 1, 0 ; TPS/load AE
vvtPosition = scalar,F32, 248, "deg", 1, 0 engineLoadDelta = scalar, S16, 76, "value",{1/100}, 0
engineMode = scalar, U32, 252, "em", 1, 0.0; deltaTps = scalar, S16, 78, "ratio",{1/100}, 0
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; engineLoadAccelExtra=scalar,S16, 80, "value",{1/100}, 0
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 ; Ignition
coilDutyCycle = scalar, F32, 272, "perc", 1, 0 ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
accelerationX = scalar, S16, 276, "G", 0.01, 0 sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
accelerationY = scalar, S16, 278, "G", 0.01, 0 coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 ; Idle & ETB
injectionOffset = scalar, F32, 288, "deg", 1, 0; idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
debugIntField4 = scalar, S16, 292, "val", 1, 0.0; etbTarget = scalar, S16, 92, "%",{1/100}, 0
debugIntField5 = scalar, S16, 294, "val", 1, 0.0; etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0
recentErrorCode0 = scalar,U16, 296, "error", 1, 0 etb1Error = scalar, S16, 96, "%",{1/100}, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
recentErrorCode2 = scalar,U16, 300, "error", 1, 0 ; Fuel system
recentErrorCode3 = scalar,U16, 302, "error", 1, 0 fuelTankLevel = scalar, S16, 98, "amount",{1/100}, 0
recentErrorCode4 = scalar,U16, 304, "error", 1, 0 fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
recentErrorCode6 = scalar,U16, 308, "error", 1, 0 ; Knock
recentErrorCode7 = scalar,U16, 310, "error", 1, 0 knockCount = scalar, U32, 104,"counter", 1, 0
etbTarget = scalar,F32, 312, "%", 1, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
etb1Error = scalar,F32, 320, "%", 1, 0 ; Mode, firmware, protocol, run time
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

280
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -44,7 +44,7 @@ enable2ndByteCanID = false
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:24 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 22 08:22:03 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1248,141 +1248,177 @@ fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c" ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 220
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm",{1/100}, 0
speedToRpmRatio = scalar, S16, 8, "value",{1/100}, 0
vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "deg C", 1, 0.0 coolant = scalar, S16, 12, "deg C",{1/100}, 0.0
#else #else
coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 coolant = scalar, S16, 12, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "deg C", 1, 0.0 intake = scalar, S16, 14, "deg C",{1/100}, 0.0
#else #else
intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 intake = scalar, S16, 14, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
TPSValue = scalar, F32, 12, "%", 1, 0 ; todo: aux1
MAFValue = scalar, F32, 16, "V", 1, 0 ; todo: aux2
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 ; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",,{1/1000},, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0
engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",,{1/1000},, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg",{1/50}, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false"; ; fuel math
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; chargeAirMass = scalar, U16, 44, "g",0.001, 0
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; baseFuel = scalar, U16, 50, "ms",{1/300}, 0
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; fuelRunning = scalar, U16, 52, "ms",{1/300}, 0
ind_fan = bits, U32, 72, [6:6], "true", "false"; actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0
ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0
ind_check_engine= bits, U32, 72, [8:8], "true", "false"; veValue = scalar, U08, 57, "ratio", 0.5, 0
needBurn = bits, U32, 72, [9:9], "true", "false"; injectionOffset = scalar, S16, 58, "deg",{1/50}, 0
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; tCharge = scalar, U16, 60, "deg C",{1/100}, 0.0
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false"; ; Corrections
ind_clt_error = bits, U32, 80, [1:1], "true", "false"; injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
ind_map_error = bits, U32, 80, [2:2], "true", "false"; iatCorrection = scalar, U16, 64, "%",{1/100}, 0
ind_iat_error = bits, U32, 80, [3:3], "true", "false"; cltCorrection = scalar, U16, 66, "%",{1/100}, 0
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; baroCorrection = scalar, U16, 68, "%",{1/100}, 0
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
lastErrorCode = scalar,U16, 240, "error", 1, 0 ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
internalMcuTemperature = scalar,F32, 244, "C", 1, 0 ; TPS/load AE
vvtPosition = scalar,F32, 248, "deg", 1, 0 engineLoadDelta = scalar, S16, 76, "value",{1/100}, 0
engineMode = scalar, U32, 252, "em", 1, 0.0; deltaTps = scalar, S16, 78, "ratio",{1/100}, 0
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; engineLoadAccelExtra=scalar,S16, 80, "value",{1/100}, 0
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 ; Ignition
coilDutyCycle = scalar, F32, 272, "perc", 1, 0 ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
accelerationX = scalar, S16, 276, "G", 0.01, 0 sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
accelerationY = scalar, S16, 278, "G", 0.01, 0 coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 ; Idle & ETB
injectionOffset = scalar, F32, 288, "deg", 1, 0; idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
debugIntField4 = scalar, S16, 292, "val", 1, 0.0; etbTarget = scalar, S16, 92, "%",{1/100}, 0
debugIntField5 = scalar, S16, 294, "val", 1, 0.0; etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0
recentErrorCode0 = scalar,U16, 296, "error", 1, 0 etb1Error = scalar, S16, 96, "%",{1/100}, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
recentErrorCode2 = scalar,U16, 300, "error", 1, 0 ; Fuel system
recentErrorCode3 = scalar,U16, 302, "error", 1, 0 fuelTankLevel = scalar, S16, 98, "amount",{1/100}, 0
recentErrorCode4 = scalar,U16, 304, "error", 1, 0 fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
recentErrorCode6 = scalar,U16, 308, "error", 1, 0 ; Knock
recentErrorCode7 = scalar,U16, 310, "error", 1, 0 knockCount = scalar, U32, 104,"counter", 1, 0
etbTarget = scalar,F32, 312, "%", 1, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
etb1Error = scalar,F32, 320, "%", 1, 0 ; Mode, firmware, protocol, run time
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

280
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -44,7 +44,7 @@ enable2ndByteCanID = false
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sat Dec 21 19:54:17 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Dec 22 08:22:09 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1248,141 +1248,177 @@ fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c" ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 220
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm",{1/100}, 0
speedToRpmRatio = scalar, S16, 8, "value",{1/100}, 0
vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "deg C", 1, 0.0 coolant = scalar, S16, 12, "deg C",{1/100}, 0.0
#else #else
coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 coolant = scalar, S16, 12, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "deg C", 1, 0.0 intake = scalar, S16, 14, "deg C",{1/100}, 0.0
#else #else
intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 intake = scalar, S16, 14, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
TPSValue = scalar, F32, 12, "%", 1, 0 ; todo: aux1
MAFValue = scalar, F32, 16, "V", 1, 0 ; todo: aux2
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 ; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",,{1/1000},, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0
engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",,{1/1000},, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg",{1/50}, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false"; ; fuel math
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; chargeAirMass = scalar, U16, 44, "g",0.001, 0
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; baseFuel = scalar, U16, 50, "ms",{1/300}, 0
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; fuelRunning = scalar, U16, 52, "ms",{1/300}, 0
ind_fan = bits, U32, 72, [6:6], "true", "false"; actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0
ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0
ind_check_engine= bits, U32, 72, [8:8], "true", "false"; veValue = scalar, U08, 57, "ratio", 0.5, 0
needBurn = bits, U32, 72, [9:9], "true", "false"; injectionOffset = scalar, S16, 58, "deg",{1/50}, 0
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; tCharge = scalar, U16, 60, "deg C",{1/100}, 0.0
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false"; ; Corrections
ind_clt_error = bits, U32, 80, [1:1], "true", "false"; injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
ind_map_error = bits, U32, 80, [2:2], "true", "false"; iatCorrection = scalar, U16, 64, "%",{1/100}, 0
ind_iat_error = bits, U32, 80, [3:3], "true", "false"; cltCorrection = scalar, U16, 66, "%",{1/100}, 0
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; baroCorrection = scalar, U16, 68, "%",{1/100}, 0
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
lastErrorCode = scalar,U16, 240, "error", 1, 0 ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
internalMcuTemperature = scalar,F32, 244, "C", 1, 0 ; TPS/load AE
vvtPosition = scalar,F32, 248, "deg", 1, 0 engineLoadDelta = scalar, S16, 76, "value",{1/100}, 0
engineMode = scalar, U32, 252, "em", 1, 0.0; deltaTps = scalar, S16, 78, "ratio",{1/100}, 0
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; engineLoadAccelExtra=scalar,S16, 80, "value",{1/100}, 0
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 ; Ignition
coilDutyCycle = scalar, F32, 272, "perc", 1, 0 ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
accelerationX = scalar, S16, 276, "G", 0.01, 0 sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
accelerationY = scalar, S16, 278, "G", 0.01, 0 coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 ; Idle & ETB
injectionOffset = scalar, F32, 288, "deg", 1, 0; idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
debugIntField4 = scalar, S16, 292, "val", 1, 0.0; etbTarget = scalar, S16, 92, "%",{1/100}, 0
debugIntField5 = scalar, S16, 294, "val", 1, 0.0; etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0
recentErrorCode0 = scalar,U16, 296, "error", 1, 0 etb1Error = scalar, S16, 96, "%",{1/100}, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
recentErrorCode2 = scalar,U16, 300, "error", 1, 0 ; Fuel system
recentErrorCode3 = scalar,U16, 302, "error", 1, 0 fuelTankLevel = scalar, S16, 98, "amount",{1/100}, 0
recentErrorCode4 = scalar,U16, 304, "error", 1, 0 fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
recentErrorCode6 = scalar,U16, 308, "error", 1, 0 ; Knock
recentErrorCode7 = scalar,U16, 310, "error", 1, 0 knockCount = scalar, U32, 104,"counter", 1, 0
etbTarget = scalar,F32, 312, "%", 1, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
etb1Error = scalar,F32, 320, "%", 1, 0 ; Mode, firmware, protocol, run time
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

280
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -44,7 +44,7 @@ enable2ndByteCanID = false
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:21 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 22 08:22:00 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1248,141 +1248,177 @@ fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c" ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 220
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm",{1/100}, 0
speedToRpmRatio = scalar, S16, 8, "value",{1/100}, 0
vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "deg C", 1, 0.0 coolant = scalar, S16, 12, "deg C",{1/100}, 0.0
#else #else
coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 coolant = scalar, S16, 12, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "deg C", 1, 0.0 intake = scalar, S16, 14, "deg C",{1/100}, 0.0
#else #else
intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 intake = scalar, S16, 14, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
TPSValue = scalar, F32, 12, "%", 1, 0 ; todo: aux1
MAFValue = scalar, F32, 16, "V", 1, 0 ; todo: aux2
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 ; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",,{1/1000},, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0
engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",,{1/1000},, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg",{1/50}, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false"; ; fuel math
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; chargeAirMass = scalar, U16, 44, "g",0.001, 0
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; baseFuel = scalar, U16, 50, "ms",{1/300}, 0
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; fuelRunning = scalar, U16, 52, "ms",{1/300}, 0
ind_fan = bits, U32, 72, [6:6], "true", "false"; actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0
ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0
ind_check_engine= bits, U32, 72, [8:8], "true", "false"; veValue = scalar, U08, 57, "ratio", 0.5, 0
needBurn = bits, U32, 72, [9:9], "true", "false"; injectionOffset = scalar, S16, 58, "deg",{1/50}, 0
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; tCharge = scalar, U16, 60, "deg C",{1/100}, 0.0
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false"; ; Corrections
ind_clt_error = bits, U32, 80, [1:1], "true", "false"; injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
ind_map_error = bits, U32, 80, [2:2], "true", "false"; iatCorrection = scalar, U16, 64, "%",{1/100}, 0
ind_iat_error = bits, U32, 80, [3:3], "true", "false"; cltCorrection = scalar, U16, 66, "%",{1/100}, 0
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; baroCorrection = scalar, U16, 68, "%",{1/100}, 0
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
lastErrorCode = scalar,U16, 240, "error", 1, 0 ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
internalMcuTemperature = scalar,F32, 244, "C", 1, 0 ; TPS/load AE
vvtPosition = scalar,F32, 248, "deg", 1, 0 engineLoadDelta = scalar, S16, 76, "value",{1/100}, 0
engineMode = scalar, U32, 252, "em", 1, 0.0; deltaTps = scalar, S16, 78, "ratio",{1/100}, 0
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; engineLoadAccelExtra=scalar,S16, 80, "value",{1/100}, 0
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 ; Ignition
coilDutyCycle = scalar, F32, 272, "perc", 1, 0 ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
accelerationX = scalar, S16, 276, "G", 0.01, 0 sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
accelerationY = scalar, S16, 278, "G", 0.01, 0 coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 ; Idle & ETB
injectionOffset = scalar, F32, 288, "deg", 1, 0; idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
debugIntField4 = scalar, S16, 292, "val", 1, 0.0; etbTarget = scalar, S16, 92, "%",{1/100}, 0
debugIntField5 = scalar, S16, 294, "val", 1, 0.0; etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0
recentErrorCode0 = scalar,U16, 296, "error", 1, 0 etb1Error = scalar, S16, 96, "%",{1/100}, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
recentErrorCode2 = scalar,U16, 300, "error", 1, 0 ; Fuel system
recentErrorCode3 = scalar,U16, 302, "error", 1, 0 fuelTankLevel = scalar, S16, 98, "amount",{1/100}, 0
recentErrorCode4 = scalar,U16, 304, "error", 1, 0 fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
recentErrorCode6 = scalar,U16, 308, "error", 1, 0 ; Knock
recentErrorCode7 = scalar,U16, 310, "error", 1, 0 knockCount = scalar, U32, 104,"counter", 1, 0
etbTarget = scalar,F32, 312, "%", 1, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
etb1Error = scalar,F32, 320, "%", 1, 0 ; Mode, firmware, protocol, run time
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

280
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -44,7 +44,7 @@ enable2ndByteCanID = false
[TunerStudio] [TunerStudio]
queryCommand = "S" queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar. versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI v1.07" ; signature is expected to be 7 or more characters. signature = "rusEFI v1.08" ; signature is expected to be 7 or more characters.
[Constants] [Constants]
; new packet serial format with CRC ; new packet serial format with CRC
@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 18 19:37:26 EST 2019 ; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Dec 22 08:22:06 EST 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -1248,141 +1248,177 @@ fileVersion = { 20190701 }
ochGetCommand = "O%2o%2c" ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code ; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356 ochBlockSize = 220
; ;
; see TunerStudioOutputChannels struct ; see TunerStudioOutputChannels struct
; ;
RPMValue = scalar, U32, 0, "RPM", 1, 0.00000
; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false";
ind_o2_heater = bits, U32, 0, [7:7], "true", "false";
ind_check_engine= bits, U32, 0, [8:8], "true", "false";
needBurn = bits, U32, 0, [9:9], "true", "false";
ind_2nd_trigger_en=bits, U32, 0, [10:10], "true", "false";
clutchUpState =bits, U32, 0, [11:11], "true", "false";
clutchDownState =bits, U32, 0, [12:12], "true", "false";
knockEverIndicator=bits, U32, 0, [13:13], "true", "false";
knockNowIndicator=bits, U32, 0, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 0, [15:15], "true", "false";
toothLogReady =bits, U32, 0, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 0, [17:17], "true", "false";
ind_tps_error = bits, U32, 0, [18:18], "true", "false";
ind_clt_error = bits, U32, 0, [19:19], "true", "false";
ind_map_error = bits, U32, 0, [20:21], "true", "false";
ind_iat_error = bits, U32, 0, [21:22], "true", "false";
ind_isTriggerError = bits, U32, 0, [23:23], "true", "false";
ind_hasFatalError=bits, U32, 0, [24:24], "true", "false";
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
rpmAcceleration = scalar, S16, 6, "dRpm",{1/100}, 0
speedToRpmRatio = scalar, S16, 8, "value",{1/100}, 0
vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0.0
; temperatures
internalMcuTemperature = scalar,S08, 11, "deg C", 1, 0
#if CELSIUS #if CELSIUS
coolant = scalar, F32, 4, "deg C", 1, 0.0 coolant = scalar, S16, 12, "deg C",{1/100}, 0.0
#else #else
coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 coolant = scalar, S16, 12, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
#if CELSIUS #if CELSIUS
intake = scalar, F32, 8, "deg C", 1, 0.0 intake = scalar, S16, 14, "deg C",{1/100}, 0.0
#else #else
intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 intake = scalar, S16, 14, "deg F",{9/(5 * 100)}, 17.77777
#endif #endif
TPSValue = scalar, F32, 12, "%", 1, 0 ; todo: aux1
MAFValue = scalar, F32, 16, "V", 1, 0 ; todo: aux2
AFRValue = scalar, F32, 20, "AFR", 1, 0.0
engineLoad = scalar, F32, 24, "%", 1, 0.0 ; Blend of MAP and TPS, depends on algorithm
VBatt = scalar, F32, 28, "V", 1, 0.0 ; throttle, pedal
TPSValue = scalar, U16, 20, "%",{1/100}, 0
throttlePedalPosition = scalar,U16, 22, "%",{1/100}, 0
tpsADC = scalar, U16, 24, "ADC", 1, 0.0;
; air flow/mass measurments
MAFValue = scalar, U16, 26, "V",,{1/1000},, 0
massAirFlowValue= scalar, U16, 28, "Kg/h", 0.01, 0
MAPValue = scalar, U16, 30, "kPa",{1/30}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/30}, 0.0
AFRValue = scalar, U16, 34, "AFR",,{1/1000},, 0.0
engineLoad = scalar, U16, 36, "%",{1/100}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",,{1/1000},, 0.0
oilPressure = scalar, U16, 40, "kPa",{1/30}, 0.0
vvtPosition = scalar, U16, 42, "deg",{1/50}, 0
; 10 bit TPS ADC value (from 0 to 1023 in 5v scale) ; 10 bit TPS ADC value (from 0 to 1023 in 5v scale)
tpsADC = scalar, U16, 32, "ADC", 1, 0.0; ;tpsADC2 = scalar, U16, 44, "ADC", 1, 0.0;
tpsADC2 = scalar, U16, 34, "ADC", 1, 0.0;
baroPressure = scalar, F32, 36, "pres", 1, 0.0;
MAPValue = scalar, F32, 40, "MAP", 1, 0.0;
; total fuel squirt duration (in MS) per engine cycle according to current CLT
crankingFuelMs = scalar, F32, 44, "ms", 1, 0.0;
baseFuel = scalar, F32, 48, "ms", 1, 0
tCharge = scalar, F32, 52, "T", 1, 0.0;
ignitionAdvance = scalar, F32, 56, "deg", 1, 0.0;
sparkDwellValue = scalar, F32, 60, "ms", 1, 0.0;
; actual total Ms time per engine cycle with all corrections
actualLastInjection = scalar, F32, 64, "ms", 1, 0.0;
debugFloatField1 = scalar, F32, 68, "val", 1, 0.0;
hasSdCard = bits, U32, 72, [0:0], "true", "false"; ; fuel math
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; chargeAirMass = scalar, U16, 44, "g",0.001, 0
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false"; crankingFuelMs = scalar, U16, 46, "ms",{1/300}, 0.0
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false"; currentTargetAfr= scalar, U16, 48, "ratio",,{1/1000},, 0
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false"; baseFuel = scalar, U16, 50, "ms",{1/300}, 0
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false"; fuelRunning = scalar, U16, 52, "ms",{1/300}, 0
ind_fan = bits, U32, 72, [6:6], "true", "false"; actualLastInjection=scalar,U16, 54, "ms",{1/300}, 0.0
ind_o2_heater = bits, U32, 72, [7:7], "true", "false"; injectorDutyCycle=scalar, U08, 56, "%", 0.5, 0
ind_check_engine= bits, U32, 72, [8:8], "true", "false"; veValue = scalar, U08, 57, "ratio", 0.5, 0
needBurn = bits, U32, 72, [9:9], "true", "false"; injectionOffset = scalar, S16, 58, "deg",{1/50}, 0
ind_2nd_trigger_en=bits, U32, 72, [10:10], "true", "false"; tCharge = scalar, U16, 60, "deg C",{1/100}, 0.0
clutchUpState =bits, U32, 72, [11:11], "true", "false";
clutchDownState =bits, U32, 72, [12:12], "true", "false";
knockEverIndicator=bits, U32, 72, [13:13], "true", "false";
knockNowIndicator=bits, U32, 72, [14:14], "true", "false";
brakePedalIndicator=bits, U32, 72, [15:15], "true", "false";
toothLogReady =bits, U32, 72, [16:16], "true", "false";
acSwitchIndicator =bits, U32, 72, [17:17], "true", "false";
vehicleSpeedKph = scalar, F32, 76, "kph", 1, 0.0;
ind_tps_error = bits, U32, 80, [0:0], "true", "false"; ; Corrections
ind_clt_error = bits, U32, 80, [1:1], "true", "false"; injectorLagMs = scalar, U16, 62, "ms",{1/300}, 0.0
ind_map_error = bits, U32, 80, [2:2], "true", "false"; iatCorrection = scalar, U16, 64, "%",{1/100}, 0
ind_iat_error = bits, U32, 80, [3:3], "true", "false"; cltCorrection = scalar, U16, 66, "%",{1/100}, 0
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false"; baroCorrection = scalar, U16, 68, "%",{1/100}, 0
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; fuelPidCorrection=scalar, S16, 70, "ms",{1/300}, 0
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "deg C", 1, 0
egt2 = scalar, S16, 90, "deg C", 1, 0
egt3 = scalar, S16, 92, "deg C", 1, 0
egt4 = scalar, S16, 94, "deg C", 1, 0
egt5 = scalar, S16, 96, "deg C", 1, 0
egt6 = scalar, S16, 98, "deg C", 1, 0
egt7 = scalar, S16, 100, "deg C", 1, 0
egt8 = scalar, S16, 102, "deg C", 1, 0
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0
deltaTps = scalar, F32, 116, "ratio", 1, 0
triggerErrorsCounter = scalar, U32,120, "counter", 1, 0
engineLoadAccelExtra = scalar,F32, 124, "value", 1, 0
tpsAccelFuel = scalar, F32, 128, "ms", 1, 0
baroCorrection = scalar, F32, 132, "%", 1, 0
throttlePedalPosition = scalar, F32, 136, "%", 1, 0
injectorDutyCycle= scalar, F32, 140, "%", 1, 0
knockCount = scalar, U32, 144, "counter", 1, 0
fuelTankLevel = scalar, F32, 148, "amount", 1, 0
knockLevel = scalar, F32, 152, "Volts", 1, 0
; totalTriggerErrorCounter 156
wallFuelAmount = scalar, F32, 160, "ms", 1, 0
iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
idleAirValvePosition = scalar, F32, 172, "percent", 1, 0
currentTargetAfr = scalar, F32, 176, "ratio", 1, 0
chargeAirMass = scalar, F32, 180, "g", 1, 0
cltCorrection = scalar, F32, 184, "%", 1, 0
fuelRunning = scalar, F32, 188, "g", 1, 0
debugIntField1 = scalar, S32, 192, "val", 1, 0.0;
injectorLagMs = scalar, F32, 196, "ms", 1, 0.0;
debugFloatField2 = scalar, F32, 200, "val", 1, 0.0;
debugFloatField3 = scalar, F32, 204, "val", 1, 0.0;
debugFloatField4 = scalar, F32, 208, "val", 1, 0.0;
debugFloatField5 = scalar, F32, 212, "val", 1, 0.0;
debugIntField2 = scalar, S32, 216, "val", 1, 0.0;
debugIntField3 = scalar, S32, 220, "val", 1, 0.0;
timeSeconds = scalar, U32, 224, "sec", 1, 0.0;
engineLoadDelta = scalar,F32, 228, "value", 1, 0
speedToRpmRatio = scalar,F32, 232, "value", 1, 0
warningCounter = scalar,U16, 236, "count", 1, 0
lastErrorCode = scalar,U16, 240, "error", 1, 0 ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/300}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0
internalMcuTemperature = scalar,F32, 244, "C", 1, 0 ; TPS/load AE
vvtPosition = scalar,F32, 248, "deg", 1, 0 engineLoadDelta = scalar, S16, 76, "value",{1/100}, 0
engineMode = scalar, U32, 252, "em", 1, 0.0; deltaTps = scalar, S16, 78, "ratio",{1/100}, 0
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0; engineLoadAccelExtra=scalar,S16, 80, "value",{1/100}, 0
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0; tpsAccelFuel = scalar, U16, 82, "ms",{1/300}, 0
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
fuelPidCorrection = scalar, F32, 268, "ms", 1, 0 ; Ignition
coilDutyCycle = scalar, F32, 272, "perc", 1, 0 ignitionAdvance = scalar, U16, 84, "deg",{1/50}, 0.0
accelerationX = scalar, S16, 276, "G", 0.01, 0 sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0
accelerationY = scalar, S16, 278, "G", 0.01, 0 coilDutyCycle = scalar, U16, 88, "%",{1/100}, 0
oilPressure = scalar, F32, 280, "kPa", 1, 0.0
fuelConsumptionPerHour=scalar, F32, 284, "kPa", 1, 0.0 ; Idle & ETB
injectionOffset = scalar, F32, 288, "deg", 1, 0; idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0
debugIntField4 = scalar, S16, 292, "val", 1, 0.0; etbTarget = scalar, S16, 92, "%",{1/100}, 0
debugIntField5 = scalar, S16, 294, "val", 1, 0.0; etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0
recentErrorCode0 = scalar,U16, 296, "error", 1, 0 etb1Error = scalar, S16, 96, "%",{1/100}, 0
recentErrorCode1 = scalar,U16, 298, "error", 1, 0
recentErrorCode2 = scalar,U16, 300, "error", 1, 0 ; Fuel system
recentErrorCode3 = scalar,U16, 302, "error", 1, 0 fuelTankLevel = scalar, S16, 98, "amount",{1/100}, 0
recentErrorCode4 = scalar,U16, 304, "error", 1, 0 fuelConsumptionPerHour=scalar,F32, 100, "kPa", 1, 0.0
recentErrorCode5 = scalar,U16, 306, "error", 1, 0
recentErrorCode6 = scalar,U16, 308, "error", 1, 0 ; Knock
recentErrorCode7 = scalar,U16, 310, "error", 1, 0 knockCount = scalar, U32, 104,"counter", 1, 0
etbTarget = scalar,F32, 312, "%", 1, 0 knockLevel = scalar, F32, 108, "Volts", 1, 0
etb1DutyCycle = scalar,F32, 316, "%", 1, 0
etb1Error = scalar,F32, 320, "%", 1, 0 ; Mode, firmware, protocol, run time
timeSeconds = scalar, U32, 112, "sec", 1, 0.0
engineMode = scalar, U32, 116, "em", 1, 0.0;
firmwareVersion = scalar, U32, 120,"version_f", 1, 0
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
recentErrorCode1= scalar, U16, 142, "error", 1, 0
recentErrorCode2= scalar, U16, 144, "error", 1, 0
recentErrorCode3= scalar, U16, 146, "error", 1, 0
recentErrorCode4= scalar, U16, 148, "error", 1, 0
recentErrorCode5= scalar, U16, 150, "error", 1, 0
recentErrorCode6= scalar, U16, 152, "error", 1, 0
recentErrorCode7= scalar, U16, 154, "error", 1, 0
; Debug
debugFloatField1= scalar, F32, 156, "val", 1, 0.0
debugFloatField2= scalar, F32, 160, "val", 1, 0.0
debugFloatField3= scalar, F32, 164, "val", 1, 0.0
debugFloatField4= scalar, F32, 168, "val", 1, 0.0
debugFloatField5= scalar, F32, 172, "val", 1, 0.0
debugFloatField6= scalar, F32, 176, "val", 1, 0.0
debugFloatField7= scalar, F32, 180, "val", 1, 0.0
debugIntField1 = scalar, S32, 184, "val", 1, 0.0
debugIntField2 = scalar, S32, 188, "val", 1, 0.0
debugIntField3 = scalar, S32, 192, "val", 1, 0.0
debugIntField4 = scalar, S16, 196, "val", 1, 0.0
debugIntField5 = scalar, S16, 198, "val", 1, 0.0
; Accel
accelerationX = scalar, S16, 200, "G", 0.01, 0
accelerationY = scalar, S16, 202, "G", 0.01, 0
; egt
egt1 = scalar, S16, 204, "deg C", 1, 0
egt2 = scalar, S16, 206, "deg C", 1, 0
egt3 = scalar, S16, 208, "deg C", 1, 0
egt4 = scalar, S16, 210, "deg C", 1, 0
egt5 = scalar, S16, 212, "deg C", 1, 0
egt6 = scalar, S16, 214, "deg C", 1, 0
egt7 = scalar, S16, 216, "deg C", 1, 0
egt8 = scalar, S16, 218, "deg C", 1, 0
; ;

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -49,7 +49,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20191221; public static final int CONSOLE_VERSION = 20191222;
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", "."); public static final String TOOLS_PATH = System.getProperty("tools_path", ".");