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

connecting time units

This commit is contained in:
rusefi 2020-05-26 01:08:21 -04:00
parent 98aa135d1e
commit 50e01b4041
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -310,6 +310,7 @@
#define ENGINE_MAKE_MERCEDES "Mercedes" #define ENGINE_MAKE_MERCEDES "Mercedes"
#define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_TOYOTA "Toyota"
#define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_NOISE_CURVE_SIZE 8
#define ENGINE_SNIFFER_UNIT_US 10
#define engineChartSize_offset 1480 #define engineChartSize_offset 1480
#define engineCode_offset 1128 #define engineCode_offset 1128
#define engineConfiguration_offset 0 #define engineConfiguration_offset 0

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

@ -310,6 +310,7 @@
#define ENGINE_MAKE_MERCEDES "Mercedes" #define ENGINE_MAKE_MERCEDES "Mercedes"
#define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_TOYOTA "Toyota"
#define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_NOISE_CURVE_SIZE 8
#define ENGINE_SNIFFER_UNIT_US 10
#define engineChartSize_offset 1480 #define engineChartSize_offset 1480
#define engineCode_offset 1128 #define engineCode_offset 1128
#define engineConfiguration_offset 0 #define engineConfiguration_offset 0

2
firmware/development/engine_sniffer.cpp
View File

@ -209,7 +209,7 @@ void WaveChart::addEvent3(const char *name, const char * msg) {
* at least that's 32 bit division now * at least that's 32 bit division now
*/ */
uint32_t diffNt = nowNt - startTimeNt; uint32_t diffNt = nowNt - startTimeNt;
uint32_t time100 = NT2US(diffNt / 10); uint32_t time100 = NT2US(diffNt / ENGINE_SNIFFER_UNIT_US);
if (remainingSize(&logging) > 35) { if (remainingSize(&logging) > 35) {
/** /**

3
firmware/integration/rusefi_config.txt
View File

@ -1580,7 +1580,8 @@ end_struct
#define TS_GET_STRUCT '9' #define TS_GET_STRUCT '9'
#define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8' #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 // High speed logger commands
#define TS_SET_LOGGER_SWITCH 'l' #define TS_SET_LOGGER_SWITCH 'l'

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

@ -1,6 +1,6 @@
package com.rusefi.config.generated; 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 // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; 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_MERCEDES = "Mercedes";
public static final String ENGINE_MAKE_TOYOTA = "Toyota"; public static final String ENGINE_MAKE_TOYOTA = "Toyota";
public static final int ENGINE_NOISE_CURVE_SIZE = 8; 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 engineChartSize_offset = 1480;
public static final int engineCode_offset = 1128; public static final int engineCode_offset = 1128;
public static final int engineConfiguration_offset = 0; public static final int engineConfiguration_offset = 0;

2
java_console/models/src/com/rusefi/waves/EngineReport.java
View File

@ -25,7 +25,7 @@ public class EngineReport implements TimeAxisTranslator {
/** /**
* number of ChibiOS systicks per ms * 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 double RATIO = 0.05;
public static final int mult = (int) (100 * SYS_TICKS_PER_MS); // 100ms public static final int mult = (int) (100 * SYS_TICKS_PER_MS); // 100ms