diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 646f1e0dc9..d50dae4652 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 587294122 -#define TS_SIGNATURE "rusEFI 2021.11.27.all.587294122" +#define SIGNATURE_HASH 3533288633 +#define TS_SIGNATURE "rusEFI 2021.11.27.all.3533288633" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ae1dce6e94..e842a68c3d 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1070305421 -#define TS_SIGNATURE "rusEFI 2021.11.27.atlas.1070305421" +#define SIGNATURE_HASH 3461562782 +#define TS_SIGNATURE "rusEFI 2021.11.27.atlas.3461562782" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index ed8d089375..b1a00b5c1e 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 587294122 -#define TS_SIGNATURE "rusEFI 2021.11.27.f429-discovery.587294122" +#define SIGNATURE_HASH 3533288633 +#define TS_SIGNATURE "rusEFI 2021.11.27.f429-discovery.3533288633" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index d65cfb56e3..d5b4e3c992 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1496526915 -#define TS_SIGNATURE "rusEFI 2021.11.27.frankenso_na6.1496526915" +#define SIGNATURE_HASH 2829836624 +#define TS_SIGNATURE "rusEFI 2021.11.27.frankenso_na6.2829836624" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 41fc150b34..35966fc0b5 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2261996835 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen-nb1.2261996835" +#define SIGNATURE_HASH 2001437744 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen-nb1.2001437744" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 6cfff38d78..7ba9b5791e 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2558854923 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen121nissan.2558854923" +#define SIGNATURE_HASH 1763563032 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen121nissan.1763563032" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 47a9c5e090..1dc502463c 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2091008416 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen121vag.2091008416" +#define SIGNATURE_HASH 2369425587 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen121vag.2369425587" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 15b0841487..f51ccd1248 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3116830221 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen128.3116830221" +#define SIGNATURE_HASH 1214242590 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen128.1214242590" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 0d66f7366a..f5e92ab143 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 30762764 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen154hyundai.30762764" +#define SIGNATURE_HASH 4031624735 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen154hyundai.4031624735" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 300a7b6e6c..0c50f05d2e 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3619480090 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen72.3619480090" +#define SIGNATURE_HASH 639906569 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen72.639906569" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b44588f90b..4ed00af856 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2193749237 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen88bmw.2193749237" +#define SIGNATURE_HASH 1935222246 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen88bmw.1935222246" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 331164fafd..9ffb7b3d1f 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1430004482 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellenNA6.1430004482" +#define SIGNATURE_HASH 2762273297 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellenNA6.2762273297" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 4f61bca34b..dc8c8adc81 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 435454486 -#define TS_SIGNATURE "rusEFI 2021.11.27.hellen_cypress.435454486" +#define SIGNATURE_HASH 3899413253 +#define TS_SIGNATURE "rusEFI 2021.11.27.hellen_cypress.3899413253" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 13bdbff20a..808ceb4482 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 3864088298 -#define TS_SIGNATURE "rusEFI 2021.11.27.kin.3864088298" +#define SIGNATURE_HASH 399089657 +#define TS_SIGNATURE "rusEFI 2021.11.27.kin.399089657" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 18f0e07a34..071af1c8d5 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2418417438 -#define TS_SIGNATURE "rusEFI 2021.11.27.mre_f4.2418417438" +#define SIGNATURE_HASH 1639894541 +#define TS_SIGNATURE "rusEFI 2021.11.27.mre_f4.1639894541" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2063cacb9a..5ad4e1a1c6 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2418417438 -#define TS_SIGNATURE "rusEFI 2021.11.27.mre_f7.2418417438" +#define SIGNATURE_HASH 1639894541 +#define TS_SIGNATURE "rusEFI 2021.11.27.mre_f7.1639894541" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index eabfc097a3..7833aa3cde 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1944829004 -#define TS_SIGNATURE "rusEFI 2021.11.27.prometheus_405.1944829004" +#define SIGNATURE_HASH 2188602719 +#define TS_SIGNATURE "rusEFI 2021.11.27.prometheus_405.2188602719" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index c63caf61e9..e9c1418622 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1944829004 -#define TS_SIGNATURE "rusEFI 2021.11.27.prometheus_469.1944829004" +#define SIGNATURE_HASH 2188602719 +#define TS_SIGNATURE "rusEFI 2021.11.27.prometheus_469.2188602719" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index a53934aabc..2289c1a9fa 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2289962539 -#define TS_SIGNATURE "rusEFI 2021.11.27.proteus_f4.2289962539" +#define SIGNATURE_HASH 2045173560 +#define TS_SIGNATURE "rusEFI 2021.11.27.proteus_f4.2045173560" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4f6a81cbe6..e60c3c3d50 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2289962539 -#define TS_SIGNATURE "rusEFI 2021.11.27.proteus_f7.2289962539" +#define SIGNATURE_HASH 2045173560 +#define TS_SIGNATURE "rusEFI 2021.11.27.proteus_f7.2045173560" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index fd3a028ce3..5eefaef9bf 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3770381306 -#define TS_SIGNATURE "rusEFI 2021.11.27.subaru_eg33_f7.3770381306" +#define SIGNATURE_HASH 287548137 +#define TS_SIGNATURE "rusEFI 2021.11.27.subaru_eg33_f7.287548137" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index ecbc56a308..6e2c284b26 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 74982a6137..af994ccc9d 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.all.587294122" + signature = "rusEFI 2021.11.27.all.3533288633" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.all.587294122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.all.3533288633" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:12 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:45 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index f5abf1e2e9..55d8bbf8ab 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.atlas.1070305421" + signature = "rusEFI 2021.11.27.atlas.3461562782" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.atlas.1070305421" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.atlas.3461562782" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:42 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 43f65c25be..07f8fda23a 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.f429-discovery.587294122" + signature = "rusEFI 2021.11.27.f429-discovery.3533288633" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.f429-discovery.587294122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.f429-discovery.3533288633" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:20:47 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index ea2a173435..1111e4cc24 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.frankenso_na6.1496526915" + signature = "rusEFI 2021.11.27.frankenso_na6.2829836624" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.frankenso_na6.1496526915" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.frankenso_na6.2829836624" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:57 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:25 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index cc7d8cd2b1..5245aabf87 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen-nb1.2261996835" + signature = "rusEFI 2021.11.27.hellen-nb1.2001437744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen-nb1.2261996835" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen-nb1.2001437744" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:11 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index bc6a8f3769..0b325a9dca 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen121nissan.2558854923" + signature = "rusEFI 2021.11.27.hellen121nissan.1763563032" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen121nissan.2558854923" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen121nissan.1763563032" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:20:57 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 3c5d030070..f178ec5953 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen121vag.2091008416" + signature = "rusEFI 2021.11.27.hellen121vag.2369425587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen121vag.2091008416" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen121vag.2369425587" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:20:54 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 823051e423..f2deef5440 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen128.3116830221" + signature = "rusEFI 2021.11.27.hellen128.1214242590" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen128.3116830221" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen128.1214242590" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:20:50 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 86d0962516..38a5c8c1d2 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen154hyundai.30762764" + signature = "rusEFI 2021.11.27.hellen154hyundai.4031624735" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen154hyundai.30762764" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen154hyundai.4031624735" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:01 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4e60c07b95..fd68924c8f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen72.3619480090" + signature = "rusEFI 2021.11.27.hellen72.639906569" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen72.3619480090" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen72.639906569" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:08 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index eff3a44dbb..08b42ef16e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen88bmw.2193749237" + signature = "rusEFI 2021.11.27.hellen88bmw.1935222246" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen88bmw.2193749237" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen88bmw.1935222246" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:04 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 51884a2b97..2d01d7a0ea 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellenNA6.1430004482" + signature = "rusEFI 2021.11.27.hellenNA6.2762273297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellenNA6.1430004482" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellenNA6.2762273297" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:14 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 70c2b9ed60..d9909518b7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.hellen_cypress.435454486" + signature = "rusEFI 2021.11.27.hellen_cypress.3899413253" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.hellen_cypress.435454486" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.hellen_cypress.3899413253" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 27 17:43:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Nov 27 18:21:51 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 951bc7fa37..5846089fa2 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.kin.3864088298" + signature = "rusEFI 2021.11.27.kin.399089657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.kin.3864088298" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.kin.399089657" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Nov 27 18:21:48 UTC 2021 pageSize = 19972 page = 1 @@ -1957,83 +1957,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2052,13 +2020,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2096,6 +2064,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2106,6 +2078,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 13a10588a1..a2cb2bdfc7 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.mre_f4.2418417438" + signature = "rusEFI 2021.11.27.mre_f4.1639894541" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.mre_f4.2418417438" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.mre_f4.1639894541" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:21 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 174835c8d2..956138e69a 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.mre_f7.2418417438" + signature = "rusEFI 2021.11.27.mre_f7.1639894541" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.mre_f7.2418417438" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.mre_f7.1639894541" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:18 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f5bb4020d0..d80db731f9 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.prometheus_405.1944829004" + signature = "rusEFI 2021.11.27.prometheus_405.2188602719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.prometheus_405.1944829004" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.prometheus_405.2188602719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:02 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:31 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 392f6768cb..14af8125eb 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.prometheus_469.1944829004" + signature = "rusEFI 2021.11.27.prometheus_469.2188602719" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.prometheus_469.1944829004" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.prometheus_469.2188602719" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:42:59 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:28 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index b8257f0f2b..871bffbd95 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.proteus_f4.2289962539" + signature = "rusEFI 2021.11.27.proteus_f4.2045173560" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.proteus_f4.2289962539" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.proteus_f4.2045173560" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:38 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index f42a2f2b9b..8646cf383b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.proteus_f7.2289962539" + signature = "rusEFI 2021.11.27.proteus_f7.2045173560" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.proteus_f7.2289962539" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.proteus_f7.2045173560" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 27 17:43:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:35 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e229ae5bc3..2fbf9e31ae 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.27.subaru_eg33_f7.3770381306" + signature = "rusEFI 2021.11.27.subaru_eg33_f7.287548137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.27.subaru_eg33_f7.3770381306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.27.subaru_eg33_f7.287548137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 27 17:43:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sat Nov 27 18:21:55 UTC 2021 pageSize = 20000 page = 1 @@ -1991,83 +1991,51 @@ unused76 = scalar, U16, 76, "", 1, 0 deltaTps = scalar, U16, 78, "ratio", 0.01, 0 unused80 = scalar, U16, 80, "", 1, 0 tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 - -; Ignition - ignitionAdvance = scalar, S16, 84, "deg",{1/50}, 0.0 - sparkDwellValue = scalar, U16, 86, "ms",{1/300}, 0.0 - coilDutyCycle = scalar, S16, 88, "%",{1/100}, 0 - -; Idle & ETB - idleAirValvePosition=scalar,S16, 90, "%",{1/100}, 0 - etbTarget = scalar, S16, 92, "%",{1/100}, 0 - etb1DutyCycle = scalar, S16, 94, "%",{1/100}, 0 - etb1Error = scalar, S16, 96, "%",{1/100}, 0 - -; Fuel system - fuelTankLevel = scalar, U16, 98, "%",{1/100}, 0 - totalFuelConsumption=scalar,U16, 100, "grams", 1, 0 - fuelFlowRate = scalar, U16, 102, "gram/s",{1/200}, 0 - -; Y axis values for selectable tables - veTableYAxis = scalar, U16, 104, "%", 0.01, 0 - afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 - -; Knock - knockLevel = scalar, F32, 108, "Volts", 1, 0 - knockCount = scalar, U16, 306, "count", 1, 0 - knockRetard = scalar, U08, 36, "deg", 0.1, 0 - -; Mode, firmware, protocol, run time -; TS requires 'seconds' name since it has special internal meaning - seconds = scalar, U32, 112, "sec", 1, 0.0 - engineMode = scalar, U32, 116, "em", 1, 0.0; - firmwareVersion = scalar, U32, 120,"version_f", 1, 0 - - -; calibation helpers - calibrationValue = scalar, F32, 128, "", 1, 0 - calibrationMode = scalar, U08, 132, "", 1, 0 - ; 1 bytes padding1 - - 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, 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, 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, 212, "G", {1/100}, 0 - accelerationY = scalar, S16, 214, "G", {1/100}, 0 - accelerationZ = scalar, S16, 308, "G", {1/100}, 0 - accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 - accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 +ignitionAdvance = scalar, U16, 84, "deg", 0.02, 0 +sparkDwellValue = scalar, U16, 86, "ms", 0.0033333333333333335, 0 +coilDutyCycle = scalar, U16, 88, "%", 0.01, 0 +idleAirValvePosition = scalar, U16, 90, "%", 0.01, 0 +etbTarget = scalar, U16, 92, "%", 0.01, 0 +etb1DutyCycle = scalar, U16, 94, "%", 0.01, 0 +etb1Error = scalar, U16, 96, "%", 0.01, 0 +fuelTankLevel = scalar, U16, 98, "%", 0.01, 0 +totalFuelConsumption = scalar, U16, 100, "grams", 1, 0 +fuelFlowRate = scalar, U16, 102, "gram/s", 0.005, 0 +veTableYAxis = scalar, U16, 104, "%", 0.01, 0 +afrTableYAxis = scalar, U16, 106, "%", 0.01, 0 +knockLevel = scalar, F32, 108, "Volts", 1, 0 +timeSeconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +seconds = scalar, U32, 112, "sec", 1, 0 +engineMode = scalar, U32, 116, "em", 1, 0 +firmwareVersion = scalar, U32, 120, "version_f", 1, 0 +tsConfigVersion = scalar, U32, 124, "", 1, 0 +calibrationValue = scalar, F32, 128, "", 1, 0 +calibrationMode = scalar, U08, 132, "", 1, 0 +padding = scalar, U08, 133, "", 1, 0 +fuelingLoad = scalar, U16, 134, "%", 0.01, 0 +ignitionLoad = scalar, U16, 136, "%", 0.01, 0 +engineMakeCodeNameCrc16 = scalar, U16, 138, "crc16", 1, 0 +totalTriggerErrorCounter = scalar, U32, 140, "counter", 1, 0 +orderingErrorCounter = scalar, U32, 144, "", 1, 0 +warningCounter = scalar, U16, 148, "count", 1, 0 +lastErrorCode = scalar, U16, 150, "error", 1, 0 +recentErrorCodes = array, U16, 152, [8], "error", 1, 0 +debugFloatField1 = scalar, F32, 168, "val", 1, 0 +debugFloatField2 = scalar, F32, 172, "val", 1, 0 +debugFloatField3 = scalar, F32, 176, "val", 1, 0 +debugFloatField4 = scalar, F32, 180, "val", 1, 0 +debugFloatField5 = scalar, F32, 184, "val", 1, 0 +debugFloatField6 = scalar, F32, 188, "val", 1, 0 +debugFloatField7 = scalar, F32, 192, "val", 1, 0 +debugIntField1 = scalar, U32, 196, "val", 1, 0 +debugIntField2 = scalar, U32, 200, "val", 1, 0 +debugIntField3 = scalar, U32, 204, "val", 1, 0 +debugIntField4 = scalar, U16, 208, "val", 1, 0 +debugIntField5 = scalar, U16, 210, "val", 1, 0 +accelerationX = scalar, U16, 212, "G", 0.01, 0 +accelerationY = scalar, U16, 214, "G", 0.01, 0 ; egt egt1 = scalar, S16, 216, "deg C", 1, 0 @@ -2086,13 +2054,13 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 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 - rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 ; Transmission tcuCurrentGear = scalar, S08, 247, "gear", 1, 0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 knock1 = scalar, S08, 250, "dbv", 1, 0 knock2 = scalar, S08, 251, "dbv", 1, 0 @@ -2130,6 +2098,10 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 fuelPidCorrection=scalar, S16, 296, "%",{1/100}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/100}, 0 + accelerationZ = scalar, S16, 308, "G", {1/100}, 0 + accelerationRoll= scalar, S16, 310, "G", {1/100}, 0 + accelerationYaw = scalar, S16, 312, "G", {1/100}, 0 + vvtTargetB1I = scalar, S08, 314, "deg", 1, 0 vvtTargetB1E = scalar, S08, 315, "deg", 1, 0 vvtTargetB2I = scalar, S08, 316, "deg", 1, 0 @@ -2140,6 +2112,7 @@ tpsAccelFuel = scalar, U16, 82, "ms", 0.0033333333333333335, 0 rawTps1Secondary = scalar, U16, 300, "V",{1/1000}, 0.0 rawTps2Primary = scalar, U16, 302, "V",{1/1000}, 0.0 rawTps2Secondary = scalar, U16, 304, "V",{1/1000}, 0.0 + knockCount = scalar, U16, 306, "count", 1, 0 ; ; see TunerStudioOutputChannels struct