parent
8176b1bcaa
commit
dd3a6ab90c
|
@ -744,8 +744,6 @@ entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f"
|
||||||
entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f"
|
entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f"
|
||||||
entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d"
|
entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d"
|
||||||
entry = jamDetected0, "jamDetected0", int, "%d"
|
entry = jamDetected0, "jamDetected0", int, "%d"
|
||||||
entry = etbDutyRateOfChange0, "ETB duty rate of change0", float, "%.3f"
|
|
||||||
entry = etbDutyAverage0, "ETB average duty0", float, "%.3f"
|
|
||||||
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
|
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
|
||||||
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
|
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
|
||||||
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
|
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
|
||||||
|
@ -762,8 +760,6 @@ entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f"
|
||||||
entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f"
|
entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f"
|
||||||
entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d"
|
entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d"
|
||||||
entry = jamDetected1, "jamDetected1", int, "%d"
|
entry = jamDetected1, "jamDetected1", int, "%d"
|
||||||
entry = etbDutyRateOfChange1, "ETB duty rate of change1", float, "%.3f"
|
|
||||||
entry = etbDutyAverage1, "ETB average duty1", float, "%.3f"
|
|
||||||
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
|
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
|
||||||
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
|
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
|
||||||
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
|
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
|
||||||
|
|
|
@ -511,13 +511,11 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0"
|
||||||
graphLine = etbCurrentTarget0
|
graphLine = etbCurrentTarget0
|
||||||
graphLine = etbCurrentAdjustedTarget0
|
graphLine = etbCurrentAdjustedTarget0
|
||||||
liveGraph = electronic_throttle0_3_Graph, "Graph", South
|
liveGraph = electronic_throttle0_3_Graph, "Graph", South
|
||||||
graphLine = etbDutyRateOfChange0
|
|
||||||
graphLine = etbDutyAverage0
|
|
||||||
graphLine = etbTpsErrorCounter0
|
graphLine = etbTpsErrorCounter0
|
||||||
graphLine = etbPpsErrorCounter0
|
graphLine = etbPpsErrorCounter0
|
||||||
liveGraph = electronic_throttle0_4_Graph, "Graph", South
|
|
||||||
graphLine = etbErrorCode0
|
graphLine = etbErrorCode0
|
||||||
graphLine = tcEtbDrop0
|
graphLine = tcEtbDrop0
|
||||||
|
liveGraph = electronic_throttle0_4_Graph, "Graph", South
|
||||||
graphLine = jamTimer0
|
graphLine = jamTimer0
|
||||||
graphLine = adjustedEtbTarget0
|
graphLine = adjustedEtbTarget0
|
||||||
|
|
||||||
|
@ -538,13 +536,11 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1"
|
||||||
graphLine = etbCurrentTarget1
|
graphLine = etbCurrentTarget1
|
||||||
graphLine = etbCurrentAdjustedTarget1
|
graphLine = etbCurrentAdjustedTarget1
|
||||||
liveGraph = electronic_throttle1_3_Graph, "Graph", South
|
liveGraph = electronic_throttle1_3_Graph, "Graph", South
|
||||||
graphLine = etbDutyRateOfChange1
|
|
||||||
graphLine = etbDutyAverage1
|
|
||||||
graphLine = etbTpsErrorCounter1
|
graphLine = etbTpsErrorCounter1
|
||||||
graphLine = etbPpsErrorCounter1
|
graphLine = etbPpsErrorCounter1
|
||||||
liveGraph = electronic_throttle1_4_Graph, "Graph", South
|
|
||||||
graphLine = etbErrorCode1
|
graphLine = etbErrorCode1
|
||||||
graphLine = tcEtbDrop1
|
graphLine = tcEtbDrop1
|
||||||
|
liveGraph = electronic_throttle1_4_Graph, "Graph", South
|
||||||
graphLine = jamTimer1
|
graphLine = jamTimer1
|
||||||
graphLine = adjustedEtbTarget1
|
graphLine = adjustedEtbTarget1
|
||||||
|
|
||||||
|
|
|
@ -28,15 +28,11 @@ boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0,
|
||||||
targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
||||||
luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
|
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
|
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", "%", -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
|
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
|
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
|
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
|
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
|
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", "%", -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
|
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
|
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
|
dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
||||||
|
|
|
@ -62,8 +62,8 @@ LDS_lambda_monitor,
|
||||||
#define WALL_FUEL_STATE_BASE_ADDRESS 1540
|
#define WALL_FUEL_STATE_BASE_ADDRESS 1540
|
||||||
#define IDLE_STATE_BASE_ADDRESS 1548
|
#define IDLE_STATE_BASE_ADDRESS 1548
|
||||||
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1596
|
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1596
|
||||||
#define WIDEBAND_STATE_BASE_ADDRESS 1708
|
#define WIDEBAND_STATE_BASE_ADDRESS 1692
|
||||||
#define DC_MOTORS_BASE_ADDRESS 1732
|
#define DC_MOTORS_BASE_ADDRESS 1716
|
||||||
#define SENT_STATE_BASE_ADDRESS 1744
|
#define SENT_STATE_BASE_ADDRESS 1728
|
||||||
#define VVT_BASE_ADDRESS 1752
|
#define VVT_BASE_ADDRESS 1736
|
||||||
#define LAMBDA_MONITOR_BASE_ADDRESS 1756
|
#define LAMBDA_MONITOR_BASE_ADDRESS 1740
|
||||||
|
|
|
@ -830,60 +830,56 @@ etbCurrentTarget0 = scalar, F32, 1620, "%", 1, 0
|
||||||
etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0
|
etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0
|
||||||
etbRevLimitActive0 = bits, U32, 1628, [0:0]
|
etbRevLimitActive0 = bits, U32, 1628, [0:0]
|
||||||
jamDetected0 = bits, U32, 1628, [1:1]
|
jamDetected0 = bits, U32, 1628, [1:1]
|
||||||
etbDutyRateOfChange0 = scalar, F32, 1632, "per", 1,0
|
etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0
|
||||||
etbDutyAverage0 = scalar, F32, 1636, "%", 1,0
|
etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0
|
||||||
etbTpsErrorCounter0 = scalar, U16, 1640, "count", 1,0
|
etbErrorCode0 = scalar, S08, 1636, "", 1, 0
|
||||||
etbPpsErrorCounter0 = scalar, U16, 1642, "count", 1,0
|
tcEtbDrop0 = scalar, S08, 1637, "%", 1, 0
|
||||||
etbErrorCode0 = scalar, S08, 1644, "", 1, 0
|
jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0
|
||||||
tcEtbDrop0 = scalar, S08, 1645, "%", 1, 0
|
adjustedEtbTarget0 = scalar, S08, 1640, "%", 1, 0
|
||||||
jamTimer0 = scalar, U16, 1646, "sec", 0.01, 0
|
; total TS size = 1644
|
||||||
adjustedEtbTarget0 = scalar, S08, 1648, "%", 1, 0
|
targetWithIdlePosition1 = scalar, F32, 1644, "per", 1,0
|
||||||
; total TS size = 1652
|
trim1 = scalar, F32, 1648, "", 1, 0
|
||||||
targetWithIdlePosition1 = scalar, F32, 1652, "per", 1,0
|
luaAdjustment1 = scalar, F32, 1652, "per", 1,0
|
||||||
trim1 = scalar, F32, 1656, "", 1, 0
|
m_wastegatePosition1 = scalar, F32, 1656, "per", 1,0
|
||||||
luaAdjustment1 = scalar, F32, 1660, "per", 1,0
|
etbFeedForward1 = scalar, F32, 1660
|
||||||
m_wastegatePosition1 = scalar, F32, 1664, "per", 1,0
|
etbIntegralError1 = scalar, F32, 1664, "", 1, 0
|
||||||
etbFeedForward1 = scalar, F32, 1668
|
etbCurrentTarget1 = scalar, F32, 1668, "%", 1, 0
|
||||||
etbIntegralError1 = scalar, F32, 1672, "", 1, 0
|
etbCurrentAdjustedTarget1 = scalar, F32, 1672, "%", 1, 0
|
||||||
etbCurrentTarget1 = scalar, F32, 1676, "%", 1, 0
|
etbRevLimitActive1 = bits, U32, 1676, [0:0]
|
||||||
etbCurrentAdjustedTarget1 = scalar, F32, 1680, "%", 1, 0
|
jamDetected1 = bits, U32, 1676, [1:1]
|
||||||
etbRevLimitActive1 = bits, U32, 1684, [0:0]
|
etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0
|
||||||
jamDetected1 = bits, U32, 1684, [1:1]
|
etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0
|
||||||
etbDutyRateOfChange1 = scalar, F32, 1688, "per", 1,0
|
etbErrorCode1 = scalar, S08, 1684, "", 1, 0
|
||||||
etbDutyAverage1 = scalar, F32, 1692, "%", 1,0
|
tcEtbDrop1 = scalar, S08, 1685, "%", 1, 0
|
||||||
etbTpsErrorCounter1 = scalar, U16, 1696, "count", 1,0
|
jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0
|
||||||
etbPpsErrorCounter1 = scalar, U16, 1698, "count", 1,0
|
adjustedEtbTarget1 = scalar, S08, 1688, "%", 1, 0
|
||||||
etbErrorCode1 = scalar, S08, 1700, "", 1, 0
|
; total TS size = 1692
|
||||||
tcEtbDrop1 = scalar, S08, 1701, "%", 1, 0
|
faultCode0 = scalar, U08, 1692, "", 1, 0
|
||||||
jamTimer1 = scalar, U16, 1702, "sec", 0.01, 0
|
heaterDuty0 = scalar, U08, 1693, "%", 1, 0
|
||||||
adjustedEtbTarget1 = scalar, S08, 1704, "%", 1, 0
|
pumpDuty0 = scalar, U08, 1694, "%", 1, 0
|
||||||
; total TS size = 1708
|
tempC0 = scalar, U16, 1696, "C", 1, 0
|
||||||
faultCode0 = scalar, U08, 1708, "", 1, 0
|
nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0
|
||||||
heaterDuty0 = scalar, U08, 1709, "%", 1, 0
|
esr0 = scalar, U16, 1700, "ohm", 1, 0
|
||||||
pumpDuty0 = scalar, U08, 1710, "%", 1, 0
|
; total TS size = 1704
|
||||||
tempC0 = scalar, U16, 1712, "C", 1, 0
|
faultCode1 = scalar, U08, 1704, "", 1, 0
|
||||||
nernstVoltage0 = scalar, U16, 1714, "V", 0.001, 0
|
heaterDuty1 = scalar, U08, 1705, "%", 1, 0
|
||||||
esr0 = scalar, U16, 1716, "ohm", 1, 0
|
pumpDuty1 = scalar, U08, 1706, "%", 1, 0
|
||||||
; total TS size = 1720
|
tempC1 = scalar, U16, 1708, "C", 1, 0
|
||||||
faultCode1 = scalar, U08, 1720, "", 1, 0
|
nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0
|
||||||
heaterDuty1 = scalar, U08, 1721, "%", 1, 0
|
esr1 = scalar, U16, 1712, "ohm", 1, 0
|
||||||
pumpDuty1 = scalar, U08, 1722, "%", 1, 0
|
; total TS size = 1716
|
||||||
tempC1 = scalar, U16, 1724, "C", 1, 0
|
dcOutput0 = scalar, F32, 1716, "per", 1,0
|
||||||
nernstVoltage1 = scalar, U16, 1726, "V", 0.001, 0
|
isEnabled0_int = scalar, U08, 1720, "per", 1,0
|
||||||
esr1 = scalar, U16, 1728, "ohm", 1, 0
|
isEnabled0 = bits, U32, 1724, [0:0]
|
||||||
; total TS size = 1732
|
; total TS size = 1728
|
||||||
dcOutput0 = scalar, F32, 1732, "per", 1,0
|
value0 = scalar, U16, 1728, "value", 1,0
|
||||||
isEnabled0_int = scalar, U08, 1736, "per", 1,0
|
value1 = scalar, U16, 1730, "value", 1,0
|
||||||
isEnabled0 = bits, U32, 1740, [0:0]
|
errorRate = scalar, F32, 1732, "ratio", 1,0
|
||||||
; total TS size = 1744
|
; total TS size = 1736
|
||||||
value0 = scalar, U16, 1744, "value", 1,0
|
vvtTarget = scalar, U16, 1736, "deg", 0.1, 0
|
||||||
value1 = scalar, U16, 1746, "value", 1,0
|
vvtOutput = scalar, U08, 1738, "%", 0.5, 0
|
||||||
errorRate = scalar, F32, 1748, "ratio", 1,0
|
; total TS size = 1740
|
||||||
; total TS size = 1752
|
lambdaCurrentlyGood = bits, U32, 1740, [0:0]
|
||||||
vvtTarget = scalar, U16, 1752, "deg", 0.1, 0
|
lambdaMonitorCut = bits, U32, 1740, [1:1]
|
||||||
vvtOutput = scalar, U08, 1754, "%", 0.5, 0
|
lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0
|
||||||
; total TS size = 1756
|
; total TS size = 1748
|
||||||
lambdaCurrentlyGood = bits, U32, 1756, [0:0]
|
|
||||||
lambdaMonitorCut = bits, U32, 1756, [1:1]
|
|
||||||
lambdaTimeSinceGood = scalar, U16, 1760, "sec", 0.01, 0
|
|
||||||
; total TS size = 1764
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
// generated by gen_live_documentation.sh / LiveDataProcessor.java
|
// generated by gen_live_documentation.sh / LiveDataProcessor.java
|
||||||
#define TS_TOTAL_OUTPUT_SIZE 1764
|
#define TS_TOTAL_OUTPUT_SIZE 1748
|
|
@ -672,10 +672,9 @@ struct engine_configuration_s {
|
||||||
*/
|
*/
|
||||||
Gpio canRxPin;
|
Gpio canRxPin;
|
||||||
/**
|
/**
|
||||||
* By the way ETB PID runs at 500hz, length in 1/500 of second here.
|
|
||||||
* offset 36
|
* offset 36
|
||||||
*/
|
*/
|
||||||
uint16_t etbExpAverageLength;
|
uint16_t unusedEtbExpAverageLength;
|
||||||
/**
|
/**
|
||||||
* units: %
|
* units: %
|
||||||
* offset 38
|
* offset 38
|
||||||
|
@ -3644,10 +3643,9 @@ struct engine_configuration_s {
|
||||||
*/
|
*/
|
||||||
float idleTimingSoftEntryTime;
|
float idleTimingSoftEntryTime;
|
||||||
/**
|
/**
|
||||||
* By the way ETB PID runs at 500hz, length in 1/500 of second here.
|
|
||||||
* offset 2384
|
* offset 2384
|
||||||
*/
|
*/
|
||||||
int16_t etbRocExpAverageLength;
|
int16_t unusedEtbRocExpAverageLength;
|
||||||
/**
|
/**
|
||||||
* A delay in cycles between fuel-enrich. portions
|
* A delay in cycles between fuel-enrich. portions
|
||||||
* units: cycles
|
* units: cycles
|
||||||
|
@ -3878,7 +3876,7 @@ struct engine_configuration_s {
|
||||||
* units: %
|
* units: %
|
||||||
* offset 3062
|
* offset 3062
|
||||||
*/
|
*/
|
||||||
uint8_t etbJamIntegratorLimit;
|
uint8_t jamDetectThreshold;
|
||||||
/**
|
/**
|
||||||
* units: lobes/cam
|
* units: lobes/cam
|
||||||
* offset 3063
|
* offset 3063
|
||||||
|
@ -5051,32 +5049,32 @@ struct persistent_config_s {
|
||||||
* units: value
|
* units: value
|
||||||
* offset 15864
|
* offset 15864
|
||||||
*/
|
*/
|
||||||
int8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8];
|
int8_t vvtTable1[VVT_TABLE_SIZE][VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: L
|
* units: L
|
||||||
* offset 15928
|
* offset 15928
|
||||||
*/
|
*/
|
||||||
uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8];
|
uint16_t vvtTable1LoadBins[VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: RPM
|
* units: RPM
|
||||||
* offset 15944
|
* offset 15944
|
||||||
*/
|
*/
|
||||||
uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8];
|
uint16_t vvtTable1RpmBins[VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: value
|
* units: value
|
||||||
* offset 15960
|
* offset 15960
|
||||||
*/
|
*/
|
||||||
int8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8];
|
int8_t vvtTable2[VVT_TABLE_SIZE][VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: L
|
* units: L
|
||||||
* offset 16024
|
* offset 16024
|
||||||
*/
|
*/
|
||||||
uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8];
|
uint16_t vvtTable2LoadBins[VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: RPM
|
* units: RPM
|
||||||
* offset 16040
|
* offset 16040
|
||||||
*/
|
*/
|
||||||
uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8];
|
uint16_t vvtTable2RpmBins[VVT_TABLE_SIZE];
|
||||||
/**
|
/**
|
||||||
* units: deg
|
* units: deg
|
||||||
* offset 16056
|
* offset 16056
|
||||||
|
|
|
@ -1302,7 +1302,7 @@
|
||||||
#define show_Proteus_presets false
|
#define show_Proteus_presets false
|
||||||
#define show_test_presets false
|
#define show_test_presets false
|
||||||
#define show_vvt_output_pin true
|
#define show_vvt_output_pin true
|
||||||
#define SIGNATURE_HASH 341116960
|
#define SIGNATURE_HASH 890822542
|
||||||
#define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin"
|
#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_PREFIX "generated/simulator_tune_image"
|
||||||
#define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin"
|
#define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin"
|
||||||
|
@ -1752,14 +1752,14 @@
|
||||||
#define ts_show_wastegate_sensor true
|
#define ts_show_wastegate_sensor true
|
||||||
#define ts_show_wbo_canbus_index true
|
#define ts_show_wbo_canbus_index true
|
||||||
#define ts_show_wbo_canbus_set_index true
|
#define ts_show_wbo_canbus_set_index true
|
||||||
#define TS_SIGNATURE "rusEFI main.2024.09.18.mega100.341116960"
|
#define TS_SIGNATURE "rusEFI main.2024.09.19.mega100.890822542"
|
||||||
#define TS_SIMULATE_CAN '>'
|
#define TS_SIMULATE_CAN '>'
|
||||||
#define TS_SIMULATE_CAN_char >
|
#define TS_SIMULATE_CAN_char >
|
||||||
#define TS_SINGLE_WRITE_COMMAND 'W'
|
#define TS_SINGLE_WRITE_COMMAND 'W'
|
||||||
#define TS_SINGLE_WRITE_COMMAND_char W
|
#define TS_SINGLE_WRITE_COMMAND_char W
|
||||||
#define TS_TEST_COMMAND 't'
|
#define TS_TEST_COMMAND 't'
|
||||||
#define TS_TEST_COMMAND_char t
|
#define TS_TEST_COMMAND_char t
|
||||||
#define TS_TOTAL_OUTPUT_SIZE 1764
|
#define TS_TOTAL_OUTPUT_SIZE 1748
|
||||||
#define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
|
#define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
|
||||||
#define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
|
#define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
|
||||||
#define TS_TRIGGER_SCOPE_DISABLE 5
|
#define TS_TRIGGER_SCOPE_DISABLE 5
|
||||||
|
@ -1834,6 +1834,7 @@
|
||||||
#define vvt_mode_e_VVT_SINGLE_TOOTH 1
|
#define vvt_mode_e_VVT_SINGLE_TOOTH 1
|
||||||
#define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2
|
#define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2
|
||||||
#define vvt_mode_e_VVT_TOYOTA_4_1 6
|
#define vvt_mode_e_VVT_TOYOTA_4_1 6
|
||||||
|
#define VVT_TABLE_SIZE 8
|
||||||
#define VVT_TRACKING_LENGTH 4
|
#define VVT_TRACKING_LENGTH 4
|
||||||
#define WARNING_BUFFER_SIZE 120
|
#define WARNING_BUFFER_SIZE 120
|
||||||
#define WWAE_TABLE_SIZE 8
|
#define WWAE_TABLE_SIZE 8
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
|
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
|
||||||
//
|
//
|
||||||
|
|
||||||
#define SIGNATURE_HASH 341116960
|
#define SIGNATURE_HASH 890822542
|
||||||
#define TS_SIGNATURE "rusEFI main.2024.09.18.mega100.341116960"
|
#define TS_SIGNATURE "rusEFI main.2024.09.19.mega100.890822542"
|
||||||
|
|
|
@ -143,60 +143,48 @@ struct electronic_throttle_s {
|
||||||
/**
|
/**
|
||||||
offset 32 bit 31 */
|
offset 32 bit 31 */
|
||||||
bool unusedBit_10_31 : 1 {};
|
bool unusedBit_10_31 : 1 {};
|
||||||
/**
|
|
||||||
* "ETB duty rate of change"
|
|
||||||
* units: per
|
|
||||||
* offset 36
|
|
||||||
*/
|
|
||||||
float etbDutyRateOfChange = (float)0;
|
|
||||||
/**
|
|
||||||
* "ETB average duty"
|
|
||||||
* units: %
|
|
||||||
* offset 40
|
|
||||||
*/
|
|
||||||
float etbDutyAverage = (float)0;
|
|
||||||
/**
|
/**
|
||||||
* "ETB TPS error counter"
|
* "ETB TPS error counter"
|
||||||
* units: count
|
* units: count
|
||||||
* offset 44
|
* offset 36
|
||||||
*/
|
*/
|
||||||
uint16_t etbTpsErrorCounter = (uint16_t)0;
|
uint16_t etbTpsErrorCounter = (uint16_t)0;
|
||||||
/**
|
/**
|
||||||
* "ETB pedal error counter"
|
* "ETB pedal error counter"
|
||||||
* units: count
|
* units: count
|
||||||
* offset 46
|
* offset 38
|
||||||
*/
|
*/
|
||||||
uint16_t etbPpsErrorCounter = (uint16_t)0;
|
uint16_t etbPpsErrorCounter = (uint16_t)0;
|
||||||
/**
|
/**
|
||||||
* offset 48
|
* offset 40
|
||||||
*/
|
*/
|
||||||
int8_t etbErrorCode = (int8_t)0;
|
int8_t etbErrorCode = (int8_t)0;
|
||||||
/**
|
/**
|
||||||
* ETB traction control
|
* ETB traction control
|
||||||
* units: %
|
* units: %
|
||||||
* offset 49
|
* offset 41
|
||||||
*/
|
*/
|
||||||
int8_t tcEtbDrop = (int8_t)0;
|
int8_t tcEtbDrop = (int8_t)0;
|
||||||
/**
|
/**
|
||||||
* ETB jam timer
|
* ETB jam timer
|
||||||
* units: sec
|
* units: sec
|
||||||
* offset 50
|
* offset 42
|
||||||
*/
|
*/
|
||||||
scaled_channel<uint16_t, 100, 1> jamTimer = (uint16_t)0;
|
scaled_channel<uint16_t, 100, 1> jamTimer = (uint16_t)0;
|
||||||
/**
|
/**
|
||||||
* ETB with adjustments
|
* ETB with adjustments
|
||||||
* units: %
|
* units: %
|
||||||
* offset 52
|
* offset 44
|
||||||
*/
|
*/
|
||||||
int8_t adjustedEtbTarget = (int8_t)0;
|
int8_t adjustedEtbTarget = (int8_t)0;
|
||||||
/**
|
/**
|
||||||
* need 4 byte alignment
|
* need 4 byte alignment
|
||||||
* units: units
|
* units: units
|
||||||
* offset 53
|
* offset 45
|
||||||
*/
|
*/
|
||||||
uint8_t alignmentFill_at_53[3];
|
uint8_t alignmentFill_at_45[3];
|
||||||
};
|
};
|
||||||
static_assert(sizeof(electronic_throttle_s) == 56);
|
static_assert(sizeof(electronic_throttle_s) == 48);
|
||||||
|
|
||||||
// end
|
// end
|
||||||
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt
|
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt
|
||||||
|
|
|
@ -38,12 +38,12 @@ enable2ndByteCanID = false
|
||||||
|
|
||||||
[MegaTune]
|
[MegaTune]
|
||||||
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
|
||||||
signature = "rusEFI main.2024.09.18.mega100.341116960"
|
signature = "rusEFI main.2024.09.19.mega100.890822542"
|
||||||
|
|
||||||
[TunerStudio]
|
[TunerStudio]
|
||||||
queryCommand = "S"
|
queryCommand = "S"
|
||||||
versionInfo = "V" ; firmware version for title bar.
|
versionInfo = "V" ; firmware version for title bar.
|
||||||
signature= "rusEFI main.2024.09.18.mega100.341116960" ; signature is expected to be 7 or more characters.
|
signature= "rusEFI main.2024.09.19.mega100.890822542" ; 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
|
; 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
|
useLegacyFTempUnits = false
|
||||||
|
@ -123,7 +123,7 @@ mainRelayPin = bits, U16, 28, [0:8], $output_pin_e_list
|
||||||
sdCardCsPin = bits, U16, 30, [0:8], $gpio_list
|
sdCardCsPin = bits, U16, 30, [0:8], $gpio_list
|
||||||
canTxPin = bits, U16, 32, [0:8], $gpio_list
|
canTxPin = bits, U16, 32, [0:8], $gpio_list
|
||||||
canRxPin = bits, U16, 34, [0:8], $gpio_list
|
canRxPin = bits, U16, 34, [0:8], $gpio_list
|
||||||
etbExpAverageLength = scalar, U16, 36, "", 1, 0, 0, 32000, 0
|
unusedEtbExpAverageLength = scalar, U16, 36, "", 1, 0, 0, 32000, 0
|
||||||
launchFuelAdderPercent = scalar, S08, 38, "%", 1, 0, 0, 100, 0
|
launchFuelAdderPercent = scalar, S08, 38, "%", 1, 0, 0, 100, 0
|
||||||
etbJamTimeout = scalar, U08, 39, "sec", 0.02, 0, 0, 5, 2
|
etbJamTimeout = scalar, U08, 39, "sec", 0.02, 0, 0, 5, 2
|
||||||
tachOutputPin = bits, U16, 40, [0:8], $output_pin_e_list
|
tachOutputPin = bits, U16, 40, [0:8], $output_pin_e_list
|
||||||
|
@ -1015,7 +1015,7 @@ idleTimingPid_periodMs = scalar, S16, 2374, "ms", 1, 0, 0, 3000, 0
|
||||||
idleTimingPid_minValue = scalar, S16, 2376, "", 1, 0, -30000, 30000, 0
|
idleTimingPid_minValue = scalar, S16, 2376, "", 1, 0, -30000, 30000, 0
|
||||||
idleTimingPid_maxValue = scalar, S16, 2378, "", 1, 0, -30000, 30000, 0
|
idleTimingPid_maxValue = scalar, S16, 2378, "", 1, 0, -30000, 30000, 0
|
||||||
idleTimingSoftEntryTime = scalar, F32, 2380, "", 1, 0, 0, 100, 1
|
idleTimingSoftEntryTime = scalar, F32, 2380, "", 1, 0, 0, 100, 1
|
||||||
etbRocExpAverageLength = scalar, S16, 2384, "", 1, 0, 0, 32000, 0
|
unusedEtbRocExpAverageLength = scalar, S16, 2384, "", 1, 0, 0, 32000, 0
|
||||||
tpsAccelFractionPeriod = scalar, S16, 2386, "cycles", 1, 0, 0, 500, 0
|
tpsAccelFractionPeriod = scalar, S16, 2386, "cycles", 1, 0, 0, 500, 0
|
||||||
tpsAccelFractionDivisor = scalar, F32, 2388, "coef", 1, 0, 1, 100, 2
|
tpsAccelFractionDivisor = scalar, F32, 2388, "coef", 1, 0, 1, 100, 2
|
||||||
tle8888spiDevice = bits, U08, 2392, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "SPI5", "SPI6", "INVALID"
|
tle8888spiDevice = bits, U08, 2392, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "SPI5", "SPI6", "INVALID"
|
||||||
|
@ -1146,7 +1146,7 @@ dfcoDelay = scalar, U08, 3057, "sec", 0.1, 0, 0, 10, 1
|
||||||
acDelay = scalar, U08, 3058, "sec", 0.1, 0, 0, 10, 1
|
acDelay = scalar, U08, 3058, "sec", 0.1, 0, 0, 10, 1
|
||||||
tChargeMode = bits, U08, 3059, [0:1], "RPM+TPS (Default)", "Air Mass Interpolation", "Table", "INVALID"
|
tChargeMode = bits, U08, 3059, [0:1], "RPM+TPS (Default)", "Air Mass Interpolation", "Table", "INVALID"
|
||||||
fordInjectorSmallPulseBreakPoint = scalar, U16, 3060, "mg", 0.001, 0, 0, 65, 3
|
fordInjectorSmallPulseBreakPoint = scalar, U16, 3060, "mg", 0.001, 0, 0, 65, 3
|
||||||
etbJamIntegratorLimit = scalar, U08, 3062, "%", 1, 0, 0, 50, 0
|
jamDetectThreshold = scalar, U08, 3062, "%", 1, 0, 0, 50, 0
|
||||||
hpfpCamLobes = scalar, U08, 3063, "lobes/cam", 1, 0, 0, 255, 0
|
hpfpCamLobes = scalar, U08, 3063, "lobes/cam", 1, 0, 0, 255, 0
|
||||||
hpfpCam = bits, U08, 3064, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID"
|
hpfpCam = bits, U08, 3064, [0:2], "NONE", "Intake 1", "Exhaust 1", "Intake 2", "Exhaust 2", "INVALID", "INVALID", "INVALID"
|
||||||
acLowRpmLimit = scalar, S08, 3065, "RPM", 10.0, 0, 0, 1200, 0
|
acLowRpmLimit = scalar, S08, 3065, "RPM", 10.0, 0, 0, 1200, 0
|
||||||
|
@ -1730,7 +1730,6 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0
|
||||||
wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
|
wastegatePositionMax = "Voltage when the wastegate is fully open.\nYou probably don't have one of these!\n1 volt = 1000 units"
|
||||||
idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
|
idlePositionMin = "Voltage when the idle valve is closed.\nYou probably don't have one of these!"
|
||||||
idlePositionMax = "Voltage when the idle valve is open.\nYou probably don't have one of these!\n1 volt = 1000 units"
|
idlePositionMax = "Voltage when the idle valve is open.\nYou probably don't have one of these!\n1 volt = 1000 units"
|
||||||
etbExpAverageLength = "By the way ETB PID runs at 500hz, length in 1/500 of second here."
|
|
||||||
etbJamTimeout = "Time required to detect a stuck throttle."
|
etbJamTimeout = "Time required to detect a stuck throttle."
|
||||||
acIdleExtraOffset = "Additional idle % while A/C is active"
|
acIdleExtraOffset = "Additional idle % while A/C is active"
|
||||||
manIdlePosition = "Value between 0 and 100 used in Manual mode"
|
manIdlePosition = "Value between 0 and 100 used in Manual mode"
|
||||||
|
@ -2220,7 +2219,6 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0
|
||||||
idleTimingPid_minValue = "Output Min Duty Cycle"
|
idleTimingPid_minValue = "Output Min Duty Cycle"
|
||||||
idleTimingPid_maxValue = "Output Max Duty Cycle"
|
idleTimingPid_maxValue = "Output Max Duty Cycle"
|
||||||
idleTimingSoftEntryTime = "When entering idle, and the PID settings are aggressive, it's good to make a soft entry upon entering closed loop"
|
idleTimingSoftEntryTime = "When entering idle, and the PID settings are aggressive, it's good to make a soft entry upon entering closed loop"
|
||||||
etbRocExpAverageLength = "By the way ETB PID runs at 500hz, length in 1/500 of second here."
|
|
||||||
tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions"
|
tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions"
|
||||||
tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions"
|
tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions"
|
||||||
idlerpmpid_iTermMin = "iTerm min value"
|
idlerpmpid_iTermMin = "iTerm min value"
|
||||||
|
@ -2550,7 +2548,7 @@ minimumOilPressureValues = array, U08, 22960, [8], "kPa", 10.0, 0, 0, 1000, 0
|
||||||
ochGetCommand = "O%2o%2c"
|
ochGetCommand = "O%2o%2c"
|
||||||
|
|
||||||
; see TS_OUTPUT_SIZE in console source code
|
; see TS_OUTPUT_SIZE in console source code
|
||||||
ochBlockSize = 1764
|
ochBlockSize = 1748
|
||||||
|
|
||||||
; 11.2.3 Full Optimized – High Speed
|
; 11.2.3 Full Optimized – High Speed
|
||||||
scatteredOchGetCommand = 9
|
scatteredOchGetCommand = 9
|
||||||
|
@ -3397,63 +3395,59 @@ etbCurrentTarget0 = scalar, F32, 1620, "%", 1, 0
|
||||||
etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0
|
etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0
|
||||||
etbRevLimitActive0 = bits, U32, 1628, [0:0]
|
etbRevLimitActive0 = bits, U32, 1628, [0:0]
|
||||||
jamDetected0 = bits, U32, 1628, [1:1]
|
jamDetected0 = bits, U32, 1628, [1:1]
|
||||||
etbDutyRateOfChange0 = scalar, F32, 1632, "per", 1,0
|
etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0
|
||||||
etbDutyAverage0 = scalar, F32, 1636, "%", 1,0
|
etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0
|
||||||
etbTpsErrorCounter0 = scalar, U16, 1640, "count", 1,0
|
etbErrorCode0 = scalar, S08, 1636, "", 1, 0
|
||||||
etbPpsErrorCounter0 = scalar, U16, 1642, "count", 1,0
|
tcEtbDrop0 = scalar, S08, 1637, "%", 1, 0
|
||||||
etbErrorCode0 = scalar, S08, 1644, "", 1, 0
|
jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0
|
||||||
tcEtbDrop0 = scalar, S08, 1645, "%", 1, 0
|
adjustedEtbTarget0 = scalar, S08, 1640, "%", 1, 0
|
||||||
jamTimer0 = scalar, U16, 1646, "sec", 0.01, 0
|
; total TS size = 1644
|
||||||
adjustedEtbTarget0 = scalar, S08, 1648, "%", 1, 0
|
targetWithIdlePosition1 = scalar, F32, 1644, "per", 1,0
|
||||||
; total TS size = 1652
|
trim1 = scalar, F32, 1648, "", 1, 0
|
||||||
targetWithIdlePosition1 = scalar, F32, 1652, "per", 1,0
|
luaAdjustment1 = scalar, F32, 1652, "per", 1,0
|
||||||
trim1 = scalar, F32, 1656, "", 1, 0
|
m_wastegatePosition1 = scalar, F32, 1656, "per", 1,0
|
||||||
luaAdjustment1 = scalar, F32, 1660, "per", 1,0
|
etbFeedForward1 = scalar, F32, 1660
|
||||||
m_wastegatePosition1 = scalar, F32, 1664, "per", 1,0
|
etbIntegralError1 = scalar, F32, 1664, "", 1, 0
|
||||||
etbFeedForward1 = scalar, F32, 1668
|
etbCurrentTarget1 = scalar, F32, 1668, "%", 1, 0
|
||||||
etbIntegralError1 = scalar, F32, 1672, "", 1, 0
|
etbCurrentAdjustedTarget1 = scalar, F32, 1672, "%", 1, 0
|
||||||
etbCurrentTarget1 = scalar, F32, 1676, "%", 1, 0
|
etbRevLimitActive1 = bits, U32, 1676, [0:0]
|
||||||
etbCurrentAdjustedTarget1 = scalar, F32, 1680, "%", 1, 0
|
jamDetected1 = bits, U32, 1676, [1:1]
|
||||||
etbRevLimitActive1 = bits, U32, 1684, [0:0]
|
etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0
|
||||||
jamDetected1 = bits, U32, 1684, [1:1]
|
etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0
|
||||||
etbDutyRateOfChange1 = scalar, F32, 1688, "per", 1,0
|
etbErrorCode1 = scalar, S08, 1684, "", 1, 0
|
||||||
etbDutyAverage1 = scalar, F32, 1692, "%", 1,0
|
tcEtbDrop1 = scalar, S08, 1685, "%", 1, 0
|
||||||
etbTpsErrorCounter1 = scalar, U16, 1696, "count", 1,0
|
jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0
|
||||||
etbPpsErrorCounter1 = scalar, U16, 1698, "count", 1,0
|
adjustedEtbTarget1 = scalar, S08, 1688, "%", 1, 0
|
||||||
etbErrorCode1 = scalar, S08, 1700, "", 1, 0
|
; total TS size = 1692
|
||||||
tcEtbDrop1 = scalar, S08, 1701, "%", 1, 0
|
faultCode0 = scalar, U08, 1692, "", 1, 0
|
||||||
jamTimer1 = scalar, U16, 1702, "sec", 0.01, 0
|
heaterDuty0 = scalar, U08, 1693, "%", 1, 0
|
||||||
adjustedEtbTarget1 = scalar, S08, 1704, "%", 1, 0
|
pumpDuty0 = scalar, U08, 1694, "%", 1, 0
|
||||||
; total TS size = 1708
|
tempC0 = scalar, U16, 1696, "C", 1, 0
|
||||||
faultCode0 = scalar, U08, 1708, "", 1, 0
|
nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0
|
||||||
heaterDuty0 = scalar, U08, 1709, "%", 1, 0
|
esr0 = scalar, U16, 1700, "ohm", 1, 0
|
||||||
pumpDuty0 = scalar, U08, 1710, "%", 1, 0
|
; total TS size = 1704
|
||||||
tempC0 = scalar, U16, 1712, "C", 1, 0
|
faultCode1 = scalar, U08, 1704, "", 1, 0
|
||||||
nernstVoltage0 = scalar, U16, 1714, "V", 0.001, 0
|
heaterDuty1 = scalar, U08, 1705, "%", 1, 0
|
||||||
esr0 = scalar, U16, 1716, "ohm", 1, 0
|
pumpDuty1 = scalar, U08, 1706, "%", 1, 0
|
||||||
; total TS size = 1720
|
tempC1 = scalar, U16, 1708, "C", 1, 0
|
||||||
faultCode1 = scalar, U08, 1720, "", 1, 0
|
nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0
|
||||||
heaterDuty1 = scalar, U08, 1721, "%", 1, 0
|
esr1 = scalar, U16, 1712, "ohm", 1, 0
|
||||||
pumpDuty1 = scalar, U08, 1722, "%", 1, 0
|
; total TS size = 1716
|
||||||
tempC1 = scalar, U16, 1724, "C", 1, 0
|
dcOutput0 = scalar, F32, 1716, "per", 1,0
|
||||||
nernstVoltage1 = scalar, U16, 1726, "V", 0.001, 0
|
isEnabled0_int = scalar, U08, 1720, "per", 1,0
|
||||||
esr1 = scalar, U16, 1728, "ohm", 1, 0
|
isEnabled0 = bits, U32, 1724, [0:0]
|
||||||
; total TS size = 1732
|
; total TS size = 1728
|
||||||
dcOutput0 = scalar, F32, 1732, "per", 1,0
|
value0 = scalar, U16, 1728, "value", 1,0
|
||||||
isEnabled0_int = scalar, U08, 1736, "per", 1,0
|
value1 = scalar, U16, 1730, "value", 1,0
|
||||||
isEnabled0 = bits, U32, 1740, [0:0]
|
errorRate = scalar, F32, 1732, "ratio", 1,0
|
||||||
; total TS size = 1744
|
; total TS size = 1736
|
||||||
value0 = scalar, U16, 1744, "value", 1,0
|
vvtTarget = scalar, U16, 1736, "deg", 0.1, 0
|
||||||
value1 = scalar, U16, 1746, "value", 1,0
|
vvtOutput = scalar, U08, 1738, "%", 0.5, 0
|
||||||
errorRate = scalar, F32, 1748, "ratio", 1,0
|
; total TS size = 1740
|
||||||
; total TS size = 1752
|
lambdaCurrentlyGood = bits, U32, 1740, [0:0]
|
||||||
vvtTarget = scalar, U16, 1752, "deg", 0.1, 0
|
lambdaMonitorCut = bits, U32, 1740, [1:1]
|
||||||
vvtOutput = scalar, U08, 1754, "%", 0.5, 0
|
lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0
|
||||||
; total TS size = 1756
|
; total TS size = 1748
|
||||||
lambdaCurrentlyGood = bits, U32, 1756, [0:0]
|
|
||||||
lambdaMonitorCut = bits, U32, 1756, [1:1]
|
|
||||||
lambdaTimeSinceGood = scalar, U16, 1760, "sec", 0.01, 0
|
|
||||||
; total TS size = 1764
|
|
||||||
|
|
||||||
|
|
||||||
time = { timeNow }
|
time = { timeNow }
|
||||||
|
@ -4706,15 +4700,11 @@ boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0,
|
||||||
targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
||||||
luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2
|
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
|
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", "%", -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
|
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
|
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
|
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
|
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
|
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", "%", -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
|
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
|
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
|
dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2
|
||||||
|
@ -5904,8 +5894,6 @@ entry = etbCurrentTarget0, "ETB: target for current pedal0", float, "%.3f"
|
||||||
entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f"
|
entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float, "%.3f"
|
||||||
entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d"
|
entry = etbRevLimitActive0, "etbRevLimitActive0", int, "%d"
|
||||||
entry = jamDetected0, "jamDetected0", int, "%d"
|
entry = jamDetected0, "jamDetected0", int, "%d"
|
||||||
entry = etbDutyRateOfChange0, "ETB duty rate of change0", float, "%.3f"
|
|
||||||
entry = etbDutyAverage0, "ETB average duty0", float, "%.3f"
|
|
||||||
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
|
entry = etbTpsErrorCounter0, "ETB TPS error counter0", int, "%d"
|
||||||
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
|
entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d"
|
||||||
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
|
entry = etbErrorCode0, "etbErrorCode0", int, "%d"
|
||||||
|
@ -5922,8 +5910,6 @@ entry = etbCurrentTarget1, "ETB: target for current pedal1", float, "%.3f"
|
||||||
entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f"
|
entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f"
|
||||||
entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d"
|
entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d"
|
||||||
entry = jamDetected1, "jamDetected1", int, "%d"
|
entry = jamDetected1, "jamDetected1", int, "%d"
|
||||||
entry = etbDutyRateOfChange1, "ETB duty rate of change1", float, "%.3f"
|
|
||||||
entry = etbDutyAverage1, "ETB average duty1", float, "%.3f"
|
|
||||||
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
|
entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d"
|
||||||
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
|
entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d"
|
||||||
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
|
entry = etbErrorCode1, "etbErrorCode1", int, "%d"
|
||||||
|
@ -7010,13 +6996,11 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0"
|
||||||
graphLine = etbCurrentTarget0
|
graphLine = etbCurrentTarget0
|
||||||
graphLine = etbCurrentAdjustedTarget0
|
graphLine = etbCurrentAdjustedTarget0
|
||||||
liveGraph = electronic_throttle0_3_Graph, "Graph", South
|
liveGraph = electronic_throttle0_3_Graph, "Graph", South
|
||||||
graphLine = etbDutyRateOfChange0
|
|
||||||
graphLine = etbDutyAverage0
|
|
||||||
graphLine = etbTpsErrorCounter0
|
graphLine = etbTpsErrorCounter0
|
||||||
graphLine = etbPpsErrorCounter0
|
graphLine = etbPpsErrorCounter0
|
||||||
liveGraph = electronic_throttle0_4_Graph, "Graph", South
|
|
||||||
graphLine = etbErrorCode0
|
graphLine = etbErrorCode0
|
||||||
graphLine = tcEtbDrop0
|
graphLine = tcEtbDrop0
|
||||||
|
liveGraph = electronic_throttle0_4_Graph, "Graph", South
|
||||||
graphLine = jamTimer0
|
graphLine = jamTimer0
|
||||||
graphLine = adjustedEtbTarget0
|
graphLine = adjustedEtbTarget0
|
||||||
|
|
||||||
|
@ -7037,13 +7021,11 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1"
|
||||||
graphLine = etbCurrentTarget1
|
graphLine = etbCurrentTarget1
|
||||||
graphLine = etbCurrentAdjustedTarget1
|
graphLine = etbCurrentAdjustedTarget1
|
||||||
liveGraph = electronic_throttle1_3_Graph, "Graph", South
|
liveGraph = electronic_throttle1_3_Graph, "Graph", South
|
||||||
graphLine = etbDutyRateOfChange1
|
|
||||||
graphLine = etbDutyAverage1
|
|
||||||
graphLine = etbTpsErrorCounter1
|
graphLine = etbTpsErrorCounter1
|
||||||
graphLine = etbPpsErrorCounter1
|
graphLine = etbPpsErrorCounter1
|
||||||
liveGraph = electronic_throttle1_4_Graph, "Graph", South
|
|
||||||
graphLine = etbErrorCode1
|
graphLine = etbErrorCode1
|
||||||
graphLine = tcEtbDrop1
|
graphLine = tcEtbDrop1
|
||||||
|
liveGraph = electronic_throttle1_4_Graph, "Graph", South
|
||||||
graphLine = jamTimer1
|
graphLine = jamTimer1
|
||||||
graphLine = adjustedEtbTarget1
|
graphLine = adjustedEtbTarget1
|
||||||
|
|
||||||
|
@ -9393,8 +9375,9 @@ dialog = tcuControls, "Transmission Settings"
|
||||||
field = "PWM Frequency", etbFreq
|
field = "PWM Frequency", etbFreq
|
||||||
field = "Minimum ETB position", etbMinimumPosition
|
field = "Minimum ETB position", etbMinimumPosition
|
||||||
field = "Maximum ETB position", etbMaximumPosition
|
field = "Maximum ETB position", etbMaximumPosition
|
||||||
; field = "Jam detection integrator max", etbJamIntegratorLimit
|
field = ""
|
||||||
; field = "Jam detection timeout period", etbJamTimeout
|
field = "Jam detection error max", jamDetectThreshold
|
||||||
|
field = "Jam detection timeout period", etbJamTimeout
|
||||||
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
|
||||||
; criteria for the same panel when used in multiple places
|
; criteria for the same panel when used in multiple places
|
||||||
; todo: report bug to TS?
|
; todo: report bug to TS?
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
! Generated by gen_signature.sh
|
! Generated by gen_signature.sh
|
||||||
! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar
|
! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar
|
||||||
! gen_signature.sh Using env variable branch [main]
|
! gen_signature.sh Using env variable branch [main]
|
||||||
#define TS_SIGNATURE "rusEFI main.2024.09.18.mega100.@@SIGNATURE_HASH@@"
|
#define TS_SIGNATURE "rusEFI main.2024.09.19.mega100.@@SIGNATURE_HASH@@"
|
||||||
|
|
Loading…
Reference in New Issue