From 0f5e1505a0b57d48f38ef5118ec481072ca211dc Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 12 Apr 2020 23:59:24 -0400 Subject: [PATCH] i think we better be explicit about buffer size? --- firmware/integration/rusefi_config.txt | 2 ++ firmware/tunerstudio/rusefi.input | 2 ++ .../models/src/com/rusefi/config/generated/Fields.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5810254716..90671c2841 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -76,7 +76,9 @@ struct_no_prefix engine_configuration_s #define TRIGGER_TYPE_60_2 8 #define TRIGGER_TYPE_36_1 9 +#define COMPOSITE_PACKET_COUNT 1000 #define COMPOSITE_PACKET_SIZE 2 +#define COMPOSITE_DATA_LENGTH @@COMPOSITE_PACKET_SIZE@@*@@COMPOSITE_PACKET_COUNT@@ #define MAP_ANGLE_SIZE 8 #define MAP_WINDOW_SIZE 8 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 1cb3cf2e05..f512f95ad1 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -115,6 +115,8 @@ enable2ndByteCanID = false dataReadCommand = "L" dataReadTimeout = 10000 ; time in ms dataReadyCondition = { toothLogReady } + ; each packet is @@COMPOSITE_PACKET_SIZE@@ and we have @@COMPOSITE_PACKET_COUNT@@ of those + dataLength = @@COMPOSITE_DATA_LENGTH@@ ; recordDef = headerLen, footerLen, recordLen recordDef = 0, 0, @@COMPOSITE_PACKET_SIZE@@ 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 668d33c9eb..22a837d384 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 Sun Apr 12 19:03:41 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 23:47:17 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -285,6 +285,8 @@ public class Fields { public static final int coastingFuelCutTps_offset = 3152; public static final int communicationLedPin_offset = 1812; public static final int communicationLedPin_offset_hex = 714; + public static final int COMPOSITE_DATA_LENGTH = 2000; + public static final int COMPOSITE_PACKET_COUNT = 1000; public static final int COMPOSITE_PACKET_SIZE = 2; public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; public static final int consoleLoopPeriodMs_offset = 716;