Merge branch 'master' of https://github.com/rusefi/rusefi

NMSTEC · May 8, 2022 · e3f6541 · e3f6541
2 parents bd84598 + c9560fb
commit e3f6541
Show file tree

Hide file tree

Showing 39 changed files with 15,098 additions and 14,660 deletions.
diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini
@@ -227,7 +227,6 @@ entry = dfcoActive, "dfcoActive", int,    "%d"
 entry = tpsAccelActive, "tpsAccelActive", int,    "%d"
 entry = boostControllerOutput, "Boost Output", float,  "%.3f"
 entry = boostControllerOpenLoopPart, "Boost Open Loop", float,  "%.3f"
-entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float,  "%.3f"
 entry = fallbackMap, "fallbackMap", float,  "%.3f"
 entry = boostControllerClosedLoopPart, "Boost Closed Loop", float,  "%.3f"
 entry = detectedGear, "Detected Gear", int,    "%d"
@@ -394,10 +393,11 @@ entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float,  "%.3
 entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float,  "%.3f"
 entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int,    "%d"
 entry = mapVvt_map_peak, "mapVvt_map_peak", int,    "%d"
-entry = currentGap, "currentGap", float,  "%.3f"
 entry = totalRevolutionCounter, "Crank revolution counter", int,    "%d"
 entry = vvtSyncGapRatio, "vvtSyncGapRatio", float,  "%.3f"
 entry = vvtCurrentPosition, "vvtCurrentPosition", float,  "%.3f"
+entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float,  "%.3f"
+entry = triggerActualSyncGapRatio, "triggerActualSyncGapRatio", float,  "%.3f"
 entry = triggerStateIndex, "triggerStateIndex", int,    "%d"
 entry = vvtCounter, "vvtCounter", int,    "%d"
 entry = vvtSyncCounter, "vvtSyncCounter", int,    "%d"

diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini
@@ -192,14 +192,16 @@ dialog = trigger_centralDialog, "trigger_central"
 
 dialog = trigger_stateDialog, "trigger_state"
 	liveGraph = trigger_state_1_Graph, "Graph", South
-		graphLine = currentGap
 		graphLine = totalRevolutionCounter
 		graphLine = vvtSyncGapRatio
 		graphLine = vvtCurrentPosition
+		graphLine = triggerSyncGapRatio
 	liveGraph = trigger_state_2_Graph, "Graph", South
+		graphLine = triggerActualSyncGapRatio
 		graphLine = triggerStateIndex
 		graphLine = vvtCounter
 		graphLine = vvtSyncCounter
+	liveGraph = trigger_state_3_Graph, "Graph", South
 		graphLine = vvtStateIndex
 
 

diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini
@@ -291,8 +291,6 @@ unusedBit_229_30Gauge = unusedBit_229_30,"unusedBit_229_30", "", -1.0,-1.0, -1.0
 unusedBit_229_31Gauge = unusedBit_229_31,"unusedBit_229_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
 boostControllerOutputGauge = boostControllerOutput,"Boost Output", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1
 boostControllerOpenLoopPartGauge = boostControllerOpenLoopPart,"Boost Open Loop", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1
-alignmentFill_at_414Gauge = alignmentFill_at_414,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.0, 0,0
-triggerSyncGapRatioGauge = triggerSyncGapRatio,"Trigger Sync Latest Ratio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
 fallbackMapGauge = fallbackMap,"fallbackMap", "kPa", 0.0,1000.0, 0.0,1000.0, 0.0,1000.0, 1,1
 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost Closed Loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1
 detectedGearGauge = detectedGear,"Detected Gear", "", 0.0,8.0, 0.0,8.0, 0.0,8.0, 0,0
@@ -306,6 +304,7 @@ maxLockedDurationGauge = maxLockedDuration,"maxLockedDuration", "", -10000.0,100
 maxTriggerReentrantGauge = maxTriggerReentrant,"maxTriggerReentrant", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
 canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
 canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
+alignmentFill_at_438Gauge = alignmentFill_at_438,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.0, 0,0
 triggerPrimaryFallGauge = triggerPrimaryFall,"triggerPrimaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
 triggerPrimaryRiseGauge = triggerPrimaryRise,"triggerPrimaryRise", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
 triggerSecondaryFallGauge = triggerSecondaryFall,"triggerSecondaryFall", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3