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

disablePrimaryUart for MRE for GDI

This commit is contained in:
rusefi 2022-01-08 19:38:02 -05:00
parent 09f543a3d5
commit 1a8b6d24fc
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/binary/tunerstudio.cpp
View File

@ -113,8 +113,8 @@ static void resetTs() {
void printTsStats(void) { void printTsStats(void) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
#ifdef EFI_CONSOLE_RX_BRAIN_PIN #ifdef EFI_CONSOLE_RX_BRAIN_PIN
efiPrintf("Primary Channel RX", hwPortname(EFI_CONSOLE_RX_BRAIN_PIN)); efiPrintf("Primary UART RX", hwPortname(EFI_CONSOLE_RX_BRAIN_PIN));
efiPrintf("Primary Channel TX", hwPortname(EFI_CONSOLE_TX_BRAIN_PIN)); efiPrintf("Primary UART TX", hwPortname(EFI_CONSOLE_TX_BRAIN_PIN));
#endif #endif
if (false) { if (false) {

15
firmware/console/binary/tunerstudio_io_serial_ports.cpp
View File

@ -40,8 +40,10 @@ class SerialTsChannel;
TsChannelBase* setupChannel() { TsChannelBase* setupChannel() {
#if EFI_PROD_CODE #if EFI_PROD_CODE
efiSetPadMode("Primary Channel RX", EFI_CONSOLE_RX_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_CONSOLE_AF)); // historically the idea was that primary UART has to be very hard-coded as the last line of reliability defense
efiSetPadMode("Primary Channel TX", EFI_CONSOLE_TX_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_CONSOLE_AF)); // as of 2022 it looks like sometimes we just need the GPIO on MRE for instance more than we need UART
efiSetPadMode("Primary UART RX", EFI_CONSOLE_RX_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_CONSOLE_AF));
efiSetPadMode("Primary UART TX", EFI_CONSOLE_TX_BRAIN_PIN, PAL_MODE_ALTERNATE(EFI_CONSOLE_AF));
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
primaryChannel.start(engineConfiguration->uartConsoleSerialSpeed); primaryChannel.start(engineConfiguration->uartConsoleSerialSpeed);
@ -71,8 +73,8 @@ class SerialTsChannel;
TsChannelBase* setupChannel() { TsChannelBase* setupChannel() {
#if EFI_PROD_CODE #if EFI_PROD_CODE
efiSetPadMode("Secondary Channel RX", engineConfiguration->binarySerialRxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF)); efiSetPadMode("Secondary UART RX", engineConfiguration->binarySerialRxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
efiSetPadMode("Secondary Channel TX", engineConfiguration->binarySerialTxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF)); efiSetPadMode("Secondary UART TX", engineConfiguration->binarySerialTxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
secondaryChannel.start(engineConfiguration->uartConsoleSerialSpeed); secondaryChannel.start(engineConfiguration->uartConsoleSerialSpeed);
@ -86,7 +88,10 @@ class SerialTsChannel;
void startSerialChannels() { void startSerialChannels() {
#if HAS_PRIMARY #if HAS_PRIMARY
primaryChannelThread.Start(); // todo: invert setting one day?
if (!engineConfiguration->disablePrimaryUart) {
primaryChannelThread.Start();
}
#endif #endif
#if HAS_SECONDARY #if HAS_SECONDARY

2
firmware/integration/rusefi_config.txt
View File

@ -1000,7 +1000,7 @@ end_struct
uint16_t tps2SecondaryMin;;"ADC", 1, 0, 0, 1000, 0 uint16_t tps2SecondaryMin;;"ADC", 1, 0, 0, 1000, 0
uint16_t tps2SecondaryMax;;"ADC", 1, 0, 0, 1000, 0 uint16_t tps2SecondaryMax;;"ADC", 1, 0, 0, 1000, 0
bit unused1464b0 bit disablePrimaryUart
bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling. bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.
bit isVerboseIAC;+Print details into rusEfi console\nenable verbose_idle bit isVerboseIAC;+Print details into rusEfi console\nenable verbose_idle
bit unused1464b3 bit unused1464b3

1
firmware/tunerstudio/rusefi.input
View File

@ -3563,6 +3563,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
; Racing Features->Launch Control ; Racing Features->Launch Control
dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL" dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL"
field = "disablePrimaryUart", disablePrimaryUart
field = "Enable Launch Control", launchControlEnabled field = "Enable Launch Control", launchControlEnabled
field = "Activation Mode", launchActivationMode field = "Activation Mode", launchActivationMode
field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} field = "Switch Input", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1}