Custom Auto-generated Configs

[no ci]
This commit is contained in:
GitHub git update Action 2024-12-14 00:20:04 +00:00
parent a0bc5280ec
commit 9656506f78
11 changed files with 1419 additions and 1306 deletions

View File

@ -313,6 +313,12 @@ entry = boostClosedLoopBlendBias1, "boostClosedLoopBlendBias 1", float, "%.3f"
entry = boostClosedLoopBlendBias2, "boostClosedLoopBlendBias 2", float, "%.3f"
entry = boostClosedLoopBlendOutput1, "boostClosedLoopBlendOutput 1", float, "%.3f"
entry = boostClosedLoopBlendOutput2, "boostClosedLoopBlendOutput 2", float, "%.3f"
entry = targetAfrBlendParameter1, "targetAfrBlendParameter 1", float, "%.3f"
entry = targetAfrBlendParameter2, "targetAfrBlendParameter 2", float, "%.3f"
entry = targetAfrBlendBias1, "targetAfrBlendBias 1", float, "%.3f"
entry = targetAfrBlendBias2, "targetAfrBlendBias 2", float, "%.3f"
entry = targetAfrBlendOutput1, "targetAfrBlendOutput 1", float, "%.3f"
entry = targetAfrBlendOutput2, "targetAfrBlendOutput 2", float, "%.3f"
entry = coilState1, "coilState1", int, "%d"
entry = coilState2, "coilState2", int, "%d"
entry = coilState3, "coilState3", int, "%d"

View File

