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-12-25 13:02:34 -05:00
parent 5439044dd8
commit 0c7e1d161d
10 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio.cpp
View File

@ -86,6 +86,8 @@
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
#define TS_OUTPUT_SIZE 356
EXTERN_ENGINE
;

7
firmware/console/binary/tunerstudio_configuration.h
View File

@ -15,10 +15,6 @@
#define PAGE_COUNT 1
//#define PAGE_1_SIZE 1152
#define TS_OUTPUT_SIZE 276
typedef struct {
uint16_t values[EGT_CHANNEL_COUNT];
} egt_values_s;
@ -135,7 +131,8 @@ typedef struct {
int engineMode; // 252
float debugFloatField6; // 256
float debugFloatField7; // 260
int unused3[3];
int firmwareVersion; // 264
int unused3[22];
} TunerStudioOutputChannels;
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */

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

@ -35,7 +35,7 @@ typedef enum {
// see 'blockingFactor' in rusefi.ini todo: move to rusefi_config.txt
// see BLOCKING_FACTOR in java console code
#define BLOCKING_FACTOR 320
#define BLOCKING_FACTOR 400
typedef struct {
BaseChannel * channel;
@ -44,7 +44,7 @@ typedef struct {
* we use 'blockingFactor = 320' in rusefi.ini
* todo: should we just do (320 + CRC_WRAPPING_SIZE) ?
*/
char crcReadBuffer[350];
char crcReadBuffer[BLOCKING_FACTOR + 10];
} ts_channel_s;
#define TS_HELLO_COMMAND_DEPRECATED 'H' // 0x48

3
firmware/console/status_loop.cpp
View File

@ -247,6 +247,8 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "f: wall amt", "v", ENGINE(wallFuel).getWallFuel(0), 2);
reportSensorF(log, fileFormat, "f: wall crr", "v", ENGINE(wallFuelCorrection), 2);
reportSensorI(log, fileFormat, "version", "#", getRusEfiVersion());
}
@ -690,6 +692,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
efitimesec_t now = getTimeNowSeconds();
tsOutputChannels->timeSeconds = now;
tsOutputChannels->firmwareVersion = getRusEfiVersion();
tsOutputChannels->isWarnNow = isWarningNow(now, true);

2
firmware/controllers/algo/rusefi_generated.h
View File

@ -1,6 +1,6 @@
#define LE_COMMAND_LENGTH 200
#define FSIO_ADC_COUNT 4
#define TS_FILE_VERSION 20160702
#define TS_FILE_VERSION 20161225
#define WARMUP_TARGET_AFR_SIZE 4
#define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8

2
firmware/integration/rusefi_config.txt
View File

@ -34,7 +34,7 @@ struct_no_prefix engine_configuration_s
!
! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
! so not forget to change fileVersion in rusefi.ini
#define TS_FILE_VERSION 20160702
#define TS_FILE_VERSION 20161225
#define WARMUP_TARGET_AFR_SIZE 4

14
firmware/tunerstudio/rusefi.ini
View File

@ -33,7 +33,7 @@ enable2ndByteCanID = false
interWriteDelay = 10
blockReadTimeout = 3000; Milliseconds general timeout
blockingFactor = 320 ; max chunk size
blockingFactor = 400 ; max chunk size
;end communication settings
; name = bits, type, offset, bits
@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:37:45 EST 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 12:28:24 EST 2016
pageSize = 16376
page = 1
@ -801,12 +801,12 @@ page = 1
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20160702 }
fileVersion = { 20161225 }
ochGetCommand = "O"
; see OUTPUT_CHANNELS_SIZE in console source code
ochBlockSize = 276
; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356
rpm = scalar, U32, 0, "RPM", 1, 0.00000
#if CELSIUS
@ -863,7 +863,7 @@ fileVersion = { 20160702 }
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false";
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false";
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version", 1, 0
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "°C", 1, 0
egt2 = scalar, S16, 90, "°C", 1, 0
egt3 = scalar, S16, 92, "°C", 1, 0
@ -907,6 +907,7 @@ fileVersion = { 20160702 }
engineMode = scalar, U32, 252, "em", 1, 0.0;
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0;
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0;
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
egoCorrection = { 100 }
time = { timeNow }
@ -1254,6 +1255,7 @@ fileVersion = { 20160702 }
; Channel Label Type Format
entry = time, "Time", float, "%.3f"
entry = rpm, "RPM", int, "%d"
entry = firmwareVersion, "version", int, "%d"
entry = coolant, "CLT", float, "%.2f"
entry = intake, "IAT", float, "%.2f"
entry = TPS, "TPS", float, "%.2f"

12
firmware/tunerstudio/rusefi.input
View File

@ -33,7 +33,7 @@ enable2ndByteCanID = false
interWriteDelay = 10
blockReadTimeout = 3000; Milliseconds general timeout
blockingFactor = 320 ; max chunk size
blockingFactor = 400 ; max chunk size
;end communication settings
; name = bits, type, offset, bits
@ -745,12 +745,12 @@ page = 1
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20160702 }
fileVersion = { 20161225 }
ochGetCommand = "O"
; see OUTPUT_CHANNELS_SIZE in console source code
ochBlockSize = 276
; see TS_OUTPUT_SIZE in console source code
ochBlockSize = 356
rpm = scalar, U32, 0, "RPM", 1, 0.00000
#if CELSIUS
@ -807,7 +807,7 @@ fileVersion = { 20160702 }
ind_isTriggerError = bits, U32, 80, [5:5], "true", "false";
ind_hasFatalError=bits, U32, 80, [6:6], "true", "false";
ind_isWarnNow =bits, U32, 80, [7:7], "true", "false";
firmwareTsVersion = scalar,U32, 84, "version", 1, 0
firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0
egt1 = scalar, S16, 88, "°C", 1, 0
egt2 = scalar, S16, 90, "°C", 1, 0
egt3 = scalar, S16, 92, "°C", 1, 0
@ -851,6 +851,7 @@ fileVersion = { 20160702 }
engineMode = scalar, U32, 252, "em", 1, 0.0;
debugFloatField6 = scalar, F32, 256, "val", 1, 0.0;
debugFloatField7 = scalar, F32, 260, "val", 1, 0.0;
firmwareVersion = scalar,U32, 264, "version_f", 1, 0
egoCorrection = { 100 }
time = { timeNow }
@ -1198,6 +1199,7 @@ fileVersion = { 20160702 }
; Channel Label Type Format
entry = time, "Time", float, "%.3f"
entry = rpm, "RPM", int, "%d"
entry = firmwareVersion, "version", int, "%d"
entry = coolant, "CLT", float, "%.2f"
entry = intake, "IAT", float, "%.2f"
entry = TPS, "TPS", float, "%.2f"

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

@ -32,7 +32,7 @@ public class BinaryProtocol {
public static final int OUTPUT_CHANNELS_SIZE = 276;
// see BLOCKING_FACTOR in firmware code
private static final int BLOCKING_FACTOR = 320;
private static final int BLOCKING_FACTOR = 400;
private static final byte RESPONSE_OK = 0;
private static final byte RESPONSE_BURN_OK = 0x04;
private static final byte RESPONSE_COMMAND_OK = 0x07;

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

@ -1,10 +1,10 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:37:45 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 12:28:24 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
public static final int TS_FILE_VERSION = 20160702;
public static final int TS_FILE_VERSION = 20161225;
public static final int WARMUP_TARGET_AFR_SIZE = 4;
public static final int MAP_ANGLE_SIZE = 8;
public static final int MAP_WINDOW_SIZE = 8;