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

maybe improvent for trigger errors in TS and console, TS still does not know about order error counter

This commit is contained in:
rusefi 2019-12-25 15:57:47 -05:00
parent 6a193576be
commit 3ab209fafc
8 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/binary/tunerstudio_configuration.h
View File

@ -196,8 +196,8 @@ typedef struct {
uint32_t tsConfigVersion; // 124
// Errors
int triggerErrorsCounter; // 128
int totalTriggerErrorCounter; // 132
int totalTriggerErrorCounter; // 128
int orderingErrorCounter; // 132
int16_t warningCounter; // 136
int16_t lastErrorCode; // 138
int16_t recentErrorCodes[8]; // 140

7
firmware/console/status_loop.cpp
View File

@ -754,9 +754,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
// offset 116
// TPS acceleration
tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getMaxDelta();
// 120
tsOutputChannels->triggerErrorsCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
// 128
tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
// 132
tsOutputChannels->orderingErrorCounter = engine->triggerCentral.triggerState.orderingErrorCounter;
// 68
tsOutputChannels->baroCorrection = engine->engineState.baroCorrection;
// 136
tsOutputChannels->pedalPosition = hasPedalPositionSensor(PASS_ENGINE_PARAMETER_SIGNATURE) ? getPedalPosition(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
@ -810,7 +812,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->knockLevel = engine->knockVolts;
tsOutputChannels->hasFatalError = hasFirmwareError();
tsOutputChannels->totalTriggerErrorCounter = engine->triggerCentral.triggerState.totalTriggerErrorCounter;
tsOutputChannels->coilDutyCycle = getCoilDutyCycle(rpm PASS_ENGINE_PARAMETER_SUFFIX);

10
firmware/tunerstudio/rusefi.ini
View File

@ -85,7 +85,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 Wed Dec 25 15:38:31 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 25 15:54:40 EST 2019
pageSize = 20000
page = 1
@ -1378,8 +1378,8 @@ fileVersion = { 20191221 }
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
totalTriggerErrorCounter=scalar,U32, 128,"counter", 1, 0
; orderingErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
@ -1891,7 +1891,7 @@ gaugeCategory = Sensors - Extra 2
gaugeCategory = ECU Status
warningCounterGauge = warningCounter, "Warning count", "", 0, 100, 0, 0, 100, 100, 0, 0
lastErrorCodeGauge = lastErrorCode, "Last error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
triggerErrorsCounterGauge = triggerErrorsCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
@ -2089,7 +2089,7 @@ gaugeCategory = Throttle Body (incl. ETB)
entry = massAirFlowValue,"air flow", float, "%.3f"
entry = chargeAirMass, "air mass", float, "%.3f"
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
entry = triggerErrorsCounter, "trg err",int, "%d"
entry = totalTriggerErrorCounter, "trg err",int, "%d"
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"

8
firmware/tunerstudio/rusefi.input
View File

@ -292,8 +292,8 @@ fileVersion = { @@TS_FILE_VERSION@@ }
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
totalTriggerErrorCounter=scalar,U32, 128,"counter", 1, 0
; orderingErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
@ -805,7 +805,7 @@ gaugeCategory = Sensors - Extra 2
gaugeCategory = ECU Status
warningCounterGauge = warningCounter, "Warning count", "", 0, 100, 0, 0, 100, 100, 0, 0
lastErrorCodeGauge = lastErrorCode, "Last error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
triggerErrorsCounterGauge = triggerErrorsCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
@ -1003,7 +1003,7 @@ gaugeCategory = Throttle Body (incl. ETB)
entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f"
entry = chargeAirMass, @@GAUGE_NAME_AIR_MASS@@, float, "%.3f"
entry = throttlePedalPosition, @@GAUGE_NAME_THROTTLE_PEDAL@@, float, "%.3f"
entry = triggerErrorsCounter, "trg err",int, "%d"
entry = totalTriggerErrorCounter, "trg err",int, "%d"
entry = idleAirValvePosition, @@GAUGE_NAME_IAC@@, float, "%.3f"

10
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -85,7 +85,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 Wed Dec 25 15:38:40 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 25 15:54:44 EST 2019
pageSize = 20000
page = 1
@ -1378,8 +1378,8 @@ fileVersion = { 20191221 }
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
totalTriggerErrorCounter=scalar,U32, 128,"counter", 1, 0
; orderingErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
@ -1891,7 +1891,7 @@ gaugeCategory = Sensors - Extra 2
gaugeCategory = ECU Status
warningCounterGauge = warningCounter, "Warning count", "", 0, 100, 0, 0, 100, 100, 0, 0
lastErrorCodeGauge = lastErrorCode, "Last error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
triggerErrorsCounterGauge = triggerErrorsCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
@ -2089,7 +2089,7 @@ gaugeCategory = Throttle Body (incl. ETB)
entry = massAirFlowValue,"air flow", float, "%.3f"
entry = chargeAirMass, "air mass", float, "%.3f"
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
entry = triggerErrorsCounter, "trg err",int, "%d"
entry = totalTriggerErrorCounter, "trg err",int, "%d"
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"

10
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -85,7 +85,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 Wed Dec 25 15:38:36 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 25 15:54:43 EST 2019
pageSize = 20000
page = 1
@ -1378,8 +1378,8 @@ fileVersion = { 20191221 }
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
totalTriggerErrorCounter=scalar,U32, 128,"counter", 1, 0
; orderingErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
@ -1891,7 +1891,7 @@ gaugeCategory = Sensors - Extra 2
gaugeCategory = ECU Status
warningCounterGauge = warningCounter, "Warning count", "", 0, 100, 0, 0, 100, 100, 0, 0
lastErrorCodeGauge = lastErrorCode, "Last error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
triggerErrorsCounterGauge = triggerErrorsCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
@ -2089,7 +2089,7 @@ gaugeCategory = Throttle Body (incl. ETB)
entry = massAirFlowValue,"air flow", float, "%.3f"
entry = chargeAirMass, "air mass", float, "%.3f"
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
entry = triggerErrorsCounter, "trg err",int, "%d"
entry = totalTriggerErrorCounter, "trg err",int, "%d"
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"

10
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -85,7 +85,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 Wed Dec 25 15:38:46 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 25 15:54:46 EST 2019
pageSize = 20000
page = 1
@ -1378,8 +1378,8 @@ fileVersion = { 20191221 }
firmwareTsVersion=scalar, U32, 124,"version_p", 1, 0
; Errors
triggerErrorsCounter=scalar,U32, 128,"counter", 1, 0
; totalTriggerErrorCounter 132
totalTriggerErrorCounter=scalar,U32, 128,"counter", 1, 0
; orderingErrorCounter 132
warningCounter = scalar, U16, 136, "count", 1, 0
lastErrorCode = scalar, U16, 138, "error", 1, 0
recentErrorCode0= scalar, U16, 140, "error", 1, 0
@ -1891,7 +1891,7 @@ gaugeCategory = Sensors - Extra 2
gaugeCategory = ECU Status
warningCounterGauge = warningCounter, "Warning count", "", 0, 100, 0, 0, 100, 100, 0, 0
lastErrorCodeGauge = lastErrorCode, "Last error", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
triggerErrorsCounterGauge = triggerErrorsCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
triggerErrorsCounterGauge = totalTriggerErrorCounter, "Trigger error count", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0
recentErrorCode0Gauge = recentErrorCode0, "Error#1", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode1Gauge = recentErrorCode1, "Error#2", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
recentErrorCode2Gauge = recentErrorCode2, "Error#3", "", 0, 18000, 0, 0, 18000, 18000, 0, 0
@ -2089,7 +2089,7 @@ gaugeCategory = Throttle Body (incl. ETB)
entry = massAirFlowValue,"air flow", float, "%.3f"
entry = chargeAirMass, "air mass", float, "%.3f"
entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f"
entry = triggerErrorsCounter, "trg err",int, "%d"
entry = totalTriggerErrorCounter, "trg err",int, "%d"
entry = idleAirValvePosition, "Idle Air Valve", float, "%.3f"

2
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -92,6 +92,8 @@ public enum Sensor {
TS_CONFIG_VERSION(".ini version", SensorCategory.OPERATIONS, FieldType.INT, 124, BackgroundColor.BLUE),
// Errors
totalTriggerErrorCounter("trigger total error counter", SensorCategory.STATUS, FieldType.INT, 128, BackgroundColor.MUD, 0, 5),
orderingErrorCounter("trigger order error counter", SensorCategory.STATUS, FieldType.INT, 132, BackgroundColor.MUD, 0, 5),
errorCodeCounter("error counter", SensorCategory.STATUS, FieldType.INT, 136, BackgroundColor.MUD, 0, 5),
lastErrorCode("last error", SensorCategory.STATUS, FieldType.INT, 138, BackgroundColor.MUD, 0, 5),