diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index 588bc59322..3f7ac57982 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 20:42:31 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 20:42:31 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 02cc400ceb..199aec4bd3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1058,7 +1058,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 428657885 +#define SIGNATURE_HASH 2527596749 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1290,7 +1290,7 @@ #define TS_HELLO_COMMAND 'S' #define TS_IO_TEST_COMMAND 'w' #define TS_OUTPUT_COMMAND 'O' -#define TS_OUTPUT_SIZE 244 +#define TS_OUTPUT_SIZE 248 #define TS_PAGE_COMMAND 'P' #define TS_PERF_TRACE_BEGIN 'r' #define TS_PERF_TRACE_GET_BUFFER 'b' @@ -1318,7 +1318,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.04.kin.428657885" +#define TS_SIGNATURE "rusEFI 2020.07.04.kin.2527596749" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 53c0972d66..55dc45c269 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -3522,4 +3522,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index bdc3f27201..ff747de71c 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 59ae1945aa..0d523048dc 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index d03228238d..4ba82f9876 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 5930498df2..431cf21684 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6e5021cd52..74b6900dd0 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1058,7 +1058,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 3568439367 +#define SIGNATURE_HASH 1536609367 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1290,7 +1290,7 @@ #define TS_HELLO_COMMAND 'S' #define TS_IO_TEST_COMMAND 'w' #define TS_OUTPUT_COMMAND 'O' -#define TS_OUTPUT_SIZE 244 +#define TS_OUTPUT_SIZE 248 #define TS_PAGE_COMMAND 'P' #define TS_PERF_TRACE_BEGIN 'r' #define TS_PERF_TRACE_GET_BUFFER 'b' @@ -1318,7 +1318,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.07.04.all.3568439367" +#define TS_SIGNATURE "rusEFI 2020.07.04.all.1536609367" #define TS_SINGLE_WRITE_COMMAND 'W' #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 925a358556..78546eb602 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 3568439367 -#define TS_SIGNATURE "rusEFI 2020.07.04.all.3568439367" +#define SIGNATURE_HASH 1536609367 +#define TS_SIGNATURE "rusEFI 2020.07.04.all.1536609367" diff --git a/firmware/controllers/generated/signature_fra.h b/firmware/controllers/generated/signature_fra.h index 3acd13f024..aa7eb9f05e 100644 --- a/firmware/controllers/generated/signature_fra.h +++ b/firmware/controllers/generated/signature_fra.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD fra #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 171277476 -#define TS_SIGNATURE "rusEFI 2020.07.04.fra.171277476" +#define SIGNATURE_HASH 2232524980 +#define TS_SIGNATURE "rusEFI 2020.07.04.fra.2232524980" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 842eac4d32..fab0459fd5 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 428657885 -#define TS_SIGNATURE "rusEFI 2020.07.04.kin.428657885" +#define SIGNATURE_HASH 2527596749 +#define TS_SIGNATURE "rusEFI 2020.07.04.kin.2527596749" diff --git a/firmware/controllers/generated/signature_mre.h b/firmware/controllers/generated/signature_mre.h index f6ca36974c..f37544b346 100644 --- a/firmware/controllers/generated/signature_mre.h +++ b/firmware/controllers/generated/signature_mre.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 2639054537 -#define TS_SIGNATURE "rusEFI 2020.07.04.mre.2639054537" +#define SIGNATURE_HASH 308812505 +#define TS_SIGNATURE "rusEFI 2020.07.04.mre.308812505" diff --git a/firmware/controllers/generated/signature_pro.h b/firmware/controllers/generated/signature_pro.h index 89d22b3a09..e007faca3b 100644 --- a/firmware/controllers/generated/signature_pro.h +++ b/firmware/controllers/generated/signature_pro.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pro #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 1495490952 -#define TS_SIGNATURE "rusEFI 2020.07.04.pro.1495490952" +#define SIGNATURE_HASH 3590831512 +#define TS_SIGNATURE "rusEFI 2020.07.04.pro.3590831512" diff --git a/firmware/controllers/generated/signature_pth.h b/firmware/controllers/generated/signature_pth.h index 06a551cc85..b53b631586 100644 --- a/firmware/controllers/generated/signature_pth.h +++ b/firmware/controllers/generated/signature_pth.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD pth #define SIGNATURE_DATE 2020.07.04 -#define SIGNATURE_HASH 565102787 -#define TS_SIGNATURE "rusEFI 2020.07.04.pth.565102787" +#define SIGNATURE_HASH 2928284883 +#define TS_SIGNATURE "rusEFI 2020.07.04.pth.2928284883" diff --git a/firmware/tunerstudio/cache.zip b/firmware/tunerstudio/cache.zip index 2e309c524f..45fc33ddfb 100644 Binary files a/firmware/tunerstudio/cache.zip and b/firmware/tunerstudio/cache.zip differ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index dca6e08728..898125c267 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.all.3568439367" + signature = "rusEFI 2020.07.04.all.1536609367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.all.3568439367" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.all.1536609367" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 685ca97851..71b648215c 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.fra.171277476" + signature = "rusEFI 2020.07.04.fra.2232524980" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.fra.171277476" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.fra.2232524980" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:28 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 0158f104fb..c39f11cee0 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.kin.428657885" + signature = "rusEFI 2020.07.04.kin.2527596749" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.kin.428657885" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.kin.2527596749" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 03:06:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jul 04 20:42:31 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 400c0715a1..34efe2e56a 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.mre.2639054537" + signature = "rusEFI 2020.07.04.mre.308812505" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.mre.2639054537" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.mre.308812505" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 gen_config.sh integration/rusefi_config.txt Sat Jul 04 04:32:29 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:26 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 51a89ac1fa..a3bd6fca4e 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.pth.565102787" + signature = "rusEFI 2020.07.04.pth.2928284883" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.pth.565102787" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.pth.2928284883" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:29 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 0370780a99..b9e9fcd62d 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -45,12 +45,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.07.04.pro.1495490952" + signature = "rusEFI 2020.07.04.pro.3590831512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.04.pro.1495490952" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.04.pro.3590831512" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -88,7 +88,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 gen_config.sh integration/rusefi_config.txt Sat Jul 04 03:06:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:30 UTC 2020 pageSize = 20000 page = 1 @@ -1454,7 +1454,7 @@ page = 1 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 244 + ochBlockSize = 248 ; ; see TunerStudioOutputChannels struct @@ -1585,60 +1585,63 @@ page = 1 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 + fuelingLoad = scalar, U16, 134, "%", 0.01, 0 + ignitionLoad = scalar, U16, 136, "%", 0.01, 0 + + engineMakeCodeNameCrc16= scalar, U16, 138, "crc16", 1, 0 ; Errors - totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 - ; orderingErrorCounter 140 - warningCounter = scalar, U16, 144, "count", 1, 0 - lastErrorCode = scalar, U16, 146, "error", 1, 0 - recentErrorCode0= scalar, U16, 148, "error", 1, 0 - recentErrorCode1= scalar, U16, 150, "error", 1, 0 - recentErrorCode2= scalar, U16, 152, "error", 1, 0 - recentErrorCode3= scalar, U16, 154, "error", 1, 0 - recentErrorCode4= scalar, U16, 156, "error", 1, 0 - recentErrorCode5= scalar, U16, 158, "error", 1, 0 - recentErrorCode6= scalar, U16, 160, "error", 1, 0 - recentErrorCode7= scalar, U16, 162, "error", 1, 0 + totalTriggerErrorCounter=scalar,U32, 140,"counter", 1, 0 + ; orderingErrorCounter 144 + warningCounter = scalar, U16, 148, "count", 1, 0 + lastErrorCode = scalar, U16, 150, "error", 1, 0 + recentErrorCode0= scalar, U16, 152, "error", 1, 0 + recentErrorCode1= scalar, U16, 154, "error", 1, 0 + recentErrorCode2= scalar, U16, 156, "error", 1, 0 + recentErrorCode3= scalar, U16, 158, "error", 1, 0 + recentErrorCode4= scalar, U16, 160, "error", 1, 0 + recentErrorCode5= scalar, U16, 162, "error", 1, 0 + recentErrorCode6= scalar, U16, 164, "error", 1, 0 + recentErrorCode7= scalar, U16, 166, "error", 1, 0 ; Debug - debugFloatField1= scalar, F32, 164, "val", 1, 0.0 - debugFloatField2= scalar, F32, 168, "val", 1, 0.0 - debugFloatField3= scalar, F32, 172, "val", 1, 0.0 - debugFloatField4= scalar, F32, 176, "val", 1, 0.0 - debugFloatField5= scalar, F32, 180, "val", 1, 0.0 - debugFloatField6= scalar, F32, 184, "val", 1, 0.0 - debugFloatField7= scalar, F32, 188, "val", 1, 0.0 - debugIntField1 = scalar, S32, 192, "val", 1, 0.0 - debugIntField2 = scalar, S32, 196, "val", 1, 0.0 - debugIntField3 = scalar, S32, 200, "val", 1, 0.0 - debugIntField4 = scalar, S16, 204, "val", 1, 0.0 - debugIntField5 = scalar, S16, 206, "val", 1, 0.0 + debugFloatField1= scalar, F32, 168, "val", 1, 0.0 + debugFloatField2= scalar, F32, 172, "val", 1, 0.0 + debugFloatField3= scalar, F32, 176, "val", 1, 0.0 + debugFloatField4= scalar, F32, 180, "val", 1, 0.0 + debugFloatField5= scalar, F32, 184, "val", 1, 0.0 + debugFloatField6= scalar, F32, 188, "val", 1, 0.0 + debugFloatField7= scalar, F32, 192, "val", 1, 0.0 + debugIntField1 = scalar, S32, 196, "val", 1, 0.0 + debugIntField2 = scalar, S32, 200, "val", 1, 0.0 + debugIntField3 = scalar, S32, 204, "val", 1, 0.0 + debugIntField4 = scalar, S16, 208, "val", 1, 0.0 + debugIntField5 = scalar, S16, 210, "val", 1, 0.0 ; Accel - accelerationX = scalar, S16, 208, "G", 0.01, 0 - accelerationY = scalar, S16, 210, "G", 0.01, 0 + accelerationX = scalar, S16, 212, "G", 0.01, 0 + accelerationY = scalar, S16, 214, "G", 0.01, 0 ; egt - egt1 = scalar, S16, 212, "deg C", 1, 0 - egt2 = scalar, S16, 214, "deg C", 1, 0 - egt3 = scalar, S16, 216, "deg C", 1, 0 - egt4 = scalar, S16, 218, "deg C", 1, 0 - egt5 = scalar, S16, 220, "deg C", 1, 0 - egt6 = scalar, S16, 222, "deg C", 1, 0 - egt7 = scalar, S16, 224, "deg C", 1, 0 - egt8 = scalar, S16, 226, "deg C", 1, 0 + egt1 = scalar, S16, 216, "deg C", 1, 0 + egt2 = scalar, S16, 218, "deg C", 1, 0 + egt3 = scalar, S16, 220, "deg C", 1, 0 + egt4 = scalar, S16, 222, "deg C", 1, 0 + egt5 = scalar, S16, 224, "deg C", 1, 0 + egt6 = scalar, S16, 226, "deg C", 1, 0 + egt7 = scalar, S16, 228, "deg C", 1, 0 + egt8 = scalar, S16, 230, "deg C", 1, 0 - TPS2Value = scalar, S16, 228, "%",{1/100}, 0 + TPS2Value = scalar, S16, 232, "%",{1/100}, 0 - rawTps1Primary = scalar, U16, 230, "V",{1/1000}, 0.0 - rawPpsPrimary = scalar, U16, 232, "V",{1/1000}, 0.0 - rawClt = scalar, U16, 234, "V",{1/1000}, 0.0 - rawIat = scalar, U16, 236, "V",{1/1000}, 0.0 - rawOilPressure = scalar, U16, 238, "V",{1/1000}, 0.0 + rawTps1Primary = scalar, U16, 234, "V",{1/1000}, 0.0 + rawPpsPrimary = scalar, U16, 236, "V",{1/1000}, 0.0 + rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 + rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 + rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 ; we use this to match logs to tunes - tuneCrc16= scalar, U16, 240, "crc16", 1, 0 + tuneCrc16= scalar, U16, 244, "crc16", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 8d38737958..fa9c9ccaa1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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.sh integration/rusefi_config.txt Sat Jul 04 03:06:48 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jul 04 20:42:24 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1039,6 +1039,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1536609367; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1267,7 +1268,7 @@ public class Fields { public static final char TS_HELLO_COMMAND = 'S'; public static final char TS_IO_TEST_COMMAND = 'w'; public static final char TS_OUTPUT_COMMAND = 'O'; - public static final int TS_OUTPUT_SIZE = 244; + public static final int TS_OUTPUT_SIZE = 248; public static final char TS_PAGE_COMMAND = 'P'; public static final char TS_PERF_TRACE_BEGIN = 'r'; public static final char TS_PERF_TRACE_GET_BUFFER = 'b'; @@ -1277,7 +1278,7 @@ public class Fields { public static final int TS_RESPONSE_COMMAND_OK = 7; public static final int TS_RESPONSE_OK = 0; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.07.04.all.3568439367"; + public static final String TS_SIGNATURE = "rusEFI 2020.07.04.all.1536609367"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 85ef6b5564..b9626e8229 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +