From e8f33ce7ec058c70400d1645961728102b6e9b6b Mon Sep 17 00:00:00 2001
From: Andrey G <dron0gus@gmail.com>
Date: Mon, 3 Oct 2022 15:51:19 +0300
Subject: [PATCH] Bluetooth hang (#4632)

* tunerstudio: send BT disconnect notifications only for BT channel

* bluetooth: btProcessIsRunning duplicates btProcessIsStarted

* bluetooth: some comments

* bluetooth: no need to call chThdExit(), just exit thread function

* bluetooth: avoid possible race conditions: set flag first

* bluetooth: make "bluetooth_cancel" do something
---
 firmware/console/binary/bluetooth.cpp   | 26 ++++++++++++-------------
 firmware/console/binary/tunerstudio.cpp |  8 +++++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/firmware/console/binary/bluetooth.cpp b/firmware/console/binary/bluetooth.cpp
index a44ab20e9a..84e52ee623 100644
--- a/firmware/console/binary/bluetooth.cpp
+++ b/firmware/console/binary/bluetooth.cpp
@@ -20,7 +20,6 @@
 #if EFI_BLUETOOTH_SETUP
 
 static bool btProcessIsStarted = false;
-static bool btProcessIsRunning = false;
 static const char *commands[5];
 static int numCommands = 0;
 static int setBaudIdx = -1;
@@ -70,7 +69,7 @@ static void runCommands() {
 				break;
 		}
 		
-		bool restoreAndExit = (cmdIdx >= numCommands || baudIdx < 0);
+		bool restoreAndExit = (cmdIdx >= numCommands || baudIdx < 0) || chThdShouldTerminateX();
 		
 		// if the baud rate is changed, reinit the UART
 		if (baudIdx != prevBaudIdx || restoreAndExit) {
@@ -105,10 +104,12 @@ static void runCommands() {
 		bool wasAnswer = false;
 		int received = tsChannel->readTimeout(buffer, 2, btModuleTimeout);
 		if (received == 2) {
+			efiPrintf("received %d byte(s) %d [%c][%c]", received, wasAnswer, buffer[0], buffer[1]);
 			wasAnswer = (buffer[0] == 'O' && buffer[1] == 'K') || 
 				(buffer[0] == '+' && (buffer[1] >= 'A' && buffer[1] <= 'Z'));
+		} else {
+			efiPrintf("timeout receiving BT reply");
 		}
-		efiPrintf("received %d byte(s) %d [%c][%c]", received, wasAnswer, buffer[0], buffer[1]);
 
 		// wait 1 second and skip all remaining response bytes from the bluetooth module
 		while (true) {
@@ -155,18 +156,16 @@ static THD_FUNCTION(btThreadEntryPoint, arg) {
 	chSysUnlock();
 	
 	if (msg == MSG_TIMEOUT) {
+		// timeout waiting for silence on uart...
 		efiPrintf("The Bluetooth module init procedure is cancelled (timeout)!");
 		return;
 	} else {
 		// call this when the thread is resumed (after the disconnect)
-		btProcessIsRunning = true;
 		runCommands();
-		btProcessIsRunning = false;
 	}
 
 	// release the command
 	btProcessIsStarted = false;
-	chThdExit(MSG_OK);
 }
 
 void bluetoothStart(bluetooth_module_e moduleType, const char *baudRate, const char *name, const char *pinCode) {
@@ -270,13 +269,15 @@ void bluetoothStart(bluetooth_module_e moduleType, const char *baudRate, const c
 	commands[numCommands++] = cmdBaud;
 	commands[numCommands++] = cmdName;
    	commands[numCommands++] = cmdPin;
-   	
-   	// create a thread to execute these commands later
-   	btThread = chThdCreateStatic(btThreadStack, sizeof(btThreadStack), PRIO_CONSOLE, (tfunc_t)btThreadEntryPoint, NULL);
-   	
+
 	btProcessIsStarted = true;
+
+	// create a thread to execute these commands after TS disconnected
+	// See bluetoothSoftwareDisconnectNotify
+	btThread = chThdCreateStatic(btThreadStack, sizeof(btThreadStack), PRIO_CONSOLE, (tfunc_t)btThreadEntryPoint, NULL);
 }
-	
+
+// Called after 1S of silence on BT UART...
 void bluetoothSoftwareDisconnectNotify() {
 	if (btProcessIsStarted) {
 		// start communication with the module
@@ -291,9 +292,6 @@ void bluetoothCancel() {
 		efiPrintf("The Bluetooth module init procedure was not started! Nothing to cancel!");
 		return;
 	}
-
-	if (btProcessIsRunning)
-		return;
 	
 	// terminate thread
 	chThdTerminate(btThread);
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index ea6ec96c76..d8fa3f9d8b 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -433,9 +433,11 @@ static int tsProcessOne(TsChannelBase* tsChannel) {
 	if (received != 1) {
 //			tunerStudioError("ERROR: no command");
 #if EFI_BLUETOOTH_SETUP
-		// no data in a whole second means time to disconnect BT
-		// assume there's connection loss and notify the bluetooth init code
-		bluetoothSoftwareDisconnectNotify();
+		if (tsChannel == getBluetoothChannel()) {
+			// no data in a whole second means time to disconnect BT
+			// assume there's connection loss and notify the bluetooth init code
+			bluetoothSoftwareDisconnectNotify();
+		}
 #endif  /* EFI_BLUETOOTH_SETUP */
 		tsChannel->in_sync = false;
 		return -1;