rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

verbose trigger sync: better field name & check box to engine sniffer

This commit is contained in:
rusefi 2019-06-25 02:25:26 -04:00
parent 4e370278f3
commit a82c7e30db
15 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -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;

6
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 18 19:18:08 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:09 EDT 2019
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
#define CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1622,7 +1622,7 @@ struct engine_configuration_s {
/**
* enable trigger_details
offset 1476 bit 11 */
bool isPrintTriggerSynchDetails : 1;
bool verboseTriggerSynchDetails : 1;
/**
* Usually if we have no trigger events that means engine is stopped
* Unless we are troubleshooting and spinning the engine by hand - this case a longer
@ -2820,4 +2820,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 18 19:18:08 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:09 EDT 2019

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -1234,8 +1234,6 @@
#define isManualSpinningMode_offset_hex 5c4
#define isMapAveragingEnabled_offset 1476
#define isMapAveragingEnabled_offset_hex 5c4
#define isPrintTriggerSynchDetails_offset 1476
#define isPrintTriggerSynchDetails_offset_hex 5c4
#define isSdCardEnabled_offset 744
#define isSdCardEnabled_offset_hex 2e8
#define issue_294_15_offset 76
@ -1914,6 +1912,8 @@
#define vehicleSpeedSensorInputPin_offset_hex 3c8
#define veLoadBins_offset 18464
#define veLoadBins_offset_hex 4820
#define verboseTriggerSynchDetails_offset 1476
#define verboseTriggerSynchDetails_offset_hex 5c4
#define veRpmBins_offset 18528
#define veRpmBins_offset_hex 4860
#define veTable_offset 17440

2
firmware/controllers/settings.cpp
View File

@ -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")) {

4
firmware/controllers/trigger/trigger_central.cpp
View File

@ -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) {

4
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -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 */

2
firmware/integration/rusefi_config.txt
View File

@ -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

8
firmware/tunerstudio/rusefi.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:18 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:09 EDT 2019
pageSize = 20000
page = 1
@ -541,7 +541,7 @@ page = 1
isTunerStudioEnabled = bits, U32, 1476, [8:8], "false", "true"
isWaveAnalyzerEnabled = bits, U32, 1476, [9:9], "false", "true"
useSeparateVeForIdle = bits, U32, 1476, [10:10], "false", "true"
isPrintTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
verboseTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1476, [12:12], "false", "true"
twoWireBatchInjection = bits, U32, 1476, [13:13], "false", "true"
useOnlyRisingEdgeForTrigger= bits, U32, 1476, [14:14], "false", "true"
@ -1016,7 +1016,7 @@ page = 1
overrideCrankingIacSetting = "This setting overrides the normal multiplication values that have been set for the idle air control valve during cranking. If this setting is enabled the "IAC multiplier" table in the Cranking settings tab needs to be adjusted appropriately or potentially no IAC opening will occur."
useSeparateAdvanceForIdle = "This activates a separate ignition timing table for idle conditions, this can help idle stability by using ignition retard and advance either side of the desired idle speed. Extra retard at low idle speeds will prevent stalling and extra advance at high idle speeds can help reduce engine power and slow the idle speed."
useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
isPrintTriggerSynchDetails = "enable trigger_details"
verboseTriggerSynchDetails = "enable trigger_details"
twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front\nenable trigger_only_front"
twoWireBatchIgnition = "This is needed if your coils are individually wired (COP) and you wish to use batch ignition (wasted spark)."
@ -2420,7 +2420,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

2
firmware/tunerstudio/rusefi.input
View File

@ -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

