Skip to content

Commit

Permalink
Custom Auto-generated Configs
Browse files Browse the repository at this point in the history
[no ci]
  • Loading branch information
actions-user committed Sep 6, 2024
1 parent 371e686 commit 6d70f99
Show file tree
Hide file tree
Showing 36 changed files with 6,350 additions and 1,473 deletions.
2 changes: 2 additions & 0 deletions generated/console/binary/generated/data_logs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ entry = vssEdgeCounter, "vssEdgeCounter", int, "%d"
entry = issEdgeCounter, "issEdgeCounter", int, "%d"
entry = auxLinear1, "Aux linear #1", float, "%.3f"
entry = auxLinear2, "Aux linear #2", float, "%.3f"
entry = auxLinear3, "Aux linear #3", float, "%.3f"
entry = auxLinear4, "Aux linear #4", float, "%.3f"
entry = fallbackMap, "fallbackMap", float, "%.3f"
entry = instantMAPValue, "Instant MAP", float, "%.3f"
entry = maxLockedDuration, "maxLockedDuration", int, "%d"
Expand Down
54 changes: 27 additions & 27 deletions generated/console/binary/generated/live_data_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,30 @@ LDS_vvt,
LDS_lambda_monitor,
} live_data_e;
#define OUTPUT_CHANNELS_BASE_ADDRESS 0
#define FUEL_COMPUTER_BASE_ADDRESS 840
#define IGNITION_STATE_BASE_ADDRESS 892
#define KNOCK_CONTROLLER_BASE_ADDRESS 932
#define TCU_CONTROLLER_BASE_ADDRESS 968
#define THROTTLE_MODEL_BASE_ADDRESS 984
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 996
#define INJECTOR_MODEL_BASE_ADDRESS 1024
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1036
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1044
#define BOOST_CONTROL_BASE_ADDRESS 1056
#define AC_CONTROL_BASE_ADDRESS 1080
#define FAN_CONTROL_BASE_ADDRESS 1092
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1108
#define MAIN_RELAY_BASE_ADDRESS 1112
#define ENGINE_STATE_BASE_ADDRESS 1116
#define TPS_ACCEL_STATE_BASE_ADDRESS 1216
#define TRIGGER_CENTRAL_BASE_ADDRESS 1264
#define TRIGGER_STATE_BASE_ADDRESS 1328
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1528
#define WALL_FUEL_STATE_BASE_ADDRESS 1536
#define IDLE_STATE_BASE_ADDRESS 1544
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1592
#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 FUEL_COMPUTER_BASE_ADDRESS 848
#define IGNITION_STATE_BASE_ADDRESS 900
#define KNOCK_CONTROLLER_BASE_ADDRESS 940
#define TCU_CONTROLLER_BASE_ADDRESS 976
#define THROTTLE_MODEL_BASE_ADDRESS 992
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 1004
#define INJECTOR_MODEL_BASE_ADDRESS 1032
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 1044
#define ANTILAG_SYSTEM_STATE_BASE_ADDRESS 1052
#define BOOST_CONTROL_BASE_ADDRESS 1064
#define AC_CONTROL_BASE_ADDRESS 1088
#define FAN_CONTROL_BASE_ADDRESS 1100
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 1116
#define MAIN_RELAY_BASE_ADDRESS 1120
#define ENGINE_STATE_BASE_ADDRESS 1124
#define TPS_ACCEL_STATE_BASE_ADDRESS 1224
#define TRIGGER_CENTRAL_BASE_ADDRESS 1272
#define TRIGGER_STATE_BASE_ADDRESS 1336
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1536
#define WALL_FUEL_STATE_BASE_ADDRESS 1544
#define IDLE_STATE_BASE_ADDRESS 1552
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1600
#define WIDEBAND_STATE_BASE_ADDRESS 1712
#define DC_MOTORS_BASE_ADDRESS 1736
#define SENT_STATE_BASE_ADDRESS 1748
#define VVT_BASE_ADDRESS 1756
#define LAMBDA_MONITOR_BASE_ADDRESS 1760
1,396 changes: 699 additions & 697 deletions generated/console/binary/generated/output_channels.ini

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// generated by gen_live_documentation.sh / LiveDataProcessor.java
#define TS_TOTAL_OUTPUT_SIZE 1760
#define TS_TOTAL_OUTPUT_SIZE 1768
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Sep 02 13:56:38 UTC 2024
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
Expand Down Expand Up @@ -4563,16 +4563,24 @@ struct engine_configuration_s {
*/
scaled_channel<uint8_t, 10, 1> minimumOilPressureTimeout;
/**
* need 4 byte alignment
* units: units
* offset 3853
*/
uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING];
uint8_t alignmentFill_at_3853[3];
/**
* offset 3856
*/
linear_sensor_s auxLinear3;
/**
* offset 3876
*/
linear_sensor_s auxLinear4;
/**
* need 4 byte alignment
* units: units
* offset 4021
* offset 3896
*/
uint8_t alignmentFill_at_4021[3];
uint8_t unusedOftenChangesDuringFirmwareUpdate[END_OF_CALIBRATION_PADDING];
};
static_assert(sizeof(engine_configuration_s) == 4024);

