diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 7ea32a0376..38adc66b06 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -31,6 +31,9 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->vvtCamSensorUseRise = true; engineConfiguration->vvtOffset = -70; +// boardConfiguration->fuelPumpPin = GPIOD_5; // todo: rewire my board to default E_4 + + // enable trigger_details engineConfiguration->isPrintTriggerSynchDetails = false; @@ -51,7 +54,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { // 6.375 // 10.625 boardConfiguration->nb2ratioFrom = 8.50 * 0.75; - boardConfiguration->nb2ratioTo = 8.50 * 1.25; + boardConfiguration->nb2ratioTo = 14; engineConfiguration->nbVvtIndex = 0; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 0d0b884cf4..ec71af2916 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -948,6 +948,8 @@ static void printAllInfo(void) { static void getValue(const char *paramStr) { if (strEqualCaseInsensitive(paramStr, "isCJ125Enabled")) { scheduleMsg(&logger, "isCJ125Enabled=%d", boardConfiguration->isCJ125Enabled); + } else if (strEqualCaseInsensitive(paramStr, "nb_vvt_index")) { + scheduleMsg(&logger, "nb_vvt_index=%d", engineConfiguration->nbVvtIndex); } else if (strEqualCaseInsensitive(paramStr, "global_trigger_offset_angle")) { scheduleMsg(&logger, "global_trigger_offset=%f", engineConfiguration->globalTriggerAngleOffset); } else if (strEqualCaseInsensitive(paramStr, "warningPeriod")) { @@ -992,6 +994,8 @@ static void setValue(const char *paramStr, const char *valueStr) { engineConfiguration->vvtOffset = valueF; } else if (strEqualCaseInsensitive(paramStr, "vvt_mode")) { engineConfiguration->vvtMode = (vvt_mode_e)valueI; + } else if (strEqualCaseInsensitive(paramStr, "nb_vvt_index")) { + engineConfiguration->nbVvtIndex = valueI; } else if (strEqualCaseInsensitive(paramStr, "step1timing")) { engineConfiguration->step1timing = valueI; } else if (strEqualCaseInsensitive(paramStr, "operation_mode")) { diff --git a/firmware/controllers/trigger/trigger_mazda.cpp b/firmware/controllers/trigger/trigger_mazda.cpp index 8286019cd5..f496f064db 100644 --- a/firmware/controllers/trigger/trigger_mazda.cpp +++ b/firmware/controllers/trigger/trigger_mazda.cpp @@ -57,9 +57,9 @@ void initializeMazdaMiataNb2Crank(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { s->tdcPosition = 60; - s->setTriggerSynchronizationGap(1.57f); - s->addEvent2(o + 4 * 66.0f, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(o + 4 * 70.0f, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->setTriggerSynchronizationGap2(0.75f, 0.98f); + s->addEvent2(o + 4 * 56.0f, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(o + 4 * 60.0f, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); s->addEvent2(o + 4 * 136.0f, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); s->addEvent2(o + 4 * 140.0f, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); } diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 39ecd6c62f..304a60e2ed 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -290,5 +290,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20161117; + return 20161123; }