Custom Auto-generated Configs

[no ci]

generated/console/binary/generated/data_logs.ini

@@ -744,8 +744,6 @@ entry = etbCurrentTarget0, "ETB: target for current pedal0", float,  "%.3f"
 entry = etbCurrentAdjustedTarget0, "etbCurrentAdjustedTarget0", float,  "%.3f"
 entry = etbRevLimitActive0, "etbRevLimitActive0", 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 = etbPpsErrorCounter0, "ETB pedal error counter0", 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 = etbRevLimitActive1, "etbRevLimitActive1", 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 = etbPpsErrorCounter1, "ETB pedal error counter1", int,    "%d"
 entry = etbErrorCode1, "etbErrorCode1", int,    "%d"

generated/console/binary/generated/fancy_content.ini

@@ -511,13 +511,11 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0"
 		graphLine = etbCurrentTarget0
 		graphLine = etbCurrentAdjustedTarget0
 	liveGraph = electronic_throttle0_3_Graph, "Graph", South
-		graphLine = etbDutyRateOfChange0
-		graphLine = etbDutyAverage0
 		graphLine = etbTpsErrorCounter0
 		graphLine = etbPpsErrorCounter0
-	liveGraph = electronic_throttle0_4_Graph, "Graph", South
 		graphLine = etbErrorCode0
 		graphLine = tcEtbDrop0
+	liveGraph = electronic_throttle0_4_Graph, "Graph", South
 		graphLine = jamTimer0
 		graphLine = adjustedEtbTarget0
 
@@ -538,13 +536,11 @@ dialog = electronic_throttle1Dialog, "electronic_throttle1"
 		graphLine = etbCurrentTarget1
 		graphLine = etbCurrentAdjustedTarget1
 	liveGraph = electronic_throttle1_3_Graph, "Graph", South
-		graphLine = etbDutyRateOfChange1
-		graphLine = etbDutyAverage1
 		graphLine = etbTpsErrorCounter1
 		graphLine = etbPpsErrorCounter1
-	liveGraph = electronic_throttle1_4_Graph, "Graph", South
 		graphLine = etbErrorCode1
 		graphLine = tcEtbDrop1
+	liveGraph = electronic_throttle1_4_Graph, "Graph", South
 		graphLine = jamTimer1
 		graphLine = adjustedEtbTarget1
 

generated/console/binary/generated/gauges.ini

@@ -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
 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", "%", -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", "%", -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

generated/console/binary/generated/live_data_ids.h

@@ -62,8 +62,8 @@ LDS_lambda_monitor,
 #define WALL_FUEL_STATE_BASE_ADDRESS 1540
 #define IDLE_STATE_BASE_ADDRESS 1548
 #define ELECTRONIC_THROTTLE_BASE_ADDRESS 1596
-#define WIDEBAND_STATE_BASE_ADDRESS 1708
-#define DC_MOTORS_BASE_ADDRESS 1732
-#define SENT_STATE_BASE_ADDRESS 1744
-#define VVT_BASE_ADDRESS 1752
-#define LAMBDA_MONITOR_BASE_ADDRESS 1756
+#define WIDEBAND_STATE_BASE_ADDRESS 1692
+#define DC_MOTORS_BASE_ADDRESS 1716
+#define SENT_STATE_BASE_ADDRESS 1728
+#define VVT_BASE_ADDRESS 1736
+#define LAMBDA_MONITOR_BASE_ADDRESS 1740

generated/console/binary/generated/output_channels.ini

@@ -830,60 +830,56 @@ etbCurrentTarget0 = scalar, F32, 1620, "%", 1, 0
 etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0
 etbRevLimitActive0 = bits, U32, 1628, [0:0]
 jamDetected0 = bits, U32, 1628, [1:1]
