From b271e7b9008ec7b3d94c81e20a36ba4c674ba167 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 23 Jun 2019 09:25:04 -0400 Subject: [PATCH] fresh ini --- firmware/controllers/engine_controller.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 51 +++++++++++---------- firmware/tunerstudio/rusefi_frankenso.ini | 51 +++++++++++---------- firmware/tunerstudio/rusefi_microrusefi.ini | 51 +++++++++++---------- firmware/tunerstudio/rusefi_prometheus.ini | 51 +++++++++++---------- 5 files changed, 109 insertions(+), 97 deletions(-) diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 4979d42ce0..1a48bc4dfb 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -810,6 +810,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190617; + return 20190623; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 202224a18d..8d02da8638 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -82,7 +82,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 integration\rusefi_config.txt Tue Jun 18 19:18:08 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:18 EDT 2019 pageSize = 20000 page = 1 @@ -1137,14 +1137,14 @@ fileVersion = { 20171101 } ; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS - coolant = scalar, F32, 4, "°C", 1, 0.0 + coolant = scalar, F32, 4, "deg C", 1, 0.0 #else - coolant = scalar, F32, 4, "°F", {9/5}, 17.77777 + coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "°C", 1, 0.0 + intake = scalar, F32, 8, "deg C", 1, 0.0 #else - intake = scalar, F32, 8, "°F", {9/5}, 17.77777 + intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 #endif TPSValue = scalar, F32, 12, "%", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0 @@ -1194,14 +1194,14 @@ fileVersion = { 20171101 } ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "°C", 1, 0 - egt2 = scalar, S16, 90, "°C", 1, 0 - egt3 = scalar, S16, 92, "°C", 1, 0 - egt4 = scalar, S16, 94, "°C", 1, 0 - egt5 = scalar, S16, 96, "°C", 1, 0 - egt6 = scalar, S16, 98, "°C", 1, 0 - egt7 = scalar, S16, 100, "°C", 1, 0 - egt8 = scalar, S16, 102, "°C", 1, 0 + egt1 = scalar, S16, 88, "deg C", 1, 0 + egt2 = scalar, S16, 90, "deg C", 1, 0 + egt3 = scalar, S16, 92, "deg C", 1, 0 + egt4 = scalar, S16, 94, "deg C", 1, 0 + egt5 = scalar, S16, 96, "deg C", 1, 0 + egt6 = scalar, S16, 98, "deg C", 1, 0 + egt7 = scalar, S16, 100, "deg C", 1, 0 + egt8 = scalar, S16, 102, "deg C", 1, 0 rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 veValue = scalar, F32, 112, "ratio", 1, 0 @@ -1769,14 +1769,14 @@ gaugeCategory = Debug gaugeCategory = Sensors RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 #if CELSIUS - CLTGauge = coolant, "Coolant Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - CLTGauge = coolant, "Coolant Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif #if CELSIUS - IATGauge = intake, "Intake Air Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - IATGauge = intake, "Intake Air Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 afr1Gauge = AFRValue, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 @@ -1814,9 +1814,9 @@ gaugeCategory = Accel Data gaugeCategory = Fuel Data ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld #if CELSIUS - tChargeGauge = tCharge, "fuel: charge T", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - tChargeGauge = tCharge, "fuel: charge T", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif baroCorrectionGauge = baroCorrection,"BaroCorr", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 @@ -2283,7 +2283,9 @@ cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" - + +cmd_reset_controller = "w\x00\xbb\x00\x00" + ; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" @@ -2481,7 +2483,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} @@ -2498,7 +2500,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} @@ -2725,7 +2727,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2748,7 +2750,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3473,6 +3475,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine + commandButton = "Reset ECU", cmd_reset_controller ; bench test dialog = ioTest, "Bench Test & Commands", border diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index ce0df01def..3958683eef 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -82,7 +82,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 integration\rusefi_config.txt Tue Jun 18 19:18:13 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:23 EDT 2019 pageSize = 20000 page = 1 @@ -1137,14 +1137,14 @@ fileVersion = { 20171101 } ; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS - coolant = scalar, F32, 4, "°C", 1, 0.0 + coolant = scalar, F32, 4, "deg C", 1, 0.0 #else - coolant = scalar, F32, 4, "°F", {9/5}, 17.77777 + coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "°C", 1, 0.0 + intake = scalar, F32, 8, "deg C", 1, 0.0 #else - intake = scalar, F32, 8, "°F", {9/5}, 17.77777 + intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 #endif TPSValue = scalar, F32, 12, "%", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0 @@ -1194,14 +1194,14 @@ fileVersion = { 20171101 } ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "°C", 1, 0 - egt2 = scalar, S16, 90, "°C", 1, 0 - egt3 = scalar, S16, 92, "°C", 1, 0 - egt4 = scalar, S16, 94, "°C", 1, 0 - egt5 = scalar, S16, 96, "°C", 1, 0 - egt6 = scalar, S16, 98, "°C", 1, 0 - egt7 = scalar, S16, 100, "°C", 1, 0 - egt8 = scalar, S16, 102, "°C", 1, 0 + egt1 = scalar, S16, 88, "deg C", 1, 0 + egt2 = scalar, S16, 90, "deg C", 1, 0 + egt3 = scalar, S16, 92, "deg C", 1, 0 + egt4 = scalar, S16, 94, "deg C", 1, 0 + egt5 = scalar, S16, 96, "deg C", 1, 0 + egt6 = scalar, S16, 98, "deg C", 1, 0 + egt7 = scalar, S16, 100, "deg C", 1, 0 + egt8 = scalar, S16, 102, "deg C", 1, 0 rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 veValue = scalar, F32, 112, "ratio", 1, 0 @@ -1769,14 +1769,14 @@ gaugeCategory = Debug gaugeCategory = Sensors RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 #if CELSIUS - CLTGauge = coolant, "Coolant Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - CLTGauge = coolant, "Coolant Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif #if CELSIUS - IATGauge = intake, "Intake Air Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - IATGauge = intake, "Intake Air Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 afr1Gauge = AFRValue, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 @@ -1814,9 +1814,9 @@ gaugeCategory = Accel Data gaugeCategory = Fuel Data ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld #if CELSIUS - tChargeGauge = tCharge, "fuel: charge T", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - tChargeGauge = tCharge, "fuel: charge T", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif baroCorrectionGauge = baroCorrection,"BaroCorr", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 @@ -2283,7 +2283,9 @@ cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" - + +cmd_reset_controller = "w\x00\xbb\x00\x00" + ; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" @@ -2481,7 +2483,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} @@ -2498,7 +2500,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} @@ -2725,7 +2727,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2748,7 +2750,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3473,6 +3475,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine + commandButton = "Reset ECU", cmd_reset_controller ; bench test dialog = ioTest, "Bench Test & Commands", border diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 83aa0044fc..968acd68d3 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -82,7 +82,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 integration\rusefi_config.txt Tue Jun 18 19:18:11 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:21 EDT 2019 pageSize = 20000 page = 1 @@ -1137,14 +1137,14 @@ fileVersion = { 20171101 } ; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS - coolant = scalar, F32, 4, "°C", 1, 0.0 + coolant = scalar, F32, 4, "deg C", 1, 0.0 #else - coolant = scalar, F32, 4, "°F", {9/5}, 17.77777 + coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "°C", 1, 0.0 + intake = scalar, F32, 8, "deg C", 1, 0.0 #else - intake = scalar, F32, 8, "°F", {9/5}, 17.77777 + intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 #endif TPSValue = scalar, F32, 12, "%", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0 @@ -1194,14 +1194,14 @@ fileVersion = { 20171101 } ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "°C", 1, 0 - egt2 = scalar, S16, 90, "°C", 1, 0 - egt3 = scalar, S16, 92, "°C", 1, 0 - egt4 = scalar, S16, 94, "°C", 1, 0 - egt5 = scalar, S16, 96, "°C", 1, 0 - egt6 = scalar, S16, 98, "°C", 1, 0 - egt7 = scalar, S16, 100, "°C", 1, 0 - egt8 = scalar, S16, 102, "°C", 1, 0 + egt1 = scalar, S16, 88, "deg C", 1, 0 + egt2 = scalar, S16, 90, "deg C", 1, 0 + egt3 = scalar, S16, 92, "deg C", 1, 0 + egt4 = scalar, S16, 94, "deg C", 1, 0 + egt5 = scalar, S16, 96, "deg C", 1, 0 + egt6 = scalar, S16, 98, "deg C", 1, 0 + egt7 = scalar, S16, 100, "deg C", 1, 0 + egt8 = scalar, S16, 102, "deg C", 1, 0 rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 veValue = scalar, F32, 112, "ratio", 1, 0 @@ -1769,14 +1769,14 @@ gaugeCategory = Debug gaugeCategory = Sensors RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 #if CELSIUS - CLTGauge = coolant, "Coolant Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - CLTGauge = coolant, "Coolant Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif #if CELSIUS - IATGauge = intake, "Intake Air Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - IATGauge = intake, "Intake Air Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 afr1Gauge = AFRValue, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 @@ -1814,9 +1814,9 @@ gaugeCategory = Accel Data gaugeCategory = Fuel Data ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld #if CELSIUS - tChargeGauge = tCharge, "fuel: charge T", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - tChargeGauge = tCharge, "fuel: charge T", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif baroCorrectionGauge = baroCorrection,"BaroCorr", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 @@ -2276,7 +2276,9 @@ cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" - + +cmd_reset_controller = "w\x00\xbb\x00\x00" + ; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" @@ -2474,7 +2476,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} @@ -2491,7 +2493,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} @@ -2710,7 +2712,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2733,7 +2735,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3457,6 +3459,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine + commandButton = "Reset ECU", cmd_reset_controller ; bench test dialog = ioTest, "Bench Test & Commands", border diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 8db255847f..bb60ec2d74 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -82,7 +82,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 integration\rusefi_config.txt Tue Jun 18 19:18:16 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jun 23 09:24:25 EDT 2019 pageSize = 20000 page = 1 @@ -1137,14 +1137,14 @@ fileVersion = { 20171101 } ; RPMValue = scalar, U32, 0, "RPM", 1, 0.00000 #if CELSIUS - coolant = scalar, F32, 4, "°C", 1, 0.0 + coolant = scalar, F32, 4, "deg C", 1, 0.0 #else - coolant = scalar, F32, 4, "°F", {9/5}, 17.77777 + coolant = scalar, F32, 4, "deg F", {9/5}, 17.77777 #endif #if CELSIUS - intake = scalar, F32, 8, "°C", 1, 0.0 + intake = scalar, F32, 8, "deg C", 1, 0.0 #else - intake = scalar, F32, 8, "°F", {9/5}, 17.77777 + intake = scalar, F32, 8, "deg F", {9/5}, 17.77777 #endif TPSValue = scalar, F32, 12, "%", 1, 0 MAFValue = scalar, F32, 16, "V", 1, 0 @@ -1194,14 +1194,14 @@ fileVersion = { 20171101 } ind_hasFatalError=bits, U32, 80, [6:6], "true", "false"; ind_isWarnNow =bits, U32, 80, [7:7], "true", "false"; firmwareTsVersion = scalar,U32, 84, "version_p", 1, 0 - egt1 = scalar, S16, 88, "°C", 1, 0 - egt2 = scalar, S16, 90, "°C", 1, 0 - egt3 = scalar, S16, 92, "°C", 1, 0 - egt4 = scalar, S16, 94, "°C", 1, 0 - egt5 = scalar, S16, 96, "°C", 1, 0 - egt6 = scalar, S16, 98, "°C", 1, 0 - egt7 = scalar, S16, 100, "°C", 1, 0 - egt8 = scalar, S16, 102, "°C", 1, 0 + egt1 = scalar, S16, 88, "deg C", 1, 0 + egt2 = scalar, S16, 90, "deg C", 1, 0 + egt3 = scalar, S16, 92, "deg C", 1, 0 + egt4 = scalar, S16, 94, "deg C", 1, 0 + egt5 = scalar, S16, 96, "deg C", 1, 0 + egt6 = scalar, S16, 98, "deg C", 1, 0 + egt7 = scalar, S16, 100, "deg C", 1, 0 + egt8 = scalar, S16, 102, "deg C", 1, 0 rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 veValue = scalar, F32, 112, "ratio", 1, 0 @@ -1769,14 +1769,14 @@ gaugeCategory = Debug gaugeCategory = Sensors RPMGauge = RPMValue, "Engine Speed", "RPM", 0, 15000, 200, 500, 6000, 6000, 0, 0 #if CELSIUS - CLTGauge = coolant, "Coolant Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - CLTGauge = coolant, "Coolant Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + CLTGauge = coolant, "Coolant Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif #if CELSIUS - IATGauge = intake, "Intake Air Temp", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - IATGauge = intake, "Intake Air Temp", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + IATGauge = intake, "Intake Air Temp", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif TPSGauge = TPSValue, "Throttle Position", "%", 0, 100, 0, 0, 100, 100, 2, 2 afr1Gauge = AFRValue, "Air:Fuel Ratio 1", "", 10, 19.4, 12, 13, 15, 16, 2, 2 @@ -1814,9 +1814,9 @@ gaugeCategory = Accel Data gaugeCategory = Fuel Data ;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld #if CELSIUS - tChargeGauge = tCharge, "fuel: charge T", "°C", -40, 140, -15, 1, 95, 110, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg C", -40, 140, -15, 1, 95, 110, 1, 1 #else - tChargeGauge = tCharge, "fuel: charge T", "°F", -40, 285, 5, 35, 205, 230, 1, 1 + tChargeGauge = tCharge, "fuel: charge T", "deg F", -40, 285, 5, 35, 205, 230, 1, 1 #endif baroCorrectionGauge = baroCorrection,"BaroCorr", "ratio", 0.5, 1.5, 0.6, 0.7, 1.3, 1.4, 1, 1 crankingFuelGauge = crankingFuelMs, "fuel: cranking", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 @@ -2279,7 +2279,9 @@ cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" - + +cmd_reset_controller = "w\x00\xbb\x00\x00" + ; See 'executeTSCommand' in firmware source code ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Miata_NA6_MAP = "w\x00\x30\x00\x29" @@ -2477,7 +2479,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor1_bias_resistor, {auxTempSensor1_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor1_tempC_1, {auxTempSensor1_adcChannel != 16} field = "Resistance @ LT", auxTempSensor1_resistance_1, {auxTempSensor1_adcChannel != 16} @@ -2494,7 +2496,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", auxTempSensor2_bias_resistor, {auxTempSensor2_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", auxTempSensor2_tempC_1, {auxTempSensor2_adcChannel != 16} field = "Resistance @ LT", auxTempSensor2_resistance_1, {auxTempSensor2_adcChannel != 16} @@ -2721,7 +2723,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2744,7 +2746,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40°C, 0°C and 100°C" + field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3469,6 +3471,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve commandButton = "Stop Engine", cmd_stop_engine + commandButton = "Reset ECU", cmd_reset_controller ; bench test dialog = ioTest, "Bench Test & Commands", border