diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index dd870db6cb..9747f7f351 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -203,6 +203,7 @@ entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" entry = mafEstimate, "MAF estimate", float, "%.3f" entry = instantRpm, "instantRpm", int, "%d" entry = di_nextStart, "DI: next start", float, "%.3f" +entry = systemEventReuse, "systemEventReuse", int, "%d" entry = launchSpeedCondition, "launchSpeedCondition", int, "%d" entry = launchRpmCondition, "launchRpmCondition", int, "%d" entry = launchTpsCondition, "launchTpsCondition", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 50b9a7119d..5d74401edd 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -203,6 +203,9 @@ m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v" mafEstimateGauge = mafEstimate,"MAF estimate", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 instantRpmGauge = instantRpm,"instantRpm", "rpm", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 di_nextStartGauge = di_nextStart,"DI: next start", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 +systemEventReuseGauge = systemEventReuse,"systemEventReuse", "counter", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd21Gauge = unusedAtTheEnd21,"unusedAtTheEnd21", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +unusedAtTheEnd22Gauge = unusedAtTheEnd22,"unusedAtTheEnd22", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd1Gauge = unusedAtTheEnd1,"unusedAtTheEnd1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd2Gauge = unusedAtTheEnd2,"unusedAtTheEnd2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd3Gauge = unusedAtTheEnd3,"unusedAtTheEnd3", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -303,10 +306,6 @@ unusedAtTheEnd97Gauge = unusedAtTheEnd97,"unusedAtTheEnd97", "", 0.0,0.0, 0.0,0. unusedAtTheEnd98Gauge = unusedAtTheEnd98,"unusedAtTheEnd98", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd99Gauge = unusedAtTheEnd99,"unusedAtTheEnd99", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd100Gauge = unusedAtTheEnd100,"unusedAtTheEnd100", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd101Gauge = unusedAtTheEnd101,"unusedAtTheEnd101", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd102Gauge = unusedAtTheEnd102,"unusedAtTheEnd102", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd103Gauge = unusedAtTheEnd103,"unusedAtTheEnd103", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd104Gauge = unusedAtTheEnd104,"unusedAtTheEnd104", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 launchSpeedConditionGauge = launchSpeedCondition,"launchSpeedCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchRpmConditionGauge = launchRpmCondition,"launchRpmCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchTpsConditionGauge = launchTpsCondition,"launchTpsCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 @@ -314,31 +313,31 @@ launchActivateSwitchConditionGauge = launchActivateSwitchCondition,"launchActiva launchIsLaunchConditionGauge = launchIsLaunchCondition,"launchIsLaunchCondition", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchCombinedConditionsGauge = launchCombinedConditions,"launchCombinedConditions", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 launchActivatePinStateGauge = launchActivatePinState,"launchActivatePinState", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_7Gauge = unusedBit_182_7,"unusedBit_182_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_8Gauge = unusedBit_182_8,"unusedBit_182_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_9Gauge = unusedBit_182_9,"unusedBit_182_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_10Gauge = unusedBit_182_10,"unusedBit_182_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_11Gauge = unusedBit_182_11,"unusedBit_182_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_12Gauge = unusedBit_182_12,"unusedBit_182_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_13Gauge = unusedBit_182_13,"unusedBit_182_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_14Gauge = unusedBit_182_14,"unusedBit_182_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_15Gauge = unusedBit_182_15,"unusedBit_182_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_16Gauge = unusedBit_182_16,"unusedBit_182_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_17Gauge = unusedBit_182_17,"unusedBit_182_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_18Gauge = unusedBit_182_18,"unusedBit_182_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_19Gauge = unusedBit_182_19,"unusedBit_182_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_20Gauge = unusedBit_182_20,"unusedBit_182_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_21Gauge = unusedBit_182_21,"unusedBit_182_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_22Gauge = unusedBit_182_22,"unusedBit_182_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_23Gauge = unusedBit_182_23,"unusedBit_182_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_24Gauge = unusedBit_182_24,"unusedBit_182_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_25Gauge = unusedBit_182_25,"unusedBit_182_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_26Gauge = unusedBit_182_26,"unusedBit_182_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_27Gauge = unusedBit_182_27,"unusedBit_182_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_28Gauge = unusedBit_182_28,"unusedBit_182_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_29Gauge = unusedBit_182_29,"unusedBit_182_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_30Gauge = unusedBit_182_30,"unusedBit_182_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_182_31Gauge = unusedBit_182_31,"unusedBit_182_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_7Gauge = unusedBit_184_7,"unusedBit_184_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_8Gauge = unusedBit_184_8,"unusedBit_184_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_9Gauge = unusedBit_184_9,"unusedBit_184_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_10Gauge = unusedBit_184_10,"unusedBit_184_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_11Gauge = unusedBit_184_11,"unusedBit_184_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_12Gauge = unusedBit_184_12,"unusedBit_184_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_13Gauge = unusedBit_184_13,"unusedBit_184_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_14Gauge = unusedBit_184_14,"unusedBit_184_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_15Gauge = unusedBit_184_15,"unusedBit_184_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_16Gauge = unusedBit_184_16,"unusedBit_184_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_17Gauge = unusedBit_184_17,"unusedBit_184_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_18Gauge = unusedBit_184_18,"unusedBit_184_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_19Gauge = unusedBit_184_19,"unusedBit_184_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_20Gauge = unusedBit_184_20,"unusedBit_184_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_21Gauge = unusedBit_184_21,"unusedBit_184_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_22Gauge = unusedBit_184_22,"unusedBit_184_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_23Gauge = unusedBit_184_23,"unusedBit_184_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_24Gauge = unusedBit_184_24,"unusedBit_184_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_25Gauge = unusedBit_184_25,"unusedBit_184_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_26Gauge = unusedBit_184_26,"unusedBit_184_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_27Gauge = unusedBit_184_27,"unusedBit_184_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_28Gauge = unusedBit_184_28,"unusedBit_184_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_29Gauge = unusedBit_184_29,"unusedBit_184_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_30Gauge = unusedBit_184_30,"unusedBit_184_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_184_31Gauge = unusedBit_184_31,"unusedBit_184_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 boostControllerOutputGauge = boostControllerOutput,"boostControllerOutput", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"boostControllerClosedLoopPart", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index fa63c2c368..db79735c27 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -203,110 +203,109 @@ m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 mafEstimate = scalar, U16, 356, "kg/h", 0.1, 0 instantRpm = scalar, U16, 358, "rpm", 1, 0 di_nextStart = scalar, F32, 360, "v", 1, 0 -unusedAtTheEnd1 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 467, "", 1, 0 +systemEventReuse = scalar, U16, 364, "counter", 1, 0 +unusedAtTheEnd21 = scalar, U08, 366, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 367, "", 1, 0 +unusedAtTheEnd1 = scalar, U08, 368, "", 1, 0 +unusedAtTheEnd2 = scalar, U08, 369, "", 1, 0 +unusedAtTheEnd3 = scalar, U08, 370, "", 1, 0 +unusedAtTheEnd4 = scalar, U08, 371, "", 1, 0 +unusedAtTheEnd5 = scalar, U08, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, U08, 373, "", 1, 0 +unusedAtTheEnd7 = scalar, U08, 374, "", 1, 0 +unusedAtTheEnd8 = scalar, U08, 375, "", 1, 0 +unusedAtTheEnd9 = scalar, U08, 376, "", 1, 0 +unusedAtTheEnd10 = scalar, U08, 377, "", 1, 0 +unusedAtTheEnd11 = scalar, U08, 378, "", 1, 0 +unusedAtTheEnd12 = scalar, U08, 379, "", 1, 0 +unusedAtTheEnd13 = scalar, U08, 380, "", 1, 0 +unusedAtTheEnd14 = scalar, U08, 381, "", 1, 0 +unusedAtTheEnd15 = scalar, U08, 382, "", 1, 0 +unusedAtTheEnd16 = scalar, U08, 383, "", 1, 0 +unusedAtTheEnd17 = scalar, U08, 384, "", 1, 0 +unusedAtTheEnd18 = scalar, U08, 385, "", 1, 0 +unusedAtTheEnd19 = scalar, U08, 386, "", 1, 0 +unusedAtTheEnd20 = scalar, U08, 387, "", 1, 0 +unusedAtTheEnd21 = scalar, U08, 388, "", 1, 0 +unusedAtTheEnd22 = scalar, U08, 389, "", 1, 0 +unusedAtTheEnd23 = scalar, U08, 390, "", 1, 0 +unusedAtTheEnd24 = scalar, U08, 391, "", 1, 0 +unusedAtTheEnd25 = scalar, U08, 392, "", 1, 0 +unusedAtTheEnd26 = scalar, U08, 393, "", 1, 0 +unusedAtTheEnd27 = scalar, U08, 394, "", 1, 0 +unusedAtTheEnd28 = scalar, U08, 395, "", 1, 0 +unusedAtTheEnd29 = scalar, U08, 396, "", 1, 0 +unusedAtTheEnd30 = scalar, U08, 397, "", 1, 0 +unusedAtTheEnd31 = scalar, U08, 398, "", 1, 0 +unusedAtTheEnd32 = scalar, U08, 399, "", 1, 0 +unusedAtTheEnd33 = scalar, U08, 400, "", 1, 0 +unusedAtTheEnd34 = scalar, U08, 401, "", 1, 0 +unusedAtTheEnd35 = scalar, U08, 402, "", 1, 0 +unusedAtTheEnd36 = scalar, U08, 403, "", 1, 0 +unusedAtTheEnd37 = scalar, U08, 404, "", 1, 0 +unusedAtTheEnd38 = scalar, U08, 405, "", 1, 0 +unusedAtTheEnd39 = scalar, U08, 406, "", 1, 0 +unusedAtTheEnd40 = scalar, U08, 407, "", 1, 0 +unusedAtTheEnd41 = scalar, U08, 408, "", 1, 0 +unusedAtTheEnd42 = scalar, U08, 409, "", 1, 0 +unusedAtTheEnd43 = scalar, U08, 410, "", 1, 0 +unusedAtTheEnd44 = scalar, U08, 411, "", 1, 0 +unusedAtTheEnd45 = scalar, U08, 412, "", 1, 0 +unusedAtTheEnd46 = scalar, U08, 413, "", 1, 0 +unusedAtTheEnd47 = scalar, U08, 414, "", 1, 0 +unusedAtTheEnd48 = scalar, U08, 415, "", 1, 0 +unusedAtTheEnd49 = scalar, U08, 416, "", 1, 0 +unusedAtTheEnd50 = scalar, U08, 417, "", 1, 0 +unusedAtTheEnd51 = scalar, U08, 418, "", 1, 0 +unusedAtTheEnd52 = scalar, U08, 419, "", 1, 0 +unusedAtTheEnd53 = scalar, U08, 420, "", 1, 0 +unusedAtTheEnd54 = scalar, U08, 421, "", 1, 0 +unusedAtTheEnd55 = scalar, U08, 422, "", 1, 0 +unusedAtTheEnd56 = scalar, U08, 423, "", 1, 0 +unusedAtTheEnd57 = scalar, U08, 424, "", 1, 0 +unusedAtTheEnd58 = scalar, U08, 425, "", 1, 0 +unusedAtTheEnd59 = scalar, U08, 426, "", 1, 0 +unusedAtTheEnd60 = scalar, U08, 427, "", 1, 0 +unusedAtTheEnd61 = scalar, U08, 428, "", 1, 0 +unusedAtTheEnd62 = scalar, U08, 429, "", 1, 0 +unusedAtTheEnd63 = scalar, U08, 430, "", 1, 0 +unusedAtTheEnd64 = scalar, U08, 431, "", 1, 0 +unusedAtTheEnd65 = scalar, U08, 432, "", 1, 0 +unusedAtTheEnd66 = scalar, U08, 433, "", 1, 0 +unusedAtTheEnd67 = scalar, U08, 434, "", 1, 0 +unusedAtTheEnd68 = scalar, U08, 435, "", 1, 0 +unusedAtTheEnd69 = scalar, U08, 436, "", 1, 0 +unusedAtTheEnd70 = scalar, U08, 437, "", 1, 0 +unusedAtTheEnd71 = scalar, U08, 438, "", 1, 0 +unusedAtTheEnd72 = scalar, U08, 439, "", 1, 0 +unusedAtTheEnd73 = scalar, U08, 440, "", 1, 0 +unusedAtTheEnd74 = scalar, U08, 441, "", 1, 0 +unusedAtTheEnd75 = scalar, U08, 442, "", 1, 0 +unusedAtTheEnd76 = scalar, U08, 443, "", 1, 0 +unusedAtTheEnd77 = scalar, U08, 444, "", 1, 0 +unusedAtTheEnd78 = scalar, U08, 445, "", 1, 0 +unusedAtTheEnd79 = scalar, U08, 446, "", 1, 0 +unusedAtTheEnd80 = scalar, U08, 447, "", 1, 0 +unusedAtTheEnd81 = scalar, U08, 448, "", 1, 0 +unusedAtTheEnd82 = scalar, U08, 449, "", 1, 0 +unusedAtTheEnd83 = scalar, U08, 450, "", 1, 0 +unusedAtTheEnd84 = scalar, U08, 451, "", 1, 0 +unusedAtTheEnd85 = scalar, U08, 452, "", 1, 0 +unusedAtTheEnd86 = scalar, U08, 453, "", 1, 0 +unusedAtTheEnd87 = scalar, U08, 454, "", 1, 0 +unusedAtTheEnd88 = scalar, U08, 455, "", 1, 0 +unusedAtTheEnd89 = scalar, U08, 456, "", 1, 0 +unusedAtTheEnd90 = scalar, U08, 457, "", 1, 0 +unusedAtTheEnd91 = scalar, U08, 458, "", 1, 0 +unusedAtTheEnd92 = scalar, U08, 459, "", 1, 0 +unusedAtTheEnd93 = scalar, U08, 460, "", 1, 0 +unusedAtTheEnd94 = scalar, U08, 461, "", 1, 0 +unusedAtTheEnd95 = scalar, U08, 462, "", 1, 0 +unusedAtTheEnd96 = scalar, U08, 463, "", 1, 0 +unusedAtTheEnd97 = scalar, U08, 464, "", 1, 0 +unusedAtTheEnd98 = scalar, U08, 465, "", 1, 0 +unusedAtTheEnd99 = scalar, U08, 466, "", 1, 0 +unusedAtTheEnd100 = scalar, U08, 467, "", 1, 0 launchSpeedCondition = bits, U32, 468, [0:0] launchRpmCondition = bits, U32, 468, [1:1] launchTpsCondition = bits, U32, 468, [2:2] @@ -314,31 +313,31 @@ launchActivateSwitchCondition = bits, U32, 468, [3:3] launchIsLaunchCondition = bits, U32, 468, [4:4] launchCombinedConditions = bits, U32, 468, [5:5] launchActivatePinState = bits, U32, 468, [6:6] -unusedBit_182_7 = bits, U32, 468, [7:7] -unusedBit_182_8 = bits, U32, 468, [8:8] -unusedBit_182_9 = bits, U32, 468, [9:9] -unusedBit_182_10 = bits, U32, 468, [10:10] -unusedBit_182_11 = bits, U32, 468, [11:11] -unusedBit_182_12 = bits, U32, 468, [12:12] -unusedBit_182_13 = bits, U32, 468, [13:13] -unusedBit_182_14 = bits, U32, 468, [14:14] -unusedBit_182_15 = bits, U32, 468, [15:15] -unusedBit_182_16 = bits, U32, 468, [16:16] -unusedBit_182_17 = bits, U32, 468, [17:17] -unusedBit_182_18 = bits, U32, 468, [18:18] -unusedBit_182_19 = bits, U32, 468, [19:19] -unusedBit_182_20 = bits, U32, 468, [20:20] -unusedBit_182_21 = bits, U32, 468, [21:21] -unusedBit_182_22 = bits, U32, 468, [22:22] -unusedBit_182_23 = bits, U32, 468, [23:23] -unusedBit_182_24 = bits, U32, 468, [24:24] -unusedBit_182_25 = bits, U32, 468, [25:25] -unusedBit_182_26 = bits, U32, 468, [26:26] -unusedBit_182_27 = bits, U32, 468, [27:27] -unusedBit_182_28 = bits, U32, 468, [28:28] -unusedBit_182_29 = bits, U32, 468, [29:29] -unusedBit_182_30 = bits, U32, 468, [30:30] -unusedBit_182_31 = bits, U32, 468, [31:31] +unusedBit_184_7 = bits, U32, 468, [7:7] +unusedBit_184_8 = bits, U32, 468, [8:8] +unusedBit_184_9 = bits, U32, 468, [9:9] +unusedBit_184_10 = bits, U32, 468, [10:10] +unusedBit_184_11 = bits, U32, 468, [11:11] +unusedBit_184_12 = bits, U32, 468, [12:12] +unusedBit_184_13 = bits, U32, 468, [13:13] +unusedBit_184_14 = bits, U32, 468, [14:14] +unusedBit_184_15 = bits, U32, 468, [15:15] +unusedBit_184_16 = bits, U32, 468, [16:16] +unusedBit_184_17 = bits, U32, 468, [17:17] +unusedBit_184_18 = bits, U32, 468, [18:18] +unusedBit_184_19 = bits, U32, 468, [19:19] +unusedBit_184_20 = bits, U32, 468, [20:20] +unusedBit_184_21 = bits, U32, 468, [21:21] +unusedBit_184_22 = bits, U32, 468, [22:22] +unusedBit_184_23 = bits, U32, 468, [23:23] +unusedBit_184_24 = bits, U32, 468, [24:24] +unusedBit_184_25 = bits, U32, 468, [25:25] +unusedBit_184_26 = bits, U32, 468, [26:26] +unusedBit_184_27 = bits, U32, 468, [27:27] +unusedBit_184_28 = bits, U32, 468, [28:28] +unusedBit_184_29 = bits, U32, 468, [29:29] +unusedBit_184_30 = bits, U32, 468, [30:30] +unusedBit_184_31 = bits, U32, 468, [31:31] TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 boostControllerOutput = scalar, U08, 473, "", 1, 0 boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0 diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index a24bdb9f47..ea205aaa5d 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -273,8 +273,11 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0 float di_nextStart;"DI: next start";"v", 1, 0, 0, 100, 0 + uint16_t systemEventReuse;;"counter", 1, 0, 0, 0, 0 + uint8_t[2 iterate] unusedAtTheEnd2;;"",1, 0, 0, 0, 0 + ! we have some unused bytes to allow compatible TS changes - uint8_t[104 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0 + uint8_t[100 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0 bit launchSpeedCondition bit launchRpmCondition diff --git a/firmware/console/binary/ts_outputs_generated.h b/firmware/console/binary/ts_outputs_generated.h index 51c4aab907..8cd345ba03 100644 --- a/firmware/console/binary/ts_outputs_generated.h +++ b/firmware/console/binary/ts_outputs_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 18 00:21:26 EST 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 18 00:40:09 EST 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -916,9 +916,18 @@ struct ts_outputs_s { */ float di_nextStart = (float)0; /** + counter * offset 364 */ - uint8_t unusedAtTheEnd[104]; + uint16_t systemEventReuse = (uint16_t)0; + /** + * offset 366 + */ + uint8_t unusedAtTheEnd2[2]; + /** + * offset 368 + */ + uint8_t unusedAtTheEnd[100]; /** offset 468 bit 0 */ bool launchSpeedCondition : 1 {}; @@ -942,79 +951,79 @@ struct ts_outputs_s { bool launchActivatePinState : 1 {}; /** offset 468 bit 7 */ - bool unusedBit_182_7 : 1 {}; + bool unusedBit_184_7 : 1 {}; /** offset 468 bit 8 */ - bool unusedBit_182_8 : 1 {}; + bool unusedBit_184_8 : 1 {}; /** offset 468 bit 9 */ - bool unusedBit_182_9 : 1 {}; + bool unusedBit_184_9 : 1 {}; /** offset 468 bit 10 */ - bool unusedBit_182_10 : 1 {}; + bool unusedBit_184_10 : 1 {}; /** offset 468 bit 11 */ - bool unusedBit_182_11 : 1 {}; + bool unusedBit_184_11 : 1 {}; /** offset 468 bit 12 */ - bool unusedBit_182_12 : 1 {}; + bool unusedBit_184_12 : 1 {}; /** offset 468 bit 13 */ - bool unusedBit_182_13 : 1 {}; + bool unusedBit_184_13 : 1 {}; /** offset 468 bit 14 */ - bool unusedBit_182_14 : 1 {}; + bool unusedBit_184_14 : 1 {}; /** offset 468 bit 15 */ - bool unusedBit_182_15 : 1 {}; + bool unusedBit_184_15 : 1 {}; /** offset 468 bit 16 */ - bool unusedBit_182_16 : 1 {}; + bool unusedBit_184_16 : 1 {}; /** offset 468 bit 17 */ - bool unusedBit_182_17 : 1 {}; + bool unusedBit_184_17 : 1 {}; /** offset 468 bit 18 */ - bool unusedBit_182_18 : 1 {}; + bool unusedBit_184_18 : 1 {}; /** offset 468 bit 19 */ - bool unusedBit_182_19 : 1 {}; + bool unusedBit_184_19 : 1 {}; /** offset 468 bit 20 */ - bool unusedBit_182_20 : 1 {}; + bool unusedBit_184_20 : 1 {}; /** offset 468 bit 21 */ - bool unusedBit_182_21 : 1 {}; + bool unusedBit_184_21 : 1 {}; /** offset 468 bit 22 */ - bool unusedBit_182_22 : 1 {}; + bool unusedBit_184_22 : 1 {}; /** offset 468 bit 23 */ - bool unusedBit_182_23 : 1 {}; + bool unusedBit_184_23 : 1 {}; /** offset 468 bit 24 */ - bool unusedBit_182_24 : 1 {}; + bool unusedBit_184_24 : 1 {}; /** offset 468 bit 25 */ - bool unusedBit_182_25 : 1 {}; + bool unusedBit_184_25 : 1 {}; /** offset 468 bit 26 */ - bool unusedBit_182_26 : 1 {}; + bool unusedBit_184_26 : 1 {}; /** offset 468 bit 27 */ - bool unusedBit_182_27 : 1 {}; + bool unusedBit_184_27 : 1 {}; /** offset 468 bit 28 */ - bool unusedBit_182_28 : 1 {}; + bool unusedBit_184_28 : 1 {}; /** offset 468 bit 29 */ - bool unusedBit_182_29 : 1 {}; + bool unusedBit_184_29 : 1 {}; /** offset 468 bit 30 */ - bool unusedBit_182_30 : 1 {}; + bool unusedBit_184_30 : 1 {}; /** offset 468 bit 31 */ - bool unusedBit_182_31 : 1 {}; + bool unusedBit_184_31 : 1 {}; /** * offset 472 */ @@ -1212,4 +1221,4 @@ struct ts_outputs_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 18 00:21:26 EST 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Jan 18 00:40:09 EST 2022 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 3e9a4159e8..90afcb5dd4 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -334,6 +334,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.instantRpm; if (strEqualCaseInsensitive(name, "di_nextStart")) return engine->outputChannels.di_nextStart; + if (strEqualCaseInsensitive(name, "systemEventReuse")) + return engine->outputChannels.systemEventReuse; if (strEqualCaseInsensitive(name, "launchSpeedCondition")) return engine->outputChannels.launchSpeedCondition; if (strEqualCaseInsensitive(name, "launchRpmCondition")) diff --git a/firmware/controllers/system/timer/trigger_scheduler.cpp b/firmware/controllers/system/timer/trigger_scheduler.cpp index 601c6f585d..2d16deea3c 100644 --- a/firmware/controllers/system/timer/trigger_scheduler.cpp +++ b/firmware/controllers/system/timer/trigger_scheduler.cpp @@ -64,6 +64,7 @@ bool TriggerScheduler::scheduleOrQueue(AngleBasedEvent *event, return false; } } + engine->outputChannels.systemEventReuse++; // not atomic/not volatile but good enough for just debugging #if SPARK_EXTREME_LOGGING efiPrintf("isPending thus not adding to queue index=%d rev=%d now=%d", trgEventIndex, getRevolutionCounter(), (int)getTimeNowUs()); @@ -89,7 +90,7 @@ void TriggerScheduler::scheduleEventsUntilNextTriggerTooth(int rpm, { chibios_rt::CriticalSectionLocker csl; - keephead =m_angleBasedEventsHead; + keephead = m_angleBasedEventsHead; m_angleBasedEventsHead = nullptr; } diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3aae7936a1..218d805143 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -973,6 +973,7 @@ TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000 TEMPLOG_MAP_AT_CYCLE_COUNTGauge = TEMPLOG_MAP_AT_CYCLE_COUNT,"TEMPLOG_MAP_AT_CYCLE_COUNT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 gaugeCategory = GDI +systemEventReuseGauge = systemEventReuse,"systemEventReuse", "counter", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 di_nextStartGauge = di_nextStart,"DI: next start", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0 m_requested_pumpGauge = m_requested_pump,"DI: Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 fuel_requested_percentGauge = fuel_requested_percent,"DI: fuel_requested_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0