8
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:23 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:15 EDT 2019
pageSize = 20000
page = 1
@ -541,7 +541,7 @@ page = 1
isTunerStudioEnabled = bits, U32, 1476, [8:8], "false", "true"
isWaveAnalyzerEnabled = bits, U32, 1476, [9:9], "false", "true"
useSeparateVeForIdle = bits, U32, 1476, [10:10], "false", "true"
isPrintTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
verboseTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1476, [12:12], "false", "true"
twoWireBatchInjection = bits, U32, 1476, [13:13], "false", "true"
useOnlyRisingEdgeForTrigger= bits, U32, 1476, [14:14], "false", "true"
@ -1016,7 +1016,7 @@ page = 1
overrideCrankingIacSetting = "This setting overrides the normal multiplication values that have been set for the idle air control valve during cranking. If this setting is enabled the "IAC multiplier" table in the Cranking settings tab needs to be adjusted appropriately or potentially no IAC opening will occur."
useSeparateAdvanceForIdle = "This activates a separate ignition timing table for idle conditions, this can help idle stability by using ignition retard and advance either side of the desired idle speed. Extra retard at low idle speeds will prevent stalling and extra advance at high idle speeds can help reduce engine power and slow the idle speed."
useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
isPrintTriggerSynchDetails = "enable trigger_details"
verboseTriggerSynchDetails = "enable trigger_details"
twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front\nenable trigger_only_front"
twoWireBatchIgnition = "This is needed if your coils are individually wired (COP) and you wish to use batch ignition (wasted spark)."
@ -2420,7 +2420,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

8
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 10:37:37 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:12 EDT 2019
pageSize = 20000
page = 1
@ -541,7 +541,7 @@ page = 1
isTunerStudioEnabled = bits, U32, 1476, [8:8], "false", "true"
isWaveAnalyzerEnabled = bits, U32, 1476, [9:9], "false", "true"
useSeparateVeForIdle = bits, U32, 1476, [10:10], "false", "true"
isPrintTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
verboseTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1476, [12:12], "false", "true"
twoWireBatchInjection = bits, U32, 1476, [13:13], "false", "true"
useOnlyRisingEdgeForTrigger= bits, U32, 1476, [14:14], "false", "true"
@ -1016,7 +1016,7 @@ page = 1
overrideCrankingIacSetting = "This setting overrides the normal multiplication values that have been set for the idle air control valve during cranking. If this setting is enabled the "IAC multiplier" table in the Cranking settings tab needs to be adjusted appropriately or potentially no IAC opening will occur."
useSeparateAdvanceForIdle = "This activates a separate ignition timing table for idle conditions, this can help idle stability by using ignition retard and advance either side of the desired idle speed. Extra retard at low idle speeds will prevent stalling and extra advance at high idle speeds can help reduce engine power and slow the idle speed."
useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
isPrintTriggerSynchDetails = "enable trigger_details"
verboseTriggerSynchDetails = "enable trigger_details"
twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front\nenable trigger_only_front"
twoWireBatchIgnition = "This is needed if your coils are individually wired (COP) and you wish to use batch ignition (wasted spark)."
@ -2413,7 +2413,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

8
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -82,7 +82,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:25 EDT 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Jun 25 02:03:17 EDT 2019
pageSize = 20000
page = 1
@ -541,7 +541,7 @@ page = 1
isTunerStudioEnabled = bits, U32, 1476, [8:8], "false", "true"
isWaveAnalyzerEnabled = bits, U32, 1476, [9:9], "false", "true"
useSeparateVeForIdle = bits, U32, 1476, [10:10], "false", "true"
isPrintTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
verboseTriggerSynchDetails= bits, U32, 1476, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1476, [12:12], "false", "true"
twoWireBatchInjection = bits, U32, 1476, [13:13], "false", "true"
useOnlyRisingEdgeForTrigger= bits, U32, 1476, [14:14], "false", "true"
@ -1016,7 +1016,7 @@ page = 1
overrideCrankingIacSetting = "This setting overrides the normal multiplication values that have been set for the idle air control valve during cranking. If this setting is enabled the "IAC multiplier" table in the Cranking settings tab needs to be adjusted appropriately or potentially no IAC opening will occur."
useSeparateAdvanceForIdle = "This activates a separate ignition timing table for idle conditions, this can help idle stability by using ignition retard and advance either side of the desired idle speed. Extra retard at low idle speeds will prevent stalling and extra advance at high idle speeds can help reduce engine power and slow the idle speed."
useSeparateVeForIdle = "This activates a separate fuel table for Idle, this allows fine tuning of the idle fuelling."
isPrintTriggerSynchDetails = "enable trigger_details"
verboseTriggerSynchDetails = "enable trigger_details"
twoWireBatchInjection = "This is needed if your coils are individually wired and you wish to use batch injection.\nenable two_wire_batch_injection"
useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front\nenable trigger_only_front"
twoWireBatchIgnition = "This is needed if your coils are individually wired (COP) and you wish to use batch ignition (wasted spark)."
@ -2416,7 +2416,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

8
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -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,

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -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";

1
java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

@ -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());