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

Making UART/TTL pins configurable

This commit is contained in:
rusefi 2019-12-07 21:22:09 -05:00
parent 3c8b28db0b
commit 23c0d8646f
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,10 @@ void startTsPort(ts_channel_s *tsChannel) {
if (CONFIGB(useSerialPort)) {
print("TunerStudio over USART");
/**
* We have hard-coded USB serial console so that it would be clear how to connect to each specific board,
* but for UART serial we allow users to change settings.
*/
efiSetPadMode("tunerstudio rx", engineConfiguration->binarySerialRxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
efiSetPadMode("tunerstudio tx", engineConfiguration->binarySerialTxPin, PAL_MODE_ALTERNATE(TS_SERIAL_AF));

2
firmware/controllers/engine_controller.cpp
View File

@ -819,6 +819,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20191202;
return 20191206;
}
#endif /* EFI_UNIT_TEST */

6
firmware/tunerstudio/rusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:37:59 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:32 EST 2019
pageSize = 20000
page = 1
@ -3215,7 +3215,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Board->Connection
dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort
field = "Use UART/TTL serial?", useSerialPort
field = "RX pin", binarySerialRxPin, {useSerialPort == 1}
field = "TX pin", binarySerialTxPin, {useSerialPort == 1}
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus"

2
firmware/tunerstudio/rusefi.input
View File

@ -2191,7 +2191,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Board->Connection
dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort
field = "Use UART/TTL serial?", useSerialPort
field = "RX pin", binarySerialRxPin, {useSerialPort == 1}
field = "TX pin", binarySerialTxPin, {useSerialPort == 1}
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed

6
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:05 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:38 EST 2019
pageSize = 20000
page = 1
@ -3215,7 +3215,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Board->Connection
dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort
field = "Use UART/TTL serial?", useSerialPort
field = "RX pin", binarySerialRxPin, {useSerialPort == 1}
field = "TX pin", binarySerialTxPin, {useSerialPort == 1}
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus"

6
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:02 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:35 EST 2019
pageSize = 20000
page = 1
@ -3199,7 +3199,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Board->Connection
dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort
field = "Use UART/TTL serial?", useSerialPort
field = "RX pin", binarySerialRxPin, {useSerialPort == 1}
field = "TX pin", binarySerialTxPin, {useSerialPort == 1}
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus"

6
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Wed Dec 04 00:38:08 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sat Dec 07 21:20:41 EST 2019
pageSize = 20000
page = 1
@ -3211,7 +3211,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
; Board->Connection
dialog = tsPort, "TunerStudio Port"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort
field = "Use UART/TTL serial?", useSerialPort
field = "RX pin", binarySerialRxPin, {useSerialPort == 1}
field = "TX pin", binarySerialTxPin, {useSerialPort == 1}
field = "uartConsoleSerialSpeed", uartConsoleSerialSpeed
dialog = canBus, "CAN Bus"