rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Three names of the same thing fix #4085

This commit is contained in:
rusefillc 2022-04-19 19:47:43 -04:00
parent 47310b0ee7
commit 451b4a766c
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/actuators/idle_thread_io.cpp
View File

@ -115,7 +115,7 @@ void startPedalPins() {
startInputPinIfValid("throttle pedal up switch", engineConfiguration->throttlePedalUpPin, engineConfiguration->throttlePedalUpPinMode);
startInputPinIfValid("brake pedal switch", engineConfiguration->brakePedalPin, engineConfiguration->brakePedalPinMode);
startInputPinIfValid("launch switch", engineConfiguration->launchActivatePin, engineConfiguration->launchActivatePinMode);
startInputPinIfValid("Launch Button", engineConfiguration->launchActivatePin, engineConfiguration->launchActivatePinMode);
#endif /* EFI_PROD_CODE */
}

2
firmware/integration/rusefi_config.txt
View File

@ -968,7 +968,7 @@ bit verboseCan2,"Print all","Do not print";Print incoming and outgoing second bu
boostType_e boostType;
int boostPwmFrequency;;"Hz", 1, 0, 0, 3000, 0
#define launchActivationMode_e_enum "Switch Input", "Clutch Input", "Always Active(Disabled By Speed)", "INVALID"
#define launchActivationMode_e_enum "Launch Button", "Clutch Down Switch", "Always Active(Disabled By Speed)", "INVALID"
custom launchActivationMode_e 4 bits, S32, @OFFSET@, [0:1], @@launchActivationMode_e_enum@@
launchActivationMode_e launchActivationMode;

24
firmware/tunerstudio/rusefi.input
View File

@ -2321,13 +2321,13 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
; Sensor Inputs
dialog = otherSensorInputs, "Other Sensor Inputs"
field = "Clutch down switch", clutchDownPin
field = "Clutch down inverted", clutchDownPinInverted
field = "Clutch down mode", clutchDownPinMode
field = "Clutch Down", clutchDownPin
field = "Clutch Down inverted", clutchDownPinInverted
field = "Clutch Down mode", clutchDownPinMode
field = "Clutch up switch", clutchUpPin
field = "Clutch up inverted", clutchUpPinInverted
field = "Clutch up mode", clutchUpPinMode
field = "Clutch Up", clutchUpPin
field = "Clutch Up inverted", clutchUpPinInverted
field = "Clutch Up mode", clutchUpPinMode
field = "Throttle Up switch", throttlePedalUpPin
field = "Brake pedal switch", brakePedalPin
field = "Flex fuel sensor", flexSensorPin
@ -3778,11 +3778,15 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL"
field = "Enable Launch Control", launchControlEnabled
field = "Activation Mode", launchActivationMode
field = "Switch Input", launchActivatePin, {launchActivationMode == @@launchActivationMode_e_SWITCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Switch Input inverted", launchActivatePinMode, {launchActivationMode == @@launchActivationMode_e_SWITCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Clutch Input", clutchDownPin, {launchActivationMode == @@launchActivationMode_e_CLUTCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Clutch Input inverted", clutchDownPinMode, {launchActivationMode == @@launchActivationMode_e_CLUTCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Launch Button", launchActivatePin, {launchActivationMode == @@launchActivationMode_e_SWITCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == @@launchActivationMode_e_SWITCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Clutch Down", clutchDownPin, {launchActivationMode == @@launchActivationMode_e_CLUTCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = "Clutch Down inverted", clutchDownPinInverted
field = "Clutch Down mode", clutchDownPinMode, {launchActivationMode == @@launchActivationMode_e_CLUTCH_INPUT_LAUNCH@@ && launchControlEnabled == 1}
field = ""
; dead code field = "Rpm Threshold", launchRpmThreshold, {launchControlEnabled == 1}
field = "Speed Threshold", launchSpeedThreshold, {launchControlEnabled == 1}
field = ""