From b2203e22cb1fad0027aee45d2cad4d6a1451cef8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 25 May 2017 08:28:30 -0400 Subject: [PATCH] silentTriggerError --- .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/controllers/trigger/trigger_decoder.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 6 +++--- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index f7fffb9967..dd9392d440 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 00:30:55 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 08:26:42 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1202,7 +1202,7 @@ typedef struct { bool isEngineChartEnabled : 1; /** offset 1488 bit 6 */ - bool unusedBit_7 : 1; + bool silentTriggerError : 1; /** offset 1488 bit 7 */ bool unusedBit__2 : 1; @@ -2105,4 +2105,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 00:30:55 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 08:26:42 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 733f9469a6..1655780852 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -849,8 +849,8 @@ #define useConstantDwellDuringCranking_offset_hex 5d0 #define isEngineChartEnabled_offset 1488 #define isEngineChartEnabled_offset_hex 5d0 -#define unusedBit_7_offset 1488 -#define unusedBit_7_offset_hex 5d0 +#define silentTriggerError_offset 1488 +#define silentTriggerError_offset_hex 5d0 #define unusedBit__2_offset 1488 #define unusedBit__2_offset_hex 5d0 #define canReadEnabled_offset 1488 diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index 707a180454..c6e514dba9 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -248,7 +248,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no && thirdGap; #if EFI_PROD_CODE || defined(__DOXYGEN__) - if (engineConfiguration->isPrintTriggerSynchDetails || someSortOfTriggerError) { + if (engineConfiguration->isPrintTriggerSynchDetails || (someSortOfTriggerError && !engineConfiguration->silentTriggerError)) { #else if (printTriggerDebug) { #endif /* EFI_PROD_CODE */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 82753feb92..453daeee52 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -590,7 +590,7 @@ bit vvtDisplayInverted bit isVerboseETB bit useConstantDwellDuringCranking bit isEngineChartEnabled;This options enables data for 'engine sniffer' tab in console, which comes at some CPU price - bit unusedBit_7 + bit silentTriggerError bit unusedBit__2 bit canReadEnabled bit canWriteEnabled diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index f1d74e605d..7f26ffab31 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,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 Thu May 25 00:30:55 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 08:26:42 EDT 2017 pageSize = 16376 page = 1 @@ -430,7 +430,7 @@ page = 1 isVerboseETB = bits, U32, 1488, [3:3], "false", "true" useConstantDwellDuringCranking= bits, U32, 1488, [4:4], "false", "true" isEngineChartEnabled = bits, U32, 1488, [5:5], "false", "true" - unusedBit_7 = bits, U32, 1488, [6:6], "false", "true" + silentTriggerError = bits, U32, 1488, [6:6], "false", "true" unusedBit__2 = bits, U32, 1488, [7:7], "false", "true" canReadEnabled = bits, U32, 1488, [8:8], "false", "true" canWriteEnabled = bits, U32, 1488, [9:9], "false", "true" @@ -2348,6 +2348,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" dialog = etbDialog, "Electronic Thtottle Body (alpha)" field = "pedal Position Channel", pedalPositionChannel + field = "verbose", isVerboseETB field = "Pedal min", pedalPositionMin field = "Pedal max", pedalPositionMax field = "PWM Frequency", etbFreq diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index a348076f66..176fdcad92 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1608,6 +1608,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" dialog = etbDialog, "Electronic Thtottle Body (alpha)" field = "pedal Position Channel", pedalPositionChannel + field = "verbose", isVerboseETB field = "Pedal min", pedalPositionMin field = "Pedal max", pedalPositionMax field = "PWM Frequency", etbFreq diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 254caebaf2..2343c82063 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 00:30:55 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 08:26:42 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -626,7 +626,7 @@ public class Fields { public static final int isVerboseETB_offset = 1488; public static final int useConstantDwellDuringCranking_offset = 1488; public static final int isEngineChartEnabled_offset = 1488; - public static final int unusedBit_7_offset = 1488; + public static final int silentTriggerError_offset = 1488; public static final int unusedBit__2_offset = 1488; public static final int canReadEnabled_offset = 1488; public static final int canWriteEnabled_offset = 1488; @@ -1444,7 +1444,7 @@ public class Fields { public static final Field ISVERBOSEETB = Field.create("ISVERBOSEETB", 1488, FieldType.BIT, 3); public static final Field USECONSTANTDWELLDURINGCRANKING = Field.create("USECONSTANTDWELLDURINGCRANKING", 1488, FieldType.BIT, 4); public static final Field ISENGINECHARTENABLED = Field.create("ISENGINECHARTENABLED", 1488, FieldType.BIT, 5); - public static final Field UNUSEDBIT_7 = Field.create("UNUSEDBIT_7", 1488, FieldType.BIT, 6); + public static final Field SILENTTRIGGERERROR = Field.create("SILENTTRIGGERERROR", 1488, FieldType.BIT, 6); public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7); public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8); public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9);