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

#490 fixing offset defect

This commit is contained in:
rusefi 2017-12-02 21:16:42 -05:00
parent b9e845db0c
commit b37fc28c72
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/controllers/trigger/aux_valves.cpp
View File

@ -32,10 +32,12 @@ static void turnOff(NamedOutputPin *output) {
output->setLow(); output->setLow();
} }
#define SCHEDULING_TRIGGER_INDEX 2
static void auxValveTriggerCallback(trigger_event_e ckpSignalType, static void auxValveTriggerCallback(trigger_event_e ckpSignalType,
uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_PROD_CODE || EFI_SIMULATOR || defined(__DOXYGEN__)
if (index != 2) { if (index != SCHEDULING_TRIGGER_INDEX) {
return; return;
} }
int rpm = ENGINE(rpmCalculator.rpmValue); int rpm = ENGINE(rpmCalculator.rpmValue);
@ -49,7 +51,12 @@ static void auxValveTriggerCallback(trigger_event_e ckpSignalType,
NamedOutputPin *output = &enginePins.auxValve[valveIndex]; NamedOutputPin *output = &enginePins.auxValve[valveIndex];
for (int phaseIndex = 0; phaseIndex < 2; phaseIndex++) { for (int phaseIndex = 0; phaseIndex < 2; phaseIndex++) {
angle_t extra = phaseIndex * 360 + valveIndex * 180; // todo: at the moment this logic is assuming four-stroke 720-degree engine cycle
angle_t extra = phaseIndex * 360 // cycle opens twice per 720 engine cycle
+ valveIndex * 180 // 2nd valve is operating at 180 offset to first
+ tdcPosition() // engine cycle position to trigger cycle position conversion
- ENGINE(triggerCentral.triggerShape.eventAngles[SCHEDULING_TRIGGER_INDEX])
;
angle_t onTime = extra + engine->engineState.auxValveStart; angle_t onTime = extra + engine->engineState.auxValveStart;
fixAngle(onTime, "onTime"); fixAngle(onTime, "onTime");
scheduleByAngle(rpm, &turnOnEvent[valveIndex][phaseIndex], scheduleByAngle(rpm, &turnOnEvent[valveIndex][phaseIndex],

2
firmware/rusefi.cpp
View File

@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20171201; return 20171202;
} }