-etbDutyRateOfChange0 = scalar, F32, 1632, "per", 1,0
-etbDutyAverage0 = scalar, F32, 1636, "%", 1,0
-etbTpsErrorCounter0 = scalar, U16, 1640, "count", 1,0
-etbPpsErrorCounter0 = scalar, U16, 1642, "count", 1,0
-etbErrorCode0 = scalar, S08, 1644, "", 1, 0
-tcEtbDrop0 = scalar, S08, 1645, "%", 1, 0
-jamTimer0 = scalar, U16, 1646, "sec", 0.01, 0
-adjustedEtbTarget0 = scalar, S08, 1648, "%", 1, 0
-; total TS size = 1652
-targetWithIdlePosition1 = scalar, F32, 1652, "per", 1,0
-trim1 = scalar, F32, 1656, "", 1, 0
-luaAdjustment1 = scalar, F32, 1660, "per", 1,0
-m_wastegatePosition1 = scalar, F32, 1664, "per", 1,0
-etbFeedForward1 = scalar, F32, 1668
-etbIntegralError1 = scalar, F32, 1672, "", 1, 0
-etbCurrentTarget1 = scalar, F32, 1676, "%", 1, 0
-etbCurrentAdjustedTarget1 = scalar, F32, 1680, "%", 1, 0
-etbRevLimitActive1 = bits, U32, 1684, [0:0]
-jamDetected1 = bits, U32, 1684, [1:1]
-etbDutyRateOfChange1 = scalar, F32, 1688, "per", 1,0
-etbDutyAverage1 = scalar, F32, 1692, "%", 1,0
-etbTpsErrorCounter1 = scalar, U16, 1696, "count", 1,0
-etbPpsErrorCounter1 = scalar, U16, 1698, "count", 1,0
-etbErrorCode1 = scalar, S08, 1700, "", 1, 0
-tcEtbDrop1 = scalar, S08, 1701, "%", 1, 0
-jamTimer1 = scalar, U16, 1702, "sec", 0.01, 0
-adjustedEtbTarget1 = scalar, S08, 1704, "%", 1, 0
-; total TS size = 1708
-faultCode0 = scalar, U08, 1708, "", 1, 0
-heaterDuty0 = scalar, U08, 1709, "%", 1, 0
-pumpDuty0 = scalar, U08, 1710, "%", 1, 0
-tempC0 = scalar, U16, 1712, "C", 1, 0
-nernstVoltage0 = scalar, U16, 1714, "V", 0.001, 0
-esr0 = scalar, U16, 1716, "ohm", 1, 0
-; total TS size = 1720
-faultCode1 = scalar, U08, 1720, "", 1, 0
-heaterDuty1 = scalar, U08, 1721, "%", 1, 0
-pumpDuty1 = scalar, U08, 1722, "%", 1, 0
-tempC1 = scalar, U16, 1724, "C", 1, 0
-nernstVoltage1 = scalar, U16, 1726, "V", 0.001, 0
-esr1 = scalar, U16, 1728, "ohm", 1, 0
-; total TS size = 1732
-dcOutput0 = scalar, F32, 1732, "per", 1,0
-isEnabled0_int = scalar, U08, 1736, "per", 1,0
-isEnabled0 = bits, U32, 1740, [0:0]
-; total TS size = 1744
-value0 = scalar, U16, 1744, "value", 1,0
-value1 = scalar, U16, 1746, "value", 1,0
-errorRate = scalar, F32, 1748, "ratio", 1,0
-; total TS size = 1752
-vvtTarget = scalar, U16, 1752, "deg", 0.1, 0
-vvtOutput = scalar, U08, 1754, "%", 0.5, 0
-; total TS size = 1756
-lambdaCurrentlyGood = bits, U32, 1756, [0:0]
-lambdaMonitorCut = bits, U32, 1756, [1:1]
-lambdaTimeSinceGood = scalar, U16, 1760, "sec", 0.01, 0
-; total TS size = 1764
+etbTpsErrorCounter0 = scalar, U16, 1632, "count", 1,0
+etbPpsErrorCounter0 = scalar, U16, 1634, "count", 1,0
+etbErrorCode0 = scalar, S08, 1636, "", 1, 0
+tcEtbDrop0 = scalar, S08, 1637, "%", 1, 0
+jamTimer0 = scalar, U16, 1638, "sec", 0.01, 0
+adjustedEtbTarget0 = scalar, S08, 1640, "%", 1, 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]
+etbTpsErrorCounter1 = scalar, U16, 1680, "count", 1,0
+etbPpsErrorCounter1 = scalar, U16, 1682, "count", 1,0
+etbErrorCode1 = scalar, S08, 1684, "", 1, 0
+tcEtbDrop1 = scalar, S08, 1685, "%", 1, 0
+jamTimer1 = scalar, U16, 1686, "sec", 0.01, 0
+adjustedEtbTarget1 = scalar, S08, 1688, "%", 1, 0
+; total TS size = 1692
+faultCode0 = scalar, U08, 1692, "", 1, 0
+heaterDuty0 = scalar, U08, 1693, "%", 1, 0
+pumpDuty0 = scalar, U08, 1694, "%", 1, 0
+tempC0 = scalar, U16, 1696, "C", 1, 0
+nernstVoltage0 = scalar, U16, 1698, "V", 0.001, 0
+esr0 = scalar, U16, 1700, "ohm", 1, 0
+; total TS size = 1704
+faultCode1 = scalar, U08, 1704, "", 1, 0
+heaterDuty1 = scalar, U08, 1705, "%", 1, 0
+pumpDuty1 = scalar, U08, 1706, "%", 1, 0
+tempC1 = scalar, U16, 1708, "C", 1, 0
+nernstVoltage1 = scalar, U16, 1710, "V", 0.001, 0
+esr1 = scalar, U16, 1712, "ohm", 1, 0
+; total TS size = 1716
+dcOutput0 = scalar, F32, 1716, "per", 1,0
+isEnabled0_int = scalar, U08, 1720, "per", 1,0
+isEnabled0 = bits, U32, 1724, [0:0]
+; total TS size = 1728
+value0 = scalar, U16, 1728, "value", 1,0
+value1 = scalar, U16, 1730, "value", 1,0
+errorRate = scalar, F32, 1732, "ratio", 1,0
+; total TS size = 1736
+vvtTarget = scalar, U16, 1736, "deg", 0.1, 0
+vvtOutput = scalar, U08, 1738, "%", 0.5, 0
+; total TS size = 1740
+lambdaCurrentlyGood = bits, U32, 1740, [0:0]
+lambdaMonitorCut = bits, U32, 1740, [1:1]
+lambdaTimeSinceGood = scalar, U16, 1744, "sec", 0.01, 0
+; total TS size = 1748

