Merge branch 'main' of github.com:amrikarisma/fw-custom-mazduino into mazduino

Author: amrikarisma

board.mk

@@ -18,8 +18,3 @@ DDEFS += -DKNOCK_SPECTROGRAM=TRUE
 # assign critical LED to a non-existent pin if you do not have it on your board
 # good old PD14 is still the default value
 # DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::I15
-
-# we do not have much Lua RAM, let's drop some fancy functions
-# DDEFS += -DWITH_LUA_CONSUMPTION=FALSE
-# DDEFS += -DWITH_LUA_PID=FALSE
-# DDEFS += -DWITH_LUA_STOP_ENGINE=FALSE

board_configuration.cpp

@@ -64,3 +64,6 @@ void customBoardTsAction(uint16_t subSystem, uint16_t index);
     custom_board_ts_command = customBoardTsAction;
 }
 
+void setup_custom_board_overrides() {
+    custom_board_DefaultConfiguration = customBoardDefaultConfiguration;
+}

ext/rusefi

@@ -1,2 +1,4 @@
 struct_no_prefix extra_s
+bit extraBit
+int extraInt
 end_struct

extra.txt

@@ -34,6 +34,7 @@ entry = RPMValue, "RPM", int,    "%d"
 entry = rpmAcceleration, "dRPM", int,    "%d"
 entry = speedToRpmRatio, "Gearbox Ratio", float,  "%.3f"
 entry = internalMcuTemperature, "ECU: CPU Temperature", int,    "%d"
+entry = internalVref, "internalVref", float,  "%.3f"
 entry = coolant, "CLT", float,  "%.3f"
 entry = intake, "IAT", float,  "%.3f"
 entry = auxTemp1, "auxTemp1", float,  "%.3f"
@@ -50,6 +51,7 @@ entry = VBatt, "VBatt", float,  "%.3f"
 entry = oilPressure, "Oil Pressure", float,  "%.3f"
 entry = vvtPositionB1I, "VVT: bank 1 intake", float,  "%.3f"
 entry = actualLastInjection, "Fuel: Last inj pulse width", float,  "%.3f"
+entry = actualLastInjectionRatio, "Fuel: Last inj pulse growth", float,  "%.3f"
 entry = stopEngineCode, "stopEngineCode", int,    "%d"
 entry = injectorDutyCycle, "Fuel: injector duty cycle", float,  "%.3f"
 entry = tempLogging1, "tempLogging1", int,    "%d"
@@ -169,11 +171,13 @@ entry = tps1Split, "tps1Split", float,  "%.3f"
 entry = tps2Split, "tps2Split", float,  "%.3f"
 entry = tps12Split, "tps12Split", float,  "%.3f"
 entry = accPedalSplit, "accPedalSplit", float,  "%.3f"
+entry = accPedalUnfiltered, "accPedalUnfiltered", float,  "%.3f"
 entry = sparkCutReason, "Ign: Cut Code", int,    "%d"
 entry = fuelCutReason, "Fuel: Cut Code", int,    "%d"
 entry = mafEstimate, "Air: Flow estimate", float,  "%.3f"
 entry = instantRpm, "sync: instant RPM", int,    "%d"
 entry = rawMap, "rawMap", float,  "%.3f"
+entry = rawMapFast, "rawMapFast", float,  "%.3f"
 entry = rawAfr, "rawAfr", float,  "%.3f"
 entry = calibrationValue2, "calibrationValue2", float,  "%.3f"
 entry = luaInvocationCounter, "Lua: Tick counter", int,    "%d"
@@ -330,6 +334,8 @@ entry = targetAfrBlendBias1, "targetAfrBlendBias 1", float,  "%.3f"
 entry = targetAfrBlendBias2, "targetAfrBlendBias 2", float,  "%.3f"
 entry = targetAfrBlendOutput1, "targetAfrBlendOutput 1", float,  "%.3f"
 entry = targetAfrBlendOutput2, "targetAfrBlendOutput 2", float,  "%.3f"
+entry = targetAfrBlendYAxis1, "targetAfrBlendYAxis 1", float,  "%.3f"
+entry = targetAfrBlendYAxis2, "targetAfrBlendYAxis 2", float,  "%.3f"
 entry = coilState1, "coilState1", int,    "%d"
 entry = coilState2, "coilState2", int,    "%d"
 entry = coilState3, "coilState3", int,    "%d"
