Custom Auto-generated Configs

[no ci]
This commit is contained in:
GitHub git update Action 2024-09-04 16:44:36 +00:00
parent 3b728f3512
commit 7b9486ea2f
10 changed files with 242 additions and 216 deletions

View File

@ -748,8 +748,9 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f"
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
entry = tcEtbDrop0, "tcEtbDrop0", int, "%d"
entry = tcEtbDrop0, "ETB traction control0", int, "%d"
entry = jamTimer0, "ETB jam timer0", float, "%.3f"
entry = adjustedEtbTarget0, "ETB with adjustments0", int, "%d"
entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f"
entry = trim1, "ETB: trim1", float, "%.3f"
entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f"
@ -765,8 +766,9 @@ entry = etbDutyAverage1, "ETB average duty1", float, "%.3f"
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
entry = tcEtbDrop1, "tcEtbDrop1", int, "%d"
entry = tcEtbDrop1, "ETB traction control1", int, "%d"
entry = jamTimer1, "ETB jam timer1", float, "%.3f"
entry = adjustedEtbTarget1, "ETB with adjustments1", int, "%d"
entry = faultCode0, "WBO: Fault code0", int, "%d"
entry = heaterDuty0, "WBO: Heater duty0", int, "%d"
entry = pumpDuty0, "WBO: Pump duty0", int, "%d"

View File

@ -520,6 +520,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0"
graphLine = etbErrorCode0
graphLine = tcEtbDrop0
graphLine = jamTimer0
graphLine = adjustedEtbTarget0
indicatorPanel = electronic_throttle1IndicatorPanel, 2
indicator = {etbRevLimitActive1}, "etbRevLimitActive No", "etbRevLimitActive Yes"
@ -546,6 +547,7 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1"
graphLine = etbErrorCode1
graphLine = tcEtbDrop1
graphLine = jamTimer1
graphLine = adjustedEtbTarget1
dialog = wideband_state0Dialog, "wideband_state0"

View File

@ -29,14 +29,14 @@ targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0",
luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2
etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "%", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2
etbDutyAverage1Gauge = etbDutyAverage1,"ETB average duty1", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbDutyAverage1Gauge = etbDutyAverage1,"ETB average duty1", "%", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2

View File

@ -63,9 +63,9 @@ LDS_extra,
#define WALL_FUEL_STATE_BASE_ADDRESS 1536
#define IDLE_STATE_BASE_ADDRESS 1544
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1592
#define WIDEBAND_STATE_BASE_ADDRESS 1696
#define DC_MOTORS_BASE_ADDRESS 1720
#define SENT_STATE_BASE_ADDRESS 1732
#define VVT_BASE_ADDRESS 1740
#define LAMBDA_MONITOR_BASE_ADDRESS 1744
#define EXTRA_BASE_ADDRESS 1752
#define WIDEBAND_STATE_BASE_ADDRESS 1704
#define DC_MOTORS_BASE_ADDRESS 1728
#define SENT_STATE_BASE_ADDRESS 1740
#define VVT_BASE_ADDRESS 1748
#define LAMBDA_MONITOR_BASE_ADDRESS 1752
#define EXTRA_BASE_ADDRESS 1760

View File

