Moved bluetooth to separate file, and clean up

Author: mholeys

Software/Arduino code/OpenAstroTracker/Configuration_adv.hpp

@@ -216,7 +216,7 @@
 #define ESPBOARD
 #undef HEADLESS_CLIENT
 #define HEADLESS_CLIENT 1
-// #define HEADLESS_BLUETOOTH 1
+// #define BLUETOOTH_ENABLED
 #define WIFI_ENABLED 
 #if defined(ESP8266) 
   #undef RUN_STEPPERS_IN_MAIN_LOOP

Software/Arduino code/OpenAstroTracker/src/b_setup.hpp

@@ -9,19 +9,18 @@
 #include "EPROMStore.hpp"
 #include "inc/Config.hpp"
 
+
 LcdMenu lcdMenu(16, 2, MAXMENUITEMS);
 LcdButtons lcdButtons(0);
 
 #ifdef ESP32
 DRAM_ATTR Mount mount(RAStepsPerDegree, DECStepsPerDegree, &lcdMenu);
-#ifdef HEADLESS_BLUETOOTH 
-  #include "BluetoothSerial.h"
-  BluetoothSerial SerialBT;
-#endif
 #else
 Mount mount(RA_STEPS_PER_DEGREE, DEC_STEPS_PER_DEGREE, &lcdMenu);
 #endif
 
+#include "g_bluetooth.hpp"
+
 #ifdef WIFI_ENABLED
 #include "WifiControl.hpp"
 WifiControl wifiControl(&mount, &lcdMenu);
@@ -68,6 +67,9 @@ void IRAM_ATTR mainLoopTask(void* payload)
 
   for (;;) {
     serialLoop();
+    #ifdef BLUETOOTH_ENABLED
+    BTin();
+    #endif
     vTaskDelay(1);
   }
 }
@@ -138,10 +140,9 @@ void setup() {
   // end microstepping -------------------
 
   Serial.begin(57600);
-  #ifdef HEADLESS_BLUETOOTH
-  SerialBT.begin("OpenAstroTracker");
+  #ifdef BLUETOOTH_ENABLED 
+  BLUETOOTH_SERIAL.begin("OpenAstroTracker");
   #endif
-  //BT.begin(9600);
 
   LOGV2(DEBUG_ANY, F("Hello, universe, this is OAT %s!"), VERSION);
 

Software/Arduino code/OpenAstroTracker/src/c_buttons.hpp

@@ -16,8 +16,6 @@
 #include "f_serial.hpp"
 #endif
 
-void BTin();
-
 #if HEADLESS_CLIENT == 0
 
   int loopsOfSameKey = 0;
@@ -217,16 +215,20 @@ void BTin();
     }
 
 
+    #ifdef BLUETOOTH_ENABLED
     BTin();
+    #endif
   }
 
   #else
 
   void loop() {
     #ifndef ESP32
       serialLoop();
+    #ifdef BLUETOOTH_ENABLED
       BTin();
     #endif
+    #endif
   }
 
 #endif

Software/Arduino code/OpenAstroTracker/src/f_serial.hpp

@@ -6,12 +6,7 @@
 #include "MeadeCommandProcessor.hpp"
 
 void processSerialData();
-#ifdef HEADLESS_BLUETOOTH
-bool bt_connected = false;
-void processSerialBTData();
-void bt_callback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param);
-bool setupCallback = false;
-#endif
+
 
 ////////////////////////////////////////////////
 // The main loop when under serial control
@@ -22,16 +17,6 @@ void serialLoop()
 
 #ifdef ESPBOARD
     processSerialData();
-
-#ifdef HEADLESS_BLUETOOTH
-    if (!setupCallback) {
-        SerialBT.register_callback(bt_callback);
-        setupCallback = true;
-    }
-    if (bt_connected) {
-        processSerialBTData();
-    }
-#endif
 #endif
 
 #ifdef WIFI_ENABLED
@@ -72,56 +57,4 @@ void processSerialData() {
     }
 }
 
