diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 0ebabffba3..1d7bd9d6bb 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2098,8 +2098,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Injection phase control mode", injectionTimingMode, { isInjectionEnabled } dialog = ignitionOutputs, "Ignition Outputs" - field = "Ignition Pin Mode", ignitionPinMode, {isIgnitionEnabled == 1}@@if_ts_show_ignitionPinMode - field = "Ignition Pin 1", ignitionPins1, {isIgnitionEnabled == 1} + field = "Ignition Output Mode", ignitionPinMode, {isIgnitionEnabled == 1}@@if_ts_show_ignitionPinMode + field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java @@FIRINGORDER@@ @@ -2228,21 +2228,21 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "E100 stoichiometric ratio", stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 } dialog = injectorOutputSettings, "Injector Outputs", yAxis - field = "Use only first half of pins for batch mode" - field = "Injection Pin 1", injectionPins1, {isInjectionEnabled == 1} - field = "Injection Pin 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} - field = "Injection Pin 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 2} - field = "Injection Pin 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} - field = "Injection Pin 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 4} - field = "Injection Pin 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 5} - field = "Injection Pin 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} - field = "Injection Pin 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} - 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 = "Use only first half of outputs for batch mode" + field = "Injection Output 1", injectionPins1, {isInjectionEnabled == 1} + field = "Injection Output 2", injectionPins2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Injection Output 3", injectionPins3, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 2} + field = "Injection Output 4", injectionPins4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Injection Output 5 ", injectionPins5, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 4} + field = "Injection Output 6 ", injectionPins6, {isInjectionEnabled == 1 && injectionMode != @@injection_mode_e_IM_SINGLE_POINT@@ && cylindersCount > 5} + field = "Injection Output 7 ", injectionPins7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Injection Output 8 ", injectionPins8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Injection Output 9 ", injectionPins9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Injection Output 10 ", injectionPins10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Injection Output 11 ", injectionPins11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Injection Output 12 ", injectionPins12, {isInjectionEnabled == 1 && cylindersCount > 11} field = ""@@if_ts_show_injectionPinMode - field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1}@@if_ts_show_injectionPinMode + field = "injection Output(s) Mode", injectionPinMode, {isInjectionEnabled == 1}@@if_ts_show_injectionPinMode dialog = cylinderBankSelect, "Cylinder Banks", yAxis field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} @@ -2498,12 +2498,12 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = tpsGauges, East dialog = wastegatePosConfig, "Wastegate position sensor" - field = "Input pin", wastegatePositionSensor + field = "Input", wastegatePositionSensor field = "Min (fully closed, most boost)", wastegatePositionMin field = "Max (fully open, least boost)", wastegatePositionMax dialog = idlePosConfig, "Idle position sensor" - field = "Input pin", idlePositionSensor + field = "Input", idlePositionSensor field = "Min (valve closed, low idle)", idlePositionMin field = "Max (valve open, high idle)", idlePositionMax @@ -2595,11 +2595,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "AFR ADC input", afr_hwChannel field = "Baro ADC input", baroSensor_hwChannel field = "MAP ADC input", map_sensor_hwChannel - field = "FuelLevelSensor", fuelLevelSensor - field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin - field = "clutchDownPin", clutchDownPin - field = "clutchUpPin", clutchUpPin - field = "brakePedalPin", brakePedalPin + field = "Fuel Level input", fuelLevelSensor + field = "Vehicle Speed input", vehicleSpeedSensorInputPin + field = "Clutch Down input", clutchDownPin + field = "Clutch Up input", clutchUpPin + field = "Brake pedal input", brakePedalPin field = "A/C Switch", acSwitch field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel @@ -2622,22 +2622,22 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = hpfpValcePin, hpfpValvePin dialog = allPins1_1 - field = "trigger stimulator pin #1", triggerSimulatorPins1 - field = "trigger stimulator pin #2", triggerSimulatorPins2 + field = "trigger stimulator output #1", triggerSimulatorPins1 + field = "trigger stimulator output #2", triggerSimulatorPins2 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice panel = joystickPanel dialog = allPins1_2 - field = "Tachometer output Pin", tachOutputPin - field = "O2 heater pin", o2heaterPin - field = "Idle Solenoid Pin", idle_solenoidPin - field = "Second Idle Solenoid Pin", secondSolenoidPin + field = "Tachometer output", tachOutputPin + field = "O2 heater output", o2heaterPin + field = "Idle Solenoid Primary output", idle_solenoidPin + field = "Idle Solenoid Secondary output",secondSolenoidPin field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Enable", stepperEnablePin - field = "Fuel Pump Pin", fuelPumpPin + field = "Fuel Pump output", fuelPumpPin field = "ETB#1 Dir #1", etbIo1_directionPin1 @@if_ts_show_etb_pins field = "ETB#1 Dir #2", etbIo1_directionPin2 @@if_ts_show_etb_pins field = "ETB#1 Control", etbIo1_controlPin @@if_ts_show_etb_pins @@ -2647,7 +2647,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "ETB#2 Control", etbIo2_controlPin @@if_ts_show_etb_pins field = "ETB#2 Disable", etbIo2_disablePin @@if_ts_show_etb_pins field = "SD CS Pin", sdCardCsPin @@if_ts_show_sd_card - field = "MIL / Check Engine Pin", malfunctionIndicatorPin + field = "MIL/Check Engine output", malfunctionIndicatorPin field = "test557pin", test557pin field = "Fan Pin", fanPin field = "A/C Relay", acRelayPin @@ -2655,35 +2655,35 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Starter Relay Pin", starterRelayDisablePin dialog = allPins2_1 - field = "Injection Pin 1", injectionPins1 - field = "Injection Pin 2", injectionPins2 - field = "Injection Pin 3", injectionPins3 - field = "Injection Pin 4", injectionPins4 - field = "Injection Pin 5 ", injectionPins5 - field = "Injection Pin 6 ", injectionPins6 - field = "Injection Pin 7 ", injectionPins7 - field = "Injection Pin 8 ", injectionPins8 - field = "Injection Pin 9 ", injectionPins9 - field = "Injection Pin 10 ", injectionPins10 - field = "Injection Pin 11 ", injectionPins11 - field = "Injection Pin 12 ", injectionPins12 + field = "Injection Output 1", injectionPins1 + field = "Injection Output 2", injectionPins2 + field = "Injection Output 3", injectionPins3 + field = "Injection Output 4", injectionPins4 + field = "Injection Output 5 ", injectionPins5 + field = "Injection Output 6 ", injectionPins6 + field = "Injection Output 7 ", injectionPins7 + field = "Injection Output 8 ", injectionPins8 + field = "Injection Output 9 ", injectionPins9 + field = "Injection Output 10 ", injectionPins10 + field = "Injection Output 11 ", injectionPins11 + field = "Injection Output 12 ", injectionPins12 field = auxSpeedSensorInputPin1, auxSpeedSensorInputPin1 field = auxSpeedSensorInputPin2, auxSpeedSensorInputPin2 dialog = allPins2_2 - field = "Ignition Pin 1", ignitionPins1 - field = "Ignition Pin 2", ignitionPins2 - field = "Ignition Pin 3", ignitionPins3 - field = "Ignition Pin 4", ignitionPins4 - field = "Ignition Pin 5", ignitionPins5 - field = "Ignition Pin 6", ignitionPins6 - field = "Ignition Pin 7", ignitionPins7 - field = "Ignition Pin 8", ignitionPins8 - field = "Ignition Pin 9", ignitionPins9 - field = "Ignition Pin 10", ignitionPins10 - field = "Ignition Pin 11", ignitionPins11 - field = "Ignition Pin 12", ignitionPins12 + field = "Ignition Output 1", ignitionPins1 + field = "Ignition Output 2", ignitionPins2 + field = "Ignition Output 3", ignitionPins3 + field = "Ignition Output 4", ignitionPins4 + field = "Ignition Output 5", ignitionPins5 + field = "Ignition Output 6", ignitionPins6 + field = "Ignition Output 7", ignitionPins7 + field = "Ignition Output 8", ignitionPins8 + field = "Ignition Output 9", ignitionPins9 + field = "Ignition Output 10", ignitionPins10 + field = "Ignition Output 11", ignitionPins11 + field = "Ignition Output 12", ignitionPins12 dialog = allPins2_3 field = "LCD E pin", HD44780_e @@ -2719,7 +2719,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1} @@if_ts_show_spi field = "hip9011CsPin", hip9011CsPin field = "LIS302DLCsPin", LIS302DLCsPin - field = "MIL / Check Engine", malfunctionIndicatorPin field = "Saab CDM knock", cdmInputPin field = "DRV8860 CS", drv8860_cs field = "DRV8860 CS Mode", drv8860_csPinMode @@ -2733,10 +2732,10 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = allPinsSensors dialog = allPins3_2 - field = "VVT Pin #1", vvtPins1 - field = "VVT Pin #2", vvtPins2 - field = "VVT Pin #3", vvtPins3 - field = "VVT Pin #4", vvtPins4 + field = "VVT solenoid bank 1 intake", vvtPins1 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "Aux Valve #1", auxValves1 field = "Aux Valve #2", auxValves2 field = "TLE8888 Chip Select", tle8888_cs @@if_ts_show_spi @@ -2748,7 +2747,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Upshift Pin", tcuUpshiftButtonPin field = "Downshift Pin", tcuDownshiftButtonPin - dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + dialog = allPins3_1_and_2, "All IO 3/3", xAxis panel = allPins3_1 panel = allPins3_2 @@ -2756,7 +2755,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/3", xAxis + dialog = allPins1, "All IO 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -2764,7 +2763,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/3", xAxis + dialog = allPins2, "All IO 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 @@ -2942,7 +2941,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ dialog = egoSettings_IO, "EGO Sensor I/O" field = "Input channel", afr_hwChannel - field = "Heater pin", o2heaterPin + field = "Heater output", o2heaterPin dialog = egoSettings, "", yAxis field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } @@ -2964,9 +2963,9 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" - field = "Idle Solenoid Pin Mode", idle_solenoidPinMode, !useStepperIdle - field = "Idle Solenoid Pin", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } - field = "Second Idle Solenoid Pin", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } + field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } + field = "Idle Solenoid output(s) Mode", idle_solenoidPinMode, !useStepperIdle field = "Idle Solenoid Frequency", idle_solenoidFrequency, !useStepperIdle dialog = etbHbridgeHardware, "ETB H-Bridge Hardware" @@ -3107,8 +3106,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ ; Engine->Fan Settings dialog = fan1Settings, "Fan 1" - field = "Pin", fanPin - field = "Pin mode", fanPinMode + field = "Output", fanPin + field = "Output mode", fanPinMode field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature field = "Enable with AC", enableFan1WithAc @@ -3116,8 +3115,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Idle adder", fan1ExtraIdle dialog = fan2Settings, "Fan 2" - field = "Pin", fan2Pin - field = "Pin mode", fan2PinMode + field = "Output", fan2Pin + field = "Output mode", fan2PinMode field = "On temperature", fan2OnTemperature field = "Off temperature", fan2OffTemperature field = "Enable with AC", enableFan2WithAc @@ -3155,31 +3154,31 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = fanIndicators dialog = fuelPump, "Fuel Pump" - field = "Pin", fuelPumpPin - field = "Pin mode", fuelPumpPinMode + field = "Output", fuelPumpPin + field = "Output mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration ; Controller->Actuator Outputs dialog = mainRelayDialog, "Main relay output" field = "microRusEFI main relay control is hard wired on pin #29"@@if_ts_show_main_relay_microRusEFI_message - field = "Pin", mainRelayPin@@if_ts_show_main_relay - field = "Pin mode", mainRelayPinMode@@if_ts_show_main_relay + field = "Output", mainRelayPin@@if_ts_show_main_relay + field = "Output mode", mainRelayPinMode@@if_ts_show_main_relay dialog = starterRelay, "Starter relay output" - field = "Pin", starterRelayDisablePin - field = "Pin mode", starterRelayDisablePinMode + field = "Output", starterRelayDisablePin + field = "Output mode", starterRelayDisablePinMode dialog = statusLeds, "Status LEDs" field = "Running status LED", runningLedPin field = "TS communication status LED", communicationLedPin field = "Warning LED", warningLedPin - field = "Trigger error LED", triggerErrorPin + field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync ; Engine->MIL Settings dialog = malfunction, "Check Engine Settings" - field = "Pin", malfunctionIndicatorPin - field = "Pin mode", malfunctionIndicatorPinMode + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" @@ -3243,7 +3242,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "ChipSelect mode", cj125CsPinMode, {isCJ125Enabled == 1} field = "!See also 'Controller-SPI setting'" field = "SPI device", cj125SpiDevice - field = "Heater pin", wboHeaterPin, {isCJ125Enabled == 1} + field = "Heater output", wboHeaterPin, {isCJ125Enabled == 1} field = "UA input", cj125ua, {isCJ125Enabled == 1} field = "UR input", cj125ur, {isCJ125Enabled == 1} field = "Is UA input divided?" cj125isUaDivided, {isCJ125Enabled == 1} @@ -3318,12 +3317,12 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = stftPartitionSettingsOverrun, {fuelClosedLoopCorrectionEnabled == 1} dialog = vvtPidDialog0, "Configuration" - field = "Activation Delay", vvtActivationDelayMs - field = "Do not control below RPM", vvtControlMinRpm + field = "Activation Delay", vvtActivationDelayMs + field = "Do not control below RPM", vvtControlMinRpm field = "VVT solenoid bank 1 intake", vvtPins1 - field = "VVT solenoid bank 1 exhaust", vvtPins2 - field = "VVT solenoid bank 2 intake", vvtPins3 - field = "VVT solenoid bank 2 exhaust", vvtPins4 + field = "VVT solenoid bank 1 exhaust", vvtPins2 + field = "VVT solenoid bank 2 intake", vvtPins3 + field = "VVT solenoid bank 2 exhaust", vvtPins4 field = "PWM frequency", vvtOutputFrequency1, {vvtPins1 != 0 || vvtPins2 != 0} field = "Detailed status in console", isVerboseAuxPid1, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } @@ -3357,8 +3356,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ dialog = alternator, "Alternator Settings", yAxis field = "Enabled", isAlternatorControlEnabled field = "Target", targetVBatt, {isAlternatorControlEnabled == 1} - field = "Pin", alternatorControlPin, {isAlternatorControlEnabled == 1} - field = "Pin Mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} + field = "Control output", alternatorControlPin, {isAlternatorControlEnabled == 1} + field = "Control outpur mode", alternatorControlPinMode, {isAlternatorControlEnabled == 1} field = "PWM frequency", alternatorPwmFrequency, {isAlternatorControlEnabled == 1} field = "Off Above TPS", alternatorOffAboveTps, {isAlternatorControlEnabled == 1} field = "Detailed status in console", isVerboseAlternator, {isAlternatorControlEnabled == 1} @@ -3372,8 +3371,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "#% duty = Pterm + Iterm + Dterm + offset%" dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button Pin", startStopButtonPin - field = "Start/Stop Button Mode", startStopButtonMode + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} @@ -3382,7 +3381,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ panel = alternator dialog = speedSensorAnalog, "Speed sensor" - field = "Input pin", vehicleSpeedSensorInputPin + field = "Input", vehicleSpeedSensorInputPin field = "Filter parameter", vssFilterReciprocal, { vehicleSpeedSensorInputPin != @@ADC_CHANNEL_NONE@@ } ; @@ -3429,11 +3428,11 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" - field = "Pin", tachOutputPin - field = "Pin mode", tachOutputPinMode - field = "Pulse Mode", tachPulseDurationAsDutyCycle + field = "Output", tachOutputPin + field = "Output mode", tachOutputPinMode + field = "Pulse Mode", tachPulseDurationAsDutyCycle field = "Pulse duration", tachPulseDuractionMs - field = "Pulse per Rev", tachPulsePerRev + field = "Pulse per Rev", tachPulsePerRev ; Board->Connection @@ -3687,20 +3686,20 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_ field = "Transmission Controller" transmissionControllerMode, { tcuEnabled } dialog = shiftSolenoidPanel, "Shift Solenoids" - field = "Solenoid 1 Pin" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 1 Pin Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 2 Pin" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 2 Pin Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 3 Pin" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 3 Pin Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 4 Pin" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 4 Pin Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 5 Pin" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 5 Pin Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 6 Pin" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "Solenoid 6 Pin Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "3-2 Solenoid Pin" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } - field = "3-2 Solenoid Pin mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 1 output" tcu_solenoid1, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 1 output Mode" tcu_solenoid_mode1, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 2 output" tcu_solenoid2, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 2 output Mode" tcu_solenoid_mode2, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 3 output" tcu_solenoid3, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 3 output Mode" tcu_solenoid_mode3, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 4 output" tcu_solenoid4, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 4 output Mode" tcu_solenoid_mode4, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 5 output" tcu_solenoid5, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 5 output Mode" tcu_solenoid_mode5, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 6 output" tcu_solenoid6, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "Solenoid 6 output Mode" tcu_solenoid_mode6, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_SimpleTransmissionController@@ || transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "3-2 Solenoid output" tcu_32_solenoid_pin, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } + field = "3-2 Solenoid output mode" tcu_32_solenoid_pin_mode, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } field = "3-2 Solenoid Frequency" tcu_32_solenoid_freq, { tcuEnabled && (transmissionControllerMode == @@TransmissionControllerMode_Gm4l6x@@) } dialog = otherSolenoidPanel, "Other Solenoids" @@ -4018,10 +4017,10 @@ dialog = tcuControls, "Transmission Settings" ; field = "digipot CS #2", digitalPotentiometerChipSelect3 ; field = "digipot CS #3", digitalPotentiometerChipSelect4 field = ""@@if_ts_show_hardware_simulator - field = "trigger stimulator pin #1", triggerSimulatorPins1@@if_ts_show_hardware_simulator - field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1@@if_ts_show_hardware_simulator - field = "trigger stimulator pin #2", triggerSimulatorPins2@@if_ts_show_hardware_simulator - field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2@@if_ts_show_hardware_simulator + field = "trigger stimulator output #1", triggerSimulatorPins1@@if_ts_show_hardware_simulator + field = "trigger stimulator output mode #1", triggerSimulatorPinModes1@@if_ts_show_hardware_simulator + field = "trigger stimulator output #2", triggerSimulatorPins2@@if_ts_show_hardware_simulator + field = "trigger stimulator output mode #2", triggerSimulatorPinModes2@@if_ts_show_hardware_simulator field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 @@ -4159,7 +4158,7 @@ dialog = tcuControls, "Transmission Settings" panel = vrThreshold2@@if_ts_show_vr_threshold_2 dialog = gppwm1left, "" - field = "Pin", gppwm1_pin + field = "Output", gppwm1_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm1_pwmFrequency, {gppwm1_pin != 0} @@ -4181,7 +4180,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm1Tbl, {gppwm1_pin != 0} dialog = gppwm2left, "" - field = "Pin", gppwm2_pin + field = "Output", gppwm2_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm2_pwmFrequency, {gppwm2_pin != 0} @@ -4203,7 +4202,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm2Tbl, {gppwm2_pin != 0} dialog = gppwm3left, "" - field = "Pin", gppwm3_pin + field = "Output", gppwm3_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm3_pwmFrequency, {gppwm3_pin != 0} @@ -4225,7 +4224,7 @@ dialog = tcuControls, "Transmission Settings" panel = gppwm3Tbl, {gppwm3_pin != 0} dialog = gppwm4left, "" - field = "Pin", gppwm4_pin + field = "Output", gppwm4_pin field = "" field = "Set frequency to 0hz for on-off mode" field = "Frequency", gppwm4_pwmFrequency, {gppwm4_pin != 0}