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 2016-09-26 20:02:24 -04:00
parent e5690535aa
commit cd14fb40f2
4 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,11 +87,11 @@ public:
FuelSchedule *processing;
#endif
OutputSignal fuelActuators[MAX_INJECTION_OUTPUT_COUNT];
scheduling_s overlappingFuelActuatorTimerUp[MAX_INJECTION_OUTPUT_COUNT];
scheduling_s overlappingFuelActuatorTimerDown[MAX_INJECTION_OUTPUT_COUNT];
OutputSignal fuelActuators[INJECTION_PIN_COUNT];
scheduling_s overlappingFuelActuatorTimerUp[INJECTION_PIN_COUNT];
scheduling_s overlappingFuelActuatorTimerDown[INJECTION_PIN_COUNT];
bool wasOverlapping[MAX_INJECTION_OUTPUT_COUNT];
bool wasOverlapping[INJECTION_PIN_COUNT];
float fsioLastValue[LE_COMMAND_COUNT];

39
firmware/controllers/algo/signal_executor.cpp
View File

@ -115,7 +115,13 @@ extern LoggingWithStorage sharedLogger;
// todo: make these macro? kind of a penny optimization if compiler is not smart to inline
void seTurnPinHigh(InjectorOutputPin *output) {
if (output->currentLogicValue == 1) {
// output->overlappingCounter++;
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
printf("seTurnPinHigh %s %d %d\r\n", output->name, output->overlappingCounter, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
if (output->overlappingCounter > 1) {
// if (output->cancelNextTurningInjectorOff) {
// // how comes AutoTest.testFordAspire ends up here?
// } else {
@ -123,9 +129,9 @@ void seTurnPinHigh(InjectorOutputPin *output) {
// * #299
// * this is another kind of overlap which happens in case of a small duty cycle after a large duty cycle
// */
#if EFI_SIMULATOR || defined(__DOXYGEN__)
printf("cancelNextTurningInjectorOff %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* EFI_SIMULATOR */
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
printf("overlapping, no need to touch pin %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
// output->cancelNextTurningInjectorOff = true;
// return;
@ -142,13 +148,14 @@ void seTurnPinHigh(InjectorOutputPin *output) {
// firmwareError("Already high");
#endif
#if EFI_SIMULATOR || defined(__DOXYGEN__)
printf("seTurnPinHigh %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* EFI_SIMULATOR */
turnPinHigh(output);
}
void seTurnPinLow(InjectorOutputPin *output) {
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
printf("seTurnPinLow %s %d %d\r\n", output->name, output->overlappingCounter, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
if (output->cancelNextTurningInjectorOff) {
/**
* in case of fuel schedule overlap between engine cycles,
@ -165,9 +172,6 @@ void seTurnPinLow(InjectorOutputPin *output) {
#endif /* EFI_SIMULATOR */
return;
}
#if EFI_SIMULATOR || defined(__DOXYGEN__)
printf("seTurnPinLow %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* EFI_SIMULATOR */
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
const char * w = output->currentLogicValue == false ? "err" : "";
@ -180,7 +184,13 @@ void seTurnPinLow(InjectorOutputPin *output) {
// if (output->currentLogicValue == 0)
// firmwareError("Already low");
#endif
output->overlappingCounter--;
if (output->overlappingCounter > 0) {
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
printf("was overlapping, no need to touch pin %s %d\r\n", output->name, (int)getTimeNowUs());
#endif /* FUEL_MATH_EXTREME_LOGGING */
// return;
}
turnPinLow(output);
}
@ -190,9 +200,10 @@ void seScheduleByTime(const char *prefix, scheduling_s *scheduling, efitimeus_t
scheduleMsg(&sharedLogger, "schX %s", param->name);
#endif /* FUEL_MATH_EXTREME_LOGGING */
#if EFI_SIMULATOR || EFI_UNIT_TEST || defined(__DOXYGEN__)
printf("schB %s %d\r\n", param->name, (int)time);
#endif /* EFI_SIMULATOR || EFI_UNIT_TEST */
#if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
const char *direction = callback == (schfunc_t) &seTurnPinHigh ? "up" : "down";
printf("seScheduleByTime %s %s %d sch=%d\r\n", direction, param->name, (int)time, (int)scheduling);
#endif /* FUEL_MATH_EXTREME_LOGGING || EFI_UNIT_TEST */
scheduleByTime(prefix, scheduling, time, callback, param);
}

6
firmware/controllers/error_handling.cpp
View File

@ -74,7 +74,11 @@ bool isWarningNow(efitimesec_t now) {
int warning(obd_code_e code, const char *fmt, ...) {
efiAssert(isWarningStreamInitialized, "warn stream not initialized", false);
UNUSED(code);
#if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__)
printf("warning %s\r\n", fmt);
#endif
efitimesec_t now = getTimeNowSeconds();
if (isWarningNow(now) || !warningEnabled)
return true; // we just had another warning, let's not spam

4
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -134,6 +134,10 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int injEventIndex, InjectionE
printf("fuel fuelMs=%f adjusted=%f\t\n", ENGINE(fuelMs), injectionDuration);
#endif /*EFI_PRINTF_FUEL_DETAILS */
if (injectionDuration > getCrankshaftRevolutionTimeMs(rpm)) {
warning(CUSTOM_OBD_50, "Too long fuel injection");
}
// todo: pre-calculate 'numberOfInjections'
floatms_t totalPerCycle = injectionDuration * getNumberOfInjections(engineConfiguration->injectionMode PASS_ENGINE_PARAMETER);
floatus_t engineCycleDuration = engine->rpmCalculator.oneDegreeUs * engine->engineCycle;