This commit is contained in:
rusefillc 2022-01-18 00:27:20 -05:00
parent 726147da75
commit 5e2ad39d91
11 changed files with 227 additions and 202 deletions

View File

@ -202,6 +202,7 @@ entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f"
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 = launchSpeedCondition, "launchSpeedCondition", int, "%d"
entry = launchRpmCondition, "launchRpmCondition", int, "%d"
entry = launchTpsCondition, "launchTpsCondition", int, "%d"

View File

@ -202,6 +202,7 @@ m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.
m_pressureTarget_kPaGauge = m_pressureTarget_kPa,"DI: m_pressureTarget_kPa", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0
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
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
@ -306,10 +307,6 @@ unusedAtTheEnd101Gauge = unusedAtTheEnd101,"unusedAtTheEnd101", "", 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
unusedAtTheEnd105Gauge = unusedAtTheEnd105,"unusedAtTheEnd105", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd106Gauge = unusedAtTheEnd106,"unusedAtTheEnd106", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd107Gauge = unusedAtTheEnd107,"unusedAtTheEnd107", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd108Gauge = unusedAtTheEnd108,"unusedAtTheEnd108", "", 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
@ -317,31 +314,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_181_7Gauge = unusedBit_181_7,"unusedBit_181_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_8Gauge = unusedBit_181_8,"unusedBit_181_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_9Gauge = unusedBit_181_9,"unusedBit_181_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_10Gauge = unusedBit_181_10,"unusedBit_181_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_11Gauge = unusedBit_181_11,"unusedBit_181_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_12Gauge = unusedBit_181_12,"unusedBit_181_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_13Gauge = unusedBit_181_13,"unusedBit_181_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_14Gauge = unusedBit_181_14,"unusedBit_181_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_15Gauge = unusedBit_181_15,"unusedBit_181_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_16Gauge = unusedBit_181_16,"unusedBit_181_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_17Gauge = unusedBit_181_17,"unusedBit_181_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_18Gauge = unusedBit_181_18,"unusedBit_181_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_19Gauge = unusedBit_181_19,"unusedBit_181_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_20Gauge = unusedBit_181_20,"unusedBit_181_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_21Gauge = unusedBit_181_21,"unusedBit_181_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_22Gauge = unusedBit_181_22,"unusedBit_181_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_23Gauge = unusedBit_181_23,"unusedBit_181_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_24Gauge = unusedBit_181_24,"unusedBit_181_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_25Gauge = unusedBit_181_25,"unusedBit_181_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_26Gauge = unusedBit_181_26,"unusedBit_181_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_27Gauge = unusedBit_181_27,"unusedBit_181_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_28Gauge = unusedBit_181_28,"unusedBit_181_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_29Gauge = unusedBit_181_29,"unusedBit_181_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_30Gauge = unusedBit_181_30,"unusedBit_181_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1
unusedBit_181_31Gauge = unusedBit_181_31,"unusedBit_181_31", "", -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
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

View File

