From 95136893debb1c163c9c1f6371e08429695ce5a6 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 1 Jan 2022 17:17:56 -0500 Subject: [PATCH] GDI Epic #1448 --- .../console/binary/generated/data_logs.ini | 6 +- firmware/console/binary/generated/gauges.ini | 162 +++--------- .../binary/generated/output_channels.ini | 238 ++++++------------ firmware/console/binary/output_channels.txt | 8 +- .../console/binary/ts_outputs_generated.h | 162 +++++++----- .../engine_cycle/high_pressure_fuel_pump.cpp | 4 + .../lua/generated/output_lookup_generated.cpp | 8 + firmware/tunerstudio/rusefi.input | 6 +- 8 files changed, 229 insertions(+), 365 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 660143921f..c3fa910590 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -192,7 +192,11 @@ entry = tps1Split, "tps1Split", float, "%.3f" entry = tps2Split, "tps2Split", float, "%.3f" entry = tps12Split, "tps12Split", float, "%.3f" entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = m_requested_pump, "Pump Angle", float, "%.3f" +entry = m_requested_pump, "DI: Pump Angle", float, "%.3f" +entry = fuel_requested_percent, "DI: fuel_requested_percent", float, "%.3f" +entry = fuel_requested_percent_pi, "DI: fuel_requested_percent_pi", float, "%.3f" +entry = m_I_sum_percent, "DI: m_I_sum_percent", float, "%.3f" +entry = m_pressureTarget_kPa, "DI: m_pressureTarget_kPa", float, "%.3f" 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 63b1be143c..1cfa9b3309 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -192,8 +192,13 @@ tps1SplitGauge = tps1Split,"tps1Split", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 tps2SplitGauge = tps2Split,"tps2Split", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 tps12SplitGauge = tps12Split,"tps12Split", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 accPedalSplitGauge = accPedalSplit,"accPedalSplit", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.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 unused16Gauge = unused16,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +alignmentFill_at_338Gauge = alignmentFill_at_338,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.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 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 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 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 @@ -222,110 +227,6 @@ unusedAtTheEnd25Gauge = unusedAtTheEnd25,"unusedAtTheEnd25", "", 0.0,0.0, 0.0,0. unusedAtTheEnd26Gauge = unusedAtTheEnd26,"unusedAtTheEnd26", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd27Gauge = unusedAtTheEnd27,"unusedAtTheEnd27", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 unusedAtTheEnd28Gauge = unusedAtTheEnd28,"unusedAtTheEnd28", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd29Gauge = unusedAtTheEnd29,"unusedAtTheEnd29", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd30Gauge = unusedAtTheEnd30,"unusedAtTheEnd30", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd31Gauge = unusedAtTheEnd31,"unusedAtTheEnd31", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd32Gauge = unusedAtTheEnd32,"unusedAtTheEnd32", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd33Gauge = unusedAtTheEnd33,"unusedAtTheEnd33", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd34Gauge = unusedAtTheEnd34,"unusedAtTheEnd34", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd35Gauge = unusedAtTheEnd35,"unusedAtTheEnd35", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd36Gauge = unusedAtTheEnd36,"unusedAtTheEnd36", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd37Gauge = unusedAtTheEnd37,"unusedAtTheEnd37", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd38Gauge = unusedAtTheEnd38,"unusedAtTheEnd38", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd39Gauge = unusedAtTheEnd39,"unusedAtTheEnd39", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd40Gauge = unusedAtTheEnd40,"unusedAtTheEnd40", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd41Gauge = unusedAtTheEnd41,"unusedAtTheEnd41", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd42Gauge = unusedAtTheEnd42,"unusedAtTheEnd42", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd43Gauge = unusedAtTheEnd43,"unusedAtTheEnd43", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd44Gauge = unusedAtTheEnd44,"unusedAtTheEnd44", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd45Gauge = unusedAtTheEnd45,"unusedAtTheEnd45", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd46Gauge = unusedAtTheEnd46,"unusedAtTheEnd46", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd47Gauge = unusedAtTheEnd47,"unusedAtTheEnd47", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd48Gauge = unusedAtTheEnd48,"unusedAtTheEnd48", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd49Gauge = unusedAtTheEnd49,"unusedAtTheEnd49", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd50Gauge = unusedAtTheEnd50,"unusedAtTheEnd50", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd51Gauge = unusedAtTheEnd51,"unusedAtTheEnd51", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd52Gauge = unusedAtTheEnd52,"unusedAtTheEnd52", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd53Gauge = unusedAtTheEnd53,"unusedAtTheEnd53", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd54Gauge = unusedAtTheEnd54,"unusedAtTheEnd54", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd55Gauge = unusedAtTheEnd55,"unusedAtTheEnd55", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd56Gauge = unusedAtTheEnd56,"unusedAtTheEnd56", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd57Gauge = unusedAtTheEnd57,"unusedAtTheEnd57", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd58Gauge = unusedAtTheEnd58,"unusedAtTheEnd58", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd59Gauge = unusedAtTheEnd59,"unusedAtTheEnd59", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd60Gauge = unusedAtTheEnd60,"unusedAtTheEnd60", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd61Gauge = unusedAtTheEnd61,"unusedAtTheEnd61", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd62Gauge = unusedAtTheEnd62,"unusedAtTheEnd62", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd63Gauge = unusedAtTheEnd63,"unusedAtTheEnd63", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd64Gauge = unusedAtTheEnd64,"unusedAtTheEnd64", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd65Gauge = unusedAtTheEnd65,"unusedAtTheEnd65", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd66Gauge = unusedAtTheEnd66,"unusedAtTheEnd66", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd67Gauge = unusedAtTheEnd67,"unusedAtTheEnd67", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd68Gauge = unusedAtTheEnd68,"unusedAtTheEnd68", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd69Gauge = unusedAtTheEnd69,"unusedAtTheEnd69", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd70Gauge = unusedAtTheEnd70,"unusedAtTheEnd70", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd71Gauge = unusedAtTheEnd71,"unusedAtTheEnd71", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd72Gauge = unusedAtTheEnd72,"unusedAtTheEnd72", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd73Gauge = unusedAtTheEnd73,"unusedAtTheEnd73", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd74Gauge = unusedAtTheEnd74,"unusedAtTheEnd74", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd75Gauge = unusedAtTheEnd75,"unusedAtTheEnd75", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd76Gauge = unusedAtTheEnd76,"unusedAtTheEnd76", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd77Gauge = unusedAtTheEnd77,"unusedAtTheEnd77", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd78Gauge = unusedAtTheEnd78,"unusedAtTheEnd78", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd79Gauge = unusedAtTheEnd79,"unusedAtTheEnd79", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd80Gauge = unusedAtTheEnd80,"unusedAtTheEnd80", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd81Gauge = unusedAtTheEnd81,"unusedAtTheEnd81", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd82Gauge = unusedAtTheEnd82,"unusedAtTheEnd82", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd83Gauge = unusedAtTheEnd83,"unusedAtTheEnd83", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd84Gauge = unusedAtTheEnd84,"unusedAtTheEnd84", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd85Gauge = unusedAtTheEnd85,"unusedAtTheEnd85", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd86Gauge = unusedAtTheEnd86,"unusedAtTheEnd86", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd87Gauge = unusedAtTheEnd87,"unusedAtTheEnd87", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd88Gauge = unusedAtTheEnd88,"unusedAtTheEnd88", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd89Gauge = unusedAtTheEnd89,"unusedAtTheEnd89", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd90Gauge = unusedAtTheEnd90,"unusedAtTheEnd90", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd91Gauge = unusedAtTheEnd91,"unusedAtTheEnd91", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd92Gauge = unusedAtTheEnd92,"unusedAtTheEnd92", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd93Gauge = unusedAtTheEnd93,"unusedAtTheEnd93", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd94Gauge = unusedAtTheEnd94,"unusedAtTheEnd94", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd95Gauge = unusedAtTheEnd95,"unusedAtTheEnd95", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd96Gauge = unusedAtTheEnd96,"unusedAtTheEnd96", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd97Gauge = unusedAtTheEnd97,"unusedAtTheEnd97", "", 0.0,0.0, 0.0,0.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 -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 -unusedAtTheEnd109Gauge = unusedAtTheEnd109,"unusedAtTheEnd109", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd110Gauge = unusedAtTheEnd110,"unusedAtTheEnd110", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd111Gauge = unusedAtTheEnd111,"unusedAtTheEnd111", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd112Gauge = unusedAtTheEnd112,"unusedAtTheEnd112", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd113Gauge = unusedAtTheEnd113,"unusedAtTheEnd113", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd114Gauge = unusedAtTheEnd114,"unusedAtTheEnd114", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd115Gauge = unusedAtTheEnd115,"unusedAtTheEnd115", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd116Gauge = unusedAtTheEnd116,"unusedAtTheEnd116", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd117Gauge = unusedAtTheEnd117,"unusedAtTheEnd117", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd118Gauge = unusedAtTheEnd118,"unusedAtTheEnd118", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd119Gauge = unusedAtTheEnd119,"unusedAtTheEnd119", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd120Gauge = unusedAtTheEnd120,"unusedAtTheEnd120", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd121Gauge = unusedAtTheEnd121,"unusedAtTheEnd121", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd122Gauge = unusedAtTheEnd122,"unusedAtTheEnd122", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd123Gauge = unusedAtTheEnd123,"unusedAtTheEnd123", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd124Gauge = unusedAtTheEnd124,"unusedAtTheEnd124", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd125Gauge = unusedAtTheEnd125,"unusedAtTheEnd125", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd126Gauge = unusedAtTheEnd126,"unusedAtTheEnd126", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd127Gauge = unusedAtTheEnd127,"unusedAtTheEnd127", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd128Gauge = unusedAtTheEnd128,"unusedAtTheEnd128", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd129Gauge = unusedAtTheEnd129,"unusedAtTheEnd129", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd130Gauge = unusedAtTheEnd130,"unusedAtTheEnd130", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd131Gauge = unusedAtTheEnd131,"unusedAtTheEnd131", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -unusedAtTheEnd132Gauge = unusedAtTheEnd132,"unusedAtTheEnd132", "", 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 @@ -333,35 +234,36 @@ 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_173_7Gauge = unusedBit_173_7,"unusedBit_173_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_8Gauge = unusedBit_173_8,"unusedBit_173_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_9Gauge = unusedBit_173_9,"unusedBit_173_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_10Gauge = unusedBit_173_10,"unusedBit_173_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_11Gauge = unusedBit_173_11,"unusedBit_173_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_12Gauge = unusedBit_173_12,"unusedBit_173_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_13Gauge = unusedBit_173_13,"unusedBit_173_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_14Gauge = unusedBit_173_14,"unusedBit_173_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_15Gauge = unusedBit_173_15,"unusedBit_173_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_16Gauge = unusedBit_173_16,"unusedBit_173_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_17Gauge = unusedBit_173_17,"unusedBit_173_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_18Gauge = unusedBit_173_18,"unusedBit_173_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_19Gauge = unusedBit_173_19,"unusedBit_173_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_20Gauge = unusedBit_173_20,"unusedBit_173_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_21Gauge = unusedBit_173_21,"unusedBit_173_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_22Gauge = unusedBit_173_22,"unusedBit_173_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_23Gauge = unusedBit_173_23,"unusedBit_173_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_24Gauge = unusedBit_173_24,"unusedBit_173_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_25Gauge = unusedBit_173_25,"unusedBit_173_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_26Gauge = unusedBit_173_26,"unusedBit_173_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_27Gauge = unusedBit_173_27,"unusedBit_173_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_28Gauge = unusedBit_173_28,"unusedBit_173_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_29Gauge = unusedBit_173_29,"unusedBit_173_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_30Gauge = unusedBit_173_30,"unusedBit_173_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_173_31Gauge = unusedBit_173_31,"unusedBit_173_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_7Gauge = unusedBit_178_7,"unusedBit_178_7", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_8Gauge = unusedBit_178_8,"unusedBit_178_8", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_9Gauge = unusedBit_178_9,"unusedBit_178_9", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_10Gauge = unusedBit_178_10,"unusedBit_178_10", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_11Gauge = unusedBit_178_11,"unusedBit_178_11", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_12Gauge = unusedBit_178_12,"unusedBit_178_12", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_13Gauge = unusedBit_178_13,"unusedBit_178_13", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_14Gauge = unusedBit_178_14,"unusedBit_178_14", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_15Gauge = unusedBit_178_15,"unusedBit_178_15", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_16Gauge = unusedBit_178_16,"unusedBit_178_16", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_17Gauge = unusedBit_178_17,"unusedBit_178_17", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_18Gauge = unusedBit_178_18,"unusedBit_178_18", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_19Gauge = unusedBit_178_19,"unusedBit_178_19", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_20Gauge = unusedBit_178_20,"unusedBit_178_20", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_21Gauge = unusedBit_178_21,"unusedBit_178_21", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_22Gauge = unusedBit_178_22,"unusedBit_178_22", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_23Gauge = unusedBit_178_23,"unusedBit_178_23", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_24Gauge = unusedBit_178_24,"unusedBit_178_24", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_25Gauge = unusedBit_178_25,"unusedBit_178_25", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_26Gauge = unusedBit_178_26,"unusedBit_178_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_27Gauge = unusedBit_178_27,"unusedBit_178_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_28Gauge = unusedBit_178_28,"unusedBit_178_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_29Gauge = unusedBit_178_29,"unusedBit_178_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_30Gauge = unusedBit_178_30,"unusedBit_178_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_178_31Gauge = unusedBit_178_31,"unusedBit_178_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 unused11Gauge = unused11,"unused11", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 unused11Gauge = unused11,"unused11", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 unused11Gauge = unused11,"unused11", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 +alignmentFill_at_474Gauge = alignmentFill_at_474,"need 4 byte alignment", "units", -20.0,100.0, -20.0,100.0, -20.0,100.0, 0,0 TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 61d37fb571..b4acf7eea5 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -194,174 +194,76 @@ tps12Split = scalar, S16, 330, "%", 0.01, 0 accPedalSplit = scalar, S16, 332, "%", 0.01, 0 m_requested_pump = scalar, S16, 334, "deg", 0.02, 0 unused16 = scalar, S16, 336, "deg", 0.02, 0 -unusedAtTheEnd1 = scalar, U08, 338, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 339, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 340, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 341, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 342, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 343, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 344, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 345, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 346, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 347, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 348, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 349, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 350, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 351, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 352, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 353, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 354, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 355, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 356, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 357, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 358, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 359, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 360, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 361, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 362, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 363, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 364, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 365, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 366, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 367, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 368, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 369, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 370, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 371, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 372, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 373, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 374, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 375, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 376, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 377, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 378, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 379, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 380, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 381, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 382, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 383, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 384, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 385, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 386, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 387, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 388, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 389, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 390, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 391, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 392, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 393, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 394, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 395, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 396, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 397, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 398, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 399, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 400, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 401, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 402, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 403, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 404, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 405, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 406, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 407, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 408, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 409, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 410, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 411, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 412, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 413, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 414, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 415, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 416, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 417, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 418, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 419, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 420, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 421, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 422, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 423, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 424, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 425, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 426, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 427, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 428, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 429, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 430, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 431, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 432, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 433, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 434, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 435, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 436, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 437, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 438, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 439, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 440, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 441, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 442, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 443, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 444, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 445, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 446, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 447, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 448, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 449, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 450, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 451, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 452, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 453, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 454, "", 1, 0 -unusedAtTheEnd118 = scalar, U08, 455, "", 1, 0 -unusedAtTheEnd119 = scalar, U08, 456, "", 1, 0 -unusedAtTheEnd120 = scalar, U08, 457, "", 1, 0 -unusedAtTheEnd121 = scalar, U08, 458, "", 1, 0 -unusedAtTheEnd122 = scalar, U08, 459, "", 1, 0 -unusedAtTheEnd123 = scalar, U08, 460, "", 1, 0 -unusedAtTheEnd124 = scalar, U08, 461, "", 1, 0 -unusedAtTheEnd125 = scalar, U08, 462, "", 1, 0 -unusedAtTheEnd126 = scalar, U08, 463, "", 1, 0 -unusedAtTheEnd127 = scalar, U08, 464, "", 1, 0 -unusedAtTheEnd128 = scalar, U08, 465, "", 1, 0 -unusedAtTheEnd129 = scalar, U08, 466, "", 1, 0 -unusedAtTheEnd130 = scalar, U08, 467, "", 1, 0 -unusedAtTheEnd131 = scalar, U08, 468, "", 1, 0 -unusedAtTheEnd132 = scalar, U08, 469, "", 1, 0 -launchSpeedCondition = bits, U32, 470, [0:0] -launchRpmCondition = bits, U32, 470, [1:1] -launchTpsCondition = bits, U32, 470, [2:2] -launchActivateSwitchCondition = bits, U32, 470, [3:3] -launchIsLaunchCondition = bits, U32, 470, [4:4] -launchCombinedConditions = bits, U32, 470, [5:5] -launchActivatePinState = bits, U32, 470, [6:6] -unusedBit_173_7 = bits, U32, 470, [7:7] -unusedBit_173_8 = bits, U32, 470, [8:8] -unusedBit_173_9 = bits, U32, 470, [9:9] -unusedBit_173_10 = bits, U32, 470, [10:10] -unusedBit_173_11 = bits, U32, 470, [11:11] -unusedBit_173_12 = bits, U32, 470, [12:12] -unusedBit_173_13 = bits, U32, 470, [13:13] -unusedBit_173_14 = bits, U32, 470, [14:14] -unusedBit_173_15 = bits, U32, 470, [15:15] -unusedBit_173_16 = bits, U32, 470, [16:16] -unusedBit_173_17 = bits, U32, 470, [17:17] -unusedBit_173_18 = bits, U32, 470, [18:18] -unusedBit_173_19 = bits, U32, 470, [19:19] -unusedBit_173_20 = bits, U32, 470, [20:20] -unusedBit_173_21 = bits, U32, 470, [21:21] -unusedBit_173_22 = bits, U32, 470, [22:22] -unusedBit_173_23 = bits, U32, 470, [23:23] -unusedBit_173_24 = bits, U32, 470, [24:24] -unusedBit_173_25 = bits, U32, 470, [25:25] -unusedBit_173_26 = bits, U32, 470, [26:26] -unusedBit_173_27 = bits, U32, 470, [27:27] -unusedBit_173_28 = bits, U32, 470, [28:28] -unusedBit_173_29 = bits, U32, 470, [29:29] -unusedBit_173_30 = bits, U32, 470, [30:30] -unusedBit_173_31 = bits, U32, 470, [31:31] -TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 474, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 -unused11 = scalar, U08, 475, "", 1, 0 +alignmentFill_at_338 = array, U08, 338, [2], "units", 1, 0 +fuel_requested_percent = scalar, F32, 340, "v", 1, 0 +fuel_requested_percent_pi = scalar, F32, 344, "v", 1, 0 +m_I_sum_percent = scalar, F32, 348, "v", 1, 0 +m_pressureTarget_kPa = scalar, F32, 352, "v", 1, 0 +unusedAtTheEnd1 = scalar, S32, 356, "", 1, 0 +unusedAtTheEnd2 = scalar, S32, 360, "", 1, 0 +unusedAtTheEnd3 = scalar, S32, 364, "", 1, 0 +unusedAtTheEnd4 = scalar, S32, 368, "", 1, 0 +unusedAtTheEnd5 = scalar, S32, 372, "", 1, 0 +unusedAtTheEnd6 = scalar, S32, 376, "", 1, 0 +unusedAtTheEnd7 = scalar, S32, 380, "", 1, 0 +unusedAtTheEnd8 = scalar, S32, 384, "", 1, 0 +unusedAtTheEnd9 = scalar, S32, 388, "", 1, 0 +unusedAtTheEnd10 = scalar, S32, 392, "", 1, 0 +unusedAtTheEnd11 = scalar, S32, 396, "", 1, 0 +unusedAtTheEnd12 = scalar, S32, 400, "", 1, 0 +unusedAtTheEnd13 = scalar, S32, 404, "", 1, 0 +unusedAtTheEnd14 = scalar, S32, 408, "", 1, 0 +unusedAtTheEnd15 = scalar, S32, 412, "", 1, 0 +unusedAtTheEnd16 = scalar, S32, 416, "", 1, 0 +unusedAtTheEnd17 = scalar, S32, 420, "", 1, 0 +unusedAtTheEnd18 = scalar, S32, 424, "", 1, 0 +unusedAtTheEnd19 = scalar, S32, 428, "", 1, 0 +unusedAtTheEnd20 = scalar, S32, 432, "", 1, 0 +unusedAtTheEnd21 = scalar, S32, 436, "", 1, 0 +unusedAtTheEnd22 = scalar, S32, 440, "", 1, 0 +unusedAtTheEnd23 = scalar, S32, 444, "", 1, 0 +unusedAtTheEnd24 = scalar, S32, 448, "", 1, 0 +unusedAtTheEnd25 = scalar, S32, 452, "", 1, 0 +unusedAtTheEnd26 = scalar, S32, 456, "", 1, 0 +unusedAtTheEnd27 = scalar, S32, 460, "", 1, 0 +unusedAtTheEnd28 = scalar, S32, 464, "", 1, 0 +launchSpeedCondition = bits, U32, 468, [0:0] +launchRpmCondition = bits, U32, 468, [1:1] +launchTpsCondition = bits, U32, 468, [2:2] +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_178_7 = bits, U32, 468, [7:7] +unusedBit_178_8 = bits, U32, 468, [8:8] +unusedBit_178_9 = bits, U32, 468, [9:9] +unusedBit_178_10 = bits, U32, 468, [10:10] +unusedBit_178_11 = bits, U32, 468, [11:11] +unusedBit_178_12 = bits, U32, 468, [12:12] +unusedBit_178_13 = bits, U32, 468, [13:13] +unusedBit_178_14 = bits, U32, 468, [14:14] +unusedBit_178_15 = bits, U32, 468, [15:15] +unusedBit_178_16 = bits, U32, 468, [16:16] +unusedBit_178_17 = bits, U32, 468, [17:17] +unusedBit_178_18 = bits, U32, 468, [18:18] +unusedBit_178_19 = bits, U32, 468, [19:19] +unusedBit_178_20 = bits, U32, 468, [20:20] +unusedBit_178_21 = bits, U32, 468, [21:21] +unusedBit_178_22 = bits, U32, 468, [22:22] +unusedBit_178_23 = bits, U32, 468, [23:23] +unusedBit_178_24 = bits, U32, 468, [24:24] +unusedBit_178_25 = bits, U32, 468, [25:25] +unusedBit_178_26 = bits, U32, 468, [26:26] +unusedBit_178_27 = bits, U32, 468, [27:27] +unusedBit_178_28 = bits, U32, 468, [28:28] +unusedBit_178_29 = bits, U32, 468, [29:29] +unusedBit_178_30 = bits, U32, 468, [30:30] +unusedBit_178_31 = bits, U32, 468, [31:31] +TEMPLOG_MAP_AT_CYCLE_COUNT = scalar, U08, 472, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +unused11 = scalar, U08, 473, "", 1, 0 +alignmentFill_at_474 = array, U08, 474, [2], "units", 1, 0 TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0 TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0 vvtSyncGapRatio = scalar, F32, 484, "", 1, 0 diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index dd7c17d0d6..263b73541a 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -259,12 +259,16 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0 int16_t autoscale tps12Split;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 int16_t autoscale accPedalSplit;;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - int16_t autoscale m_requested_pump;"Pump Angle";"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + int16_t autoscale m_requested_pump;"DI: Pump Angle";"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 int16_t autoscale unused16;"Pump Angle";"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 0 + float fuel_requested_percent;"DI: fuel_requested_percent";"v", 1, 0, 0, 100, 0 + float fuel_requested_percent_pi;"DI: fuel_requested_percent_pi";"v", 1, 0, 0, 100, 0 + float m_I_sum_percent;"DI: m_I_sum_percent";"v", 1, 0, 0, 100, 0 + float m_pressureTarget_kPa;"DI: m_pressureTarget_kPa";"v", 1, 0, 0, 100, 0 ! we have some unused bytes to allow compatible TS changes - uint8_t[132 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0 + int[28 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 a73f083869..1ba9d91549 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 Thu Dec 30 22:56:30 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Jan 01 17:12:52 EST 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -852,7 +852,7 @@ struct ts_outputs_s { */ scaled_channel accPedalSplit = (int16_t)0; /** - * "Pump Angle" + * "DI: Pump Angle" deg * offset 334 */ @@ -864,113 +864,149 @@ struct ts_outputs_s { */ scaled_channel unused16 = (int16_t)0; /** + * need 4 byte alignment + units * offset 338 */ - uint8_t unusedAtTheEnd[132]; + uint8_t alignmentFill_at_338[2]; /** - offset 470 bit 0 */ + * "DI: fuel_requested_percent" + v + * offset 340 + */ + float fuel_requested_percent = (float)0; + /** + * "DI: fuel_requested_percent_pi" + v + * offset 344 + */ + float fuel_requested_percent_pi = (float)0; + /** + * "DI: m_I_sum_percent" + v + * offset 348 + */ + float m_I_sum_percent = (float)0; + /** + * "DI: m_pressureTarget_kPa" + v + * offset 352 + */ + float m_pressureTarget_kPa = (float)0; + /** + * offset 356 + */ + int unusedAtTheEnd[28]; + /** + offset 468 bit 0 */ bool launchSpeedCondition : 1 {}; /** - offset 470 bit 1 */ + offset 468 bit 1 */ bool launchRpmCondition : 1 {}; /** - offset 470 bit 2 */ + offset 468 bit 2 */ bool launchTpsCondition : 1 {}; /** - offset 470 bit 3 */ + offset 468 bit 3 */ bool launchActivateSwitchCondition : 1 {}; /** - offset 470 bit 4 */ + offset 468 bit 4 */ bool launchIsLaunchCondition : 1 {}; /** - offset 470 bit 5 */ + offset 468 bit 5 */ bool launchCombinedConditions : 1 {}; /** - offset 470 bit 6 */ + offset 468 bit 6 */ bool launchActivatePinState : 1 {}; /** - offset 470 bit 7 */ - bool unusedBit_173_7 : 1 {}; + offset 468 bit 7 */ + bool unusedBit_178_7 : 1 {}; /** - offset 470 bit 8 */ - bool unusedBit_173_8 : 1 {}; + offset 468 bit 8 */ + bool unusedBit_178_8 : 1 {}; /** - offset 470 bit 9 */ - bool unusedBit_173_9 : 1 {}; + offset 468 bit 9 */ + bool unusedBit_178_9 : 1 {}; /** - offset 470 bit 10 */ - bool unusedBit_173_10 : 1 {}; + offset 468 bit 10 */ + bool unusedBit_178_10 : 1 {}; /** - offset 470 bit 11 */ - bool unusedBit_173_11 : 1 {}; + offset 468 bit 11 */ + bool unusedBit_178_11 : 1 {}; /** - offset 470 bit 12 */ - bool unusedBit_173_12 : 1 {}; + offset 468 bit 12 */ + bool unusedBit_178_12 : 1 {}; /** - offset 470 bit 13 */ - bool unusedBit_173_13 : 1 {}; + offset 468 bit 13 */ + bool unusedBit_178_13 : 1 {}; /** - offset 470 bit 14 */ - bool unusedBit_173_14 : 1 {}; + offset 468 bit 14 */ + bool unusedBit_178_14 : 1 {}; /** - offset 470 bit 15 */ - bool unusedBit_173_15 : 1 {}; + offset 468 bit 15 */ + bool unusedBit_178_15 : 1 {}; /** - offset 470 bit 16 */ - bool unusedBit_173_16 : 1 {}; + offset 468 bit 16 */ + bool unusedBit_178_16 : 1 {}; /** - offset 470 bit 17 */ - bool unusedBit_173_17 : 1 {}; + offset 468 bit 17 */ + bool unusedBit_178_17 : 1 {}; /** - offset 470 bit 18 */ - bool unusedBit_173_18 : 1 {}; + offset 468 bit 18 */ + bool unusedBit_178_18 : 1 {}; /** - offset 470 bit 19 */ - bool unusedBit_173_19 : 1 {}; + offset 468 bit 19 */ + bool unusedBit_178_19 : 1 {}; /** - offset 470 bit 20 */ - bool unusedBit_173_20 : 1 {}; + offset 468 bit 20 */ + bool unusedBit_178_20 : 1 {}; /** - offset 470 bit 21 */ - bool unusedBit_173_21 : 1 {}; + offset 468 bit 21 */ + bool unusedBit_178_21 : 1 {}; /** - offset 470 bit 22 */ - bool unusedBit_173_22 : 1 {}; + offset 468 bit 22 */ + bool unusedBit_178_22 : 1 {}; /** - offset 470 bit 23 */ - bool unusedBit_173_23 : 1 {}; + offset 468 bit 23 */ + bool unusedBit_178_23 : 1 {}; /** - offset 470 bit 24 */ - bool unusedBit_173_24 : 1 {}; + offset 468 bit 24 */ + bool unusedBit_178_24 : 1 {}; /** - offset 470 bit 25 */ - bool unusedBit_173_25 : 1 {}; + offset 468 bit 25 */ + bool unusedBit_178_25 : 1 {}; /** - offset 470 bit 26 */ - bool unusedBit_173_26 : 1 {}; + offset 468 bit 26 */ + bool unusedBit_178_26 : 1 {}; /** - offset 470 bit 27 */ - bool unusedBit_173_27 : 1 {}; + offset 468 bit 27 */ + bool unusedBit_178_27 : 1 {}; /** - offset 470 bit 28 */ - bool unusedBit_173_28 : 1 {}; + offset 468 bit 28 */ + bool unusedBit_178_28 : 1 {}; /** - offset 470 bit 29 */ - bool unusedBit_173_29 : 1 {}; + offset 468 bit 29 */ + bool unusedBit_178_29 : 1 {}; /** - offset 470 bit 30 */ - bool unusedBit_173_30 : 1 {}; + offset 468 bit 30 */ + bool unusedBit_178_30 : 1 {}; /** - offset 470 bit 31 */ - bool unusedBit_173_31 : 1 {}; + offset 468 bit 31 */ + bool unusedBit_178_31 : 1 {}; /** - * offset 474 + * offset 472 */ uint8_t TEMPLOG_MAP_AT_CYCLE_COUNT = (uint8_t)0; /** - * offset 475 + * offset 473 */ uint8_t unused11 = (uint8_t)0; + /** + * need 4 byte alignment + units + * offset 474 + */ + uint8_t alignmentFill_at_474[2]; /** * offset 476 */ @@ -1152,4 +1188,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 Thu Dec 30 22:56:30 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Jan 01 17:12:52 EST 2022 diff --git a/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp index 5e98f070f0..4dfded77d9 100644 --- a/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp +++ b/firmware/controllers/engine_cycle/high_pressure_fuel_pump.cpp @@ -151,6 +151,10 @@ void HpfpController::onFastCallback() { } } engine->outputChannels.m_requested_pump = m_requested_pump; + engine->outputChannels.fuel_requested_percent = fuel_requested_percent; + engine->outputChannels.fuel_requested_percent_pi = fuel_requested_percent_pi; + engine->outputChannels.m_I_sum_percent = m_quantity.m_I_sum_percent; + engine->outputChannels.m_pressureTarget_kPa = m_quantity.m_pressureTarget_kPa; } void HpfpController::pinTurnOn(HpfpController *self) { diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 81b3709cfc..ddda1d18e5 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -314,6 +314,14 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.accPedalSplit; if (strEqualCaseInsensitive(name, "m_requested_pump")) return engine->outputChannels.m_requested_pump; + if (strEqualCaseInsensitive(name, "fuel_requested_percent")) + return engine->outputChannels.fuel_requested_percent; + if (strEqualCaseInsensitive(name, "fuel_requested_percent_pi")) + return engine->outputChannels.fuel_requested_percent_pi; + if (strEqualCaseInsensitive(name, "m_I_sum_percent")) + return engine->outputChannels.m_I_sum_percent; + if (strEqualCaseInsensitive(name, "m_pressureTarget_kPa")) + return engine->outputChannels.m_pressureTarget_kPa; if (strEqualCaseInsensitive(name, "launchSpeedCondition")) return engine->outputChannels.launchSpeedCondition; if (strEqualCaseInsensitive(name, "launchRpmCondition")) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 7f0ef1255b..f4d10e0a6e 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -965,7 +965,11 @@ 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 -m_requested_pumpGauge = m_requested_pump,"Pump Angle", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.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 +m_I_sum_percentGauge = m_I_sum_percent,"DI: m_I_sum_percent", "v", 0.0,100.0, 0.0,100.0, 0.0,100.0, 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 highFuelPressureGauge = highFuelPressure, @@GAUGE_NAME_FUEL_PRESSURE_HIGH@@, @@GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS@@, 0, 200, 0, 0, 200, 200, 1, 0 gaugeCategory = Sensors - Extra 2