rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-07-05 00:02:14 -04:00
parent 566cd36d85
commit 13e349635f
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:56:26 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 04 23:04:33 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1671,7 +1671,11 @@ typedef struct {
/**
* offset 2476
*/
int unused[143];
mass_storage_e storageMode;
/**
* offset 2480
*/
int unused[142];
/** total size 3048*/
} engine_configuration_s;
@ -1886,4 +1890,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:56:26 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 04 23:04:33 EDT 2016

7
firmware/controllers/algo/rusefi_enums.h
View File

@ -430,6 +430,13 @@ typedef enum {
Force_4b_cranking_adc_channel = ENUM_32_BITS,
} adc_channel_e;
typedef enum {
MS_AUTO = 0,
MS_ALWAYS = 1,
MS_NEVER = 2,
Force_4b_mass_storage = ENUM_32_BITS,
} mass_storage_e;
typedef enum {
ES_BPSX_D1 = 0,
/**

3
firmware/controllers/algo/rusefi_generated.h
View File

@ -857,7 +857,8 @@
#define auxPidFrequency3_offset 2468
#define auxPidFrequency4_offset 2470
#define alternatorPwmFrequency_offset 2472
#define unused_offset 2476
#define storageMode_offset 2476
#define unused_offset 2480
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

5
firmware/integration/rusefi_config.txt
View File

@ -99,6 +99,8 @@ end_struct
#define debug_mode_e_enum "Alternator", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "mode8", "mode9", "mode10", "mode11", "mode12", "mode13", "mode14", "mode15"
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:3], @@debug_mode_e_enum@@
#define mass_storage_e_enum "Auto", "Always", "Never"
custom mass_storage_e 4 bits, U32, @OFFSET@, [0:1], @@mass_storage_e_enum@@
#define brain_input_pin_e_enum "INVALID", "INVALID", "PA2", "PA3", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
custom brain_input_pin_e 4 bits, U32, @OFFSET@, [0:6], @@brain_input_pin_e_enum@@
@ -709,7 +711,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
brain_pin_e[AUX_PID_COUNT iterate] auxPidPins;
fsio_pwm_freq_t[AUX_PID_COUNT iterate] auxPidFrequency;
int alternatorPwmFrequency;;"Hz", 1, 0, 0, 3000.0, 0
int[143] unused;
mass_storage_e storageMode;
int[142] unused;
end_struct

14
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 18:47:29 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jul 04 23:04:33 EDT 2016
pageSize = 16376
page = 1
@ -592,7 +592,8 @@ page = 1
auxPidFrequency3 = scalar, U16, 2468, "Hz", 1, 0, 0, 3000, 0
auxPidFrequency4 = scalar, U16, 2470, "Hz", 1, 0, 0, 3000, 0
alternatorPwmFrequency = scalar, S32, 2472, "Hz", 1, 0, 0, 3000.0, 0
;skipping unused offset 2476
storageMode = bits, U32, 2476, [0:1], "Auto", "Always", "Never"
;skipping unused offset 2480
le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2
@ -782,8 +783,8 @@ fileVersion = { 20160702 }
hasSdCard = bits, U32, 72, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false";
ind_injection_enabled=bits,U32, 72, [2:2], "true", "false";
ind_cylinder_cleanup=bits, U32, 72, [4:4], "true", "false";
isCylinderCleanupEnabled=bits, U32, 72, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32,72, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 72, [5:5], "true", "false";
ind_fan = bits, U32, 72, [6:6], "true", "false";
ind_o2_heater = bits, U32, 72, [7:7], "true", "false";
@ -1160,8 +1161,8 @@ fileVersion = { 20160702 }
; minor info
indicator = { ind_fan}, "no fan", "fan", white, black, green, black
indicator = { ind_cylinder_cleanup}, "no cyl cleanup", "cyl cleanup", white, black, green, black
indicator = { needBurn }, "no Burn", "Need Burn", white, black, red, black
indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, green, black
indicator = { needBurn }, "no Burn", "Need Burn", white, black, yellow, black
indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black
indicator = { ind_fuel_pump}, "no pump", "pump", white, black, green, black
indicator = { clutchUpState }, "clutch", "cltch Up", white, black, red, black
@ -1748,6 +1749,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = sdCard, "SD Card Logger"
field = "SdCard", isSdCardEnabled
field = "log format", logFormat
field = "Mass Storage", storageMode
dialog = gpsReceiver, "GPS Receiver"
field = "gps RX", gps_rx_pin