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

auto-sync

This commit is contained in:
rusEfi 2016-01-22 20:01:46 -05:00
parent fc5bd69248
commit bbdb5469d3
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/console/binary/tunerstudio_io.h
View File

@ -33,14 +33,18 @@ typedef enum {
TS_CRC = 1 TS_CRC = 1
} ts_response_format_e; } 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 { typedef struct {
BaseChannel * channel; BaseChannel * channel;
uint8_t writeBuffer[4]; uint8_t writeBuffer[4];
/** /**
* we use 'blockingFactor = 256' in rusefi.ini * we use 'blockingFactor = 320' in rusefi.ini
* todo: should we just do (256 + CRC_WRAPPING_SIZE) ? * todo: should we just do (320 + CRC_WRAPPING_SIZE) ?
*/ */
char crcReadBuffer[300]; char crcReadBuffer[350];
} ts_channel_s; } ts_channel_s;
#define TS_HELLO_COMMAND_DEPRECATED 'H' #define TS_HELLO_COMMAND_DEPRECATED 'H'

13
firmware/tunerstudio/rusefi.ini
View File

@ -32,7 +32,7 @@ enable2ndByteCanID = false
interWriteDelay = 10 interWriteDelay = 10
blockReadTimeout = 3000; Milliseconds general timeout blockReadTimeout = 3000; Milliseconds general timeout
blockingFactor = 256 ; max chunk size blockingFactor = 320 ; max chunk size
;end communication settings ;end communication settings
; name = bits, type, offset, bits ; name = bits, type, offset, bits
@ -650,7 +650,7 @@ fileVersion = { 20151201 }
sparkDwell = scalar, F32, 60, "MAP", 1, 0.0; sparkDwell = scalar, F32, 60, "MAP", 1, 0.0;
; actual total Ms time per engine cycle with all corrections ; actual total Ms time per engine cycle with all corrections
pulseWidth = scalar, F32, 64, "ms", 1, 0.0; 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"; hasSdCard = bits, U32, 72, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false"; isIgnitionEnabledIndicator=bits, U32, 72, [1:1], "true", "false";
@ -702,6 +702,8 @@ fileVersion = { 20151201 }
iatCorrection = scalar, F32, 164, "%", 1, 0 iatCorrection = scalar, F32, 164, "%", 1, 0
wallFuelCorrection = scalar, F32, 168, "ms", 1, 0 wallFuelCorrection = scalar, F32, 168, "ms", 1, 0
curIdlePosition = scalar, F32, 172, "percent", 1, 0 curIdlePosition = scalar, F32, 172, "percent", 1, 0
debugIntField = scalar, U32, 192, "val", 1, 0.0;
egoCorrection = { 100 } egoCorrection = { 100 }
time = { timeNow } time = { timeNow }
; engineLoad = { algorithm == 0 ? MAF : TPS } ; engineLoad = { algorithm == 0 ? MAF : TPS }
@ -935,6 +937,9 @@ fileVersion = { 20151201 }
curIdlePositionGauge = curIdlePosition, "idle position", "%", 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] [FrontPage]
; Gauges are numbered left to right, top to bottom. ; Gauges are numbered left to right, top to bottom.
; ;
@ -1011,8 +1016,10 @@ fileVersion = { 20151201 }
entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f" entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f"
entry = wallFuelAmount, "fuel: wall amout", 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", ; tpsADC = U16, "ADC",

3
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -36,7 +36,8 @@ public class BinaryProtocol {
// todo: is this auto-synched with rusefi.ini? // todo: is this auto-synched with rusefi.ini?
public static final int OUTPUT_CHANNELS_SIZE = 276; 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_OK = 0;
private static final byte RESPONSE_BURN_OK = 0x04; private static final byte RESPONSE_BURN_OK = 0x04;
private static final byte RESPONSE_COMMAND_OK = 0x07; private static final byte RESPONSE_COMMAND_OK = 0x07;