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

auto-sync

This commit is contained in:
rusEfi 2015-10-23 22:01:44 -04:00
parent 10a05be13b
commit 0885a8adca
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,13 +29,17 @@ extern SerialUSBDriver SDU1;
static SerialConfig tsSerialConfig = { 0, 0, USART_CR2_STOP1_BITS | USART_CR2_LINEN, 0 };
void startTsPort(void) {
#if EFI_USB_SERIAL || defined(__DOXYGEN__)
if (isSerialOverUart()) {
print("TunerStudio over USB serial");
/**
* This method contains a long delay, that's the reason why this is not done on the main thread
*/
usb_serial_start();
} else if (boardConfiguration->useSerialPort) {
} else
#endif
{
if (boardConfiguration->useSerialPort) {
print("TunerStudio over USART");
mySetPadMode("tunerstudio rx", TS_SERIAL_RX_PORT, TS_SERIAL_RX_PIN, PAL_MODE_ALTERNATE(TS_SERIAL_AF));
@ -45,6 +49,7 @@ void startTsPort(void) {
sdStart(TS_SERIAL_UART_DEVICE, &tsSerialConfig);
}
}
}
#endif /* EFI_PROD_CODE */

2
firmware/console/console_io.cpp
View File

@ -168,7 +168,7 @@ static msg_t consoleThreadThreadEntryPoint(void *arg) {
(void) arg;
chRegSetThreadName("console thread");
#if EFI_PROD_CODE
#if (EFI_PROD_CODE && EFI_USB_SERIAL) || defined(__DOXYGEN__)
if (!isSerialOverUart()) {
/**
* This method contains a long delay, that's the reason why this is not done on the main thread

6
firmware/iar/ch.ewp
View File

@ -229,7 +229,7 @@
<option>
<name>CCAllowList</name>
<version>1</version>
<state>0000000</state>
<state>1011111</state>
</option>
<option>
<name>CCDebugInfo</name>
@ -362,7 +362,7 @@
</option>
<option>
<name>CCOptLevel</name>
<state>0</state>
<state>3</state>
</option>
<option>
<name>CCOptStrategy</name>
@ -371,7 +371,7 @@
</option>
<option>
<name>CCOptLevelSlave</name>
<state>0</state>
<state>3</state>
</option>
<option>
<name>CompilerMisraRules98</name>