diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h index 2709689940..67010f655e 100644 --- a/firmware/console/binary/tunerstudio_io.h +++ b/firmware/console/binary/tunerstudio_io.h @@ -33,14 +33,18 @@ typedef enum { TS_CRC = 1 } ts_response_format_e; +// see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt +// see BLOCKING_FACTOR in java console code +#define BLOCKING_FACTOR 320 + typedef struct { BaseChannel * channel; uint8_t writeBuffer[4]; /** - * we use 'blockingFactor = 256' in rusefi.ini - * todo: should we just do (256 + CRC_WRAPPING_SIZE) ? + * we use 'blockingFactor = 320' in rusefi.ini + * todo: should we just do (320 + CRC_WRAPPING_SIZE) ? */ - char crcReadBuffer[300]; + char crcReadBuffer[350]; } ts_channel_s; #define TS_HELLO_COMMAND_DEPRECATED 'H' diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 53fc74ceb5..6be3d74d26 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -32,7 +32,7 @@ enable2ndByteCanID = false interWriteDelay = 10 blockReadTimeout = 3000; Milliseconds general timeout - blockingFactor = 256 ; max chunk size + blockingFactor = 320 ; max chunk size ;end communication settings ; name = bits, type, offset, bits @@ -650,7 +650,7 @@ fileVersion = { 20151201 } sparkDwell = scalar, F32, 60, "MAP", 1, 0.0; ; actual total Ms time per engine cycle with all corrections pulseWidth = scalar, F32, 64, "ms", 1, 0.0; - warmUpEnrich = scalar, F32, 68, "%", 1, 0.0; + debugFloatField = scalar, F32, 68, "val", 1, 0.0; hasSdCard = bits, U32, 72, [0:0], "true", "false"; isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; @@ -698,10 +698,12 @@ fileVersion = { 20151201 } ; fuelLevel 148 knockLevel = scalar, F32, 152, "Volts", 1, 0 ; totalTriggerErrorCounter 156 - wallFuelAmount = scalar, F32, 160, "ms", 1, 0 - iatCorrection = scalar, F32, 164, "%", 1, 0 - wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 - curIdlePosition = scalar, F32, 172, "percent", 1, 0 + wallFuelAmount = scalar, F32, 160, "ms", 1, 0 + iatCorrection = scalar, F32, 164, "%", 1, 0 + wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 + curIdlePosition = scalar, F32, 172, "percent", 1, 0 + debugIntField = scalar, U32, 192, "val", 1, 0.0; + egoCorrection = { 100 } time = { timeNow } ; engineLoad = { algorithm == 0 ? MAF : TPS } @@ -923,7 +925,7 @@ fileVersion = { 20151201 } triggerErrorsCounterGauge = triggerErrorsCounter, "trg err", "count", 0, 15000, 0, 0, 6000, 6000, 0, 0 pulseWidthGauge = pulseWidth, "fuel final squirt, per injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 - baseFuelGauge = baseFuel, "fuel: base duration, before corr", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 + baseFuelGauge = baseFuel, "fuel: base duration, before corr", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 crankingFuelGauge = crankingFuel, "fuel: crank Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 iatCorrectionGauge = iatCorrection, "fuel: IAT corr", "mult", 0, 10, 0, 0, 10, 10, 0, 0 injectorDutyCycleGauge=injectorDutyCycle, "fuel: injectorDutyCycle","%", 0, 120, 10, 10, 100, 100, 1, 1 @@ -934,6 +936,9 @@ fileVersion = { 20151201 } wallFuelCorrectionGauge = wallFuelCorrection, "fuel: wall correction extra", "ms", 0, 100, 0, 0, 100, 100, 0, 0 curIdlePositionGauge = curIdlePosition, "idle position", "%", 0, 100, 0, 0, 100, 100, 0, 0 + + debugFloatFieldGauge = debugFloatField, "debug f", "%", 0, 100, 0, 0, 100, 100, 0, 0 + debugIntFieldGauge = debugIntField, "debug i", "%", 0, 100, 0, 0, 100, 100, 0, 0 [FrontPage] ; Gauges are numbered left to right, top to bottom. @@ -1011,8 +1016,10 @@ fileVersion = { 20151201 } entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f" entry = wallFuelAmount, "fuel: wall amout", float, "%.3f" - entry = baroCorrection "baroCorrection",float,"%.3f" + entry = baroCorrection, "baroCorrection",float,"%.3f" + entry = debugFloatField, "debug f",float,"%.3f" + entry = debugIntField, "debug i",int,"%d" ; tpsADC = U16, "ADC", diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index adecba9255..9dd7f92320 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -36,7 +36,8 @@ public class BinaryProtocol { // todo: is this auto-synched with rusefi.ini? public static final int OUTPUT_CHANNELS_SIZE = 276; - private static final int BLOCKING_FACTOR = 256; + // see BLOCKING_FACTOR in firmware code + private static final int BLOCKING_FACTOR = 320; private static final byte RESPONSE_OK = 0; private static final byte RESPONSE_BURN_OK = 0x04; private static final byte RESPONSE_COMMAND_OK = 0x07;