diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index d7c3571cd7..193b064339 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -310,6 +310,7 @@ #define ENGINE_MAKE_MERCEDES "Mercedes" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_SNIFFER_UNIT_US 10 #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2a721d7258..90ad59b9eb 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -310,6 +310,7 @@ #define ENGINE_MAKE_MERCEDES "Mercedes" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_SNIFFER_UNIT_US 10 #define engineChartSize_offset 1480 #define engineCode_offset 1128 #define engineConfiguration_offset 0 diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp index 0abebaf0fc..e78eae1b5b 100644 --- a/firmware/development/engine_sniffer.cpp +++ b/firmware/development/engine_sniffer.cpp @@ -209,7 +209,7 @@ void WaveChart::addEvent3(const char *name, const char * msg) { * at least that's 32 bit division now */ uint32_t diffNt = nowNt - startTimeNt; - uint32_t time100 = NT2US(diffNt / 10); + uint32_t time100 = NT2US(diffNt / ENGINE_SNIFFER_UNIT_US); if (remainingSize(&logging) > 35) { /** diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ba9c6d8b0f..2886c78f43 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1580,7 +1580,8 @@ end_struct #define TS_GET_STRUCT '9' #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8' - +// Engine Sniffer time stamp unit, in microseconds +#define ENGINE_SNIFFER_UNIT_US 10 // High speed logger commands #define TS_SET_LOGGER_SWITCH 'l' 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 8b04e334c5..a58a2e0dd8 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 gen_config.bat integration\rusefi_config.txt Mon May 25 23:12:49 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Tue May 26 01:03:51 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -306,6 +306,7 @@ public class Fields { public static final String ENGINE_MAKE_MERCEDES = "Mercedes"; public static final String ENGINE_MAKE_TOYOTA = "Toyota"; public static final int ENGINE_NOISE_CURVE_SIZE = 8; + public static final int ENGINE_SNIFFER_UNIT_US = 10; public static final int engineChartSize_offset = 1480; public static final int engineCode_offset = 1128; public static final int engineConfiguration_offset = 0; diff --git a/java_console/models/src/com/rusefi/waves/EngineReport.java b/java_console/models/src/com/rusefi/waves/EngineReport.java index 2c875e50c7..f9b27f9d7b 100644 --- a/java_console/models/src/com/rusefi/waves/EngineReport.java +++ b/java_console/models/src/com/rusefi/waves/EngineReport.java @@ -25,7 +25,7 @@ public class EngineReport implements TimeAxisTranslator { /** * number of ChibiOS systicks per ms */ - public static final double SYS_TICKS_PER_MS = 100; + public static final double SYS_TICKS_PER_MS = 1000 / Fields.ENGINE_SNIFFER_UNIT_US; public static final double RATIO = 0.05; public static final int mult = (int) (100 * SYS_TICKS_PER_MS); // 100ms