@@ -360,6 +366,7 @@ entry = vvtChannel1, "bank 1 intake cam input", int,    "%d"
 entry = vvtChannel2, "bank 1 exhaust cam input", int,    "%d"
 entry = vvtChannel3, "bank 2 intake cam input", int,    "%d"
 entry = vvtChannel4, "bank 2 exhaust cam input", int,    "%d"
+entry = isMapPredictionActive, "AE: Map Prediction Active", int,    "%d"
 entry = outputRequestPeriod, "outputRequestPeriod", int,    "%d"
 entry = mapFast, "mapFast", float,  "%.3f"
 entry = luaGauges1, "Lua: Gauge 1", float,  "%.3f"
@@ -413,12 +420,12 @@ entry = injectorDiagnostic10, "injectorDiagnostic 10", int,    "%d"
 entry = injectorDiagnostic11, "injectorDiagnostic 11", int,    "%d"
 entry = injectorDiagnostic12, "injectorDiagnostic 12", int,    "%d"
 entry = actualLastInjectionStage2, "Fuel: Last inj pulse width stg 2", float,  "%.3f"
+entry = actualLastInjectionRatioStage2, "Fuel: Last inj pulse growth stg 2", float,  "%.3f"
 entry = injectorDutyCycleStage2, "Fuel: injector duty cycle stage 2", float,  "%.3f"
 entry = rawFlexFreq, "rawFlexFreq", int,    "%d"
 entry = canReWidebandCmdStatus, "canReWidebandCmdStatus", int,    "%d"
 entry = deviceUid, "deviceUid", int,    "%d"
 entry = mc33810spiErrorCounter, "mc33810spiErrorCounter", int,    "%d"
-entry = sadDwellRatioCounter, "sadDwellRatioCounter", int,    "%d"
 entry = injectionPrimingCounter, "injectionPrimingCounter", int,    "%d"
 entry = tempLogging2, "tempLogging2", int,    "%d"
 entry = acPressure, "A/C pressure", float,  "%.3f"
@@ -614,6 +621,7 @@ entry = luaTargetAdd, "Boost: Lua target add", float,  "%.3f"
 entry = luaTargetMult, "Boost: Lua target mult", float,  "%.3f"
 entry = boostControlTarget, "Boost: Target", float,  "%.3f"
 entry = openLoopPart, "Boost: Open loop", float,  "%.3f"
+entry = openLoopYAxis, "openLoopYAxis", float,  "%.3f"
 entry = luaOpenLoopAdd, "Boost: Lua open loop add", float,  "%.3f"
 entry = boostControllerClosedLoopPart, "Boost: Closed loop", float,  "%.3f"
 entry = boostOutput, "Boost: Output", float,  "%.3f"
@@ -720,9 +728,13 @@ entry = globalSparkCounter, "Ign: Spark counter", int,    "%d"
 entry = fuelingLoad, "Fuel: Load", float,  "%.3f"
 entry = ignitionLoad, "Ignition: load", float,  "%.3f"
 entry = veTableYAxis, "veTableYAxis", float,  "%.3f"
-entry = overDwellCounter, "overDwellCounter", int,    "%d"
-entry = overDwellNotScheduledCounter, "overDwellNotScheduledCounter", int,    "%d"
-entry = sparkOutOfOrderCounter, "sparkOutOfOrderCounter", int,    "%d"
+entry = veTableIdleYAxis, "veTableIdleYAxis", float,  "%.3f"
+entry = overDwellCanceledCounter, "Ignition: overcharge canceled", int,    "%d"
+entry = overDwellNotScheduledCounter, "Ignition: overDwellNotScheduled", int,    "%d"
+entry = sparkOutOfOrderCounter, "Ignition: sparkOutOfOrder", int,    "%d"
+entry = dwellUnderChargeCounter, "Ignition: undecharge warnings", int,    "%d"
+entry = dwellOverChargeCounter, "Ignition: overcharge warnings", int,    "%d"
+entry = dwellActualRatio, "Ignition: Dwell deviation", float,  "%.3f"
 entry = stftCorrection1, "STFT: Bank 1", float,  "%.3f"
 entry = stftCorrection2, "STFT: Bank 2", float,  "%.3f"
 entry = tpsFrom, "Fuel: TPS AE from", float,  "%.3f"
