diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 1fe1d54f2a..5f9b8cd338 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -302,7 +302,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->globalTriggerAngleOffset = 0; // enable trigger_details - engineConfiguration->isPrintTriggerSynchDetails = false; + engineConfiguration->verboseTriggerSynchDetails = false; // set cranking_timing_angle 10 engineConfiguration->crankingTimingAngle = 10; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index bfe9433fe7..8ac693c0ec 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -937,7 +937,7 @@ static void enableOrDisable(const char *param, bool isEnabled) { } else if (strEqualCaseInsensitive(param, "injection")) { engineConfiguration->isInjectionEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "trigger_details")) { - engineConfiguration->isPrintTriggerSynchDetails = isEnabled; + engineConfiguration->verboseTriggerSynchDetails = isEnabled; } else if (strEqualCaseInsensitive(param, "ignition")) { engineConfiguration->isIgnitionEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "self_stimulation")) { diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 9ef20a00e9..45c1c56fda 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -111,13 +111,13 @@ void hwHandleVvtCamSignal(trigger_value_e front DECLARE_ENGINE_PARAMETER_SUFFIX) tc->previousVvtCamDuration = currentDuration; tc->previousVvtCamTime = nowNt; - if (engineConfiguration->isPrintTriggerSynchDetails) { + if (engineConfiguration->verboseTriggerSynchDetails) { scheduleMsg(logger, "vvt ratio %.2f", ratio); } if (ratio < CONFIGB(nb2ratioFrom) || ratio > CONFIGB(nb2ratioTo)) { return; } - if (engineConfiguration->isPrintTriggerSynchDetails) { + if (engineConfiguration->verboseTriggerSynchDetails) { scheduleMsg(logger, "looks good: vvt ratio %.2f", ratio); } if (engineConfiguration->debugMode == DBG_VVT) { diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index d342dec52e..37033c3809 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -355,7 +355,7 @@ void TriggerState::handleTriggerError(DECLARE_ENGINE_PARAMETER_SIGNATURE) { someSortOfTriggerError = true; totalTriggerErrorCounter++; - if (CONFIG(isPrintTriggerSynchDetails) || someSortOfTriggerError) { + if (CONFIG(verboseTriggerSynchDetails) || someSortOfTriggerError) { #if EFI_PROD_CODE scheduleMsg(logger, "error: synchronizationPoint @ index %d expected %d/%d/%d got %d/%d/%d", currentCycle.current_index, TRIGGER_SHAPE(expectedEventCount[0]), @@ -497,7 +497,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no #if EFI_PROD_CODE - if (CONFIG(isPrintTriggerSynchDetails) || (someSortOfTriggerError && !CONFIG(silentTriggerError))) { + if (CONFIG(verboseTriggerSynchDetails) || (someSortOfTriggerError && !CONFIG(silentTriggerError))) { #else if (printTriggerDebug) { #endif /* EFI_PROD_CODE */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index a97f3c5e35..782b287f10 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -763,7 +763,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "Automatic", "Manual" bit isTunerStudioEnabled bit isWaveAnalyzerEnabled bit useSeparateVeForIdle;+This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling. - bit isPrintTriggerSynchDetails;+enable trigger_details + bit verboseTriggerSynchDetails;+enable trigger_details 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 your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection bit useOnlyRisingEdgeForTrigger;+VR sensors are only precise on rising front\nenable trigger_only_front diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 259ad528af..06b5ad65d6 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1451,7 +1451,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "NB2 from temp", nb2ratioFrom field = "NB2 to temp", nb2ratioTo field = "nbVvtIndex", nbVvtIndex - field = "print sync details to console", isPrintTriggerSynchDetails + field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8} dialog = triggerConfiguration panel = triggerConfiguration_settings, North diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 227946e6a0..4d564c78d5 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 18 19:18:08 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:09 EDT 2019 import com.rusefi.config.*; @@ -816,7 +816,6 @@ public class Fields { public static final int isInjectionEnabled_offset = 1476; public static final int isManualSpinningMode_offset = 1476; public static final int isMapAveragingEnabled_offset = 1476; - public static final int isPrintTriggerSynchDetails_offset = 1476; public static final int isSdCardEnabled_offset = 744; public static final int issue_294_15_offset = 76; public static final int issue_294_16_offset = 76; @@ -1220,6 +1219,7 @@ public class Fields { public static final int vehicleSpeedSensorInputPin_offset = 968; public static final int veLoadBins_offset = 18464; public static final int veLoadBins_offset_hex = 4820; + public static final int verboseTriggerSynchDetails_offset = 1476; public static final int veRpmBins_offset = 18528; public static final int veRpmBins_offset_hex = 4860; public static final int veTable_offset = 17440; @@ -1701,7 +1701,7 @@ public class Fields { public static final Field ISTUNERSTUDIOENABLED = Field.create("ISTUNERSTUDIOENABLED", 1476, FieldType.BIT, 8); public static final Field ISWAVEANALYZERENABLED = Field.create("ISWAVEANALYZERENABLED", 1476, FieldType.BIT, 9); public static final Field USESEPARATEVEFORIDLE = Field.create("USESEPARATEVEFORIDLE", 1476, FieldType.BIT, 10); - public static final Field ISPRINTTRIGGERSYNCHDETAILS = Field.create("ISPRINTTRIGGERSYNCHDETAILS", 1476, FieldType.BIT, 11); + public static final Field VERBOSETRIGGERSYNCHDETAILS = Field.create("VERBOSETRIGGERSYNCHDETAILS", 1476, FieldType.BIT, 11); public static final Field ISMANUALSPINNINGMODE = Field.create("ISMANUALSPINNINGMODE", 1476, FieldType.BIT, 12); public static final Field TWOWIREBATCHINJECTION = Field.create("TWOWIREBATCHINJECTION", 1476, FieldType.BIT, 13); public static final Field USEONLYRISINGEDGEFORTRIGGER = Field.create("USEONLYRISINGEDGEFORTRIGGER", 1476, FieldType.BIT, 14); @@ -2475,7 +2475,7 @@ public class Fields { ISTUNERSTUDIOENABLED, ISWAVEANALYZERENABLED, USESEPARATEVEFORIDLE, - ISPRINTTRIGGERSYNCHDETAILS, + VERBOSETRIGGERSYNCHDETAILS, ISMANUALSPINNINGMODE, TWOWIREBATCHINJECTION, USEONLYRISINGEDGEFORTRIGGER, diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 2652defca8..e69cc08fed 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -46,7 +46,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190622; + public static final int CONSOLE_VERSION = 20190625; public static final boolean SHOW_STIMULATOR = false; public static final String INPUT_FILES_PATH = ".."; private static final String TAB_INDEX = "main_tab"; diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java index 774d82cb82..18e22fb5e5 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -135,6 +135,7 @@ public class EngineSnifferPanel { if (!LinkManager.isLogViewer()) { JPanel lowerButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 0)); lowerButtons.add(new ConfigField(Fields.GLOBALTRIGGERANGLEOFFSET, "Triger Offset").getContent()); + lowerButtons.add(new BitConfigField(Fields.VERBOSETRIGGERSYNCHDETAILS, "Verbose trigger Sync").getContent()); lowerButtons.add(new BitConfigField(Fields.ISENGINECHARTENABLED, "Collect Engine Data").getContent()); lowerButtons.add(new ConfigField(Fields.SENSORCHARTFREQUENCY, "Frequency").getContent()); lowerButtons.add(new ConfigField(Fields.ENGINECHARTSIZE, "Engine Sniffer size").getContent());