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 2015-02-04 16:04:24 -06:00
parent bb93a390ba
commit e8e8f1ad33
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ void FuelSchedule::addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_
;
list->reset();
float baseAngle = engineConfiguration->globalTriggerAngleOffset + engineConfiguration->injectionAngle;
float baseAngle = tdcPosition() + engineConfiguration->injectionAngle;
switch (mode) {
case IM_SEQUENTIAL:
@ -251,7 +251,7 @@ static int findAngleIndex(float angleOffset DECLARE_ENGINE_PARAMETER_S) {
}
void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S) {
angleOffset += CONFIG(globalTriggerAngleOffset);
angleOffset += tdcPosition();
fixAngle(angleOffset);
int index = TRIGGER_SHAPE(triggerIndexByAngle[(int)angleOffset]);

3
firmware/controllers/math/engine_math.h
View File

@ -70,4 +70,7 @@ void setTimingLoadBin(engine_configuration_s *engineConfiguration, float l, floa
void setSingleCoilDwell(engine_configuration_s *engineConfiguration);
#define tdcPosition() \
(ENGINE(triggerShape.tdcPosition) + CONFIG(globalTriggerAngleOffset))
#endif /* ENGINE_MATH_H_ */

2
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -200,7 +200,7 @@ static void tdcMarkCallback(trigger_event_e ckpSignalType, uint32_t index0 DECLA
int revIndex2 = engine->rpmCalculator.getRevolutionCounter() % 2;
int rpm = getRpm();
// todo: use event-based scheduling, not just time-based scheduling
scheduleByAngle(rpm, &tdcScheduler[revIndex2], engineConfiguration->globalTriggerAngleOffset,
scheduleByAngle(rpm, &tdcScheduler[revIndex2], tdcPosition(),
(schfunc_t) onTdcCallback, NULL);
}
}

1
firmware/controllers/trigger/trigger_structure.h
View File

@ -50,6 +50,7 @@ public:
/**
* that's the angle distance from trigger event #0 and actual engine TDC
* see also globalTriggerAngleOffset
*/
float tdcPosition;