From fe0080c4c0aa91272810f1d0a80525fcc8e9affa Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 7 Jan 2024 16:31:41 -0500 Subject: [PATCH] only:towards https://github.com/rusefi/rusefi/pull/4841 --- firmware/controllers/engine_cycle/knock_controller.cpp | 3 +-- firmware/controllers/engine_cycle/prime_injection.cpp | 4 ++-- firmware/controllers/engine_cycle/prime_injection.h | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/engine_cycle/knock_controller.cpp b/firmware/controllers/engine_cycle/knock_controller.cpp index fd1a0f2d18..3131449646 100644 --- a/firmware/controllers/engine_cycle/knock_controller.cpp +++ b/firmware/controllers/engine_cycle/knock_controller.cpp @@ -161,8 +161,7 @@ static void startKnockSampling(Engine* p_engine) { void Engine::onSparkFireKnockSense(uint8_t cylinderNumber, efitick_t nowNt) { #if EFI_HIP_9011 || EFI_SOFTWARE_KNOCK cylinderNumberCopy = cylinderNumber; -static scheduling_s startSampling; - scheduleByAngle(&startSampling, nowNt, + scheduleByAngle(nullptr, nowNt, /*angle*/engineConfiguration->knockDetectionWindowStart, { startKnockSampling, engine }); #else UNUSED(cylinderNumber); diff --git a/firmware/controllers/engine_cycle/prime_injection.cpp b/firmware/controllers/engine_cycle/prime_injection.cpp index 3fe65d0605..5f82604100 100644 --- a/firmware/controllers/engine_cycle/prime_injection.cpp +++ b/firmware/controllers/engine_cycle/prime_injection.cpp @@ -60,7 +60,7 @@ void PrimeController::onIgnitionStateChanged(bool ignitionOn) { auto primeDelayMs = engineConfiguration->primingDelay * 1000; auto startTime = getTimeNowNt() + MS2NT(primeDelayMs); - getExecutorInterface()->scheduleByTimestampNt("prime", &m_start, startTime, { PrimeController::onPrimeStartAdapter, this }); + getExecutorInterface()->scheduleByTimestampNt("prime", nullptr, startTime, { PrimeController::onPrimeStartAdapter, this }); } else { efiPrintf("Skipped priming pulse since ignSwitchCounter = %d", ignSwitchCounter); } @@ -99,7 +99,7 @@ void PrimeController::onPrimeStart() { // Open all injectors, schedule closing later m_isPriming = true; startSimultaneousInjection(); - getExecutorInterface()->scheduleByTimestampNt("prime", &m_end, endTime, { onPrimeEndAdapter, this }); + getExecutorInterface()->scheduleByTimestampNt("prime", nullptr, endTime, { onPrimeEndAdapter, this }); } void PrimeController::onPrimeEnd() { diff --git a/firmware/controllers/engine_cycle/prime_injection.h b/firmware/controllers/engine_cycle/prime_injection.h index e5f584373c..1f0e53e6e0 100644 --- a/firmware/controllers/engine_cycle/prime_injection.h +++ b/firmware/controllers/engine_cycle/prime_injection.h @@ -24,9 +24,6 @@ public: } private: - scheduling_s m_start; - scheduling_s m_end; - bool m_isPriming = false; static void onPrimeStartAdapter(PrimeController* instance) {