generated/console/binary/generated/total_live_data_generated.h

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

generated/controllers/generated/engine_configuration_generated_structures_XYZ.h

@@ -672,10 +672,9 @@ struct engine_configuration_s {
 	 */
 	Gpio canRxPin;
 	/**
-	 * By the way ETB PID runs at 500hz, length in 1/500 of second here.
 	 * offset 36
 	 */
-	uint16_t etbExpAverageLength;
+	uint16_t unusedEtbExpAverageLength;
 	/**
 	 * units: %
 	 * offset 38
@@ -3644,10 +3643,9 @@ struct engine_configuration_s {
 	 */
 	float idleTimingSoftEntryTime;
 	/**
-	 * By the way ETB PID runs at 500hz, length in 1/500 of second here.
 	 * offset 2384
 	 */
-	int16_t etbRocExpAverageLength;
+	int16_t unusedEtbRocExpAverageLength;
 	/**
 	 * A delay in cycles between fuel-enrich. portions
 	 * units: cycles
@@ -3878,7 +3876,7 @@ struct engine_configuration_s {
 	 * units: %
 	 * offset 3062
 	 */
-	uint8_t etbJamIntegratorLimit;
+	uint8_t jamDetectThreshold;
 	/**
 	 * units: lobes/cam
 	 * offset 3063
@@ -5051,32 +5049,32 @@ struct persistent_config_s {
 	 * units: value
 	 * offset 15864
 	 */
-	int8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8];
+	int8_t vvtTable1[VVT_TABLE_SIZE][VVT_TABLE_SIZE];
 	/**
 	 * units: L
 	 * offset 15928
 	 */