@ -42,32 +42,32 @@ LDS_vvt,
LDS_lambda_monitor,
} live_data_e;
#define OUTPUT_CHANNELS_BASE_ADDRESS 0
#define FUEL_COMPUTER_BASE_ADDRESS 848
#define IGNITION_STATE_BASE_ADDRESS 900
#define KNOCK_CONTROLLER_BASE_ADDRESS 944
#define TCU_CONTROLLER_BASE_ADDRESS 1052
#define THROTTLE_MODEL_BASE_ADDRESS 1068
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1080
#define INJECTOR_MODEL_BASE_ADDRESS 1108
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1120
#define SHIFT_TORQUE_REDUCTION_STATE_BASE_ADDRESS 1128
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1132
#define BOOST_CONTROL_BASE_ADDRESS 1144
#define AC_CONTROL_BASE_ADDRESS 1168
#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1176
#define FAN_CONTROL_BASE_ADDRESS 1180
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1196
#define MAIN_RELAY_BASE_ADDRESS 1200
#define ENGINE_STATE_BASE_ADDRESS 1204
#define TPS_ACCEL_STATE_BASE_ADDRESS 1304
#define TRIGGER_CENTRAL_BASE_ADDRESS 1352
#define TRIGGER_STATE_BASE_ADDRESS 1400
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1580
#define WALL_FUEL_STATE_BASE_ADDRESS 1588
#define IDLE_STATE_BASE_ADDRESS 1596
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1644
#define WIDEBAND_STATE_BASE_ADDRESS 1740
#define DC_MOTORS_BASE_ADDRESS 1764
#define SENT_STATE_BASE_ADDRESS 1776
#define VVT_BASE_ADDRESS 1784
#define LAMBDA_MONITOR_BASE_ADDRESS 1788
#define FUEL_COMPUTER_BASE_ADDRESS 856
#define IGNITION_STATE_BASE_ADDRESS 908
#define KNOCK_CONTROLLER_BASE_ADDRESS 952
#define TCU_CONTROLLER_BASE_ADDRESS 1060
#define THROTTLE_MODEL_BASE_ADDRESS 1076
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1088
#define INJECTOR_MODEL_BASE_ADDRESS 1116
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1128
#define SHIFT_TORQUE_REDUCTION_STATE_BASE_ADDRESS 1136
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1140
#define BOOST_CONTROL_BASE_ADDRESS 1152
#define AC_CONTROL_BASE_ADDRESS 1176
#define NITROUS_CONTROL_STATE_BASE_ADDRESS 1184
#define FAN_CONTROL_BASE_ADDRESS 1188
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1204
#define MAIN_RELAY_BASE_ADDRESS 1208
#define ENGINE_STATE_BASE_ADDRESS 1212
#define TPS_ACCEL_STATE_BASE_ADDRESS 1312
#define TRIGGER_CENTRAL_BASE_ADDRESS 1360
#define TRIGGER_STATE_BASE_ADDRESS 1408
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1588
#define WALL_FUEL_STATE_BASE_ADDRESS 1596
#define IDLE_STATE_BASE_ADDRESS 1604
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1652
#define WIDEBAND_STATE_BASE_ADDRESS 1748
#define DC_MOTORS_BASE_ADDRESS 1772
#define SENT_STATE_BASE_ADDRESS 1784
#define VVT_BASE_ADDRESS 1792
#define LAMBDA_MONITOR_BASE_ADDRESS 1796

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -263,6 +263,12 @@ static const LogField fields[] = {
{engine->outputChannels.boostClosedLoopBlendBias[1], "boostClosedLoopBlendBias 2", "%", 1},
{engine->outputChannels.boostClosedLoopBlendOutput[0], "boostClosedLoopBlendOutput 1", "%", 1},
{engine->outputChannels.boostClosedLoopBlendOutput[1], "boostClosedLoopBlendOutput 2", "%", 1},
{engine->outputChannels.targetAfrBlendParameter[0], "targetAfrBlendParameter 1", "", 1},
{engine->outputChannels.targetAfrBlendParameter[1], "targetAfrBlendParameter 2", "", 1},
{engine->outputChannels.targetAfrBlendBias[0], "targetAfrBlendBias 1", "%", 1},
{engine->outputChannels.targetAfrBlendBias[1], "targetAfrBlendBias 2", "%", 1},
{engine->outputChannels.targetAfrBlendOutput[0], "targetAfrBlendOutput 1", "%", 1},
{engine->outputChannels.targetAfrBlendOutput[1], "targetAfrBlendOutput 2", "%", 1},
{engine->outputChannels.outputRequestPeriod, "outputRequestPeriod", "", 0},
{engine->outputChannels.mapFast, "mapFast", "", 0},
{engine->outputChannels.luaGauges[0], "Lua: Gauge 1", "value", 3},

View File

@ -6085,8 +6085,12 @@ struct persistent_config_s {
* offset 22956
*/
scaled_channel<uint8_t, 1, 10> minimumOilPressureValues[8];
/**
* offset 22964
*/
blend_table_s targetAfrBlends[TARGET_AFR_BLEND_COUNT];
};
static_assert(sizeof(persistent_config_s) == 22964);
static_assert(sizeof(persistent_config_s) == 23340);
// end
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt

View File

@ -1247,7 +1247,7 @@
#define pedalSensor_NAME "Accelerator pedal"
#define pedalToTpsTbl_NAME "ETB pedal target"
#define PERCENT_TRIM_BYTE_PACKING_DIV 0.02
#define persistent_config_s_size 22964
#define persistent_config_s_size 23340
#define pid_s_size 20
#define pin_input_mode_e_auto_enum 0="PI_DEFAULT",2="PI_PULLDOWN",1="PI_PULLUP"
#define pin_input_mode_e_enum "DEFAULT", "PULLUP", "PULLDOWN"
@ -1328,7 +1328,7 @@
#define SentInput_NONE 0
#define show_tcu_gauges true
#define show_vvt_output_pin true
#define SIGNATURE_HASH 581699930
#define SIGNATURE_HASH 326254621
#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"
@ -1362,6 +1362,7 @@
#define TABLE_3_LOAD_SIZE 8
#define TABLE_3_RPM_SIZE 8
#define TABLE_4_RPM 10
#define TARGET_AFR_BLEND_COUNT 2
#define tChargeMode_e_auto_enum 0="TCHARGE_MODE_RPM_TPS",1="TCHARGE_MODE_AIR_INTERP",2="TCHARGE_MODE_AIR_INTERP_TABLE"
#define tChargeMode_e_enum "RPM+TPS (Default)", "Air Mass Interpolation", "Table"
#define tChargeMode_e_TCHARGE_MODE_AIR_INTERP 1
@ -1390,7 +1391,7 @@
#define torqueReductionActivationMode_e_enum "Torque Reduction Button", "Launch Button"
#define torqueReductionActivationMode_e_LAUNCH_BUTTON 1
#define torqueReductionActivationMode_e_TORQUE_REDUCTION_BUTTON 0
#define TOTAL_CONFIG_SIZE 22964
#define TOTAL_CONFIG_SIZE 23340
#define TPS_2_BYTE_PACKING_MULT 100
#define TPS_PPS_TOO_HIGH_THRESHOLD 110
#define TPS_PPS_TOO_LOW_THRESHOLD -10
@ -1789,14 +1790,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.12.13.mega100.581699930"
#define TS_SIGNATURE "rusEFI main.2024.12.14.mega100.326254621"
#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 1796
#define TS_TOTAL_OUTPUT_SIZE 1804
#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 581699930
#define TS_SIGNATURE "rusEFI main.2024.12.13.mega100.581699930"
#define SIGNATURE_HASH 326254621
#define TS_SIGNATURE "rusEFI main.2024.12.14.mega100.326254621"

View File

@ -1061,350 +1061,358 @@ struct output_channels_s {
*/
scaled_channel<int16_t, 10, 1> boostClosedLoopBlendOutput[BOOST_BLEND_COUNT];
/**
* need 4 byte alignment
* units: units
* offset 646
*/
uint8_t alignmentFill_at_646[2];
scaled_channel<int16_t, 10, 1> targetAfrBlendParameter[TARGET_AFR_BLEND_COUNT];
/**
offset 648 bit 0 */
* units: %
* offset 650
*/
scaled_channel<uint8_t, 2, 1> targetAfrBlendBias[TARGET_AFR_BLEND_COUNT];
/**
* units: %
* offset 652
*/
scaled_channel<int16_t, 10, 1> targetAfrBlendOutput[TARGET_AFR_BLEND_COUNT];
/**
offset 656 bit 0 */
bool coilState1 : 1 {};
/**
offset 648 bit 1 */
offset 656 bit 1 */
bool coilState2 : 1 {};
/**
offset 648 bit 2 */
offset 656 bit 2 */
bool coilState3 : 1 {};
/**
offset 648 bit 3 */
offset 656 bit 3 */
bool coilState4 : 1 {};
/**
offset 648 bit 4 */
offset 656 bit 4 */
bool coilState5 : 1 {};
/**
offset 648 bit 5 */
offset 656 bit 5 */
bool coilState6 : 1 {};
/**
offset 648 bit 6 */
offset 656 bit 6 */
bool coilState7 : 1 {};
/**
offset 648 bit 7 */
offset 656 bit 7 */
bool coilState8 : 1 {};
/**
offset 648 bit 8 */
offset 656 bit 8 */
bool coilState9 : 1 {};
/**
offset 648 bit 9 */
offset 656 bit 9 */
bool coilState10 : 1 {};
/**
offset 648 bit 10 */
offset 656 bit 10 */
bool coilState11 : 1 {};
/**
offset 648 bit 11 */
offset 656 bit 11 */
bool coilState12 : 1 {};
/**
offset 648 bit 12 */
offset 656 bit 12 */
bool injectorState1 : 1 {};
/**
offset 648 bit 13 */
offset 656 bit 13 */
bool injectorState2 : 1 {};
/**
offset 648 bit 14 */
offset 656 bit 14 */
bool injectorState3 : 1 {};
/**
offset 648 bit 15 */
offset 656 bit 15 */
bool injectorState4 : 1 {};
/**
offset 648 bit 16 */
offset 656 bit 16 */
bool injectorState5 : 1 {};
/**
offset 648 bit 17 */
offset 656 bit 17 */
bool injectorState6 : 1 {};
/**
offset 648 bit 18 */
offset 656 bit 18 */
bool injectorState7 : 1 {};
/**
offset 648 bit 19 */
offset 656 bit 19 */
bool injectorState8 : 1 {};
/**
offset 648 bit 20 */
offset 656 bit 20 */
bool injectorState9 : 1 {};
/**
offset 648 bit 21 */
offset 656 bit 21 */
bool injectorState10 : 1 {};
/**
offset 648 bit 22 */
offset 656 bit 22 */
bool injectorState11 : 1 {};
/**
offset 648 bit 23 */
offset 656 bit 23 */
bool injectorState12 : 1 {};
/**
offset 648 bit 24 */
offset 656 bit 24 */
bool triggerChannel1 : 1 {};
/**
offset 648 bit 25 */
offset 656 bit 25 */
bool triggerChannel2 : 1 {};
/**
* bank 1 intake cam input
offset 648 bit 26 */
offset 656 bit 26 */
bool vvtChannel1 : 1 {};
/**
* bank 1 exhaust cam input
offset 648 bit 27 */
offset 656 bit 27 */
bool vvtChannel2 : 1 {};
/**
* bank 2 intake cam input
offset 648 bit 28 */
offset 656 bit 28 */
bool vvtChannel3 : 1 {};
/**
* bank 2 exhaust cam input
offset 648 bit 29 */
offset 656 bit 29 */
bool vvtChannel4 : 1 {};
/**
offset 648 bit 30 */
bool unusedBit_237_30 : 1 {};
offset 656 bit 30 */
bool unusedBit_239_30 : 1 {};
/**
offset 648 bit 31 */
bool unusedBit_237_31 : 1 {};
offset 656 bit 31 */
bool unusedBit_239_31 : 1 {};
/**
* offset 652
* offset 660
*/
uint32_t outputRequestPeriod = (uint32_t)0;
/**
* offset 656
* offset 664
*/
float mapFast = (float)0;
/**
* Lua: Gauge
* units: value
* offset 660
* offset 668
*/
float luaGauges[LUA_GAUGE_COUNT];
/**
* units: V
* offset 692
* offset 700
*/
scaled_channel<uint16_t, 1000, 1> rawMaf2 = (uint16_t)0;
/**
* @@GAUGE_NAME_AIR_FLOW_MEASURED_2@@
* units: kg/h
* offset 694
* offset 702
*/
scaled_channel<uint16_t, 10, 1> mafMeasured2 = (uint16_t)0;
/**
* offset 696
* offset 704
*/
uint16_t schedulingUsedCount = (uint16_t)0;
/**
* @@GAUGE_NAME_VVS@@
* units: kph
* offset 698
* offset 706
*/
scaled_channel<uint16_t, 100, 1> vehicleSpeedKph = (uint16_t)0;
/**
* units: %
* offset 700
* offset 708
*/
scaled_channel<uint16_t, 100, 1> Gego = (uint16_t)0;
/**
* units: count
* offset 702
* offset 710
*/
uint16_t testBenchIter = (uint16_t)0;
/**
* units: deg C
* offset 704
* offset 712
*/
scaled_channel<int16_t, 100, 1> oilTemp = (int16_t)0;
/**
* units: deg C
* offset 706
* offset 714
*/
scaled_channel<int16_t, 100, 1> fuelTemp = (int16_t)0;
/**
* units: deg C
* offset 708
* offset 716
*/
scaled_channel<int16_t, 100, 1> ambientTemp = (int16_t)0;
/**
* units: deg C
* offset 710
* offset 718
*/
scaled_channel<int16_t, 100, 1> compressorDischargeTemp = (int16_t)0;
/**
* units: kPa
* offset 712
* offset 720
*/
scaled_channel<uint16_t, 30, 1> compressorDischargePressure = (uint16_t)0;
/**
* units: kPa
* offset 714
* offset 722
*/
scaled_channel<uint16_t, 30, 1> throttleInletPressure = (uint16_t)0;
/**
* units: sec
* offset 716
* offset 724
*/
uint16_t ignitionOnTime = (uint16_t)0;
/**
* units: sec
* offset 718
* offset 726
*/
uint16_t engineRunTime = (uint16_t)0;
/**
* units: km
* offset 720
* offset 728
*/
scaled_channel<uint16_t, 10, 1> distanceTraveled = (uint16_t)0;
/**
* @@GAUGE_NAME_AFR_GAS_SCALE@@
* units: AFR
* offset 722
* offset 730
*/
scaled_channel<uint16_t, 1000, 1> afrGasolineScale = (uint16_t)0;
/**
* @@GAUGE_NAME_AFR2_GAS_SCALE@@
* units: AFR
* offset 724
* offset 732
*/
scaled_channel<uint16_t, 1000, 1> afr2GasolineScale = (uint16_t)0;
/**
* need 4 byte alignment
* units: units
* offset 726
* offset 734
*/
uint8_t alignmentFill_at_726[2];
uint8_t alignmentFill_at_734[2];
/**
* offset 728
* offset 736
*/
float wheelSlipRatio = (float)0;
/**
* offset 732
* offset 740
*/
uint8_t ignitorDiagnostic[MAX_CYLINDER_COUNT];
/**
* offset 744
* offset 752
*/
uint8_t injectorDiagnostic[MAX_CYLINDER_COUNT];
/**
* @@GAUGE_NAME_FUEL_LAST_INJECTION_STAGE_2@@
* units: ms
* offset 756
* offset 764
*/
scaled_channel<uint16_t, 300, 1> actualLastInjectionStage2 = (uint16_t)0;
/**
* @@GAUGE_NAME_FUEL_INJ_DUTY_STAGE_2@@
* units: %
* offset 758
* offset 766
*/
scaled_channel<uint8_t, 2, 1> injectorDutyCycleStage2 = (uint8_t)0;
/**
* offset 759
* offset 767
*/
uint8_t rawFlexFreq = (uint8_t)0;
/**
* offset 760
* offset 768
*/
uint8_t fastAdcErrorsCount = (uint8_t)0;
/**
* offset 761
* offset 769
*/
uint8_t deviceUid = (uint8_t)0;
/**
* offset 762
* offset 770
*/
uint16_t mc33810spiErrorCounter = (uint16_t)0;
/**
* offset 764
* offset 772
*/
uint8_t sadDwellRatioCounter = (uint8_t)0;
/**
* offset 765
* offset 773
*/
uint8_t injectionPrimingCounter = (uint8_t)0;
/**
* offset 766
* offset 774
*/
uint8_t tempLogging2 = (uint8_t)0;
/**
* need 4 byte alignment
* units: units
* offset 767
* offset 775
*/
uint8_t alignmentFill_at_767[1];
uint8_t alignmentFill_at_775[1];
/**
* @@GAUGE_NAME_AC_PRESSURE@@
* units: kPa
* offset 768
* offset 776
*/
float acPressure = (float)0;
/**
* units: V
* offset 772
* offset 780
*/
scaled_channel<int16_t, 1000, 1> rawAuxAnalog1 = (int16_t)0;
/**
* units: V
* offset 774
* offset 782
*/
scaled_channel<int16_t, 1000, 1> rawAuxAnalog2 = (int16_t)0;
/**
* units: V
* offset 776
* offset 784
*/
scaled_channel<int16_t, 1000, 1> rawAuxAnalog3 = (int16_t)0;
/**
* units: V
* offset 778
* offset 786
*/
scaled_channel<int16_t, 1000, 1> rawAuxAnalog4 = (int16_t)0;
/**
* offset 780
* offset 788
*/
uint8_t fastAdcErrorCallbackCount = (uint8_t)0;
/**
* offset 781
* offset 789
*/
uint8_t slowAdcErrorsCount = (uint8_t)0;
/**
* units: V
* offset 782
* offset 790
*/
scaled_channel<int16_t, 1000, 1> rawAuxTemp1 = (int16_t)0;
/**
* units: V
* offset 784
* offset 792
*/
scaled_channel<int16_t, 1000, 1> rawAuxTemp2 = (int16_t)0;
/**
* units: V
* offset 786
* offset 794
*/
scaled_channel<int16_t, 1000, 1> rawAmbientTemp = (int16_t)0;
/**
* offset 788
* offset 796
*/
uint32_t rtcUnixEpochTime = (uint32_t)0;
/**
* offset 792
* offset 800
*/
int8_t sparkCutReasonBlinker = (int8_t)0;
/**
* offset 793
* offset 801
*/
int8_t fuelCutReasonBlinker = (int8_t)0;
/**
* offset 794
* offset 802
*/
uint8_t unusedAtTheEnd[52];
/**
* need 4 byte alignment
* units: units
* offset 846
* offset 854
*/
uint8_t alignmentFill_at_846[2];
uint8_t alignmentFill_at_854[2];
};
static_assert(sizeof(output_channels_s) == 848);
static_assert(sizeof(output_channels_s) == 856);
// end
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) console/binary/output_channels.txt

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
! Generated by gen_signature.sh
! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar
! gen_signature.sh Using env variable branch [main]
#define TS_SIGNATURE "rusEFI main.2024.12.13.mega100.@@SIGNATURE_HASH@@"
#define TS_SIGNATURE "rusEFI main.2024.12.14.mega100.@@SIGNATURE_HASH@@"