@ -830,152 +830,154 @@ etbCurrentAdjustedTarget0 = scalar, F32, 1620, "%", 1, 0
etbRevLimitActive0 = bits, U32, 1624, [0:0]
jamDetected0 = bits, U32, 1624, [1:1]
etbDutyRateOfChange0 = scalar, F32, 1628, "per", 1,0
etbDutyAverage0 = scalar, F32, 1632, "per", 1,0
etbDutyAverage0 = scalar, F32, 1632, "%", 1,0
etbTpsErrorCounter0 = scalar, U16, 1636, "count", 1,0
etbPpsErrorCounter0 = scalar, U16, 1638, "count", 1,0
etbErrorCode0 = scalar, S08, 1640, "", 1, 0
tcEtbDrop0 = scalar, S08, 1641, "", 1, 0
tcEtbDrop0 = scalar, S08, 1641, "%", 1, 0
jamTimer0 = scalar, U16, 1642, "sec", 0.01, 0
; total TS size = 1644
targetWithIdlePosition1 = scalar, F32, 1644, "per", 1,0
trim1 = scalar, F32, 1648, "", 1, 0
luaAdjustment1 = scalar, F32, 1652, "per", 1,0
m_wastegatePosition1 = scalar, F32, 1656, "per", 1,0
etbFeedForward1 = scalar, F32, 1660
etbIntegralError1 = scalar, F32, 1664, "", 1, 0
etbCurrentTarget1 = scalar, F32, 1668, "%", 1, 0
etbCurrentAdjustedTarget1 = scalar, F32, 1672, "%", 1, 0
etbRevLimitActive1 = bits, U32, 1676, [0:0]
jamDetected1 = bits, U32, 1676, [1:1]
etbDutyRateOfChange1 = scalar, F32, 1680, "per", 1,0
etbDutyAverage1 = scalar, F32, 1684, "per", 1,0
etbTpsErrorCounter1 = scalar, U16, 1688, "count", 1,0
etbPpsErrorCounter1 = scalar, U16, 1690, "count", 1,0
etbErrorCode1 = scalar, S08, 1692, "", 1, 0
tcEtbDrop1 = scalar, S08, 1693, "", 1, 0
jamTimer1 = scalar, U16, 1694, "sec", 0.01, 0
; total TS size = 1696
faultCode0 = scalar, U08, 1696, "", 1, 0
heaterDuty0 = scalar, U08, 1697, "%", 1, 0
pumpDuty0 = scalar, U08, 1698, "%", 1, 0
tempC0 = scalar, U16, 1700, "C", 1, 0
nernstVoltage0 = scalar, U16, 1702, "V", 0.001, 0
esr0 = scalar, U16, 1704, "ohm", 1, 0
; total TS size = 1708
faultCode1 = scalar, U08, 1708, "", 1, 0
heaterDuty1 = scalar, U08, 1709, "%", 1, 0
pumpDuty1 = scalar, U08, 1710, "%", 1, 0
tempC1 = scalar, U16, 1712, "C", 1, 0
nernstVoltage1 = scalar, U16, 1714, "V", 0.001, 0
esr1 = scalar, U16, 1716, "ohm", 1, 0
; total TS size = 1720
dcOutput0 = scalar, F32, 1720, "per", 1,0
isEnabled0_int = scalar, U08, 1724, "per", 1,0
isEnabled0 = bits, U32, 1728, [0:0]
; total TS size = 1732
value0 = scalar, U16, 1732, "value", 1,0
value1 = scalar, U16, 1734, "value", 1,0
errorRate = scalar, F32, 1736, "ratio", 1,0
adjustedEtbTarget0 = scalar, S08, 1644, "%", 1, 0
; total TS size = 1648
targetWithIdlePosition1 = scalar, F32, 1648, "per", 1,0
trim1 = scalar, F32, 1652, "", 1, 0
luaAdjustment1 = scalar, F32, 1656, "per", 1,0
m_wastegatePosition1 = scalar, F32, 1660, "per", 1,0
etbFeedForward1 = scalar, F32, 1664
etbIntegralError1 = scalar, F32, 1668, "", 1, 0
etbCurrentTarget1 = scalar, F32, 1672, "%", 1, 0
etbCurrentAdjustedTarget1 = scalar, F32, 1676, "%", 1, 0
etbRevLimitActive1 = bits, U32, 1680, [0:0]
jamDetected1 = bits, U32, 1680, [1:1]
etbDutyRateOfChange1 = scalar, F32, 1684, "per", 1,0
etbDutyAverage1 = scalar, F32, 1688, "%", 1,0
etbTpsErrorCounter1 = scalar, U16, 1692, "count", 1,0
etbPpsErrorCounter1 = scalar, U16, 1694, "count", 1,0
etbErrorCode1 = scalar, S08, 1696, "", 1, 0
tcEtbDrop1 = scalar, S08, 1697, "%", 1, 0
jamTimer1 = scalar, U16, 1698, "sec", 0.01, 0
adjustedEtbTarget1 = scalar, S08, 1700, "%", 1, 0
; total TS size = 1704
faultCode0 = scalar, U08, 1704, "", 1, 0
heaterDuty0 = scalar, U08, 1705, "%", 1, 0
pumpDuty0 = scalar, U08, 1706, "%", 1, 0
tempC0 = scalar, U16, 1708, "C", 1, 0
nernstVoltage0 = scalar, U16, 1710, "V", 0.001, 0
esr0 = scalar, U16, 1712, "ohm", 1, 0
; total TS size = 1716
faultCode1 = scalar, U08, 1716, "", 1, 0
heaterDuty1 = scalar, U08, 1717, "%", 1, 0
pumpDuty1 = scalar, U08, 1718, "%", 1, 0
tempC1 = scalar, U16, 1720, "C", 1, 0
nernstVoltage1 = scalar, U16, 1722, "V", 0.001, 0
esr1 = scalar, U16, 1724, "ohm", 1, 0
; total TS size = 1728
dcOutput0 = scalar, F32, 1728, "per", 1,0
isEnabled0_int = scalar, U08, 1732, "per", 1,0
isEnabled0 = bits, U32, 1736, [0:0]
; total TS size = 1740
vvtTarget = scalar, U16, 1740, "deg", 0.1, 0
vvtOutput = scalar, U08, 1742, "%", 0.5, 0
; total TS size = 1744
lambdaCurrentlyGood = bits, U32, 1744, [0:0]
lambdaMonitorCut = bits, U32, 1744, [1:1]
lambdaTimeSinceGood = scalar, U16, 1748, "sec", 0.01, 0
value0 = scalar, U16, 1740, "value", 1,0
value1 = scalar, U16, 1742, "value", 1,0
errorRate = scalar, F32, 1744, "ratio", 1,0
; total TS size = 1748
vvtTarget = scalar, U16, 1748, "deg", 0.1, 0
vvtOutput = scalar, U08, 1750, "%", 0.5, 0
; total TS size = 1752
extraField = scalar, S32, 1752, "", 1, 0
extraCustomGauge = scalar, S32, 1756, "", 1, 0
unusedAtTheExtraEnd1 = scalar, U08, 1760, "", 1, 0
unusedAtTheExtraEnd2 = scalar, U08, 1761, "", 1, 0
unusedAtTheExtraEnd3 = scalar, U08, 1762, "", 1, 0
unusedAtTheExtraEnd4 = scalar, U08, 1763, "", 1, 0
unusedAtTheExtraEnd5 = scalar, U08, 1764, "", 1, 0
unusedAtTheExtraEnd6 = scalar, U08, 1765, "", 1, 0
unusedAtTheExtraEnd7 = scalar, U08, 1766, "", 1, 0
unusedAtTheExtraEnd8 = scalar, U08, 1767, "", 1, 0
unusedAtTheExtraEnd9 = scalar, U08, 1768, "", 1, 0
unusedAtTheExtraEnd10 = scalar, U08, 1769, "", 1, 0
unusedAtTheExtraEnd11 = scalar, U08, 1770, "", 1, 0
unusedAtTheExtraEnd12 = scalar, U08, 1771, "", 1, 0
unusedAtTheExtraEnd13 = scalar, U08, 1772, "", 1, 0
unusedAtTheExtraEnd14 = scalar, U08, 1773, "", 1, 0
unusedAtTheExtraEnd15 = scalar, U08, 1774, "", 1, 0
unusedAtTheExtraEnd16 = scalar, U08, 1775, "", 1, 0
unusedAtTheExtraEnd17 = scalar, U08, 1776, "", 1, 0
unusedAtTheExtraEnd18 = scalar, U08, 1777, "", 1, 0
unusedAtTheExtraEnd19 = scalar, U08, 1778, "", 1, 0
unusedAtTheExtraEnd20 = scalar, U08, 1779, "", 1, 0
unusedAtTheExtraEnd21 = scalar, U08, 1780, "", 1, 0
unusedAtTheExtraEnd22 = scalar, U08, 1781, "", 1, 0
unusedAtTheExtraEnd23 = scalar, U08, 1782, "", 1, 0
unusedAtTheExtraEnd24 = scalar, U08, 1783, "", 1, 0
unusedAtTheExtraEnd25 = scalar, U08, 1784, "", 1, 0
unusedAtTheExtraEnd26 = scalar, U08, 1785, "", 1, 0
unusedAtTheExtraEnd27 = scalar, U08, 1786, "", 1, 0
unusedAtTheExtraEnd28 = scalar, U08, 1787, "", 1, 0
unusedAtTheExtraEnd29 = scalar, U08, 1788, "", 1, 0
unusedAtTheExtraEnd30 = scalar, U08, 1789, "", 1, 0
unusedAtTheExtraEnd31 = scalar, U08, 1790, "", 1, 0
unusedAtTheExtraEnd32 = scalar, U08, 1791, "", 1, 0
unusedAtTheExtraEnd33 = scalar, U08, 1792, "", 1, 0
unusedAtTheExtraEnd34 = scalar, U08, 1793, "", 1, 0
unusedAtTheExtraEnd35 = scalar, U08, 1794, "", 1, 0
unusedAtTheExtraEnd36 = scalar, U08, 1795, "", 1, 0
unusedAtTheExtraEnd37 = scalar, U08, 1796, "", 1, 0
unusedAtTheExtraEnd38 = scalar, U08, 1797, "", 1, 0
unusedAtTheExtraEnd39 = scalar, U08, 1798, "", 1, 0
unusedAtTheExtraEnd40 = scalar, U08, 1799, "", 1, 0
unusedAtTheExtraEnd41 = scalar, U08, 1800, "", 1, 0
unusedAtTheExtraEnd42 = scalar, U08, 1801, "", 1, 0
unusedAtTheExtraEnd43 = scalar, U08, 1802, "", 1, 0
unusedAtTheExtraEnd44 = scalar, U08, 1803, "", 1, 0
unusedAtTheExtraEnd45 = scalar, U08, 1804, "", 1, 0
unusedAtTheExtraEnd46 = scalar, U08, 1805, "", 1, 0
unusedAtTheExtraEnd47 = scalar, U08, 1806, "", 1, 0
unusedAtTheExtraEnd48 = scalar, U08, 1807, "", 1, 0
unusedAtTheExtraEnd49 = scalar, U08, 1808, "", 1, 0
unusedAtTheExtraEnd50 = scalar, U08, 1809, "", 1, 0
unusedAtTheExtraEnd51 = scalar, U08, 1810, "", 1, 0
unusedAtTheExtraEnd52 = scalar, U08, 1811, "", 1, 0
unusedAtTheExtraEnd53 = scalar, U08, 1812, "", 1, 0
unusedAtTheExtraEnd54 = scalar, U08, 1813, "", 1, 0
unusedAtTheExtraEnd55 = scalar, U08, 1814, "", 1, 0
unusedAtTheExtraEnd56 = scalar, U08, 1815, "", 1, 0
unusedAtTheExtraEnd57 = scalar, U08, 1816, "", 1, 0
unusedAtTheExtraEnd58 = scalar, U08, 1817, "", 1, 0
unusedAtTheExtraEnd59 = scalar, U08, 1818, "", 1, 0
unusedAtTheExtraEnd60 = scalar, U08, 1819, "", 1, 0
unusedAtTheExtraEnd61 = scalar, U08, 1820, "", 1, 0
unusedAtTheExtraEnd62 = scalar, U08, 1821, "", 1, 0
unusedAtTheExtraEnd63 = scalar, U08, 1822, "", 1, 0
unusedAtTheExtraEnd64 = scalar, U08, 1823, "", 1, 0
unusedAtTheExtraEnd65 = scalar, U08, 1824, "", 1, 0
unusedAtTheExtraEnd66 = scalar, U08, 1825, "", 1, 0
unusedAtTheExtraEnd67 = scalar, U08, 1826, "", 1, 0
unusedAtTheExtraEnd68 = scalar, U08, 1827, "", 1, 0
unusedAtTheExtraEnd69 = scalar, U08, 1828, "", 1, 0
unusedAtTheExtraEnd70 = scalar, U08, 1829, "", 1, 0
unusedAtTheExtraEnd71 = scalar, U08, 1830, "", 1, 0
unusedAtTheExtraEnd72 = scalar, U08, 1831, "", 1, 0
unusedAtTheExtraEnd73 = scalar, U08, 1832, "", 1, 0
unusedAtTheExtraEnd74 = scalar, U08, 1833, "", 1, 0
unusedAtTheExtraEnd75 = scalar, U08, 1834, "", 1, 0
unusedAtTheExtraEnd76 = scalar, U08, 1835, "", 1, 0
unusedAtTheExtraEnd77 = scalar, U08, 1836, "", 1, 0
unusedAtTheExtraEnd78 = scalar, U08, 1837, "", 1, 0
unusedAtTheExtraEnd79 = scalar, U08, 1838, "", 1, 0
unusedAtTheExtraEnd80 = scalar, U08, 1839, "", 1, 0
unusedAtTheExtraEnd81 = scalar, U08, 1840, "", 1, 0
unusedAtTheExtraEnd82 = scalar, U08, 1841, "", 1, 0
unusedAtTheExtraEnd83 = scalar, U08, 1842, "", 1, 0
unusedAtTheExtraEnd84 = scalar, U08, 1843, "", 1, 0
unusedAtTheExtraEnd85 = scalar, U08, 1844, "", 1, 0
unusedAtTheExtraEnd86 = scalar, U08, 1845, "", 1, 0
unusedAtTheExtraEnd87 = scalar, U08, 1846, "", 1, 0
unusedAtTheExtraEnd88 = scalar, U08, 1847, "", 1, 0
unusedAtTheExtraEnd89 = scalar, U08, 1848, "", 1, 0
unusedAtTheExtraEnd90 = scalar, U08, 1849, "", 1, 0
unusedAtTheExtraEnd91 = scalar, U08, 1850, "", 1, 0
unusedAtTheExtraEnd92 = scalar, U08, 1851, "", 1, 0
; total TS size = 1852
lambdaCurrentlyGood = bits, U32, 1752, [0:0]
lambdaMonitorCut = bits, U32, 1752, [1:1]
lambdaTimeSinceGood = scalar, U16, 1756, "sec", 0.01, 0
; total TS size = 1760
extraField = scalar, S32, 1760, "", 1, 0
extraCustomGauge = scalar, S32, 1764, "", 1, 0
unusedAtTheExtraEnd1 = scalar, U08, 1768, "", 1, 0
unusedAtTheExtraEnd2 = scalar, U08, 1769, "", 1, 0
unusedAtTheExtraEnd3 = scalar, U08, 1770, "", 1, 0
unusedAtTheExtraEnd4 = scalar, U08, 1771, "", 1, 0
unusedAtTheExtraEnd5 = scalar, U08, 1772, "", 1, 0
unusedAtTheExtraEnd6 = scalar, U08, 1773, "", 1, 0
unusedAtTheExtraEnd7 = scalar, U08, 1774, "", 1, 0
unusedAtTheExtraEnd8 = scalar, U08, 1775, "", 1, 0
unusedAtTheExtraEnd9 = scalar, U08, 1776, "", 1, 0
unusedAtTheExtraEnd10 = scalar, U08, 1777, "", 1, 0
unusedAtTheExtraEnd11 = scalar, U08, 1778, "", 1, 0
unusedAtTheExtraEnd12 = scalar, U08, 1779, "", 1, 0
unusedAtTheExtraEnd13 = scalar, U08, 1780, "", 1, 0
unusedAtTheExtraEnd14 = scalar, U08, 1781, "", 1, 0
unusedAtTheExtraEnd15 = scalar, U08, 1782, "", 1, 0
unusedAtTheExtraEnd16 = scalar, U08, 1783, "", 1, 0
unusedAtTheExtraEnd17 = scalar, U08, 1784, "", 1, 0
unusedAtTheExtraEnd18 = scalar, U08, 1785, "", 1, 0
unusedAtTheExtraEnd19 = scalar, U08, 1786, "", 1, 0
unusedAtTheExtraEnd20 = scalar, U08, 1787, "", 1, 0
unusedAtTheExtraEnd21 = scalar, U08, 1788, "", 1, 0
unusedAtTheExtraEnd22 = scalar, U08, 1789, "", 1, 0
unusedAtTheExtraEnd23 = scalar, U08, 1790, "", 1, 0
unusedAtTheExtraEnd24 = scalar, U08, 1791, "", 1, 0
unusedAtTheExtraEnd25 = scalar, U08, 1792, "", 1, 0
unusedAtTheExtraEnd26 = scalar, U08, 1793, "", 1, 0
unusedAtTheExtraEnd27 = scalar, U08, 1794, "", 1, 0
unusedAtTheExtraEnd28 = scalar, U08, 1795, "", 1, 0
unusedAtTheExtraEnd29 = scalar, U08, 1796, "", 1, 0
unusedAtTheExtraEnd30 = scalar, U08, 1797, "", 1, 0
unusedAtTheExtraEnd31 = scalar, U08, 1798, "", 1, 0
unusedAtTheExtraEnd32 = scalar, U08, 1799, "", 1, 0
unusedAtTheExtraEnd33 = scalar, U08, 1800, "", 1, 0
unusedAtTheExtraEnd34 = scalar, U08, 1801, "", 1, 0
unusedAtTheExtraEnd35 = scalar, U08, 1802, "", 1, 0
unusedAtTheExtraEnd36 = scalar, U08, 1803, "", 1, 0
unusedAtTheExtraEnd37 = scalar, U08, 1804, "", 1, 0
unusedAtTheExtraEnd38 = scalar, U08, 1805, "", 1, 0
unusedAtTheExtraEnd39 = scalar, U08, 1806, "", 1, 0
unusedAtTheExtraEnd40 = scalar, U08, 1807, "", 1, 0
unusedAtTheExtraEnd41 = scalar, U08, 1808, "", 1, 0
unusedAtTheExtraEnd42 = scalar, U08, 1809, "", 1, 0
unusedAtTheExtraEnd43 = scalar, U08, 1810, "", 1, 0
unusedAtTheExtraEnd44 = scalar, U08, 1811, "", 1, 0
unusedAtTheExtraEnd45 = scalar, U08, 1812, "", 1, 0
unusedAtTheExtraEnd46 = scalar, U08, 1813, "", 1, 0
unusedAtTheExtraEnd47 = scalar, U08, 1814, "", 1, 0
unusedAtTheExtraEnd48 = scalar, U08, 1815, "", 1, 0
unusedAtTheExtraEnd49 = scalar, U08, 1816, "", 1, 0
unusedAtTheExtraEnd50 = scalar, U08, 1817, "", 1, 0
unusedAtTheExtraEnd51 = scalar, U08, 1818, "", 1, 0
unusedAtTheExtraEnd52 = scalar, U08, 1819, "", 1, 0
unusedAtTheExtraEnd53 = scalar, U08, 1820, "", 1, 0
unusedAtTheExtraEnd54 = scalar, U08, 1821, "", 1, 0
unusedAtTheExtraEnd55 = scalar, U08, 1822, "", 1, 0
unusedAtTheExtraEnd56 = scalar, U08, 1823, "", 1, 0
unusedAtTheExtraEnd57 = scalar, U08, 1824, "", 1, 0
unusedAtTheExtraEnd58 = scalar, U08, 1825, "", 1, 0
unusedAtTheExtraEnd59 = scalar, U08, 1826, "", 1, 0
unusedAtTheExtraEnd60 = scalar, U08, 1827, "", 1, 0
unusedAtTheExtraEnd61 = scalar, U08, 1828, "", 1, 0
unusedAtTheExtraEnd62 = scalar, U08, 1829, "", 1, 0
unusedAtTheExtraEnd63 = scalar, U08, 1830, "", 1, 0
unusedAtTheExtraEnd64 = scalar, U08, 1831, "", 1, 0
unusedAtTheExtraEnd65 = scalar, U08, 1832, "", 1, 0
unusedAtTheExtraEnd66 = scalar, U08, 1833, "", 1, 0
unusedAtTheExtraEnd67 = scalar, U08, 1834, "", 1, 0
unusedAtTheExtraEnd68 = scalar, U08, 1835, "", 1, 0
unusedAtTheExtraEnd69 = scalar, U08, 1836, "", 1, 0
unusedAtTheExtraEnd70 = scalar, U08, 1837, "", 1, 0
unusedAtTheExtraEnd71 = scalar, U08, 1838, "", 1, 0
unusedAtTheExtraEnd72 = scalar, U08, 1839, "", 1, 0
unusedAtTheExtraEnd73 = scalar, U08, 1840, "", 1, 0
unusedAtTheExtraEnd74 = scalar, U08, 1841, "", 1, 0
unusedAtTheExtraEnd75 = scalar, U08, 1842, "", 1, 0
unusedAtTheExtraEnd76 = scalar, U08, 1843, "", 1, 0
unusedAtTheExtraEnd77 = scalar, U08, 1844, "", 1, 0
unusedAtTheExtraEnd78 = scalar, U08, 1845, "", 1, 0
unusedAtTheExtraEnd79 = scalar, U08, 1846, "", 1, 0
unusedAtTheExtraEnd80 = scalar, U08, 1847, "", 1, 0
unusedAtTheExtraEnd81 = scalar, U08, 1848, "", 1, 0
unusedAtTheExtraEnd82 = scalar, U08, 1849, "", 1, 0
unusedAtTheExtraEnd83 = scalar, U08, 1850, "", 1, 0
unusedAtTheExtraEnd84 = scalar, U08, 1851, "", 1, 0
unusedAtTheExtraEnd85 = scalar, U08, 1852, "", 1, 0
unusedAtTheExtraEnd86 = scalar, U08, 1853, "", 1, 0
unusedAtTheExtraEnd87 = scalar, U08, 1854, "", 1, 0
unusedAtTheExtraEnd88 = scalar, U08, 1855, "", 1, 0
unusedAtTheExtraEnd89 = scalar, U08, 1856, "", 1, 0
unusedAtTheExtraEnd90 = scalar, U08, 1857, "", 1, 0
unusedAtTheExtraEnd91 = scalar, U08, 1858, "", 1, 0
unusedAtTheExtraEnd92 = scalar, U08, 1859, "", 1, 0
; total TS size = 1860

