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

auto-sync

This commit is contained in:
rusEfi 2016-11-28 08:03:30 -05:00
parent 4a5bb24386
commit 4aa7a3fdba
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/event_registry.h
View File

@ -65,7 +65,7 @@ public:
* two wire batch mode would generate twice the number of cylinders events, that's the max * two wire batch mode would generate twice the number of cylinders events, that's the max
*/ */
#define MAX_INJECTION_OUTPUT_COUNT 2 * INJECTION_PIN_COUNT #define MAX_INJECTION_OUTPUT_COUNT 2 * INJECTION_PIN_COUNT
#define MAX_IGNITION_EVENT_COUNT 2 * IGNITION_PIN_COUNT #define MAX_IGNITION_EVENT_COUNT IGNITION_PIN_COUNT
typedef ArrayList<InjectionEvent, MAX_INJECTION_OUTPUT_COUNT> InjectionEventList; typedef ArrayList<InjectionEvent, MAX_INJECTION_OUTPUT_COUNT> InjectionEventList;

14
firmware/controllers/trigger/spark_logic.cpp
View File

@ -198,7 +198,7 @@ static ALWAYS_INLINE void handleSparkEvent(bool limitedSpark, uint32_t trgEventI
} }
} }
static void addIgnitionEvent(angle_t localAdvance, angle_t dwellAngle, IgnitionEventList *list, IgnitionOutputPin *output DECLARE_ENGINE_PARAMETER_S) { static void addIgnitionEvent(angle_t localAdvance, angle_t dwellAngle, IgnitionEventList *list, IgnitionOutputPin *output, IgnitionOutputPin *secondOutput DECLARE_ENGINE_PARAMETER_S) {
IgnitionEvent *event = list->add(); IgnitionEvent *event = list->add();
if (!isPinAssigned(output)) { if (!isPinAssigned(output)) {
@ -206,6 +206,7 @@ static void addIgnitionEvent(angle_t localAdvance, angle_t dwellAngle, IgnitionE
warning(CUSTOM_OBD_PIN_NOT_ASSIGNED, "no_pin_cl #%s", output->name); warning(CUSTOM_OBD_PIN_NOT_ASSIGNED, "no_pin_cl #%s", output->name);
} }
event->outputs[0] = output; event->outputs[0] = output;
event->outputs[1] = secondOutput;
event->advance = localAdvance; event->advance = localAdvance;
findTriggerPosition(&event->dwellPosition, localAdvance - dwellAngle PASS_ENGINE_PARAMETER); findTriggerPosition(&event->dwellPosition, localAdvance - dwellAngle PASS_ENGINE_PARAMETER);
@ -241,16 +242,7 @@ static void initializeIgnitionActions(angle_t advance, angle_t dwellAngle,
secondOutput = NULL; secondOutput = NULL;
} }
addIgnitionEvent(localAdvance, dwellAngle, list, output PASS_ENGINE_PARAMETER); addIgnitionEvent(localAdvance, dwellAngle, list, output, secondOutput PASS_ENGINE_PARAMETER);
if (CONFIG(ignitionMode) == IM_WASTED_SPARK && CONFIG(twoWireBatchIgnition)) {
int secondIndex = index + CONFIG(specs.cylindersCount) / 2;
int secondCylinderIndex = ID2INDEX(getCylinderId(CONFIG(specs.firingOrder), secondIndex));
output = &enginePins.coils[secondCylinderIndex];
addIgnitionEvent(localAdvance, dwellAngle, list, output PASS_ENGINE_PARAMETER);
}
} }
} }