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

reducing code duplication and applying event condition more consistently

This commit is contained in:
rusefi 2018-08-31 21:11:22 -04:00
parent 88bb46ebe6
commit f292c4ccb2
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

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

13
firmware/controllers/system/efiGpio.cpp
View File

@ -210,17 +210,10 @@ void NamedOutputPin::setHigh() {
// turn the output level ACTIVE
setValue(true);
// sleep for the needed duration
#if EFI_ENGINE_SNIFFER || defined(__DOXYGEN__)
// explicit check here is a performance optimization to speed up no-chart mode
if (ENGINE(isEngineChartEnabled)) {
// dbgDurr = hal_lld_get_counter_value() - dbgStart;
addEngineSniffferEvent(name, WC_UP);
}
addEngineSniffferEvent(name, WC_UP);
#endif /* EFI_ENGINE_SNIFFER */
// dbgDurr = hal_lld_get_counter_value() - dbgStart;
}
void NamedOutputPin::setLow() {
@ -234,9 +227,7 @@ void NamedOutputPin::setLow() {
#endif /* EFI_DEFAILED_LOGGING */
#if EFI_ENGINE_SNIFFER || defined(__DOXYGEN__)
if (ENGINE(isEngineChartEnabled)) {
addEngineSniffferEvent(name, WC_DOWN);
}
addEngineSniffferEvent(name, WC_DOWN);
#endif /* EFI_ENGINE_SNIFFER */
}

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

@ -324,7 +324,7 @@ static void tdcMarkCallback(trigger_event_e ckpSignalType,
if (isTriggerSynchronizationPoint && ENGINE(isEngineChartEnabled)) {
int revIndex2 = engine->rpmCalculator.getRevolutionCounter() % 2;
int rpm = ENGINE(rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
// todo: use event-based scheduling, not just time-based scheduling
// todo: use tooth event-based scheduling, not just time-based scheduling
if (isValidRpm(rpm)) {
scheduleByAngle(rpm, &tdcScheduler[revIndex2], tdcPosition(),
(schfunc_t) onTdcCallback, NULL, &engine->rpmCalculator);

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

@ -177,7 +177,7 @@ int getRevolutionCounter(void);
#define isValidRpm(rpm) ((rpm) > 0 && (rpm) < UNREALISTIC_RPM)
#if EFI_ENGINE_SNIFFER
#define addEngineSniffferEvent(name, msg) waveChart.addEvent3((name), (msg))
#define addEngineSniffferEvent(name, msg) if (ENGINE(isEngineChartEnabled)) { waveChart.addEvent3((name), (msg)); }
#else
#define addEngineSniffferEvent(n, msg) {}
#endif /* EFI_ENGINE_SNIFFER */

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

@ -88,9 +88,7 @@ static efitick_t previousVvtCamTime = 0;
static efitick_t previousVvtCamDuration = 0;
void hwHandleVvtCamSignal(trigger_value_e front) {
if (ENGINE(isEngineChartEnabled)) {
addEngineSniffferEvent(VVT_NAME, front == TV_RISE ? WC_UP : WC_DOWN);
}
addEngineSniffferEvent(VVT_NAME, front == TV_RISE ? WC_UP : WC_DOWN);
if (boardConfiguration->vvtCamSensorUseRise ^ (front != TV_FALL)) {
return;