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

auto-sync

This commit is contained in:
rusEfi 2015-04-12 10:10:37 -05:00
parent 514309bbf5
commit 1fa2ae9c9f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/algo/engine.h
View File

@ -41,6 +41,10 @@ public:
* TODO: better data structure? better algorithm? * TODO: better data structure? better algorithm?
*/ */
uint8_t hasEvents[PWM_PHASE_MAX_COUNT]; uint8_t hasEvents[PWM_PHASE_MAX_COUNT];
/**
* How many trigger events have injection? This depends on fuel strategy & trigger shape
*/
int eventsCount;
private: private:
void clear(); void clear();
void registerInjectionEvent(OutputSignalList *sourceList, NamedOutputPin *output, float angle, bool_t isSimultanious DECLARE_ENGINE_PARAMETER_S); void registerInjectionEvent(OutputSignalList *sourceList, NamedOutputPin *output, float angle, bool_t isSimultanious DECLARE_ENGINE_PARAMETER_S);

4
firmware/controllers/math/engine_math.cpp
View File

@ -133,7 +133,10 @@ void FuelSchedule::registerInjectionEvent(OutputSignalList *sourceList, NamedOut
ev->actuator = actuator; ev->actuator = actuator;
findTriggerPosition(&ev->position, angle PASS_ENGINE_PARAMETER); findTriggerPosition(&ev->position, angle PASS_ENGINE_PARAMETER);
if(!hasEvents[ev->position.eventIndex]) {
hasEvents[ev->position.eventIndex] = true; hasEvents[ev->position.eventIndex] = true;
eventsCount++;
}
} }
FuelSchedule::FuelSchedule() { FuelSchedule::FuelSchedule() {
@ -141,6 +144,7 @@ FuelSchedule::FuelSchedule() {
void FuelSchedule::clear() { void FuelSchedule::clear() {
memset(hasEvents, 0, sizeof(hasEvents)); memset(hasEvents, 0, sizeof(hasEvents));
eventsCount = 0;
} }
void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e mode DECLARE_ENGINE_PARAMETER_S) { void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e mode DECLARE_ENGINE_PARAMETER_S) {