-	uint16_t vvtTable1LoadBins[SCRIPT_TABLE_8];
+	uint16_t vvtTable1LoadBins[VVT_TABLE_SIZE];
 	/**
 	 * units: RPM
 	 * offset 15944
 	 */
-	uint16_t vvtTable1RpmBins[SCRIPT_TABLE_8];
+	uint16_t vvtTable1RpmBins[VVT_TABLE_SIZE];
 	/**
 	 * units: value
 	 * offset 15960
 	 */
-	int8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8];
+	int8_t vvtTable2[VVT_TABLE_SIZE][VVT_TABLE_SIZE];
 	/**
 	 * units: L
 	 * offset 16024
 	 */
-	uint16_t vvtTable2LoadBins[SCRIPT_TABLE_8];
+	uint16_t vvtTable2LoadBins[VVT_TABLE_SIZE];
 	/**
 	 * units: RPM
 	 * offset 16040
 	 */
-	uint16_t vvtTable2RpmBins[SCRIPT_TABLE_8];
+	uint16_t vvtTable2RpmBins[VVT_TABLE_SIZE];
 	/**
 	 * units: deg
 	 * offset 16056

generated/controllers/generated/rusefi_generated_XYZ.h

@@ -1304,7 +1304,7 @@
 #define show_Proteus_presets false
 #define show_test_presets false
 #define show_vvt_output_pin true
-#define SIGNATURE_HASH 3032353644
+#define SIGNATURE_HASH 2515786946
 #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"
@@ -1754,14 +1754,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.18.XYZ.3032353644"
+#define TS_SIGNATURE "rusEFI main.2024.09.19.XYZ.2515786946"
 #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 1764
+#define TS_TOTAL_OUTPUT_SIZE 1748
 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
 #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
 #define TS_TRIGGER_SCOPE_DISABLE 5
@@ -1836,6 +1836,7 @@
 #define vvt_mode_e_VVT_SINGLE_TOOTH 1
 #define vvt_mode_e_VVT_TOYOTA_3_TOOTH 2
 #define vvt_mode_e_VVT_TOYOTA_4_1 6
+#define VVT_TABLE_SIZE 8
 #define VVT_TRACKING_LENGTH 4
 #define WARNING_BUFFER_SIZE 120
 #define WWAE_TABLE_SIZE 8

generated/controllers/generated/signature_XYZ.h

@@ -2,5 +2,5 @@
 // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
 //
 
-#define SIGNATURE_HASH 3032353644
-#define TS_SIGNATURE "rusEFI main.2024.09.18.XYZ.3032353644"
+#define SIGNATURE_HASH 2515786946
+#define TS_SIGNATURE "rusEFI main.2024.09.19.XYZ.2515786946"

generated/live_data_generated/electronic_throttle_generated.h

@@ -143,60 +143,48 @@ struct electronic_throttle_s {
 	/**
 	offset 32 bit 31 */
 	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"
 	 * units: count
-	 * offset 44
+	 * offset 36
 	 */
 	uint16_t etbTpsErrorCounter = (uint16_t)0;
 	/**
 	 * "ETB pedal error counter"
 	 * units: count
-	 * offset 46
+	 * offset 38
 	 */
 	uint16_t etbPpsErrorCounter = (uint16_t)0;
 	/**
-	 * offset 48
+	 * offset 40
 	 */
 	int8_t etbErrorCode = (int8_t)0;
 	/**
 	 * ETB traction control
 	 * units: %
-	 * offset 49
+	 * offset 41
 	 */
 	int8_t tcEtbDrop = (int8_t)0;
 	/**
 	 * ETB jam timer
 	 * units: sec
-	 * offset 50
+	 * offset 42
 	 */
 	scaled_channel<uint16_t, 100, 1> jamTimer = (uint16_t)0;
 	/**
 	 * ETB with adjustments
 	 * units: %
-	 * offset 52
+	 * offset 44
 	 */
 	int8_t adjustedEtbTarget = (int8_t)0;
 	/**
 	 * need 4 byte alignment
 	 * 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
 // this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/electronic_throttle.txt