View File

@ -1,2 +1,2 @@
// generated by gen_live_documentation.sh / LiveDataProcessor.java
#define TS_TOTAL_OUTPUT_SIZE 1852
#define TS_TOTAL_OUTPUT_SIZE 1860

View File

@ -151,7 +151,7 @@ struct electronic_throttle_s {
float etbDutyRateOfChange = (float)0;
/**
* "ETB average duty"
* units: per
* units: %
* offset 40
*/
float etbDutyAverage = (float)0;
@ -172,6 +172,8 @@ struct electronic_throttle_s {
*/
int8_t etbErrorCode = (int8_t)0;
/**
* ETB traction control
* units: %
* offset 49
*/
int8_t tcEtbDrop = (int8_t)0;
@ -181,8 +183,20 @@ struct electronic_throttle_s {
* offset 50
*/
scaled_channel<uint16_t, 100, 1> jamTimer = (uint16_t)0;
/**
* ETB with adjustments
* units: %
* offset 52
*/
int8_t adjustedEtbTarget = (int8_t)0;
/**
* need 4 byte alignment
* units: units
* offset 53
*/
uint8_t alignmentFill_at_53[3];
};
static_assert(sizeof(electronic_throttle_s) == 52);
static_assert(sizeof(electronic_throttle_s) == 56);
// end
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt

View File

@ -1296,7 +1296,7 @@
#define show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 200754158
#define SIGNATURE_HASH 4217665944
#define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin"
#define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image"
#define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin"
@ -1742,14 +1742,14 @@
#define ts_show_wastegate_sensor true
#define ts_show_wbo_canbus_index true
#define ts_show_wbo_canbus_set_index true
#define TS_SIGNATURE "rusEFI main.2024.09.03.XYZ.200754158"
#define TS_SIGNATURE "rusEFI main.2024.09.04.XYZ.4217665944"
#define TS_SIMULATE_CAN '>'
#define TS_SIMULATE_CAN_char >
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't'
#define TS_TEST_COMMAND_char t
#define TS_TOTAL_OUTPUT_SIZE 1752
#define TS_TOTAL_OUTPUT_SIZE 1760
#define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
#define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
#define TS_TRIGGER_SCOPE_DISABLE 5

View File

@ -2,5 +2,5 @@
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
//
#define SIGNATURE_HASH 200754158
#define TS_SIGNATURE "rusEFI main.2024.09.03.XYZ.200754158"
#define SIGNATURE_HASH 4217665944
#define TS_SIGNATURE "rusEFI main.2024.09.04.XYZ.4217665944"

View File

@ -38,12 +38,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI main.2024.09.03.XYZ.200754158"
signature = "rusEFI main.2024.09.04.XYZ.4217665944"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmware version for title bar.
signature= "rusEFI main.2024.09.03.XYZ.200754158" ; signature is expected to be 7 or more characters.
signature= "rusEFI main.2024.09.04.XYZ.4217665944" ; signature is expected to be 7 or more characters.
; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C
useLegacyFTempUnits = false
@ -2538,7 +2538,7 @@ boardSpecificCalibration1 = scalar, S32, 22968, "", 1, 0, 0, 100, 0
ochGetCommand = "O%2o%2c"
; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 1752
ochBlockSize = 1760
; 11.2.3 Full Optimized High Speed
scatteredOchGetCommand = 9
@ -3385,60 +3385,62 @@ etbCurrentAdjustedTarget0 = scalar, F32, 1620, "%", 1, 0
etbRevLimitActive0 = bits, U32, 1624, [0:0]
jamDetected0 = bits, U32, 1624, [1:1]
etbDutyRateOfChange0 = scalar, F32, 1628, "per", 1,0
etbDutyAverage0 = scalar, F32, 1632, "per", 1,0
etbDutyAverage0 = scalar, F32, 1632, "%", 1,0
etbTpsErrorCounter0 = scalar, U16, 1636, "count", 1,0
etbPpsErrorCounter0 = scalar, U16, 1638, "count", 1,0
etbErrorCode0 = scalar, S08, 1640, "", 1, 0
tcEtbDrop0 = scalar, S08, 1641, "", 1, 0
tcEtbDrop0 = scalar, S08, 1641, "%", 1, 0
jamTimer0 = scalar, U16, 1642, "sec", 0.01, 0
; total TS size = 1644
targetWithIdlePosition1 = scalar, F32, 1644, "per", 1,0
trim1 = scalar, F32, 1648, "", 1, 0
luaAdjustment1 = scalar, F32, 1652, "per", 1,0
m_wastegatePosition1 = scalar, F32, 1656, "per", 1,0
etbFeedForward1 = scalar, F32, 1660
etbIntegralError1 = scalar, F32, 1664, "", 1, 0
etbCurrentTarget1 = scalar, F32, 1668, "%", 1, 0
etbCurrentAdjustedTarget1 = scalar, F32, 1672, "%", 1, 0
etbRevLimitActive1 = bits, U32, 1676, [0:0]
jamDetected1 = bits, U32, 1676, [1:1]
etbDutyRateOfChange1 = scalar, F32, 1680, "per", 1,0
etbDutyAverage1 = scalar, F32, 1684, "per", 1,0
etbTpsErrorCounter1 = scalar, U16, 1688, "count", 1,0
etbPpsErrorCounter1 = scalar, U16, 1690, "count", 1,0
etbErrorCode1 = scalar, S08, 1692, "", 1, 0
tcEtbDrop1 = scalar, S08, 1693, "", 1, 0
jamTimer1 = scalar, U16, 1694, "sec", 0.01, 0
; total TS size = 1696
faultCode0 = scalar, U08, 1696, "", 1, 0
heaterDuty0 = scalar, U08, 1697, "%", 1, 0
pumpDuty0 = scalar, U08, 1698, "%", 1, 0
tempC0 = scalar, U16, 1700, "C", 1, 0
nernstVoltage0 = scalar, U16, 1702, "V", 0.001, 0
esr0 = scalar, U16, 1704, "ohm", 1, 0
; total TS size = 1708
faultCode1 = scalar, U08, 1708, "", 1, 0
heaterDuty1 = scalar, U08, 1709, "%", 1, 0
pumpDuty1 = scalar, U08, 1710, "%", 1, 0
tempC1 = scalar, U16, 1712, "C", 1, 0
nernstVoltage1 = scalar, U16, 1714, "V", 0.001, 0
esr1 = scalar, U16, 1716, "ohm", 1, 0
; total TS size = 1720
dcOutput0 = scalar, F32, 1720, "per", 1,0
isEnabled0_int = scalar, U08, 1724, "per", 1,0
isEnabled0 = bits, U32, 1728, [0:0]
; total TS size = 1732
value0 = scalar, U16, 1732, "value", 1,0
value1 = scalar, U16, 1734, "value", 1,0
errorRate = scalar, F32, 1736, "ratio", 1,0
adjustedEtbTarget0 = scalar, S08, 1644, "%", 1, 0
; total TS size = 1648
targetWithIdlePosition1 = scalar, F32, 1648, "per", 1,0
trim1 = scalar, F32, 1652, "", 1, 0
luaAdjustment1 = scalar, F32, 1656, "per", 1,0
m_wastegatePosition1 = scalar, F32, 1660, "per", 1,0
etbFeedForward1 = scalar, F32, 1664
etbIntegralError1 = scalar, F32, 1668, "", 1, 0
etbCurrentTarget1 = scalar, F32, 1672, "%", 1, 0
etbCurrentAdjustedTarget1 = scalar, F32, 1676, "%", 1, 0
etbRevLimitActive1 = bits, U32, 1680, [0:0]
jamDetected1 = bits, U32, 1680, [1:1]
etbDutyRateOfChange1 = scalar, F32, 1684, "per", 1,0
etbDutyAverage1 = scalar, F32, 1688, "%", 1,0
etbTpsErrorCounter1 = scalar, U16, 1692, "count", 1,0
etbPpsErrorCounter1 = scalar, U16, 1694, "count", 1,0
etbErrorCode1 = scalar, S08, 1696, "", 1, 0
tcEtbDrop1 = scalar, S08, 1697, "%", 1, 0
jamTimer1 = scalar, U16, 1698, "sec", 0.01, 0
adjustedEtbTarget1 = scalar, S08, 1700, "%", 1, 0
; total TS size = 1704
faultCode0 = scalar, U08, 1704, "", 1, 0
heaterDuty0 = scalar, U08, 1705, "%", 1, 0
pumpDuty0 = scalar, U08, 1706, "%", 1, 0
tempC0 = scalar, U16, 1708, "C", 1, 0
nernstVoltage0 = scalar, U16, 1710, "V", 0.001, 0
esr0 = scalar, U16, 1712, "ohm", 1, 0
; total TS size = 1716
faultCode1 = scalar, U08, 1716, "", 1, 0
heaterDuty1 = scalar, U08, 1717, "%", 1, 0
pumpDuty1 = scalar, U08, 1718, "%", 1, 0
tempC1 = scalar, U16, 1720, "C", 1, 0
nernstVoltage1 = scalar, U16, 1722, "V", 0.001, 0
esr1 = scalar, U16, 1724, "ohm", 1, 0
; total TS size = 1728
dcOutput0 = scalar, F32, 1728, "per", 1,0
isEnabled0_int = scalar, U08, 1732, "per", 1,0
isEnabled0 = bits, U32, 1736, [0:0]
; total TS size = 1740
vvtTarget = scalar, U16, 1740, "deg", 0.1, 0
vvtOutput = scalar, U08, 1742, "%", 0.5, 0
; total TS size = 1744
lambdaCurrentlyGood = bits, U32, 1744, [0:0]
lambdaMonitorCut = bits, U32, 1744, [1:1]
lambdaTimeSinceGood = scalar, U16, 1748, "sec", 0.01, 0
value0 = scalar, U16, 1740, "value", 1,0
value1 = scalar, U16, 1742, "value", 1,0
errorRate = scalar, F32, 1744, "ratio", 1,0
; total TS size = 1748
vvtTarget = scalar, U16, 1748, "deg", 0.1, 0
vvtOutput = scalar, U08, 1750, "%", 0.5, 0
; total TS size = 1752
lambdaCurrentlyGood = bits, U32, 1752, [0:0]
lambdaMonitorCut = bits, U32, 1752, [1:1]
lambdaTimeSinceGood = scalar, U16, 1756, "sec", 0.01, 0
; total TS size = 1760
time = { timeNow }
@ -4692,14 +4694,14 @@ targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0",
luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2
etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "%", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2
etbDutyAverage1Gauge = etbDutyAverage1,"ETB average duty1", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbDutyAverage1Gauge = etbDutyAverage1,"ETB average duty1", "%", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2
etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0
dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
@ -5889,8 +5891,9 @@ entry = etbDutyAverage0, "ETB average duty0", float, "%.3f"
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
entry = tcEtbDrop0, "tcEtbDrop0", int, "%d"
entry = tcEtbDrop0, "ETB traction control0", int, "%d"
entry = jamTimer0, "ETB jam timer0", float, "%.3f"
entry = adjustedEtbTarget0, "ETB with adjustments0", int, "%d"
entry = targetWithIdlePosition1, "ETB: target with idle1", float, "%.3f"
entry = trim1, "ETB: trim1", float, "%.3f"
entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f"
@ -5906,8 +5909,9 @@ entry = etbDutyAverage1, "ETB average duty1", float, "%.3f"
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
entry = tcEtbDrop1, "tcEtbDrop1", int, "%d"
entry = tcEtbDrop1, "ETB traction control1", int, "%d"
entry = jamTimer1, "ETB jam timer1", float, "%.3f"
entry = adjustedEtbTarget1, "ETB with adjustments1", int, "%d"
entry = faultCode0, "WBO: Fault code0", int, "%d"
entry = heaterDuty0, "WBO: Heater duty0", int, "%d"
entry = pumpDuty0, "WBO: Pump duty0", int, "%d"
@ -6988,6 +6992,7 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0"
graphLine = etbErrorCode0
graphLine = tcEtbDrop0
graphLine = jamTimer0
graphLine = adjustedEtbTarget0
indicatorPanel = electronic_throttle1IndicatorPanel, 2
indicator = {etbRevLimitActive1}, "etbRevLimitActive No", "etbRevLimitActive Yes"
@ -7014,6 +7019,7 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1"
graphLine = etbErrorCode1
graphLine = tcEtbDrop1
graphLine = jamTimer1
graphLine = adjustedEtbTarget1
dialog = wideband_state0Dialog, "wideband_state0"