@ -202,114 +202,111 @@ m_I_sum_percent = scalar, F32, 348, "v", 1, 0
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
unusedAtTheEnd1 = scalar, U08, 360, "", 1, 0
unusedAtTheEnd2 = scalar, U08, 361, "", 1, 0
unusedAtTheEnd3 = scalar, U08, 362, "", 1, 0
unusedAtTheEnd4 = scalar, U08, 363, "", 1, 0
unusedAtTheEnd5 = scalar, U08, 364, "", 1, 0
unusedAtTheEnd6 = scalar, U08, 365, "", 1, 0
unusedAtTheEnd7 = scalar, U08, 366, "", 1, 0
unusedAtTheEnd8 = scalar, U08, 367, "", 1, 0
unusedAtTheEnd9 = scalar, U08, 368, "", 1, 0
unusedAtTheEnd10 = scalar, U08, 369, "", 1, 0
unusedAtTheEnd11 = scalar, U08, 370, "", 1, 0
unusedAtTheEnd12 = scalar, U08, 371, "", 1, 0
unusedAtTheEnd13 = scalar, U08, 372, "", 1, 0
unusedAtTheEnd14 = scalar, U08, 373, "", 1, 0
unusedAtTheEnd15 = scalar, U08, 374, "", 1, 0
unusedAtTheEnd16 = scalar, U08, 375, "", 1, 0
unusedAtTheEnd17 = scalar, U08, 376, "", 1, 0
unusedAtTheEnd18 = scalar, U08, 377, "", 1, 0
unusedAtTheEnd19 = scalar, U08, 378, "", 1, 0
unusedAtTheEnd20 = scalar, U08, 379, "", 1, 0
unusedAtTheEnd21 = scalar, U08, 380, "", 1, 0
unusedAtTheEnd22 = scalar, U08, 381, "", 1, 0
unusedAtTheEnd23 = scalar, U08, 382, "", 1, 0
unusedAtTheEnd24 = scalar, U08, 383, "", 1, 0
unusedAtTheEnd25 = scalar, U08, 384, "", 1, 0
unusedAtTheEnd26 = scalar, U08, 385, "", 1, 0
unusedAtTheEnd27 = scalar, U08, 386, "", 1, 0
unusedAtTheEnd28 = scalar, U08, 387, "", 1, 0
unusedAtTheEnd29 = scalar, U08, 388, "", 1, 0
unusedAtTheEnd30 = scalar, U08, 389, "", 1, 0
unusedAtTheEnd31 = scalar, U08, 390, "", 1, 0
unusedAtTheEnd32 = scalar, U08, 391, "", 1, 0
unusedAtTheEnd33 = scalar, U08, 392, "", 1, 0
unusedAtTheEnd34 = scalar, U08, 393, "", 1, 0
unusedAtTheEnd35 = scalar, U08, 394, "", 1, 0
unusedAtTheEnd36 = scalar, U08, 395, "", 1, 0
unusedAtTheEnd37 = scalar, U08, 396, "", 1, 0
unusedAtTheEnd38 = scalar, U08, 397, "", 1, 0
unusedAtTheEnd39 = scalar, U08, 398, "", 1, 0
unusedAtTheEnd40 = scalar, U08, 399, "", 1, 0
unusedAtTheEnd41 = scalar, U08, 400, "", 1, 0
unusedAtTheEnd42 = scalar, U08, 401, "", 1, 0
unusedAtTheEnd43 = scalar, U08, 402, "", 1, 0
unusedAtTheEnd44 = scalar, U08, 403, "", 1, 0
unusedAtTheEnd45 = scalar, U08, 404, "", 1, 0
unusedAtTheEnd46 = scalar, U08, 405, "", 1, 0
unusedAtTheEnd47 = scalar, U08, 406, "", 1, 0
unusedAtTheEnd48 = scalar, U08, 407, "", 1, 0
unusedAtTheEnd49 = scalar, U08, 408, "", 1, 0
unusedAtTheEnd50 = scalar, U08, 409, "", 1, 0
unusedAtTheEnd51 = scalar, U08, 410, "", 1, 0
unusedAtTheEnd52 = scalar, U08, 411, "", 1, 0
unusedAtTheEnd53 = scalar, U08, 412, "", 1, 0
unusedAtTheEnd54 = scalar, U08, 413, "", 1, 0
unusedAtTheEnd55 = scalar, U08, 414, "", 1, 0
unusedAtTheEnd56 = scalar, U08, 415, "", 1, 0
unusedAtTheEnd57 = scalar, U08, 416, "", 1, 0
unusedAtTheEnd58 = scalar, U08, 417, "", 1, 0
unusedAtTheEnd59 = scalar, U08, 418, "", 1, 0
unusedAtTheEnd60 = scalar, U08, 419, "", 1, 0
unusedAtTheEnd61 = scalar, U08, 420, "", 1, 0
unusedAtTheEnd62 = scalar, U08, 421, "", 1, 0
unusedAtTheEnd63 = scalar, U08, 422, "", 1, 0
unusedAtTheEnd64 = scalar, U08, 423, "", 1, 0
unusedAtTheEnd65 = scalar, U08, 424, "", 1, 0
unusedAtTheEnd66 = scalar, U08, 425, "", 1, 0
unusedAtTheEnd67 = scalar, U08, 426, "", 1, 0
unusedAtTheEnd68 = scalar, U08, 427, "", 1, 0
unusedAtTheEnd69 = scalar, U08, 428, "", 1, 0
unusedAtTheEnd70 = scalar, U08, 429, "", 1, 0
unusedAtTheEnd71 = scalar, U08, 430, "", 1, 0
unusedAtTheEnd72 = scalar, U08, 431, "", 1, 0
unusedAtTheEnd73 = scalar, U08, 432, "", 1, 0
unusedAtTheEnd74 = scalar, U08, 433, "", 1, 0
unusedAtTheEnd75 = scalar, U08, 434, "", 1, 0
unusedAtTheEnd76 = scalar, U08, 435, "", 1, 0
unusedAtTheEnd77 = scalar, U08, 436, "", 1, 0
unusedAtTheEnd78 = scalar, U08, 437, "", 1, 0
unusedAtTheEnd79 = scalar, U08, 438, "", 1, 0
unusedAtTheEnd80 = scalar, U08, 439, "", 1, 0
unusedAtTheEnd81 = scalar, U08, 440, "", 1, 0
unusedAtTheEnd82 = scalar, U08, 441, "", 1, 0
unusedAtTheEnd83 = scalar, U08, 442, "", 1, 0
unusedAtTheEnd84 = scalar, U08, 443, "", 1, 0
unusedAtTheEnd85 = scalar, U08, 444, "", 1, 0
unusedAtTheEnd86 = scalar, U08, 445, "", 1, 0
unusedAtTheEnd87 = scalar, U08, 446, "", 1, 0
unusedAtTheEnd88 = scalar, U08, 447, "", 1, 0
unusedAtTheEnd89 = scalar, U08, 448, "", 1, 0
unusedAtTheEnd90 = scalar, U08, 449, "", 1, 0
unusedAtTheEnd91 = scalar, U08, 450, "", 1, 0
unusedAtTheEnd92 = scalar, U08, 451, "", 1, 0
unusedAtTheEnd93 = scalar, U08, 452, "", 1, 0
unusedAtTheEnd94 = scalar, U08, 453, "", 1, 0
unusedAtTheEnd95 = scalar, U08, 454, "", 1, 0
unusedAtTheEnd96 = scalar, U08, 455, "", 1, 0
unusedAtTheEnd97 = scalar, U08, 456, "", 1, 0
unusedAtTheEnd98 = scalar, U08, 457, "", 1, 0
unusedAtTheEnd99 = scalar, U08, 458, "", 1, 0
unusedAtTheEnd100 = scalar, U08, 459, "", 1, 0
unusedAtTheEnd101 = scalar, U08, 460, "", 1, 0
unusedAtTheEnd102 = scalar, U08, 461, "", 1, 0
unusedAtTheEnd103 = scalar, U08, 462, "", 1, 0
unusedAtTheEnd104 = scalar, U08, 463, "", 1, 0
unusedAtTheEnd105 = scalar, U08, 464, "", 1, 0
unusedAtTheEnd106 = scalar, U08, 465, "", 1, 0
unusedAtTheEnd107 = scalar, U08, 466, "", 1, 0
unusedAtTheEnd108 = scalar, U08, 467, "", 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
launchSpeedCondition = bits, U32, 468, [0:0]
launchRpmCondition = bits, U32, 468, [1:1]
launchTpsCondition = bits, U32, 468, [2:2]
@ -317,31 +314,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_181_7 = bits, U32, 468, [7:7]
unusedBit_181_8 = bits, U32, 468, [8:8]
unusedBit_181_9 = bits, U32, 468, [9:9]
unusedBit_181_10 = bits, U32, 468, [10:10]
unusedBit_181_11 = bits, U32, 468, [11:11]
unusedBit_181_12 = bits, U32, 468, [12:12]
unusedBit_181_13 = bits, U32, 468, [13:13]
unusedBit_181_14 = bits, U32, 468, [14:14]
unusedBit_181_15 = bits, U32, 468, [15:15]
unusedBit_181_16 = bits, U32, 468, [16:16]
unusedBit_181_17 = bits, U32, 468, [17:17]
unusedBit_181_18 = bits, U32, 468, [18:18]
unusedBit_181_19 = bits, U32, 468, [19:19]
unusedBit_181_20 = bits, U32, 468, [20:20]
unusedBit_181_21 = bits, U32, 468, [21:21]
unusedBit_181_22 = bits, U32, 468, [22:22]
unusedBit_181_23 = bits, U32, 468, [23:23]
unusedBit_181_24 = bits, U32, 468, [24:24]
unusedBit_181_25 = bits, U32, 468, [25:25]
unusedBit_181_26 = bits, U32, 468, [26:26]
unusedBit_181_27 = bits, U32, 468, [27:27]
unusedBit_181_28 = bits, U32, 468, [28:28]
unusedBit_181_29 = bits, U32, 468, [29:29]
unusedBit_181_30 = bits, U32, 468, [30:30]
unusedBit_181_31 = bits, U32, 468, [31:31]
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]
TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0
boostControllerOutput = scalar, U08, 473, "", 1, 0
boostControllerClosedLoopPart = scalar, U08, 474, "", 1, 0

