From 805793948218c6e48fb4edf582277f545fb4bbe1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 6 Jul 2019 20:54:14 -0400 Subject: [PATCH] progress --- firmware/tunerstudio/rusefi.ini | 22 ++++++++++----------- firmware/tunerstudio/rusefi_frankenso.ini | 22 ++++++++++----------- firmware/tunerstudio/rusefi_microrusefi.ini | 22 ++++++++++----------- firmware/tunerstudio/rusefi_prometheus.ini | 22 ++++++++++----------- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index ce9adbe7a2..f1e29b4dea 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -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 Wed Jul 03 03:18:32 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jul 06 20:49:21 EDT 2019 pageSize = 20000 page = 1 @@ -1075,22 +1075,20 @@ page = 1 [LoggerDefinition] - ; valid logger types: composite, tooth, trigger, csv - loggerDef = tooth, "Tooth Logger", tooth - dataReadCommand = "L" - dataReadTimeout = 15000 ; time in ms - dataReadyCondition = { toothLogReady } - dataLength = 256 ; in bytes, including headers, footers and data + loggerDef = compositeLogger, "Primary Trigger Logger", tooth + startCommand = "l\x01" + stopCommand = "l\x02" + dataReadCommand = "L" + dataReadTimeout = 10000 ; time in ms + dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 4; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + ; uint16 that stores 1/100 second + recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - recordField = PA3, "Inj D", 3, 1, 1, "" - recordField = PA2, "Inj C", 2, 1, 1, "" - recordField = PA1, "Inj B", 1, 1, 1, "" - recordField = PA0, "Inj A", 0, 1, 1, "" [VeAnalyze] diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 29298ebad0..02dd7042d2 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -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 Wed Jul 03 03:18:38 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jul 06 20:49:25 EDT 2019 pageSize = 20000 page = 1 @@ -1075,22 +1075,20 @@ page = 1 [LoggerDefinition] - ; valid logger types: composite, tooth, trigger, csv - loggerDef = tooth, "Tooth Logger", tooth - dataReadCommand = "L" - dataReadTimeout = 15000 ; time in ms - dataReadyCondition = { toothLogReady } - dataLength = 256 ; in bytes, including headers, footers and data + loggerDef = compositeLogger, "Primary Trigger Logger", tooth + startCommand = "l\x01" + stopCommand = "l\x02" + dataReadCommand = "L" + dataReadTimeout = 10000 ; time in ms + dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 4; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + ; uint16 that stores 1/100 second + recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - recordField = PA3, "Inj D", 3, 1, 1, "" - recordField = PA2, "Inj C", 2, 1, 1, "" - recordField = PA1, "Inj B", 1, 1, 1, "" - recordField = PA0, "Inj A", 0, 1, 1, "" [VeAnalyze] diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index e86047736a..d123d96d86 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -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 Wed Jul 03 03:18:35 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jul 06 20:49:23 EDT 2019 pageSize = 20000 page = 1 @@ -1075,22 +1075,20 @@ page = 1 [LoggerDefinition] - ; valid logger types: composite, tooth, trigger, csv - loggerDef = tooth, "Tooth Logger", tooth - dataReadCommand = "L" - dataReadTimeout = 15000 ; time in ms - dataReadyCondition = { toothLogReady } - dataLength = 256 ; in bytes, including headers, footers and data + loggerDef = compositeLogger, "Primary Trigger Logger", tooth + startCommand = "l\x01" + stopCommand = "l\x02" + dataReadCommand = "L" + dataReadTimeout = 10000 ; time in ms + dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 4; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + ; uint16 that stores 1/100 second + recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - recordField = PA3, "Inj D", 3, 1, 1, "" - recordField = PA2, "Inj C", 2, 1, 1, "" - recordField = PA1, "Inj B", 1, 1, 1, "" - recordField = PA0, "Inj A", 0, 1, 1, "" [VeAnalyze] diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 2192e22f56..54701f043d 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -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 Wed Jul 03 03:18:40 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Jul 06 20:49:27 EDT 2019 pageSize = 20000 page = 1 @@ -1075,22 +1075,20 @@ page = 1 [LoggerDefinition] - ; valid logger types: composite, tooth, trigger, csv - loggerDef = tooth, "Tooth Logger", tooth - dataReadCommand = "L" - dataReadTimeout = 15000 ; time in ms - dataReadyCondition = { toothLogReady } - dataLength = 256 ; in bytes, including headers, footers and data + loggerDef = compositeLogger, "Primary Trigger Logger", tooth + startCommand = "l\x01" + stopCommand = "l\x02" + dataReadCommand = "L" + dataReadTimeout = 10000 ; time in ms + dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 4; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + ; uint16 that stores 1/100 second + recordField = toothTime, "tooth", 0, 16, 0.01, "ms" - recordField = PA3, "Inj D", 3, 1, 1, "" - recordField = PA2, "Inj C", 2, 1, 1, "" - recordField = PA1, "Inj B", 1, 1, 1, "" - recordField = PA0, "Inj A", 0, 1, 1, "" [VeAnalyze]