@@ -831,7 +843,6 @@ entry = iacByTpsTaper, "idle: iacByTpsTaper portion", float,  "%.3f"
 entry = mightResetPid, "idle: mightResetPid", int,    "%d"
 entry = shouldResetPid, "Idle: shouldResetPid", int,    "%d"
 entry = wasResetPid, "Idle: wasResetPid", int,    "%d"
-entry = mustResetPid, "Idle: mustResetPid", int,    "%d"
 entry = isCranking, "Idle: cranking", int,    "%d"
 entry = isIacTableForCoasting, "isIacTableForCoasting", int,    "%d"
 entry = needReset, "Idle: reset", int,    "%d"
@@ -843,7 +854,10 @@ entry = looksLikeCoasting, "looksLikeCoasting", int,    "%d"
 entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int,    "%d"
 entry = isIdleCoasting, "Idle: coasting", int,    "%d"
 entry = isIdleClosedLoop, "Idle: Closed loop active", int,    "%d"
+entry = isIdling, "Idle: idling", int,    "%d"
 entry = idleTarget, "Idle: Target RPM", int,    "%d"
+entry = idleEntryRpm, "Idle: Entry threshold", int,    "%d"
+entry = idleExitRpm, "Idle: Exit threshold", int,    "%d"
 entry = targetRpmByClt, "Idle: Target RPM base", int,    "%d"
 entry = targetRpmAc, "Idle: Target A/C RPM", int,    "%d"
 entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float,  "%.3f"

generated/console/binary/generated/data_logs.ini

@@ -175,6 +175,7 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2
 	indicator = {speedCondition}, "speedCondition No", "speedCondition Yes"
 	indicator = {tpsCondition}, "tpsCondition No", "tpsCondition Yes"
 	indicator = {luaLaunchState}, "luaLaunchState No", "luaLaunchState Yes"
+	indicator = {luaLaunchState}, "luaLaunchState No", "luaLaunchState Yes"
 
 dialog = launch_control_stateDialog, "launch_control_state"
 	panel = launch_control_stateIndicatorPanel
@@ -234,6 +235,7 @@ dialog = boost_controlDialog, "boost_control"
 		graphLine = boostControlTarget
 		graphLine = openLoopPart
 	liveGraph = boost_control_2_Graph, "Graph", South
+		graphLine = openLoopYAxis
 		graphLine = luaOpenLoopAdd
 		graphLine = boostControllerClosedLoopPart
 		graphLine = boostOutput
@@ -492,7 +494,6 @@ indicatorPanel = idle_stateIndicatorPanel, 2
 	indicator = {mightResetPid}, "mightResetPid No", "mightResetPid Yes"
 	indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes"
 	indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes"
-	indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes"
 	indicator = {isCranking}, "isCranking No", "isCranking Yes"
 	indicator = {isIacTableForCoasting}, "isIacTableForCoasting No", "isIacTableForCoasting Yes"
 	indicator = {needReset}, "needReset No", "needReset Yes"
@@ -504,6 +505,7 @@ indicatorPanel = idle_stateIndicatorPanel, 2
 	indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes"
 	indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes"
 	indicator = {isIdleClosedLoop}, "isIdleClosedLoop No", "isIdleClosedLoop Yes"
+	indicator = {isIdling}, "isIdling No", "isIdling Yes"
 
 dialog = idle_stateDialog, "idle_state"
 	panel = idle_stateIndicatorPanel
@@ -513,16 +515,18 @@ dialog = idle_stateDialog, "idle_state"
 		graphLine = iacByTpsTaper
 		graphLine = idleTarget
 	liveGraph = idle_state_2_Graph, "Graph", South
+		graphLine = idleEntryRpm
+		graphLine = idleExitRpm
 		graphLine = targetRpmByClt
 		graphLine = targetRpmAc
+	liveGraph = idle_state_3_Graph, "Graph", South
 		graphLine = iacByRpmTaper
 		graphLine = luaAdd
-	liveGraph = idle_state_3_Graph, "Graph", South
 		graphLine = m_lastTargetRpm
 		graphLine = idleClosedLoop
+	liveGraph = idle_state_4_Graph, "Graph", South
 		graphLine = currentIdlePosition
 		graphLine = idleTargetAirmass
-	liveGraph = idle_state_4_Graph, "Graph", South
 		graphLine = idleTargetFlow
 
 indicatorPanel = electronic_throttle0IndicatorPanel, 2