-#ifdef HEADLESS_BLUETOOTH 
-void processSerialBTData() {
-    char buffer[2];
-    while (SerialBT.available() > 0) {
-        if (SerialBT.readBytes(buffer, 1) == 1) {
-            if (buffer[0] == 0x06) {
-                LOGV1(DEBUG_SERIAL, F("SerialBT: Received: ACK request, replying"));
-                SerialBT.print('1');
-            } else {
-                String inCmd = String(buffer[0]) + SerialBT.readStringUntil('#');
-                LOGV2(DEBUG_SERIAL, F("SerialBT: Received: %s"), inCmd.c_str());
-                if (inCmd == "Ka") {
-                    SerialBT.print('1');
-                    continue;
-                }
-                if (inCmd == "K*") {
-                    SerialBT.print('1');
-                    continue;
-                }
-                if (inCmd.charAt(1) == 0x06) {
-                    SerialBT.print('P');
-                    continue;
-                }
-                
-
-                String retVal = MeadeCommandProcessor::instance()->processCommand(inCmd);
-                if (retVal != "") {
-                    LOGV2(DEBUG_SERIAL, F("SerialBT: Replied:  %s"), retVal);
-                    SerialBT.print(retVal);
-                } else {
-                    LOGV2(DEBUG_SERIAL, F("Didnt reply %s"), retVal);
-                }
-            }
-        } else {
-            LOGV1(DEBUG_SERIAL, F("SerialBT: Read nothing"));
-        }
-           
-        mount.loop();
-    }
-}
-void bt_callback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
-    switch (event) {
-        case ESP_SPP_SRV_OPEN_EVT:
-            bt_connected = true;
-        break;
-        case ESP_SPP_CLOSE_EVT:
-            bt_connected = false;
-            break;
-    }
-}
-#endif
-
 #endif

Software/Arduino code/OpenAstroTracker/src/g_bluetooth.hpp

@@ -1,4 +1,85 @@
+#pragma once
+
+#ifdef BLUETOOTH_ENABLED
+#if SUPPORT_SERIAL_CONTROL == 1
+#include "MeadeCommandProcessor.hpp"
+#include "BluetoothSerial.h"
+BluetoothSerial SerialBT;
+#define BLUETOOTH_SERIAL SerialBT
+
+bool bt_connected = false;
+void processSerialBTData();
+void bt_callback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param);
+bool setupCallback = false;
+
+
+void bluetoothLoop() 
+{
+    if (!setupCallback) {
+        BLUETOOTH_SERIAL.register_callback(bt_callback);
+        setupCallback = true;
+    }
+    if (bt_connected) {
+        processSerialBTData();
+    }
+}
+
+void processSerialBTData() {
+    char buffer[2];
+    while (BLUETOOTH_SERIAL.available() > 0) {
+        if (BLUETOOTH_SERIAL.readBytes(buffer, 1) == 1) {
+            if (buffer[0] == '#') { 
+                // Empty command sent?
+            } else if (buffer[0] == 0x06) {
+                // ACK from client, requesting Alignment Query, 
+                // allows Stellaris (And others?) to tell if this 
+                // is a LX200/Meade comaptible mount
+                LOGV1(DEBUG_SERIAL, F("SerialBT: Received: ACK request, replying"));
+                // Assuming Polar alignment mounting mode
+                BLUETOOTH_SERIAL.print('P'); 
+            } else {
+                String inCmd = String(buffer[0]) + BLUETOOTH_SERIAL.readStringUntil('#');
+                LOGV2(DEBUG_SERIAL, F("SerialBT: Received: %s"), inCmd.c_str());
+                // Handle NexStar attempt to prevent communication issue
+                if (inCmd == "Ka" || inCmd == "K*") {
+                    continue;
+                }
+            
+                String retVal = MeadeCommandProcessor::instance()->processCommand(inCmd);
+                if (retVal != "") {
+                    LOGV2(DEBUG_SERIAL, F("SerialBT: Replied:  %s"), retVal);
+                    SerialBT.print(retVal);
+                }
+            }
+        }
+           
+        mount.loop();
+    }
+}
+
+void bt_callback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
+    switch (event) {
+        case ESP_SPP_SRV_OPEN_EVT:
+            bt_connected = true;
+            break;
+        case ESP_SPP_CLOSE_EVT:
+            bt_connected = false;
+            break;
+            ;
+        default:
+            break;
+    }
+}
+
+#endif
+#endif
+
+
+
 void BTin() {
+    #ifdef BLUETOOTH_ENABLED
+    bluetoothLoop();
+    #endif
   /*
     while (BT.available()) {
 
@@ -38,3 +119,4 @@ void BTin() {
     }
   */
 }
+