From 73003f8b64c240360e65024c88e5f9bbbb4d1e7b Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 12 Nov 2019 19:40:33 -0500 Subject: [PATCH] what's the probability of efi::size breaking build? --- firmware/controllers/system/efi_gpio.cpp | 6 +++--- firmware/hw_layer/microsecond_timer.cpp | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp index 01446a9d0d..c99adf01d1 100644 --- a/firmware/controllers/system/efi_gpio.cpp +++ b/firmware/controllers/system/efi_gpio.cpp @@ -52,20 +52,20 @@ EnginePins::EnginePins() { dizzyOutput.name = PROTOCOL_DIZZY_NAME; tachOut.name = PROTOCOL_TACH_NAME; - static_assert(efi::size(sparkNames) >= IGNITION_PIN_COUNT, "Too many ignition pins"); + //todo:uncomment static_assert(efi::size(sparkNames) >= IGNITION_PIN_COUNT, "Too many ignition pins"); for (int i = 0; i < IGNITION_PIN_COUNT;i++) { enginePins.coils[i].name = sparkNames[i]; enginePins.coils[i].shortName = sparkShortNames[i]; } - static_assert(efi::size(injectorNames) >= INJECTION_PIN_COUNT, "Too many injection pins"); + //todo:uncomment static_assert(efi::size(injectorNames) >= INJECTION_PIN_COUNT, "Too many injection pins"); for (int i = 0; i < INJECTION_PIN_COUNT;i++) { enginePins.injectors[i].injectorIndex = i; enginePins.injectors[i].name = injectorNames[i]; enginePins.injectors[i].shortName = injectorShortNames[i]; } - static_assert(efi::size(auxValveShortNames) >= AUX_DIGITAL_VALVE_COUNT, "Too many aux valve pins"); + //todo:uncomment static_assert(efi::size(auxValveShortNames) >= AUX_DIGITAL_VALVE_COUNT, "Too many aux valve pins"); for (int i = 0; i < AUX_DIGITAL_VALVE_COUNT;i++) { enginePins.auxValve[i].name = auxValveShortNames[i]; } diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp index 9309c5f6e5..e5649378e7 100644 --- a/firmware/hw_layer/microsecond_timer.cpp +++ b/firmware/hw_layer/microsecond_timer.cpp @@ -176,6 +176,10 @@ static efitimems_t testSchedulingStart; static void timerValidationCallback(void *arg) { (void)arg; + if (hasFirmwareError()) { + return; + } + testSchedulingHappened = true; efitimems_t actualTimeSinceScheduling = (currentTimeMillis() - testSchedulingStart);