Expand Down Expand Up @@ -5721,4 +5729,4 @@ struct persistent_config_s {
static_assert(sizeof(persistent_config_s) == 22968);

// end
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Mon Sep 02 13:56:38 UTC 2024
// this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
#define ego_sensor_e_ES_Innovate_MTX_L 1
#define ego_sensor_e_ES_PLX 4
#define EGT_CHANNEL_COUNT 8
#define END_OF_CALIBRATION_PADDING 168
#define END_OF_CALIBRATION_PADDING 128
#define engine_configuration_s_size 4024
#define engine_load_mode_e_auto_enum 0="LM_SPEED_DENSITY",2="LM_ALPHA_N",3="LM_LUA",100="LM_MOCK",1="LM_REAL_MAF"
#define engine_load_mode_e_enum "Speed Density", "MAF Air Charge", "Alpha-N", "Lua"
Expand Down Expand Up @@ -532,6 +532,8 @@
#define GAUGE_NAME_AIR_MASS "Air: Cylinder airmass"
#define GAUGE_NAME_AUX_LINEAR_1 "Aux linear #1"
#define GAUGE_NAME_AUX_LINEAR_2 "Aux linear #2"
#define GAUGE_NAME_AUX_LINEAR_3 "Aux linear #3"
#define GAUGE_NAME_AUX_LINEAR_4 "Aux linear #4"
#define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
#define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
#define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
Expand Down Expand Up @@ -1013,11 +1015,13 @@
#define GPPWM_2_NAME "General Purpose PWM 2"
#define GPPWM_3_NAME "General Purpose PWM 3"
#define GPPWM_4_NAME "General Purpose PWM 4"
#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",26="GPPWM_BaroPressure",3="GPPWM_Clt",25="GPPWM_DetectedGear",27="GPPWM_Egt1",28="GPPWM_Egt2",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",18="GPPWM_GppwmOutput1",19="GPPWM_GppwmOutput2",20="GPPWM_GppwmOutput3",21="GPPWM_GppwmOutput4",4="GPPWM_Iat",6="GPPWM_IgnLoad",22="GPPWM_LuaGauge1",23="GPPWM_LuaGauge2",2="GPPWM_Map",24="GPPWM_Rpm",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt"
#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2"
#define gppwm_channel_e_auto_enum 0="GPPWM_Zero",9="GPPWM_AccelPedal",16="GPPWM_AuxLinear1",17="GPPWM_AuxLinear2",29="GPPWM_AuxLinear3",30="GPPWM_AuxLinear4",7="GPPWM_AuxTemp1",8="GPPWM_AuxTemp2",26="GPPWM_BaroPressure",3="GPPWM_Clt",25="GPPWM_DetectedGear",27="GPPWM_Egt1",28="GPPWM_Egt2",15="GPPWM_EthanolPercent",5="GPPWM_FuelLoad",18="GPPWM_GppwmOutput1",19="GPPWM_GppwmOutput2",20="GPPWM_GppwmOutput3",21="GPPWM_GppwmOutput4",4="GPPWM_Iat",6="GPPWM_IgnLoad",22="GPPWM_LuaGauge1",23="GPPWM_LuaGauge2",2="GPPWM_Map",24="GPPWM_Rpm",1="GPPWM_Tps",12="GPPWM_VVT_1E",11="GPPWM_VVT_1I",14="GPPWM_VVT_2E",13="GPPWM_VVT_2I",10="GPPWM_Vbatt",31="GPPWM_VehicleSpeed"
#define gppwm_channel_e_enum "Zero", "TPS", "MAP", "CLT", "IAT", "Fuel Load", "Ignition Load", "Aux Temp 1", "Aux Temp 2", "Accel Pedal", "Battery Voltage", "VVT 1 I", "VVT 1 E", "VVT 2 I", "VVT 2 E", "Ethanol (Flex) %", "Aux Linear 1", "Aux Linear 2", "GPPWM Output 1", "GPPWM Output 2", "GPPWM Output 3", "GPPWM Output 4", "Lua Gauge 1", "Lua Gauge 2", "RPM", "Gear (detected)", "Baro pressure", "EGT 1", "EGT 2", "Aux Linear 3", "Aux Linear 4", "Vehicle speed"
#define gppwm_channel_e_GPPWM_AccelPedal 9
#define gppwm_channel_e_GPPWM_AuxLinear1 16
#define gppwm_channel_e_GPPWM_AuxLinear2 17
#define gppwm_channel_e_GPPWM_AuxLinear3 29
#define gppwm_channel_e_GPPWM_AuxLinear4 30
#define gppwm_channel_e_GPPWM_AuxTemp1 7
#define gppwm_channel_e_GPPWM_AuxTemp2 8
#define gppwm_channel_e_GPPWM_BaroPressure 26
Expand All @@ -1039,6 +1043,7 @@
#define gppwm_channel_e_GPPWM_Rpm 24
#define gppwm_channel_e_GPPWM_Tps 1
#define gppwm_channel_e_GPPWM_Vbatt 10
#define gppwm_channel_e_GPPWM_VehicleSpeed 31
#define gppwm_channel_e_GPPWM_VVT_1E 12
#define gppwm_channel_e_GPPWM_VVT_1I 11
#define gppwm_channel_e_GPPWM_VVT_2E 14
Expand Down Expand Up @@ -1297,7 +1302,7 @@
#define show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 777185703
#define SIGNATURE_HASH 3656269746
#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"
Expand Down Expand Up @@ -1667,6 +1672,7 @@
#define ts_show_fuel_trims true
#define ts_show_full_pinout true
#define ts_show_gdi false
#define ts_show_gdi_low_level true
#define ts_show_globalTriggerAngleOffset true
#define ts_show_hardware_simulator true
#define ts_show_hbridge_function true
Expand Down Expand Up @@ -1743,14 +1749,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.05.hellen-f4-community.777185703"
#define TS_SIGNATURE "rusEFI main.2024.09.06.hellen-f4-community.3656269746"
#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 1760
#define TS_TOTAL_OUTPUT_SIZE 1768
#define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1"
#define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2"
#define TS_TRIGGER_SCOPE_DISABLE 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer
//

#define SIGNATURE_HASH 777185703
#define TS_SIGNATURE "rusEFI main.2024.09.05.hellen-f4-community.777185703"
#define SIGNATURE_HASH 3656269746
#define TS_SIGNATURE "rusEFI main.2024.09.06.hellen-f4-community.3656269746"
133 changes: 133 additions & 0 deletions generated/live_data_generated/ac_control_generated.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/ac_control.txt
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
#include "rusefi_types.h"
// start of ac_control_s
struct ac_control_s {
/**
* @@INDICATOR_NAME_AC_SWITCH@@
* offset 0
*/
int8_t acButtonState = (int8_t)0;
/**
* need 4 byte alignment
* units: units
* offset 1
*/
uint8_t alignmentFill_at_1[3];
/**
* AC enabled
offset 4 bit 0 */
bool m_acEnabled : 1 {};
/**
* AC engine too slow
offset 4 bit 1 */
bool engineTooSlow : 1 {};
/**
* AC engine too fast
offset 4 bit 2 */
bool engineTooFast : 1 {};
/**
* AC no CLT
offset 4 bit 3 */
bool noClt : 1 {};
/**
* AC engine too hot
offset 4 bit 4 */
bool engineTooHot : 1 {};
/**
* AC tps too high
offset 4 bit 5 */
bool tpsTooHigh : 1 {};
/**
* AC disabled by Lua
offset 4 bit 6 */
bool isDisabledByLua : 1 {};
/**
* AC compressor on
offset 4 bit 7 */
bool acCompressorState : 1 {};
/**
* AC pressure too low
offset 4 bit 8 */
bool acPressureTooLow : 1 {};
/**
* AC pressure too high
offset 4 bit 9 */
bool acPressureTooHigh : 1 {};
/**
offset 4 bit 10 */
bool unusedBit_12_10 : 1 {};
/**
offset 4 bit 11 */
bool unusedBit_12_11 : 1 {};
/**
offset 4 bit 12 */
bool unusedBit_12_12 : 1 {};
/**
offset 4 bit 13 */
bool unusedBit_12_13 : 1 {};
/**
offset 4 bit 14 */
bool unusedBit_12_14 : 1 {};
/**
offset 4 bit 15 */
bool unusedBit_12_15 : 1 {};
/**
offset 4 bit 16 */
bool unusedBit_12_16 : 1 {};
/**
offset 4 bit 17 */
bool unusedBit_12_17 : 1 {};
/**
offset 4 bit 18 */
bool unusedBit_12_18 : 1 {};
/**
offset 4 bit 19 */
bool unusedBit_12_19 : 1 {};
/**
offset 4 bit 20 */
bool unusedBit_12_20 : 1 {};
/**
offset 4 bit 21 */
bool unusedBit_12_21 : 1 {};
/**
offset 4 bit 22 */
bool unusedBit_12_22 : 1 {};
/**
offset 4 bit 23 */
bool unusedBit_12_23 : 1 {};
/**
offset 4 bit 24 */
bool unusedBit_12_24 : 1 {};
/**
offset 4 bit 25 */
bool unusedBit_12_25 : 1 {};
/**
offset 4 bit 26 */
bool unusedBit_12_26 : 1 {};
/**
offset 4 bit 27 */
bool unusedBit_12_27 : 1 {};
/**
offset 4 bit 28 */
bool unusedBit_12_28 : 1 {};
/**
offset 4 bit 29 */
bool unusedBit_12_29 : 1 {};
/**
offset 4 bit 30 */
bool unusedBit_12_30 : 1 {};
/**
offset 4 bit 31 */
bool unusedBit_12_31 : 1 {};
/**
* offset 8
*/
int acSwitchLastChangeTimeMs = (int)0;
};
static_assert(sizeof(ac_control_s) == 12);

// end
// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/actuators/ac_control.txt
Loading

0 comments on commit 6d70f99

Please sign in to comment.