From 120571c956bce5f6aaeac6b5b3b69e1113df1e00 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 11 Jun 2016 17:01:51 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata_1_6.cpp | 3 +++ firmware/integration/rusefi_config.txt | 4 ++-- firmware/tunerstudio/rusefi.ini | 10 ++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 813745c42c..699d8ea8f5 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -19,6 +19,7 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) { setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F); engineConfiguration->trigger.type = TT_MAZDA_MIATA_NA; + engineConfiguration->specs.displacement = 1.6; engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2; @@ -71,6 +72,8 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->injectionPins[2] = GPIOB_8; // #3 boardConfiguration->injectionPins[3] = GPIOB_7; // #4 + engineConfiguration->injectionMode = IM_BATCH; + } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c4a95f54f9..6acaef3a71 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -545,9 +545,9 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true" bit isIdleThreadEnabled bit isPrintTriggerSynchDetails bit isManualSpinningMode;Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed - bit twoWireBatchInjection;This is needed if batched injection and individual injector wiring + bit twoWireBatchInjection;+This is needed if batched injection and individual injector wiring bit useOnlyRisingEdgeForTrigger;See #172 - bit twoWireBatchIgnition;This is needed if batched igniton (waster spark) and individual coil wiring + bit twoWireBatchIgnition;+This is needed if batched igniton (waster spark) and individual coil wiring uint32_t engineChartSize;;"count", 1, 0, 0, 300, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 1e1b80b6a0..eb87188a90 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 11 15:06:14 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jun 11 16:01:58 EDT 2016 pageSize = 17080 page = 1 @@ -624,6 +624,8 @@ page = 1 vehicleSpeedCoef = "This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h" trigger_useOnlyFirstChannel = "This option could be used if your second trigger channel is broken" sensorChartMode = "rusEfi console Sensor Sniffer mode" + twoWireBatchInjection = "This is needed if batched injection and individual injector wiring" + twoWireBatchIgnition = "This is needed if batched igniton (waster spark) and individual coil wiring" ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." mapAveragingSchedulingAtIndex = "At what trigger index should some MAP-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." slowAdcAlpha = "ExpAverage alpha coefficient" @@ -1698,9 +1700,9 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = crankingIgnition, "Ignition" field = "Advance", crankingTimingAngle - field = "Charge Angle", crankingChargeAngle - field = "Use constant dwell?", useConstantDwellDuringCranking - field = "Constant Dwell", ignitionDwellForCrankingMs + field = "Use constant Dwell?", useConstantDwellDuringCranking + field = "Constant Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} + field = "Charge Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} ; Tuning->Cranking