View File

@ -271,8 +271,10 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
uint16_t autoscale mafEstimate;@@GAUGE_NAME_AIR_FLOW_ESTIMATE@@;"kg/h",{1/@@PACK_MULT_MASS_FLOW@@}, 0, 0, 0, 0
uint16_t instantRpm;;"rpm", 1, 0, 0, 0, 0
float di_nextStart;"DI: next start";"v", 1, 0, 0, 100, 0
! we have some unused bytes to allow compatible TS changes
uint8_t[108 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0
uint8_t[104 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0
bit launchSpeedCondition
bit launchRpmCondition

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Jan 15 22:43:04 UTC 2022
// 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
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -910,9 +910,15 @@ struct ts_outputs_s {
*/
uint16_t instantRpm = (uint16_t)0;
/**
* "DI: next start"
v
* offset 360
*/
uint8_t unusedAtTheEnd[108];
float di_nextStart = (float)0;
/**
* offset 364
*/
uint8_t unusedAtTheEnd[104];
/**
offset 468 bit 0 */
bool launchSpeedCondition : 1 {};
@ -936,79 +942,79 @@ struct ts_outputs_s {
bool launchActivatePinState : 1 {};
/**
offset 468 bit 7 */
bool unusedBit_181_7 : 1 {};
bool unusedBit_182_7 : 1 {};
/**
offset 468 bit 8 */
bool unusedBit_181_8 : 1 {};
bool unusedBit_182_8 : 1 {};
/**
offset 468 bit 9 */
bool unusedBit_181_9 : 1 {};
bool unusedBit_182_9 : 1 {};
/**
offset 468 bit 10 */
bool unusedBit_181_10 : 1 {};
bool unusedBit_182_10 : 1 {};
/**
offset 468 bit 11 */
bool unusedBit_181_11 : 1 {};
bool unusedBit_182_11 : 1 {};
/**
offset 468 bit 12 */
bool unusedBit_181_12 : 1 {};
bool unusedBit_182_12 : 1 {};
/**
offset 468 bit 13 */
bool unusedBit_181_13 : 1 {};
bool unusedBit_182_13 : 1 {};
/**
offset 468 bit 14 */
bool unusedBit_181_14 : 1 {};
bool unusedBit_182_14 : 1 {};
/**
offset 468 bit 15 */
bool unusedBit_181_15 : 1 {};
bool unusedBit_182_15 : 1 {};
/**
offset 468 bit 16 */
bool unusedBit_181_16 : 1 {};
bool unusedBit_182_16 : 1 {};
/**
offset 468 bit 17 */
bool unusedBit_181_17 : 1 {};
bool unusedBit_182_17 : 1 {};
/**
offset 468 bit 18 */
bool unusedBit_181_18 : 1 {};
bool unusedBit_182_18 : 1 {};
/**
offset 468 bit 19 */
bool unusedBit_181_19 : 1 {};
bool unusedBit_182_19 : 1 {};
/**
offset 468 bit 20 */
bool unusedBit_181_20 : 1 {};
bool unusedBit_182_20 : 1 {};
/**
offset 468 bit 21 */
bool unusedBit_181_21 : 1 {};
bool unusedBit_182_21 : 1 {};
/**
offset 468 bit 22 */
bool unusedBit_181_22 : 1 {};
bool unusedBit_182_22 : 1 {};
/**
offset 468 bit 23 */
bool unusedBit_181_23 : 1 {};
bool unusedBit_182_23 : 1 {};
/**
offset 468 bit 24 */
bool unusedBit_181_24 : 1 {};
bool unusedBit_182_24 : 1 {};
/**
offset 468 bit 25 */
bool unusedBit_181_25 : 1 {};
bool unusedBit_182_25 : 1 {};
/**
offset 468 bit 26 */
bool unusedBit_181_26 : 1 {};
bool unusedBit_182_26 : 1 {};
/**
offset 468 bit 27 */
bool unusedBit_181_27 : 1 {};
bool unusedBit_182_27 : 1 {};
/**
offset 468 bit 28 */
bool unusedBit_181_28 : 1 {};
bool unusedBit_182_28 : 1 {};
/**
offset 468 bit 29 */
bool unusedBit_181_29 : 1 {};
bool unusedBit_182_29 : 1 {};
/**
offset 468 bit 30 */
bool unusedBit_181_30 : 1 {};
bool unusedBit_182_30 : 1 {};
/**
offset 468 bit 31 */
bool unusedBit_181_31 : 1 {};
bool unusedBit_182_31 : 1 {};
/**
* offset 472
*/
@ -1206,4 +1212,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 Sat Jan 15 22:43:04 UTC 2022
// 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

View File

@ -178,7 +178,8 @@ void HpfpController::pinTurnOff(HpfpController *self) {
}
void HpfpController::scheduleNextCycle() {
if (!enginePins.hpfpValve.isInitialized()) {
noValve = !enginePins.hpfpValve.isInitialized();
if (noValve) {
m_running = false;
return;
}
@ -186,10 +187,14 @@ void HpfpController::scheduleNextCycle() {
angle_t lobe = m_lobe.findNextLobe();
angle_t angle_requested = m_requested_pump;
if (angle_requested > engineConfiguration->hpfpMinAngle) {
angleAboveMin = angle_requested > engineConfiguration->hpfpMinAngle;
if (angleAboveMin) {
nextStart = lobe - angle_requested - m_deadtime;
engine->outputChannels.di_nextStart = nextStart;
engine->module<TriggerScheduler>()->scheduleOrQueue(
&m_event, TRIGGER_EVENT_UNDEFINED, 0,
lobe - angle_requested - m_deadtime,
nextStart,
{ pinTurnOn, this });
// Off will be scheduled after turning the valve on

View File

@ -3,7 +3,9 @@ struct_no_prefix high_pressure_fuel_pump_s
angle_t m_requested_pump;Computed requested pump duration in degrees (not including deadtime)
float fuel_requested_percent
float fuel_requested_percent_pi
bit haveValve
bit noValve
bit angleAboveMin
angle_t nextLobe
angle_t nextStart
end_struct

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Tue Jan 18 05:08:39 UTC 2022
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle\high_pressure_fuel_pump.txt Tue Jan 18 00:21:14 EST 2022
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -20,7 +20,7 @@ struct high_pressure_fuel_pump_s {
float fuel_requested_percent_pi = (float)0;
/**
offset 12 bit 0 */
bool haveValve : 1 {};
bool noValve : 1 {};
/**
offset 12 bit 1 */
bool angleAboveMin : 1 {};
@ -114,8 +114,16 @@ struct high_pressure_fuel_pump_s {
/**
offset 12 bit 31 */
bool unusedBit_5_31 : 1 {};
/** total size 16*/
/**
* offset 16
*/
angle_t nextLobe = (angle_t)0;
/**
* offset 20
*/
angle_t nextStart = (angle_t)0;
/** total size 24*/
};
// end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Tue Jan 18 05:08:39 UTC 2022
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle\high_pressure_fuel_pump.txt Tue Jan 18 00:21:14 EST 2022

View File

@ -332,6 +332,8 @@ float getOutputValueByName(const char *name) {
return engine->outputChannels.mafEstimate;
if (strEqualCaseInsensitive(name, "instantRpm"))
return engine->outputChannels.instantRpm;
if (strEqualCaseInsensitive(name, "di_nextStart"))
return engine->outputChannels.di_nextStart;
if (strEqualCaseInsensitive(name, "launchSpeedCondition"))
return engine->outputChannels.launchSpeedCondition;
if (strEqualCaseInsensitive(name, "launchRpmCondition"))

View File

@ -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
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
fuel_requested_percent_piGauge = fuel_requested_percent_pi,"DI: fuel_requested_percent_pi", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 0,0

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle/high_pressure_fuel_pump.txt Tue Jan 18 05:08:39 UTC 2022
// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/engine_cycle\high_pressure_fuel_pump.txt Tue Jan 18 00:21:14 EST 2022
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -9,7 +9,7 @@ public class HighPressureFuelPump {
public static final Field M_REQUESTED_PUMP = Field.create("M_REQUESTED_PUMP", 0, FieldType.FLOAT);
public static final Field FUEL_REQUESTED_PERCENT = Field.create("FUEL_REQUESTED_PERCENT", 4, FieldType.FLOAT);
public static final Field FUEL_REQUESTED_PERCENT_PI = Field.create("FUEL_REQUESTED_PERCENT_PI", 8, FieldType.FLOAT);
public static final Field HAVEVALVE = Field.create("HAVEVALVE", 12, FieldType.BIT, 0);
public static final Field NOVALVE = Field.create("NOVALVE", 12, FieldType.BIT, 0);
public static final Field ANGLEABOVEMIN = Field.create("ANGLEABOVEMIN", 12, FieldType.BIT, 1);
public static final Field UNUSEDBIT_5_2 = Field.create("UNUSEDBIT_5_2", 12, FieldType.BIT, 2);
public static final Field UNUSEDBIT_5_3 = Field.create("UNUSEDBIT_5_3", 12, FieldType.BIT, 3);
@ -41,11 +41,13 @@ public class HighPressureFuelPump {
public static final Field UNUSEDBIT_5_29 = Field.create("UNUSEDBIT_5_29", 12, FieldType.BIT, 29);
public static final Field UNUSEDBIT_5_30 = Field.create("UNUSEDBIT_5_30", 12, FieldType.BIT, 30);
public static final Field UNUSEDBIT_5_31 = Field.create("UNUSEDBIT_5_31", 12, FieldType.BIT, 31);
public static final Field NEXTLOBE = Field.create("NEXTLOBE", 16, FieldType.FLOAT);
public static final Field NEXTSTART = Field.create("NEXTSTART", 20, FieldType.FLOAT);
public static final Field[] VALUES = {
M_REQUESTED_PUMP,
FUEL_REQUESTED_PERCENT,
FUEL_REQUESTED_PERCENT_PI,
HAVEVALVE,
NOVALVE,
ANGLEABOVEMIN,
UNUSEDBIT_5_2,
UNUSEDBIT_5_3,
@ -77,5 +79,7 @@ public class HighPressureFuelPump {
UNUSEDBIT_5_29,
UNUSEDBIT_5_30,
UNUSEDBIT_5_31,
NEXTLOBE,
NEXTSTART,
};
}