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 16, 2024
1 parent cb10236 commit 5da0f4e
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 56 deletions.
6 changes: 3 additions & 3 deletions generated/console/binary/generated/data_logs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,10 @@ entry = hwEventCounters4, "Hardware events since boot 4", int, "%d"
entry = hwEventCounters5, "Hardware events since boot 5", int, "%d"
entry = hwEventCounters6, "Hardware events since boot 6", int, "%d"
entry = vvtCamCounter, "Sync: total cams front counter", int, "%d"
entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f"
entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f"
entry = mapVvt_MAP_AT_SPECIAL_POINT, "InstantMAP at readout angle", float, "%.3f"
entry = mapVvt_MAP_AT_DIFF, "InstantMAP delta @ readout angles", float, "%.3f"
entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d"
entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d"
entry = mapVvt_sync_counter, "Instant MAP sync counter", int, "%d"
entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f"
entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f"
entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d"
Expand Down
2 changes: 1 addition & 1 deletion generated/console/binary/generated/fancy_content.ini
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ dialog = trigger_centralDialog, "trigger_central"
liveGraph = trigger_central_3_Graph, "Graph", South
graphLine = mapVvt_MAP_AT_DIFF
graphLine = mapVvt_MAP_AT_CYCLE_COUNT
graphLine = mapVvt_map_peak
graphLine = mapVvt_sync_counter
graphLine = currentEngineDecodedPhase
liveGraph = trigger_central_4_Graph, "Graph", South
graphLine = triggerToothAngleError
Expand Down
8 changes: 4 additions & 4 deletions generated/console/binary/generated/output_channels.ini
Original file line number Diff line number Diff line change
Expand Up @@ -714,10 +714,10 @@ hwEventCounters4 = scalar, U32, 1280, "", 1, 0
hwEventCounters5 = scalar, U32, 1284, "", 1, 0
hwEventCounters6 = scalar, U32, 1288, "", 1, 0
vvtCamCounter = scalar, U32, 1292, "", 1, 0
mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1296, "", 1, 0
mapVvt_MAP_AT_DIFF = scalar, F32, 1300, "", 1, 0
mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1304, "", 1, 0
mapVvt_map_peak = scalar, U08, 1305, "", 1, 0
mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1296, "kPa", 1, 0
mapVvt_MAP_AT_DIFF = scalar, F32, 1300, "kPa", 1, 0
mapVvt_MAP_AT_CYCLE_COUNT = scalar, S08, 1304, "distance", 1, 0
mapVvt_sync_counter = scalar, U08, 1305, "counter", 1, 0
currentEngineDecodedPhase = scalar, F32, 1308, "deg", 1, 0
triggerToothAngleError = scalar, F32, 1312, "deg", 1, 0
triggerIgnoredToothCount = scalar, U08, 1316, "", 1, 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -958,9 +958,15 @@ struct engine_configuration_s {
*/
uint8_t justATempTest;
/**
* Delta kPa for MAP sync
* units: kPa
* offset 442
*/
uint16_t unused2bytesHere;
uint8_t mapSyncThreshold;
/**
* offset 443
*/
uint8_t unusedByteHere;
/**
* @@CYLINDER_BORE_TOOLTIP@@
* units: mm
Expand Down Expand Up @@ -1194,6 +1200,7 @@ struct engine_configuration_s {
*/
float adcVcc;
/**
* Magic engine phase: we compare instant MAP at X to instant MAP at x+360 angle in one complete cycle
* units: Deg
* offset 548
*/
Expand Down Expand Up @@ -2865,7 +2872,7 @@ struct engine_configuration_s {
bool enableKnockSpectrogram : 1 {};
/**
offset 1492 bit 31 */
bool unusedBit_515_31 : 1 {};
bool unusedBit_516_31 : 1 {};
/**
* This is the duration in cycles that the IAC will take to reach its normal idle position, it can be used to hold the idle higher for a few seconds after cranking to improve startup.\Should be 100 once tune is better
* units: cycles
Expand Down Expand Up @@ -3041,76 +3048,76 @@ struct engine_configuration_s {
bool can2ListenMode : 1 {};
/**
offset 1552 bit 8 */
bool unusedBit_551_8 : 1 {};
bool unusedBit_552_8 : 1 {};
/**
offset 1552 bit 9 */
bool unusedBit_551_9 : 1 {};
bool unusedBit_552_9 : 1 {};
/**
offset 1552 bit 10 */
bool unusedBit_551_10 : 1 {};
bool unusedBit_552_10 : 1 {};
/**
offset 1552 bit 11 */
bool unusedBit_551_11 : 1 {};
bool unusedBit_552_11 : 1 {};
/**
offset 1552 bit 12 */
bool unusedBit_551_12 : 1 {};
bool unusedBit_552_12 : 1 {};
/**
offset 1552 bit 13 */
bool unusedBit_551_13 : 1 {};
bool unusedBit_552_13 : 1 {};
/**
offset 1552 bit 14 */
bool unusedBit_551_14 : 1 {};
bool unusedBit_552_14 : 1 {};
/**
offset 1552 bit 15 */
bool unusedBit_551_15 : 1 {};
bool unusedBit_552_15 : 1 {};
/**
offset 1552 bit 16 */
bool unusedBit_551_16 : 1 {};
bool unusedBit_552_16 : 1 {};
/**
offset 1552 bit 17 */
bool unusedBit_551_17 : 1 {};
bool unusedBit_552_17 : 1 {};
/**
offset 1552 bit 18 */
bool unusedBit_551_18 : 1 {};
bool unusedBit_552_18 : 1 {};
/**
offset 1552 bit 19 */
bool unusedBit_551_19 : 1 {};
bool unusedBit_552_19 : 1 {};
/**
offset 1552 bit 20 */
bool unusedBit_551_20 : 1 {};
bool unusedBit_552_20 : 1 {};
/**
offset 1552 bit 21 */
bool unusedBit_551_21 : 1 {};
bool unusedBit_552_21 : 1 {};
/**
offset 1552 bit 22 */
bool unusedBit_551_22 : 1 {};
bool unusedBit_552_22 : 1 {};
/**
offset 1552 bit 23 */
bool unusedBit_551_23 : 1 {};
bool unusedBit_552_23 : 1 {};
/**
offset 1552 bit 24 */
bool unusedBit_551_24 : 1 {};
bool unusedBit_552_24 : 1 {};
/**
offset 1552 bit 25 */
bool unusedBit_551_25 : 1 {};
bool unusedBit_552_25 : 1 {};
/**
offset 1552 bit 26 */
bool unusedBit_551_26 : 1 {};
bool unusedBit_552_26 : 1 {};
/**
offset 1552 bit 27 */
bool unusedBit_551_27 : 1 {};
bool unusedBit_552_27 : 1 {};
/**
offset 1552 bit 28 */
bool unusedBit_551_28 : 1 {};
bool unusedBit_552_28 : 1 {};
/**
offset 1552 bit 29 */
bool unusedBit_551_29 : 1 {};
bool unusedBit_552_29 : 1 {};
/**
offset 1552 bit 30 */
bool unusedBit_551_30 : 1 {};
bool unusedBit_552_30 : 1 {};
/**
offset 1552 bit 31 */
bool unusedBit_551_31 : 1 {};
bool unusedBit_552_31 : 1 {};
/**
* offset 1556
*/
Expand Down
6 changes: 3 additions & 3 deletions generated/controllers/generated/rusefi_generated_XYZ.h
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@
#define show_Proteus_presets false
#define show_test_presets false
#define show_vvt_output_pin true
#define SIGNATURE_HASH 3382596294
#define SIGNATURE_HASH 3366097352
#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 @@ -1750,7 +1750,7 @@
#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.15.XYZ.3382596294"
#define TS_SIGNATURE "rusEFI main.2024.09.16.XYZ.3366097352"
#define TS_SIMULATE_CAN '>'
#define TS_SIMULATE_CAN_char >
#define TS_SINGLE_WRITE_COMMAND 'W'
Expand Down Expand Up @@ -1806,7 +1806,7 @@
#define VSS_FILTER_MIN 3
#define VVT1_TARGET_NAME "VVT intake target"
#define vvt_mode_e_auto_enum 0="VVT_INACTIVE",8="VVT_BARRA_3_PLUS_1",5="VVT_BOSCH_QUICK_START",23="VVT_DEV",19="VVT_FORD_COYOTE",7="VVT_FORD_ST170",21="VVT_HONDA_CBR_600",16="VVT_HONDA_K_EXHAUST",10="VVT_HONDA_K_INTAKE",24="VVT_HR12DDR_IN",13="VVT_MAP_V_TWIN",22="VVT_MAZDA_L",15="VVT_MAZDA_SKYACTIV",3="VVT_MIATA_NB",12="VVT_MITSUBISHI_3A92",18="VVT_MITSUBISHI_4G63",4="VVT_MITSUBISHI_4G69",17="VVT_MITSUBISHI_4G9x",20="VVT_MITSUBISHI_6G72",14="VVT_MITSUBISHI_6G75",11="VVT_NISSAN_MR",9="VVT_NISSAN_VQ",1="VVT_SINGLE_TOOTH",2="VVT_TOYOTA_3_TOOTH",6="VVT_TOYOTA_4_1"
#define vvt_mode_e_enum "Inactive", "Single Tooth", "Toyota 3 Tooth", "Miata NB2", "Mitsu 4G69", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K Intake", "Nissan MR18", "Mitsu 3A92", "VTwin by MAP", "Mitsu 6G75", "Mazda Skyactiv", "Honda K Exhaust", "Mitsubishi 4G92/93/94", "Mitsubishi 4G63", "Ford Coyote", "Mitsu 6G72", "Honda 600", "Mazda L", "Dev", "HR12DDR In", "vvt25", "vvt26"
#define vvt_mode_e_enum "Inactive", "Single Tooth", "Toyota 3 Tooth", "Miata NB2", "Mitsu 4G69", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K Intake", "Nissan MR18", "Mitsu 3A92", "Sync by MAP", "Mitsu 6G75", "Mazda Skyactiv", "Honda K Exhaust", "Mitsubishi 4G92/93/94", "Mitsubishi 4G63", "Ford Coyote", "Mitsu 6G72", "Honda 600", "Mazda L", "Dev", "HR12DDR In", "vvt25", "vvt26"
#define vvt_mode_e_VVT_BARRA_3_PLUS_1 8
#define vvt_mode_e_VVT_BOSCH_QUICK_START 5
#define vvt_mode_e_VVT_DEV 23
Expand Down
4 changes: 2 additions & 2 deletions generated/controllers/generated/signature_XYZ.h
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 3382596294
#define TS_SIGNATURE "rusEFI main.2024.09.15.XYZ.3382596294"
#define SIGNATURE_HASH 3366097352
#define TS_SIGNATURE "rusEFI main.2024.09.16.XYZ.3366097352"
11 changes: 9 additions & 2 deletions generated/live_data_generated/trigger_central_generated.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,28 @@ struct trigger_central_s {
*/
uint32_t vvtCamCounter = (uint32_t)0;
/**
* InstantMAP at readout angle
* units: kPa
* offset 28
*/
float mapVvt_MAP_AT_SPECIAL_POINT = (float)0;
/**
* InstantMAP delta @ readout angles
* units: kPa
* offset 32
*/
float mapVvt_MAP_AT_DIFF = (float)0;
/**
* units: distance
* offset 36
*/
uint8_t mapVvt_MAP_AT_CYCLE_COUNT = (uint8_t)0;
int8_t mapVvt_MAP_AT_CYCLE_COUNT = (int8_t)0;
/**
* Instant MAP sync counter
* units: counter
* offset 37
*/
uint8_t mapVvt_map_peak = (uint8_t)0;
uint8_t mapVvt_sync_counter = (uint8_t)0;
/**
* need 4 byte alignment
* units: units
Expand Down
Loading

0 comments on commit 5da0f4e

Please sign in to comment.