From c604b3875c199a438b322b0b79c2cbd846762ef2 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 21 Jan 2017 18:02:13 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_vvt.cpp | 6 ++++-- firmware/hw_layer/microsecond_timer.cpp | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 4a824dd2f0..a98b437d07 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -120,12 +120,13 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->vvtCamSensorUseRise = true; engineConfiguration->vvtOffset = -70; -// engineConfiguration->auxPidPins[0] = GPIOE_3; // VVT solenoid control + engineConfiguration->activateAuxPid1 = true; // todo: remove this field? + engineConfiguration->auxPidPins[0] = GPIOE_3; // VVT solenoid control // /** // * set_fsio_setting 0 0.55 // */ boardConfiguration->fsio_setting[0] = 0.0; - setFsioExt(0, GPIOE_3, "0 fsio_setting", 400 PASS_ENGINE_PARAMETER); +// setFsioExt(0, GPIOE_3, "0 fsio_setting", 400 PASS_ENGINE_PARAMETER); @@ -199,6 +200,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->injector.flow = 265; boardConfiguration->malfunctionIndicatorPin = GPIOD_9; +// boardConfiguration->malfunctionIndicatorPinMode = OM_INVERTED; } diff --git a/firmware/hw_layer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer.cpp index ca3198d9f4..7bd561703b 100644 --- a/firmware/hw_layer/microsecond_timer.cpp +++ b/firmware/hw_layer/microsecond_timer.cpp @@ -57,7 +57,10 @@ void setHardwareUsTimer(int32_t timeUs) { if (timeUs < 2) timeUs = 2; // for some reason '1' does not really work efiAssertVoid(timeUs > 0, "not positive timeUs"); - efiAssertVoid(timeUs < 10 * US_PER_SECOND, "setHardwareUsTimer() too large"); + if (timeUs >= 10 * US_PER_SECOND) { + firmwareError(OBD_PCM_Processor_Fault, "setHardwareUsTimer() too long: %d", timeUs); + return; + } if (GPTDEVICE.state == GPT_ONESHOT) gptStopTimerI(&GPTDEVICE);