minor changes to connection handling

Author: d03n3rfr1tz3

src/hardware/bluetoothctl.cpp

@@ -56,6 +56,7 @@ bool BluetoothHandler::connect(BTAddress address, uint16_t channel, const char *
     serialBT.discoverAsyncStop();
     serialBT.discoverClear();
 
+    if (isConnected) serialBT.disconnect();
     if (pin != nullptr) serialBT.setPin(pin);
     return serialBT.connect(address, channel);
 }

src/input/serial.cpp

@@ -31,10 +31,15 @@ void SerialInput::loop() {
  * the forward channel for a bluetooth connection
 */
 void SerialInput::forward(const char *address, uint16_t port) {
-    serialIn.print("CONNECT ");
-    serialIn.print(address);
-    serialIn.print(" ");
-    serialIn.println(port);
+    if (port > 0) {
+        serialIn.print("CONNECT ");
+        serialIn.print(address);
+        serialIn.print(" ");
+        serialIn.println(port);
+    } else {
+        serialIn.print("DISCONNECT ");
+        serialIn.println(address);
+    }
 }
 
 /**
@@ -98,6 +103,26 @@ void SerialInput::parse(const uint8_t *buffer, size_t size) {
         BluetoothOutput::setup(address, port);
     }
 
+    if (strncmp("DISCONNECT ", input, strlen("DISCONNECT ")) == 0) {
+        size_t offset = strlen("DISCONNECT ") * sizeof(uint8_t);
+        char* content = input + offset;
+        size -= offset;
+
+        size_t index = 0;
+        esp_bd_addr_t bytes;
+        uint16_t port = 0;
+
+        char *token = strtok(content, ":");
+        while (token != NULL) {
+            bytes[index++] = strtoul(token, NULL, 16);
+            token = strtok(NULL, ":");
+        }
+
+        BTAddress address(bytes);
+        BaseInput::forward(address.toString().c_str(), port);
+        BluetoothOutput::setup(address, port);
+    }
+
     // recognize a mode statement and pass it into Divoom handler
     if (strncmp("MODE ", input, strlen("MODE ")) == 0) {
         size_t offset = strlen("MODE ") * sizeof(uint8_t);

src/input/tcp.cpp

@@ -121,7 +121,7 @@ void TcpInput::disconnect(void *arg, AsyncClient *client) {
 void TcpInput::parse(const uint8_t *data, size_t size) {
 
     // recognize a connect statement and pass it into Bluetooth handler
-    if (data[0] == 0x00 && size > ESP_BD_ADDR_LEN) {
+    if (data[0] == 0x69 && size > ESP_BD_ADDR_LEN) {
         esp_bd_addr_t bytes;
         uint16_t port = 1;
 
@@ -139,6 +139,21 @@ void TcpInput::parse(const uint8_t *data, size_t size) {
         BluetoothOutput::setup(address, port);
     }
 
+    // recognize a connect statement and pass it into Bluetooth handler
+    if (data[0] == 0x96 && size > ESP_BD_ADDR_LEN) {
+        esp_bd_addr_t bytes;
+        uint16_t port = 0;
+
+        for (size_t i = 0; i < ESP_BD_ADDR_LEN; i++)
+        {
+            bytes[i] = (uint8_t)data[i + 1];
+        }
+
+        BTAddress address(bytes);
+        BaseInput::forward(address.toString().c_str(), port);
+        BluetoothOutput::setup(address, port);
+    }
+
     // recognize a raw statement and pass it into Output handlers
     if (data[0] == 0x01) {
         BaseInput::forward(data, size);

src/output/bluetooth.cpp

@@ -7,11 +7,15 @@
 #include "output/base.h"
 
 /**
- * setup functionality, that connects to the given bluetooth device
+ * setup functionality, that connects to or disconnects from a bluetooth device
 */
 void BluetoothOutput::setup(BTAddress address, uint16_t channel) { return setup(address, channel, nullptr); };
 void BluetoothOutput::setup(BTAddress address, uint16_t channel, const char *pin) {
-    BluetoothHandler::connect(address, channel, pin);
+    if (channel == 0) {
+        BluetoothHandler::disconnect();
+    } else {
+        BluetoothHandler::connect(address, channel, pin);
+    }
 }
 
 /**