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

auto-sync

This commit is contained in:
rusEfi 2015-04-08 17:10:26 -05:00
parent abdc02d7ac
commit 19360ba7f0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/bmw_e34.cpp
View File

@ -40,7 +40,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
// boardConfiguration->triggerInputPins[0] = GPIOC_6;
// boardConfiguration->triggerInputPins[1] = GPIOA_5;
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
engineConfiguration->injectionMode = IM_BATCH;
boardConfiguration->triggerInputPins[0] = GPIOA_5;

3
firmware/integration/rusefi_config.txt
View File

@ -182,7 +182,8 @@ int canSleepPeriod;;"ms", 1, 0, 0, 1000.0, 2
custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
ignition_mode_e ignitionMode;
operation_mode_e operationMode
custom operation_mode_e 4 bits, U32, @OFFSET@, [0:1], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke"
operation_mode_e operationMode;
custom display_mode_e 4 bits, U32, @OFFSET@, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
display_mode_e displayMode;

7
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Mon Apr 06 19:53:41 EDT 2015
; this section was generated by ConfigDefinition.jar on Wed Apr 08 17:44:34 EDT 2015
pageSize = 15288
page = 1
@ -98,7 +98,7 @@ page = 1
displacement = scalar, F32, 412, "L", 1, 0, 0, 1000.0, 2
cylindersCount = bits, U32, 416, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID"
firingOrder = bits, U32, 420, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
rpmHardLimit = scalar, S32, 424, "rpm", 1, 0, 0, 20000.0, 2
rpmHardLimit = scalar, S32, 424, "rpm", 1, 0, 0, 10000.0, 2
;skipping crankingInjectionMode offset 428
;skipping injectionMode offset 432
globalTriggerAngleOffset = scalar, F32, 436, "deg", 1, 0, 0, 720, 0
@ -112,7 +112,7 @@ page = 1
canNbcType = bits, U32, 468, [0:1], "BMW", "FIAT", "VAG" , "INVALID"
canSleepPeriod = scalar, S32, 472, "ms", 1, 0, 0, 1000.0, 2
ignitionMode = bits, U32, 476, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
;skipping operationMode offset 480
operationMode = bits, U32, 480, [0:1], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke"
displayMode = bits, U32, 484, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
logFormat = bits, U32, 488, [0:0], "native", "Mega Log Viewer"
firmwareVersion = scalar, S32, 492, "index", 1, 0, 0, 300, 0
@ -949,6 +949,7 @@ fileVersion = { 20150406 }
; Engine->Trigger configuration
dialog = triggerConfiguration, "Trigger configuration"
field = "Trigger type", trigger_type
field = "Operation mode", operationMode
field = "globalTriggerAngleOffset", globalTriggerAngleOffset
field = "#Custom Trigger"
field = "Synchronization Needed?", trigger_customIsSynchronizationNeeded, {trigger_type == 0}