diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index dd154269f5..579dfebb5e 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.02 -#define SIGNATURE_HASH 1686056769 -#define TS_SIGNATURE "rusEFI 2020.07.02.all.1686056769" +#define SIGNATURE_HASH 2574977903 +#define TS_SIGNATURE "rusEFI 2020.07.02.all.2574977903" diff --git a/firmware/controllers/generated/signature_fra.h b/firmware/controllers/generated/signature_fra.h index e13f624972..f08750c28f 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.02 -#define SIGNATURE_HASH 3136832418 -#define TS_SIGNATURE "rusEFI 2020.07.02.fra.3136832418" +#define SIGNATURE_HASH 1207723916 +#define TS_SIGNATURE "rusEFI 2020.07.02.fra.1207723916" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index df2763d4d7..05e58c3738 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.02 -#define SIGNATURE_HASH 2839671771 -#define TS_SIGNATURE "rusEFI 2020.07.02.kin.2839671771" +#define SIGNATURE_HASH 1413863413 +#define TS_SIGNATURE "rusEFI 2020.07.02.kin.1413863413" diff --git a/firmware/controllers/generated/signature_mre.h b/firmware/controllers/generated/signature_mre.h index 115a408394..c11f35c4ed 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.02 -#define SIGNATURE_HASH 3448479798 -#define TS_SIGNATURE "rusEFI 2020.07.02.mre.3448479798" +#define SIGNATURE_HASH 814711832 +#define TS_SIGNATURE "rusEFI 2020.07.02.mre.814711832" diff --git a/firmware/controllers/generated/signature_pro.h b/firmware/controllers/generated/signature_pro.h index 6a8b2eb76a..6b32c9bd55 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.02 -#define SIGNATURE_HASH 3924713102 -#define TS_SIGNATURE "rusEFI 2020.07.02.pro.3924713102" +#define SIGNATURE_HASH 350911136 +#define TS_SIGNATURE "rusEFI 2020.07.02.pro.350911136" diff --git a/firmware/controllers/generated/signature_pth.h b/firmware/controllers/generated/signature_pth.h index 0b7c8a4542..12b4b1dcd0 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.02 -#define SIGNATURE_HASH 2439247813 -#define TS_SIGNATURE "rusEFI 2020.07.02.pth.2439247813" +#define SIGNATURE_HASH 1818743787 +#define TS_SIGNATURE "rusEFI 2020.07.02.pth.1818743787" diff --git a/firmware/tunerstudio/cache.zip b/firmware/tunerstudio/cache.zip index b23f9e1b9b..c9c214de7b 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 c14e76c1d9..c2b08aa64c 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.02.all.1686056769" + signature = "rusEFI 2020.07.02.all.2574977903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.all.1686056769" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.all.2574977903" ; 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 Thu Jul 02 18:43:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 23:18:36 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 3800f7aaf9..bd7b2b8a9b 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.02.fra.3136832418" + signature = "rusEFI 2020.07.02.fra.1207723916" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.fra.3136832418" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.fra.1207723916" ; 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 Thu Jul 02 18:43:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 23:18:40 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index fa3f352f13..6c15879eed 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.02.kin.2839671771" + signature = "rusEFI 2020.07.02.kin.1413863413" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.kin.2839671771" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.kin.1413863413" ; 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 Thu Jul 02 18:43:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Jul 02 23:18:44 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index f2d5401336..4dbab6e0eb 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.02.mre.3448479798" + signature = "rusEFI 2020.07.02.mre.814711832" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.mre.3448479798" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.mre.814711832" ; 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 Thu Jul 02 18:43:54 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 23:18:38 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 969ba19853..c33f922293 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.02.pth.2439247813" + signature = "rusEFI 2020.07.02.pth.1818743787" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.pth.2439247813" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.pth.1818743787" ; 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 Thu Jul 02 18:43:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 23:18:41 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 7ebcf6dba0..f6cb3b38da 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.02.pro.3924713102" + signature = "rusEFI 2020.07.02.pro.350911136" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.07.02.pro.3924713102" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.07.02.pro.350911136" ; 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 Thu Jul 02 18:43:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Jul 02 23:18:42 UTC 2020 pageSize = 20000 page = 1 @@ -2453,43 +2453,18 @@ gaugeCategory = Sensors - Raw entry = injectionOffset, "injOffset" , float, "%.2F" ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" -; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS - entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: current integration term -; DBG_TPS_ACCEL: to TPS - entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: previous error -; DBG_TPS_ACCEL: tps<>tps table value - entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel - entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: D setting - entry = debugFloatField5, "debug f5: dParam",float,"%.4f", { !enableLogDebugChannels } - -; Alternator_PID: dTerm - entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - - entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } - - -; Alternator_PID: P setting - entry = debugIntField1, "debug i1: pParam",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: offset setting - entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter - entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } - - entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField4, {bitStringValue( debugFieldF4List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField5, {bitStringValue( debugFieldF5List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField6, {bitStringValue( debugFieldF6List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugFloatField7, {bitStringValue( debugFieldF7List, debugMode )},float,"%.4f", { !enableLogDebugChannels } + entry = debugIntField1, {bitStringValue( debugFieldI1List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField2, {bitStringValue( debugFieldI2List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField3, {bitStringValue( debugFieldI3List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField4, {bitStringValue( debugFieldI4List, debugMode )},int,"%d", { !enableLogDebugChannels } + entry = debugIntField5, {bitStringValue( debugFieldI5List, debugMode )},int,"%d", { !enableLogDebugChannels } entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d"