diff --git a/.gitattributes b/.gitattributes index 0252852c9b..602677d6d3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,7 +21,6 @@ *.txt text eol=lf *.yaml text eol=lf *.ini text eol=lf -*.input text eol=lf *.rules text eol=lf # KiCad files diff --git a/firmware/console/binary/tunerstudio_outputs.h b/firmware/console/binary/tunerstudio_outputs.h index f1df359082..0f71d3f0e3 100644 --- a/firmware/console/binary/tunerstudio_outputs.h +++ b/firmware/console/binary/tunerstudio_outputs.h @@ -19,11 +19,11 @@ * todo https://github.com/rusefi/rusefi/issues/197 * three locations have to be changed manually * 1) we inherit from generated ts_outputs_s based on output_channels.txt - * 2) '[OutputChannels]' block in rusefi.input + * 2) '[OutputChannels]' block in tunerstudio.template.ini * 3) com.rusefi.core.Sensor enum in rusEFI console source code * 4) static constexpr LogField fields[] SD card logging * - * see also [OutputChannels] in rusefi.input + * see also [OutputChannels] in tunerstudio.template.ini * see also TS_OUTPUT_SIZE in rusefi_config.txt */ struct TunerStudioOutputChannels : output_channels_s { }; diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index 1c3ba2bf59..04d4c50d2e 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -943,7 +943,7 @@ void doInitElectronicThrottle() { printf("doInitElectronicThrottle %s\n", boolToString(hasPedal)); #endif // EFI_UNIT_TEST - // these status flags are consumed by TS see rusefi.input TODO should those be outputs/live data not configuration?! + // these status flags are consumed by TS see tunerstudio.template.ini TODO should those be outputs/live data not configuration?! engineConfiguration->etb1configured = engineConfiguration->etb2configured = false; // todo: technical debt: we still have DC motor code initialization in ETB-specific file while DC motors are used not just as ETB diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index 0150c99a84..4d3111e884 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -435,7 +435,7 @@ int getSavedBenchTestPinStates(uint32_t durationsInStateMs[2]) { } static void handleCommandX14(uint16_t index) { -// todo: define ts_14_command magic constants and use those in rusefi.input file! +// todo: define ts_14_command magic constants and use those in tunerstudio.template.ini file! switch (index) { case TS_GRAB_TPS_CLOSED: grabTPSIsClosed(); diff --git a/firmware/controllers/limp_manager.h b/firmware/controllers/limp_manager.h index 7d784dbab7..754a8e55c1 100644 --- a/firmware/controllers/limp_manager.h +++ b/firmware/controllers/limp_manager.h @@ -4,7 +4,7 @@ #include -// Keep this list in sync with fuelIgnCutCodeList in rusefi.input! +// Keep this list in sync with fuelIgnCutCodeList in tunerstudio.template.ini! enum class ClearReason : uint8_t { None, // 0 Fatal, // 1 @@ -27,8 +27,8 @@ enum class ClearReason : uint8_t { GdiComms, PleaseBrake, - // Keep this list in sync with fuelIgnCutCodeList in rusefi.input! - // todo: add a code generator between ClearReason and fuelIgnCutCodeList in rusefi.input + // Keep this list in sync with fuelIgnCutCodeList in tunerstudio.template.ini! + // todo: add a code generator between ClearReason and fuelIgnCutCodeList in tunerstudio.template.ini }; enum class TpsState : uint8_t { @@ -43,7 +43,7 @@ enum class TpsState : uint8_t { NotConfigured, // 8 Redundancy, // 9 IntermittentPps, // 10 - // keep this list in sync with etbCutCodeList in rusefi.input! + // keep this list in sync with etbCutCodeList in tunerstudio.template.ini! }; // Only allows clearing the value, but never resetting it. diff --git a/firmware/controllers/sensors/impl/ego.cpp b/firmware/controllers/sensors/impl/ego.cpp index ba3c8ef491..6d01888636 100644 --- a/firmware/controllers/sensors/impl/ego.cpp +++ b/firmware/controllers/sensors/impl/ego.cpp @@ -41,7 +41,7 @@ float getAfr(SensorType type) { + engineConfiguration->egoValueShift; } -// this method is only used for canned tunes now! User-facing selection is defined in rusefi.input using settingSelector +// this method is only used for canned tunes now! User-facing selection is defined in tunerstudio.template.ini using settingSelector static void initEgoSensor(afr_sensor_s *sensor, ego_sensor_e type) { switch (type) { diff --git a/firmware/controllers/sensors/sensor_checker.cpp b/firmware/controllers/sensors/sensor_checker.cpp index ad5ec95502..09aabb857c 100644 --- a/firmware/controllers/sensors/sensor_checker.cpp +++ b/firmware/controllers/sensors/sensor_checker.cpp @@ -156,7 +156,7 @@ static uint8_t getTSErrorCode(brain_pin_diag_e diag) * 0 - output is not used * 1 - ok status/no diagnostic available (TODO: separate codes) * >1 - see brain_pin_diag_e, first least significant 1-bit position + 1 * - * Keep in sync with outputDiagErrorList in rusefi.input + * Keep in sync with outputDiagErrorList in tunerstudio.template.ini * Note: * diag can be combination of few errors, * while we report only one error to simplify hadling on TS side diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9b887c2cbc..545971a3b0 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -7,8 +7,8 @@ ! ! The format is unique to rusEFI but there is a guide to the format available in java_tools/config_definition/RusefiConfigGrammar.g4 ! -! This file is used in combination with tunerstudio/rusefi.input to generate the .ini files used by turner TunerStudio. -! The easiest way to find a specific variable within this config is to search within rusefi.input for the on screen text from tuner studio +! This file is used in combination with tunerstudio/tunerstudio.template.ini to generate the .ini files used by turner TunerStudio. +! The easiest way to find a specific variable within this config is to search within tunerstudio.template.ini for the on screen text from tuner studio ! this should provide the actual variable name, for example searching for "Number of Cylinders" will provide the variable "cylindersCount". ! Then you can search for "cylindersCount" in this file to find the definition. ! diff --git a/firmware/integration/rusefi_config_trigger.txt b/firmware/integration/rusefi_config_trigger.txt index 3e3f2ff38e..127481cf98 100644 --- a/firmware/integration/rusefi_config_trigger.txt +++ b/firmware/integration/rusefi_config_trigger.txt @@ -12,5 +12,5 @@ #define TRIGGER_WITH_SYNC "isSynchronizationNeeded" #define TRIGGER_SYNC_EDGE "syncEdge" -! this is shared between rusefi.input and FiringOrderTSLogic -#define IGNITION_OUTPUT "Ignition Output" \ No newline at end of file +! this is shared between tunerstudio.template.ini and FiringOrderTSLogic +#define IGNITION_OUTPUT "Ignition Output" diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 295d765a9c..7e8c73b045 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -92,7 +92,7 @@ * [Changing gauge limits](http://www.tunerstudio.com/index.php/manuals/63-changing-gauge-limits) * * Definition of the Tunerstudio configuration interface, gauges, and indicators - * tunerstudio/rusefi.input + * tunerstudio/tunerstudio.template.ini * * @section config Persistent Configuration * diff --git a/firmware/rusefi_config.mk b/firmware/rusefi_config.mk index 8a4f4fe10e..1bd5c0a887 100644 --- a/firmware/rusefi_config.mk +++ b/firmware/rusefi_config.mk @@ -7,7 +7,7 @@ SIG_FILE = $(PROJECT_DIR)/$(META_OUTPUT_ROOT_FOLDER)tunerstudio/generated/signat CONFIG_INPUTS = \ $(SIG_FILE) \ $(PROJECT_DIR)/integration/rusefi_config.txt \ - $(PROJECT_DIR)/tunerstudio/rusefi.input \ + $(PROJECT_DIR)/tunerstudio/tunerstudio.template.ini \ $(PROJECT_DIR)/console/binary/generated/output_channels.ini \ $(PROJECT_DIR)/console/binary/generated/data_logs.ini \ $(PROJECT_DIR)/console/binary/generated/fancy_content.ini \ diff --git a/firmware/tunerstudio/readme.md b/firmware/tunerstudio/readme.md index a4a7c3eae9..b9037d7eab 100644 --- a/firmware/tunerstudio/readme.md +++ b/firmware/tunerstudio/readme.md @@ -16,7 +16,7 @@ directories . ```rusefi*.ini``` files are generated based on the following four inputs: 1) ```rusefi_config.txt``` contains configuration region definition in proprietary text format. -2) ```rusefi.input``` contains the UI - all the menus and dialogs. UI definition starts at ```menuDialog = main``` +2) ```tunerstudio.template.ini``` contains the UI - all the menus and dialogs. UI definition starts at ```menuDialog = main``` line - here you will see all top level menus defined with internal IDs and visible text labels. 3) ```mapping.yaml``` is a minor detail related to how pins are named in drop downs 4) ```prepend.txt``` is a minor detail which allows you to hide elements of the UI using ```@@if_XXX``` syntax. @@ -28,4 +28,4 @@ On Windows this may be run with ```gen_config.bat```. Q: how do I offer my changes to TS project? -A: please PR only rusefi.input. Once merged, gen_config.bat would be executed automatically and results would be pushed by automation. +A: please PR only tunerstudio.template.ini. Once merged, gen_config.bat would be executed automatically and results would be pushed by automation. diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/tunerstudio.template.ini similarity index 99% rename from firmware/tunerstudio/rusefi.input rename to firmware/tunerstudio/tunerstudio.template.ini index 3e514725a3..cea09c2590 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -2,7 +2,7 @@ ; ; This file has been generated by invoking gen_config.bat. ; The input files are -; rusefi.input the common template +; tunerstudio.template.ini the common template ; rusefi_config.txt the project specific file ; ; In TunerStudio some fields have little question mark on the left of the name for additional field tips. diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java index c4ac33565b..7bbcc4c906 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java @@ -14,7 +14,7 @@ import static com.rusefi.util.IoUtils.CHARSET; * [Constants] */ public class TSProjectConsumer implements ConfigurationConsumer { - private static final String TS_FILE_INPUT_NAME = "rusefi.input"; + private static final String TS_FILE_INPUT_NAME = "tunerstudio.template.ini"; private static final String CONFIG_DEFINITION_START = "CONFIG_DEFINITION_START"; private static final String CONFIG_DEFINITION_END = "CONFIG_DEFINITION_END"; private static final String TS_CONDITION = "@@if_"; @@ -70,7 +70,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { } /** - * rusefi.input has all the content of the future .ini file with the exception of data page + * tunerstudio.template.ini has all the content of the future .ini file with the exception of data page * TODO: start generating [outputs] section as well */ private TsFileContent readTsTemplateInputFile(String tsPath) throws IOException { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelTSLogic.java b/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelTSLogic.java index 2bfa402e9d..9e192151b3 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelTSLogic.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelTSLogic.java @@ -47,8 +47,8 @@ public class TriggerWheelTSLogic { }); /* - * these are templated into rusefi.input file - * note that TT_TOOTHED_WHEEL is not mentioned in the meta file, we handle it manually right in rusefi.input file + * these are templated into tunerstudio.template.ini file + * note that TT_TOOTHED_WHEEL is not mentioned in the meta file, we handle it manually right in tunerstudio.template.ini file */ variableRegistry.register(TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION, triggerTypesWithoutKnownLocation.toString()); variableRegistry.register(TRIGGER_TYPE_WITH_SECOND_WHEEL, triggerTypesWithSecondWheel.toString()); diff --git a/java_tools/tune-tools/src/test/resources/frankenso/test-mainController.ini b/java_tools/tune-tools/src/test/resources/frankenso/test-mainController.ini index 87751d7865..863febf513 100644 --- a/java_tools/tune-tools/src/test/resources/frankenso/test-mainController.ini +++ b/java_tools/tune-tools/src/test/resources/frankenso/test-mainController.ini @@ -2,7 +2,7 @@ ; ; This file has been generated by invoking gen_config.bat. ; The input files are -; rusefi.input the common template +; tunerstudio.ini-template the common template ; rusefi_config.txt the project specific file ; ; In TunerStudio some fields have little question mark on the left of the name for additional field tips. @@ -27,8 +27,8 @@ enable2ndByteCanID = false ;#unset tuneByMAF [SettingGroups] - ; the referenceName will over-ride previous, so if you are creating a - ; settingGroup with a reference name of lambdaSensor, it will replace the + ; the referenceName will over-ride previous, so if you are creating a + ; settingGroup with a reference name of lambdaSensor, it will replace the ; setting group defined in the settingGroups.xml of the TunerStudio config ; folder. If is is an undefined referenceName, it will be added. ; keyword = referenceName, DisplayName @@ -38,7 +38,7 @@ enable2ndByteCanID = false settingOption = tuneByMAF, "MAF-Based" settingOption = tuneByLoad, "Load-Based (Default)" -; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" +; settingGroup = fAlgorithmSetting, "Fuel Logic / Tables" ; settingOption = FA_PLAIN_MAF, "Plain MAF" ; settingOption = FA_TPS, "AlphaN/TPS" ; settingOption = DEFAULT, "Speed Density" ; DEFAULT will be over looked and this will fall into the #else block of the statement. @@ -46,7 +46,7 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI v1.2020.4" + signature = "rusEFI v1.2020.4" [TunerStudio] queryCommand = "S" @@ -59,7 +59,7 @@ enable2ndByteCanID = false endianness = little nPages = 1 - + pageIdentifier = "\x00\x00" pageReadCommand = "R\x00\x00%2o%2c" @@ -77,9 +77,9 @@ enable2ndByteCanID = false writeBlocks = on interWriteDelay = 10 blockReadTimeout = 3000; Milliseconds general timeout - - ; delayAfterPortOpen = 500 - + + ; delayAfterPortOpen = 500 + blockingFactor = 256 ; max chunk size ;end communication settings @@ -87,7 +87,7 @@ enable2ndByteCanID = false ; name = array, type, offset, shape, units, scale, translate, lo, hi, digits ; name = scalar, type, offset, units, scale, translate, lo, hi, digits -; see PAGE_0_SIZE in C source code +; 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.bat integration\rusefi_config.txt Sat Jun 13 23:59:07 EDT 2020 @@ -1366,7 +1366,7 @@ page = 1 ; CONFIG_DEFINITION_END idleRpmPid_offset = "Constant base value" idleRpmPid_periodMs = "PID recalculation period" - + [Tuning] spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators. @@ -1375,7 +1375,7 @@ page = 1 gaugeColumns = 1 ; Only 1 or 2 are valid. pageButtons = "&EGO" - gauge1 = RPMGauge + gauge1 = RPMGauge gauge2 = afr1Gauge gauge3 = MAPGauge gauge4 = veValueGauge @@ -1495,7 +1495,7 @@ page = 1 intake = scalar, S16, 14, "deg C",{1/100}, 0.0 ; todo: aux1 ; todo: aux2 - + ; throttle, pedal TPSValue = scalar, S16, 20, "%",{1/100}, 0 @@ -1577,7 +1577,7 @@ page = 1 calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 ; 1 bytes padding1 - + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors @@ -1706,7 +1706,7 @@ page = 1 requiresPowerCycle = etb_use_two_wires requiresPowerCycle = etbFreq - + requiresPowerCycle = idle_solenoidFrequency requiresPowerCycle = boostPwmFrequency requiresPowerCycle = alternatorPwmFrequency @@ -1714,7 +1714,7 @@ page = 1 requiresPowerCycle = auxPidFrequency2 requiresPowerCycle = auxPidFrequency3 requiresPowerCycle = auxPidFrequency4 - + requiresPowerCycle = fsioOutputPins1 requiresPowerCycle = fsioOutputPins2 requiresPowerCycle = fsioOutputPins3 @@ -1731,7 +1731,7 @@ page = 1 requiresPowerCycle = fsioOutputPins14 requiresPowerCycle = fsioOutputPins15 requiresPowerCycle = fsioOutputPins16 - + requiresPowerCycle = fsioFrequency1 requiresPowerCycle = fsioFrequency2 requiresPowerCycle = fsioFrequency3 @@ -1748,12 +1748,12 @@ page = 1 requiresPowerCycle = fsioFrequency14 requiresPowerCycle = fsioFrequency15 requiresPowerCycle = fsioFrequency16 - + requiresPowerCycle = fsioAdc1 requiresPowerCycle = fsioAdc2 requiresPowerCycle = fsioAdc3 requiresPowerCycle = fsioAdc4 - + readOnly = warning_message @@ -1784,7 +1784,7 @@ page = 1 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - + curve = fsioCurve2, "FSIO Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 @@ -1820,7 +1820,7 @@ page = 1 xBins = sparkDwellRpmBins, RPMValue yBins = sparkDwellValues gauge = RPMGauge - + curve = map_samplingAngleCurve, "MAP Sampling Start Angle" columnLabel = "RPM", "Angle" xAxis = 0, 8000, 10 @@ -1828,7 +1828,7 @@ page = 1 xBins = map_samplingAngleBins, RPMValue yBins = map_samplingAngle gauge = MAPGauge - + curve = map_samplingWindowCurve, "MAP Sampling Duration" columnLabel = "RPM", "Window" xAxis = 0, 8000, 10 @@ -1844,7 +1844,7 @@ page = 1 xBins = injector_battLagCorrBins, VBatt yBins = injector_battLagCorr gauge = VBattGauge - + curve = mafDecodingCurve, "MAF sensor" columnLabel = "Voltage", "kg/hour" xAxis = -1, 6, 10 @@ -1860,7 +1860,7 @@ page = 1 xBins = iatFuelCorrBins, intake yBins = iatFuelCorr gauge = IATGauge - + curve = cltTimingCorrCurve, "Warmup timing correction" columnLabel = "Coolant", "Extra" xAxis = -40, 120, 10 @@ -1956,7 +1956,7 @@ page = 1 xBins = idleVeBins, RPMValue yBins = idleVe gauge = afr1Gauge - + curve = crankingAdvanceCurve, "Cranking Advance Angle" columnLabel = "RPM", "degrees" xAxis = 0, 8000, 10 @@ -1981,7 +1981,7 @@ page = 1 yBins = cltFuelCorr yBins = wueAnalRecommend ;gauge = cltGauge - + lineLabel = "Warmup Correction" lineLabel = "Recommended WUE" @@ -2035,8 +2035,8 @@ page = 1 yBins = boostTpsBins, TPSValue zBins = boostTableClosedLoop - - + + table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 xBins = fsioTable1RpmBins, RPMValue yBins = fsioTable1LoadBins, engineLoad @@ -2081,7 +2081,7 @@ page = 1 ; gridHeight = 2.0 gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - + table = ignitionTpsTableTbl, ignitionTableMap, "Ignition TPS Table", 1 ; constant, variable ; Currently we share ignitionRpmBins between two advance tables... Is it ok? @@ -2091,7 +2091,7 @@ page = 1 zBins = ignitionTpsTable gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. upDownLabel = "(RICHER)", "(LEANER)" - + table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1 ; constant, variable xBins = ignitionIatCorrRpmBins, RPMValue @@ -2210,7 +2210,7 @@ gaugeCategory = ECU Status timeSecondsGauge = seconds, "Uptime", "sec", 0, 100, 0, 0, 100, 100, 0, 0 -gaugeCategory = Debug +gaugeCategory = Debug debugF1Gauge = debugFloatField1, {bitStringValue( debugFieldF1List, debugMode )}, "", 0, 100, 0, 0, 100, 100, 4, 4 debugF2Gauge = debugFloatField2, {bitStringValue( debugFieldF2List, debugMode )}, "", -100, 100, 0, 0, 100, 100, 4, 4 debugF3Gauge = debugFloatField3, {bitStringValue( debugFieldF3List, debugMode )}, "", -100, 100, 0, 0, 100, 100, 4, 4 @@ -2232,7 +2232,7 @@ gaugeCategory = Sensors - Basic afr1Gauge = AFRValue, "Air fuel ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2 MAFGauge = MAFValue, "Mass air flow", "v", 0, 5, 0, 1, 3, 4, 1, 1 VBattGauge = VBatt, "Battery voltage", "V", 8, 21, 9, 10, 17, 19, 1, 1 - MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 + MAPGauge = MAPValue, "MAP", "kPa", 0, 300, 10, 10, 200, 200, 0, 0 massAirFlowValueGa = massAirFlowValue,"Mass air flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 @@ -2243,7 +2243,7 @@ gaugeCategory = Sensors - Extra 1 atmPresCGauge = baroPressure, "Barometric pressure", "kPa", 0, 1024, 0, 0, 0, 0, 0, 0 vvtPositionGauge = vvtPosition, "VVT position", "deg", 0, 100, 0, 0, 720, 720, 0, 0 internalMcuTemperatureGauge = internalMcuTemperature, "ECU temperature", "C", 0, 100, 0, 0, 75, 100, 0, 0 - OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 + OilPressGauge = oilPressure, "Oil Pressure", "kPa", 0, 750, 35, 75, 550, 700, 0, 0 idleAirValvePositionGauge = idleAirValvePosition, "Idle position", "%", 0, 100, 0, 0, 100, 100, 1, 1 gaugeCategory = Ignition @@ -2269,7 +2269,7 @@ gaugeCategory = Fueling injectorDutyCycleGauge=injectorDutyCycle, "fuel: injector duty cycle","%", 0, 120, 10, 10, 100, 100, 1, 1 actualLastInjectionGauge = actualLastInjection, "fuel: Last injection", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 veValueGauge = veValue, "fuel: VE", "", 0, 120, 10, 10, 100, 100, 1, 1 - + injectorLagMsGauge = injectorLagMs, "fuel: injector lag", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 fuelRunningGauge = fuelRunning, "fuel: running", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1 @@ -2293,7 +2293,7 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 [WueAnalyze] - + ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition wueAnalyzeMap = wueAnalyzer_warmup_curve, wueAfrTargetOffsetCurve, afrTableTbl, AFRValue, coolant, cltCorrection, egoCorrection @@ -2317,7 +2317,7 @@ gaugeCategory = Sensors - Raw filter = lowRpm, "Low RPM" , rpm, < , 300, , false filter = std_Custom ; Standard Custom Expression Filter. - + [FrontPage] ; Gauges are numbered left to right, top to bottom. ; @@ -2332,7 +2332,7 @@ gaugeCategory = Sensors - Raw gauge6 = VBattGauge gauge7 = dwellGauge gauge8 = ignadvGauge - + ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg @@ -2343,15 +2343,15 @@ gaugeCategory = Sensors - Raw indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", yellow, black, white, black indicator = { ind_injection_enabled}, "no injection", "injection", yellow, black, white, black indicator = { ind_isTriggerError}, "trigger ok", "trigger err", white, black, red, black - - ; this is required so that the "config error" feature works in TS + + ; this is required so that the "config error" feature works in TS ; don't change this line - TS is looking for an indicator with particular text/styling ; you don't even have to show it by default indicator = { ind_hasFatalError }, "Config Error", "Config Error", white, black, red, black - ; minor info + ; minor info indicator = { ind_fan}, "fan off", "fan on", white, black, green, black - indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black + indicator = { isCylinderCleanupActivated}, "no cyl cleanup", "cyl cleanup", white, black, yellow, black indicator = { needBurn }, "config ok", "unsaved changes", white, black, yellow, black indicator = { hasSdCard}, "no SD", "with SD", white, black, green, black indicator = { ind_fuel_pump}, "pump off", "pump on", white, black, green, black @@ -2359,7 +2359,7 @@ gaugeCategory = Sensors - Raw indicator = { clutchDownState }, "clutch", "cltch Down", white, black, yellow, black indicator = { brakePedalIndicator }, "brake", "brake down", white, black, red, black indicator = { acSwitchIndicator }, "AC off", "AC on", white, black, blue, white - + ; error codes indicator = { ind_tps_error}, "tps", "tps error", white, black, red, black indicator = { ind_clt_error}, "clt", "clt error", white, black, red, black @@ -2369,11 +2369,11 @@ gaugeCategory = Sensors - Raw indicator = { knockEverIndicator }, "", "Knock recently", white, black, red, black indicator = { knockNowIndicator }, "no knock", "Knock NOW", white, black, red, black - + [KeyActions] showPanel = spi, spiFunction - showPanel = con, connection + showPanel = con, connection [Datalog] ; Channel Label Type Format @@ -2431,7 +2431,7 @@ gaugeCategory = Sensors - Raw entry = wallFuelCorrection,"fuel: wall corr ms", float, "%.3f" entry = wallFuelAmount, "fuel: wall amount", float, "%.3f" - + entry = baroCorrection, "fuel: Barometric pressure correction",float,"%.3f" entry = iatCorrection, "fuel: IAT correction", float, "%.3f" entry = cltCorrection, "fuel: CLT correction", float,"%.3f" @@ -2442,19 +2442,19 @@ gaugeCategory = Sensors - Raw ; is there a way to log parameter? entry = debugMode, "debugMode",int,"%d" ; Alternator_PID: alternator duty cycle -; DBG_TPS_ACCEL: from TPS +; DBG_TPS_ACCEL: from TPS entry = debugFloatField1, "debug f1",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: current integration term ; DBG_TPS_ACCEL: to TPS entry = debugFloatField2, "debug f2: iTerm",float,"%.4f", { !enableLogDebugChannels } - + ; Alternator_PID: previous error ; DBG_TPS_ACCEL: tps<>tps table value entry = debugFloatField3, "debug f3: prevError",float,"%.4f", { !enableLogDebugChannels } - + ; Alternator_PID: I setting -; DBG_TPS_ACCEL: extra fuel +; DBG_TPS_ACCEL: extra fuel entry = debugFloatField4, "debug f4: iParam",float,"%.4f", { !enableLogDebugChannels } ; Alternator_PID: D setting @@ -2462,7 +2462,7 @@ gaugeCategory = Sensors - Raw ; Alternator_PID: dTerm entry = debugFloatField6, "debug f6: dTerm",float,"%.4f", { !enableLogDebugChannels } - + entry = debugFloatField7, "debug f7",float,"%.4f", { !enableLogDebugChannels } @@ -2471,8 +2471,8 @@ gaugeCategory = Sensors - Raw ; Alternator_PID: offset setting entry = debugIntField2, "debug i2: offset",int,"%d", { !enableLogDebugChannels } - -; Alternator_PID: PID reset counter + +; Alternator_PID: PID reset counter entry = debugIntField3, "debug i3",int,"%d", { !enableLogDebugChannels } entry = debugIntField4, "debug i4",int,"%d", { !enableLogDebugChannels } @@ -2495,9 +2495,9 @@ gaugeCategory = Sensors - Raw entry = recentErrorCode6, "error 6",int,"%d", { !enableLogErrorList } entry = recentErrorCode7, "error 7",int,"%d", { !enableLogErrorList } entry = internalMcuTemperature, "CPU Temperature",float,"%.2f" - + entry = tCharge, "tCharge",float,"%.3f" - + entry = clutchUpState, "clutch: up",int,"%d" entry = clutchDownState, "clutch: down",int,"%d" entry = brakePedalIndicator, "brake: down",int,"%d" @@ -2508,8 +2508,8 @@ gaugeCategory = Sensors - Raw entry = etb1Error, "ETB Error", float, "%.3f" entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" - - + + ; tpsADC = U16, "ADC", ; alignmet = U16, "al", ; atmPres = F32, "pres", @@ -2528,7 +2528,7 @@ menuDialog = main subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator - + # Digital outputs subMenu = mainRelayDialog, "Main relay" subMenu = starterRelay, "Starter Disable relay" @@ -2586,25 +2586,25 @@ menuDialog = main # corrections subMenu = cltTimingCorrCurve, "CLT correction", 0, {isIgnitionEnabled == 1} subMenu = ignitionIatCorrTableTbl, "IAT correction", 0, {isIgnitionEnabled == 1} - + menu = "&Cranking" subMenu = crankingDialog, "Cranking settings" subMenu = std_separator subMenu = crankingCltCurve, "Fuel CLT multiplier" - subMenu = crankingDurationCurve, "Fuel duration multiplier" + subMenu = crankingDurationCurve, "Fuel duration multiplier" subMenu = crankingTpsCurve, "Fuel TPS multiplier" subMenu = std_separator subMenu = crankingAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForCranking == 1} subMenu = std_separator - subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} - + subMenu = cltCrankingCurve, "IAC multiplier", 0, {overrideCrankingIacSetting == 1} + menu = "&Idle" subMenu = idleSettings, "Idle settings" subMenu = idlehw, "Idle hardware" - subMenu = std_separator + subMenu = std_separator subMenu = cltIdleRPMCurve, "Target RPM", 0, {idleMode == 0} subMenu = iacPidMultTbl, "IAC PID Multiplier", 0, {idleMode == 0 && useIacPidMultTable == 1} subMenu = std_separator @@ -2615,7 +2615,7 @@ menuDialog = main subMenu = cltIdleCurve, "CLT multiplier" subMenu = iacCoastingCurve, "Coasting IAC Position for Auto-Idle", 0, {useIacTableForCoasting == 1} - menu = "&Advanced" + menu = "&Advanced" subMenu = boostDialog, "Boost Control" subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } @@ -2671,13 +2671,13 @@ menuDialog = main # O2 sensor(s) subMenu = egoSettings, "EGO sensor" subMenu = narrowToWideOxygenCurve, "Narrow to Wideband approximation" - subMenu = cj125Function, "CJ125 settings (wbo decoder)" + subMenu = cj125Function, "CJ125 settings (wbo decoder)" subMenu = std_separator # Misc sensors subMenu = speedSensor, "Vehicle speed sensor" subMenu = oilPressureSensor, "Oil pressure" - subMenu = egtInputs, "EGT" + subMenu = egtInputs, "EGT" menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" @@ -2685,19 +2685,19 @@ menuDialog = main subMenu = ioTest, "Bench test" subMenu = engineTypeDialog, "Popular vehicles" subMenu = std_separator - - subMenu = lcdScreen, "LCD" - subMenu = joystickPanel, "Joystick" + + subMenu = lcdScreen, "LCD" + subMenu = joystickPanel, "Joystick" subMenu = spiFunction, "SPI" subMenu = monitoringSettings, "rusEfi console" subMenu = std_separator - + subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - - subMenu = allPins1, "Full pinout 1/3" - subMenu = allPins2, "Full pinout 2/3" - subMenu = allPins3_1_and_2 "Full pinout 3/3" + + subMenu = allPins1, "Full pinout 1/3" + subMenu = allPins2, "Full pinout 2/3" + subMenu = allPins3_1_and_2 "Full pinout 3/3" subMenu = std_separator @@ -2706,14 +2706,14 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = std_separator - - subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" + + subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" subMenu = std_separator - subMenu = etbDialog, "Electronic throttle body (beta version)" - subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" - subMenu = pedalToTpsTbl, "Electronic Pedal Map" - subMenu = std_separator + subMenu = etbDialog, "Electronic throttle body (beta version)" + subMenu = etbTpsBiasCurve, "Electronic throttle body bias curve" + subMenu = pedalToTpsTbl, "Electronic Pedal Map" + subMenu = std_separator # subMenu = smLaunchControl, "Launch Control" # subMenu = std_separator # subMenu = smRollingLaunch, "Rolling Launch" @@ -2732,7 +2732,7 @@ menuDialog = main ; This does not include any resultant protocol envelope data, only the response data itself. ; WARNING!! These commands bypass TunerStudio's normal memory synchronization. If these commands -; alter mapped settings (Constant) memory in the controller, TunerStudio will have an out of sync condition +; alter mapped settings (Constant) memory in the controller, TunerStudio will have an out of sync condition ; and may create error messages. ; It is expected that these commands would not typically alter any ram mapped to a Constant. @@ -2756,8 +2756,8 @@ cmd_test_spk13 = "w\x00\x12\x00\x0d" cmd_test_spk14 = "w\x00\x12\x00\x0e" cmd_test_spk15 = "w\x00\x12\x00\x0f" cmd_test_spk16 = "w\x00\x12\x00\x10" - - + + cmd_test_inj1 = "w\x00\x13\x00\x01" cmd_test_inj2 = "w\x00\x13\x00\x02" cmd_test_inj3 = "w\x00\x13\x00\x03" @@ -2831,7 +2831,7 @@ cmd_set_engine_type_etb_test = "w\x00\x30\x00\x3A" ; ETB_BENCH_ENGINE = 59 cmd_set_engine_type_8888_test = "w\x00\x30\x00\x3B" cmd_set_engine_type_default = "w\x00\x31\x00\x00" - + [UserDefined] dialog = fuelTableBottomDialog, "", card panel = fuelTableMAFTbl, Center, {fuelAlgorithm==LM_PLAIN_MAF} @@ -2874,7 +2874,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Min tCharge Coeff.", tChargeAirCoefMin field = "Max tCharge Coeff.", tChargeAirCoefMax field = "Max Air Flow, kg/h", tChargeAirFlowMax - + dialog = tChargeSettings, "tCharge Settings" panel = tChargeGeneralSettings panel = tChargeRpmTpsSettings, { tChargeMode == 0} @@ -2908,7 +2908,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Ignition Pin 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} field = "Ignition Pin 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Pin 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))} - + field = "This is useful to have tachometer working" field = " while converting from distributor" field = "Dizzy out Pin", dizzySparkOutputPin, {isIgnitionEnabled == 1} @@ -2954,7 +2954,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" - field = "use only rising edge", useOnlyRisingEdgeForTrigger + field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset @@ -2978,7 +2978,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} field = "Cam Sync/VVT input", camInputs1 - + dialog = triggerConfiguration panel = triggerConfiguration_settings, North panel = triggerInputs, South @@ -3003,8 +3003,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Injection Pin 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} field = "Injection Pin 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} field = "Injection Pin 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} - field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} - + field = "Injection Pin 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = injectionBasic, "" topicHelp = "fuelHelp" panel = baseInjection @@ -3028,7 +3028,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Extra cyl #8", timing_offset_cylinder8, {cylindersCount > 7} field = "Extra cyl #9", timing_offset_cylinder9, {cylindersCount > 8} field = "Extra cyl #10", timing_offset_cylinder10, {cylindersCount > 9} - field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} + field = "Extra cyl #11", timing_offset_cylinder11, {cylindersCount > 10} field = "Extra cyl #12", timing_offset_cylinder12, {cylindersCount > 11} dialog = multisparkDwellParams, "Delay & Dwell" @@ -3049,7 +3049,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = dwellSettings, "", yAxis panel = dwellCorrection, Center - + ; Sensors->AUX1 Thermistor Sensor Setting dialog = auxTempSensor1Sensor, "aux1 Thermistor Settings" field = "Input channel", auxTempSensor1_adcChannel @@ -3083,7 +3083,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Highest temperature", auxTempSensor2_tempC_3, {auxTempSensor2_adcChannel != 16} field = "Resistance @ HT", auxTempSensor2_resistance_3, {auxTempSensor2_adcChannel != 16} - + dialog = tpsNum1, "Throttle #1" field = "!See Tools>Calibrate TPS" field = "Primary sensor", tps1_1AdcChannel @@ -3126,7 +3126,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = pedalSensorLeft, West panel = pedalGauges, East - dialog = mc33Dialog, "GDI Dreams" + dialog = mc33Dialog, "GDI Dreams" field = mc33816_cs, mc33816_cs field = mc33816_rstb, mc33816_rstb field = mc33816_flag0, mc33816_flag0 @@ -3141,7 +3141,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = mc33_t_bypass, mc33_t_bypass field = mc33_t_hold_off, mc33_t_hold_off field = mc33_t_hold_tot, mc33_t_hold_tot - + ; Sensor Inputs dialog = otherSensorInputs, "Other Sensor Inputs" @@ -3224,15 +3224,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin field = "Fuel Pump Pin", fuelPumpPin - field = "ETB#1 Dir #1", etbIo1_directionPin1 - field = "ETB#1 Dir #2", etbIo1_directionPin2 - field = "ETB#1 Control #1", etbIo1_controlPin1 - field = "ETB#1 Disable", etbIo1_disablePin - field = "ETB#2 Dir #1", etbIo2_directionPin1 - field = "ETB#2 Dir #2", etbIo2_directionPin2 - field = "ETB#2 Control #1", etbIo2_controlPin1 - field = "ETB#2 Disable", etbIo2_disablePin - field = "SD CS Pin", sdCardCsPin + field = "ETB#1 Dir #1", etbIo1_directionPin1 + field = "ETB#1 Dir #2", etbIo1_directionPin2 + field = "ETB#1 Control #1", etbIo1_controlPin1 + field = "ETB#1 Disable", etbIo1_disablePin + field = "ETB#2 Dir #1", etbIo2_directionPin1 + field = "ETB#2 Dir #2", etbIo2_directionPin2 + field = "ETB#2 Control #1", etbIo2_controlPin1 + field = "ETB#2 Disable", etbIo2_disablePin + field = "SD CS Pin", sdCardCsPin field = "MIL / Check Engine Pin", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin @@ -3314,19 +3314,19 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "FSIO ADC #2", fsioAdc2 field = "FSIO ADC #3", fsioAdc3 field = "FSIO ADC #4", fsioAdc4 - field = "GPS RX", gps_rx_pin - field = "GPS TX", gps_tx_pin - field = "CAN RX pin", canRxPin - field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} - field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} - field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} - field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} - field = "SPI2 SCK", spi2sckPin, {is_enabled_spi_2 == 1} - field = "SPI3 MOSI", spi3mosiPin, {is_enabled_spi_3 == 1} - field = "SPI3 MISO", spi3misoPin, {is_enabled_spi_3 == 1} - field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} + field = "GPS RX", gps_rx_pin + field = "GPS TX", gps_tx_pin + field = "CAN RX pin", canRxPin + field = "CAN TX pin", canTxPin + field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} + field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} + field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} + field = "SPI2 SCK", spi2sckPin, {is_enabled_spi_2 == 1} + field = "SPI3 MOSI", spi3mosiPin, {is_enabled_spi_3 == 1} + field = "SPI3 MISO", spi3misoPin, {is_enabled_spi_3 == 1} + field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin field = "MIL / Check Engine", malfunctionIndicatorPin @@ -3350,8 +3350,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Aux Pin #4", auxPidPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 - field = "TLE8888 Chip Select", tle8888_cs - field = "TLE 8888 spi", tle8888spiDevice + field = "TLE8888 Chip Select", tle8888_cs + field = "TLE 8888 spi", tle8888spiDevice field = "AUX Serial TX", auxSerialTxPin field = "AUX Serial RX", auxSerialRxPin @@ -3429,7 +3429,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = iatSensor, "IAT Sensor", border panel = iat_thermistor, West panel = iatGauges, East - + ; Sensors->Oil pressure sensor dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel @@ -3447,14 +3447,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = oilPressureGauges, East ; Sensors->MAP sensor - dialog = mapSensorAnalog, "MAP sensor", yAxis + dialog = mapSensorAnalog, "MAP sensor", yAxis field = "MAP ADC input", map_sensor_hwChannel field = "MAP type", map_sensor_type, { map_sensor_hwChannel != 16 } field = "MAP value low point", map_sensor_lowValue, { map_sensor_hwChannel != 16 && map_sensor_type == 0 } field = "MAP voltage low point", mapLowValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 } field = "MAP value high point", map_sensor_highValue,{ map_sensor_hwChannel != 16 && map_sensor_type == 0 } field = "MAP voltage high value", mapHighValueVoltage, { map_sensor_hwChannel != 16 && map_sensor_type == 0 } - + dialog = mapSensorFreq, "MAP frequency sensor", yAxis field = "MAP Freq", frequencyReportingMapInputPin field = "0 kPa freq", mapFrequency0Kpa @@ -3490,7 +3490,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Sensors->EGO sensor dialog = egoSettings_sensor, "EGO sensor" field = "Type", afr_type -; todo: only use these values for custom! +; todo: only use these values for custom! field = "low voltage", afr_v1 field = "low value", afr_value1 field = "high voltage", afr_v2 @@ -3519,7 +3519,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "CS #7", max31855_cs7 field = "CS #8", max31855_cs8 -; Engine->idle Settings +; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Pin", idle_solenoidPin, !useStepperIdle @@ -3562,8 +3562,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Use Stepper", useStepperIdle field = "Double Solenoid Mode", isDoubleSolenoidIdle panel = idleHwType - - dialog = idlePidSettings, "PID IAC Control" + + dialog = idlePidSettings, "PID IAC Control" field = "#See Idle Target RPM Curve" field = "P-factor", idleRpmPid_pFactor field = "I-factor", idleRpmPid_iFactor @@ -3580,8 +3580,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "RPM upper limit to deactivate IAC pid",idlePidRpmUpperLimit field = "PID Extra for low RPM", pidExtraForLowRpm field = "Use IAC PID Multiplier Table", useIacPidMultTable - - + + dialog = idleSettings, "", yAxis field = "Idle IAC control mode", idleMode field = useInstantRpmForIdle, useInstantRpmForIdle @@ -3643,7 +3643,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = starterRelay, "Starter relay output" field = "Pin", starterRelayDisablePin field = "Pin mode", starterRelayDisableMode - + dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin @@ -3653,7 +3653,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod ; Engine->hip9011 Settings @@ -3673,7 +3673,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Band Freq override", knockBandCustom, {isHip9011Enabled == 1} field = "SPI device", hip9011SpiDevice, {isHip9011Enabled == 1} panel = knockThresholdCurve - + ; Engine->cj125 Settings dialog = cj125Function, "CJ125 Settings (wbo decoder)" field = "Enabled", isCJ125Enabled @@ -3689,7 +3689,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} field = "Is UR input divided?" cj125isUrDivided, {isCJ125Enabled == 1} - + dialog = spiFunction, "SPI settings" field = "!ECU reboot needed to apply these settings" field = "SPI1 enable", is_enabled_spi_1 @@ -3809,7 +3809,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = batteryDialog panel = alternator panel = startStopDialog - + dialog = speedSensorAnalog field = "Input pin", vehicleSpeedSensorInputPin field = "revolution to speed mult", vehicleSpeedCoef @@ -3825,8 +3825,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge - -; Engine->Other inputs + +; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" field = "!ECU reboot needed to apply these settings" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap @@ -3851,7 +3851,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "TX pin", binarySerialTxPin, {useSerialPort == 1} field = "RX pin", binarySerialRxPin, {useSerialPort == 1} field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed - + dialog = canBus, "CAN Bus" field = "Can Read Enabled", canReadEnabled field = "Can Write Enabled", canWriteEnabled @@ -3859,14 +3859,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Enable rusEFI CAN broadcast", enableVerboseCanTx field = "rusEfi CAN data base address", verboseCanBaseAddress field = "Can Sleep Period", canSleepPeriodMs - field = "RX pin", canRxPin - field = "TX pin", canTxPin + field = "RX pin", canRxPin + field = "TX pin", canTxPin dialog = auxSerial, "AUX Serial" - field = "RX pin", auxSerialRxPin - field = "TX pin", auxSerialTxPin - field = "Serial Baud Rate", auxSerialSpeed - + field = "RX pin", auxSerialRxPin + field = "TX pin", auxSerialTxPin + field = "Serial Baud Rate", auxSerialSpeed + dialog = sdCard, "SD Card Logger" field = "SdCard", isSdCardEnabled field = "showSdCardWarning", showSdCardWarning @@ -3875,11 +3875,11 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "log format", logFormat field = "Mass Storage", storageMode field = "Write Period", sdCardPeriodMs - - dialog = gpsReceiver, "GPS Receiver" + + dialog = gpsReceiver, "GPS Receiver" field = "gps RX", gps_rx_pin field = "gps TX", gps_tx_pin - + dialog = lcdScreen, "LCD screen" field = "display Mode", displayMode field = "height", HD44780height @@ -3890,45 +3890,45 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "D5 pin", HD44780_db5 field = "D6 pin", HD44780_db6 field = "D7 pin", HD44780_db7 - + dialog = tle8888, "TLE8888", yAxis - field = "TLE8888 Chip Select", tle8888_cs - field = "TLE8888 SPI", tle8888spiDevice + field = "TLE8888 Chip Select", tle8888_cs + field = "TLE8888 SPI", tle8888spiDevice field = "Mode", tle8888mode field = "useTLE8888 cranking reset hack", useTLE8888_cranking_hack commandButton = "Reinit", cmd_tle8888_init dialog = connection, "", yAxis field = "ADC vRef voltage", adcVcc - panel = tsPort + panel = tsPort panel = canBus panel = auxSerial - panel = sdCard - panel = gpsReceiver + panel = sdCard + panel = gpsReceiver - - dialog = monitoringSettings, "rusEfi Console Settings" + + dialog = monitoringSettings, "rusEfi Console Settings" field = "Sensor Sniffer", sensorChartMode field = " Threshold", sensorSnifferRpmThreshold field = " Each X cycle", sensorChartFrequency - field = "Engine Sniffer", isEngineChartEnabled + field = "Engine Sniffer", isEngineChartEnabled field = " Threshold", engineSnifferRpmThreshold - + dialog = generalSettings, "General" field = "!https://rusefi.com/s/fuel" field = "Fuel strategy", fuelAlgorithm - + dialog = debugging, "Debug" field = "!https://rusefi.com/s/debugmode" field = "Debug mode", debugMode field = "Warning Text", warning_message field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning - + dialog = limits, "Limits" field = "RPM hard limit", rpmHardLimit field = "Boost cut pressure", boostCutPressure - + ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" topicHelp = "baseHelp" @@ -3946,7 +3946,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration field = "Override IAC multiplier for cranking", overrideCrankingIacSetting - + dialog = crankingIgnition, "Ignition" field = "Advance", crankingTimingAngle, {useSeparateAdvanceForCranking == 0} field = "Use separate Advance Table for cranking", useSeparateAdvanceForCranking @@ -3954,16 +3954,16 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Use fixed cranking dwell", useConstantDwellDuringCranking field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec - + dialog = primingFuelPulsePanel, "Priming fuel pulse" field = "Duration at -40C degrees", startOfCrankingPrimingPulse field = "Falloff temperature", primeInjFalloffTemperature - - + + ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm @@ -3992,20 +3992,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#Accelerator Pump model:" field = "Fraction Period", tpsAccelFractionPeriod field = "Fraction Divisor", tpsAccelFractionDivisor - + dialog = WallWettingAccelPanel, "Wall Wetting (alpha version)" field = "evaporation time constant / tau", wwaeTau field = "added to wall coef / beta", wwaeBeta - - + + ; Tuning->AccelEnrichment dialog = AccelEnrich, "Accel/Decel Enrichment" panel = TpsAccelPanel panel = WallWettingAccelPanel panel = EngineLoadAccelPanel field = "No accel after RPM hard limit", noAccelAfterHardLimitPeriodSecs - - + + ; Flex Logic dialog = fsioIO, "Outputs" field = "output #1", fsioOutputPins1 @@ -4028,7 +4028,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "aux valve #2", auxValves2 field = "Start/Stop Button", startStopButtonPin field = "External Knock", externalKnockSenseAdc - + dialog = fsioFrequency, "Frequency" field = "freq #1", fsioFrequency1 field = "freq #2", fsioFrequency2 @@ -4048,7 +4048,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "freq #16", fsioFrequency16 field = "" field = "" - + dialog = fsioSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." @@ -4068,12 +4068,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "set #14", fsio_setting14 field = "set #15", fsio_setting15 field = "set #16", fsio_setting16 - + dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center panel = fsioSetting, East - + dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" field = "#fsioinfo command in rusEfi console could be useful while troubleshooting those" @@ -4086,10 +4086,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "use FSIO #5 for critical engine stop", useFSIO5ForCriticalIssueEngineStop field = "#5", fsioFormulas5 - + field = "use FSIO #6 for rev limiter", useFSIO6ForRevLimiter field = "#6", fsioFormulas6 - + field = "#7", fsioFormulas7 field = "use FSIO #8 for servo #1", useFSIO8ForServo1 @@ -4110,7 +4110,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "#15", fsioFormulas15 field = "use FSIO #16 for timing adjustment", useFSIO16ForTimingAdjustment field = "#16", fsioFormulas16 - + dialog = fsioInputsDialog, "FSIO inputs" field = "ADC #1", fsioAdc1 field = "ADC #2", fsioAdc2 @@ -4124,8 +4124,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Control Mode", boostType, { isBoostControlEnabled } field = "Output", boostControlPin, { isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } - field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } - + field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } + dialog = boostDialog, "", border panel = boost_left, West panel = boostTableTbl, Center @@ -4133,28 +4133,28 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } - field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } - field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } - field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } - field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } - field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } + field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } + field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } + field = "Min Duty", boostPid_minValue, { isBoostControlEnabled && boostType == 1 } + field = "Max Duty", boostPid_maxValue, { isBoostControlEnabled && boostType == 1 } dialog = boostTableDialog, "", card panel = boostTable2Tbl dialog = boostPidDialog, "", border panel = boostPidleft, West - panel = boostTableDialog, Center - + panel = boostTableDialog, Center + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" - - help = fuelHelp, "Fuel Control" + + help = fuelHelp, "Fuel Control" text = "More about fuel control on the web" webHelp = "https://rusefi.com/s/fuel" - + help = etbHelp, "ETB Control" text = "More about electronic throttle body on the web" webHelp = "https://rusefi.com/s/etb" @@ -4163,14 +4163,14 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" text = "More about Tps To Tps acceleration on the web" webHelp = "https://rusefi.com/s/tpstps" - help = baseHelp, "Base Settings Control" + help = baseHelp, "Base Settings Control" text = "More about rusefi on the web" webHelp = "https://rusefi.com/" dialog = veTableDialog topicHelp = "veTableDialogHelp" panel = veTableTbl, South - + dialog = veTableDialog3D, "VE Table" topicHelp = "veTableDialogHelp" panel = veTableMap, South @@ -4228,7 +4228,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Spark #6", cmd_test_spk6 commandButton = "Spark #7", cmd_test_spk7 commandButton = "Spark #8", cmd_test_spk8 - + dialog = testInjectors, "Fuel" commandButton = "Injector #1", cmd_test_inj1 commandButton = "Injector #2", cmd_test_inj2 @@ -4238,29 +4238,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" commandButton = "Injector #6", cmd_test_inj6 commandButton = "Injector #7", cmd_test_inj7 commandButton = "Injector #8", cmd_test_inj8 - + dialog = testMisc, "Misc" ; commandButton = "Come To Pit", cmd_call_from_pit commandButton = "Fuel Pump", cmd_test_fuel_pump commandButton = "Radiator Fan", cmd_test_radiator_fan commandButton = "Check Engine", cmd_test_check_engine_light commandButton = "Idle Air Valve", cmd_test_idle_valve - commandButton = "A/C Relay", cmd_test_ac_relay + commandButton = "A/C Relay", cmd_test_ac_relay commandButton = "Starter Relay", cmd_test_starter_relay commandButton = "Stop Engine", cmd_stop_engine - commandButton = "Write Config", cmd_write_config + commandButton = "Write Config", cmd_write_config commandButton = "Reset ECU", cmd_reset_controller commandButton = "Reset to DFU", cmd_dfu - ; bench test + ; bench test dialog = ioTest, "Bench Test & Commands", border panel = testSpark, West panel = testInjectors, Center panel = testMisc, East - + dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEfi controller to apply preset values" - field = "!Once you send the command, please reconnect to rusEfi controller in order to read fresh values" + field = "!Once you send the command, please reconnect to rusEfi controller in order to read fresh values" commandButton = "Frankenso Miata NA6 Stage 0", cmd_set_engine_type_Frankenso_Miata_NA6_VAF commandButton = "Frankenso Miata NA6 Stage 1", cmd_set_engine_type_Frankenso_Miata_NA6_MAP commandButton = "Frankenso Miata NB2 MAP", cmd_set_engine_type_Frankenso_Miata_NB2 @@ -4328,7 +4328,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Ignition Cut", launchSparkCutEnable, {launchControlEnabled == 1} field = "Fuel Cut", launchFuelCutEnable, {launchControlEnabled == 1} field = "Hard Cut RPM Range", hardCutRpmRange, {launchControlEnabled == 1} - + @@ -4343,7 +4343,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} - + dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" field = "Enable Coasting Fuel Cutoff", coastingFuelCutEnabled field = "Cutoff Activation RPM High Limit", coastingFuelCutRpmHigh, {coastingFuelCutEnabled == 1} @@ -4451,4 +4451,4 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ;addTool = toolName, PanelName addTool = veTableGenerator, "VE Table Generator", veTableTbl addTool = afrTableGenerator, "AFR Table Generator", afrTableTbl - +