From 6a907c84e077e7b1a627d2dc8374df085c61f44e Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Sat, 6 Dec 2014 22:03:14 -0600
Subject: [PATCH] auto-sync

---
 firmware/console/tunerstudio/tunerstudio.cpp   | 10 +++++-----
 firmware/hw_layer/serial_over_usb/usbconsole.c |  5 +----
 firmware/rusefi.cpp                            |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/tunerstudio/tunerstudio.cpp
index 535542eb06..12709952ed 100644
--- a/firmware/console/tunerstudio/tunerstudio.cpp
+++ b/firmware/console/tunerstudio/tunerstudio.cpp
@@ -79,17 +79,17 @@ extern persistent_config_container_s persistentState;
 
 static efitimems_t previousWriteReportMs = 0;
 
-static int ts_serail_ready(void) {
+static int ts_serial_ready(void) {
 #if EFI_PROD_CODE
 	if (isSerialOverUart()) {
 		// TS uses USB when console uses serial
 		return is_usb_serial_ready();
 	} else {
 		// TS uses serial when console uses USB
-		return TRUE;
+		return true;
 	}
 #else
-	return TRUE;
+	return true;
 #endif
 }
 
@@ -381,7 +381,7 @@ static msg_t tsThreadEntryPoint(void *arg) {
 
 	int wasReady = false;
 	while (true) {
-		int isReady = ts_serail_ready();
+		int isReady = ts_serial_ready();
 		if (!isReady) {
 			chThdSleepMilliseconds(10);
 			wasReady = false;
@@ -389,7 +389,7 @@ static msg_t tsThreadEntryPoint(void *arg) {
 		}
 
 		if (!wasReady) {
-			wasReady = TRUE;
+			wasReady = true;
 //			scheduleSimpleMsg(&logger, "ts channel is now ready ", hTimeNow());
 		}
 
diff --git a/firmware/hw_layer/serial_over_usb/usbconsole.c b/firmware/hw_layer/serial_over_usb/usbconsole.c
index 9cdbac5014..40c2152ed2 100644
--- a/firmware/hw_layer/serial_over_usb/usbconsole.c
+++ b/firmware/hw_layer/serial_over_usb/usbconsole.c
@@ -31,17 +31,14 @@ void usb_serial_start(void) {
 	 * after a reset.
 	 */
 	usbDisconnectBus(serusbcfg.usbp);
-	chThdSleepMilliseconds(1000);
+	chThdSleepMilliseconds(1500);
 	usbStart(serusbcfg.usbp, &usbcfg);
 	usbConnectBus(serusbcfg.usbp);
 
 	/*
 	 * Activates the serial driver 2 using the driver default configuration.
-	 * PA2(TX) and PA3(RX) are routed to USART2.
 	 */
 	sdStart(&SD2, NULL);
-	palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(7));
-	palSetPadMode(GPIOA, 3, PAL_MODE_ALTERNATE(7));
 }
 
 bool is_usb_serial_ready(void) {
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index e0b72ca4cc..10cf143ed8 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -185,7 +185,7 @@ void runRusEfi(void) {
 	startStatusThreads(engine);
 
 	print("Running main loop\r\n");
-	main_loop_started = TRUE;
+	main_loop_started = true;
 	/**
 	 * This loop is the closes we have to 'main loop' - but here we only publish the status. The main logic of engine
 	 * control is around main_trigger_callback