Wifi support for AP mode as well as fail over, Adding stop commands to Meade

Author: jwellman80

Software/Arduino code/OpenAstroTracker/MeadeCommandProcessor.cpp

@@ -156,6 +156,10 @@
 //      This stops all motors, including tracking. Note that deceleration curves are still followed.
 //      Returns: 1 when all motors have stopped.
 //
+// :Qd#
+//      Stop slew in specified direction where d is n, s, e, w
+//      Returns: nothing
+//
 // -- QUIT MOVEMENT Extensions --
 // :Qq#
 //      Disconnect, Quit Control mode
@@ -304,10 +308,6 @@ String MeadeCommandProcessor::handleMeadeSyncControl(String inCmd) {
 // SET INFO
 /////////////////////////////
 String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
-  if (inCmd.length() < 6) {
-    return "0";
-  }
-
   if ((inCmd[0] == 'd') && (inCmd.length() == 10)) {
     // Set DEC
     //   0123456789
@@ -401,7 +401,7 @@ String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
   {
     return "1";
   }
-  else if (inCmd[0] == 'D') { // Set Date (MM/DD/YY) :SC04/30/20#
+  else if (inCmd[0] == 'C') { // Set Date (MM/DD/YY) :SC04/30/20#
     return "1Updating Planetary Data#"; // 
   }
   else {
@@ -541,18 +541,33 @@ String MeadeCommandProcessor::handleMeadeExtraCommands(String inCmd) {
 String MeadeCommandProcessor::handleMeadeQuit(String inCmd) {
   // :Q# stops a motors - remains in Control mode
   // :Qq# command does not stop motors, but quits Control mode
-  if ((inCmd.length() == 0) || (inCmd[0] != 'q')) {
+  if (inCmd.length() == 0) {
     _mount->stopSlewing(ALL_DIRECTIONS | TRACKING);
     _mount->waitUntilStopped(ALL_DIRECTIONS);
     return "1";
   }
-  else {
-    inSerialControl = false;
-    _lcdMenu->setCursor(0, 0);
-    _lcdMenu->updateDisplay();
-    _mount->startSlewing(TRACKING);
-    return "";
+
+  switch (inCmd[0]) {
+  case 'e':
+      _mount->stopSlewing(EAST);
+      break;
+  case 'w':
+      _mount->stopSlewing(WEST);
+      break;
+  case 'n':
+      _mount->stopSlewing(NORTH);
+      break;
+  case 's':
+      _mount->stopSlewing(SOUTH);
+      break;
+  case 'q':
+      inSerialControl = false;
+      _lcdMenu->setCursor(0, 0);
+      _lcdMenu->updateDisplay();
+      break;
   }
+
+  return "";
 }
 
 /////////////////////////////

Software/Arduino code/OpenAstroTracker/WifiControl.cpp

@@ -7,29 +7,57 @@ WifiControl::WifiControl(Mount* mount, LcdMenu* lcdMenu)
 {
     _mount = mount;
     _lcdMenu = lcdMenu;
-
-    switch (WIFI_MODE) {
-    case 0: // startup Infrastructure Mode
-        break;
-    case 1: // startup AP mode
-        break;
-    case 2: // Attempt Infra, fail over to AP
-        break;
-    }
 }
 
 void WifiControl::setup() {
+
+#ifdef DEBUG_MODE
+    Serial.printf("Starting up Wifi As Mode %d\n", WIFI_MODE);
+#endif
+
   _cmdProcessor = MeadeCommandProcessor::instance();
+
+  switch (WIFI_MODE) {
+  case 0: // startup Infrastructure Mode
+      startInfrastructureMode();
+      break;
+  case 1: // startup AP mode
+      startAccessPointMode();
+      break;
+  case 2: // Attempt Infra, fail over to AP
+      startInfrastructureMode();
+      _infraStart = millis();
+      break;
+  }
 }
 
 
 void WifiControl::startInfrastructureMode()
 {
+#ifdef DEBUG_MODE
+    Serial.println("Starting Infrastructure Mode Wifi");
+#endif
+    WiFi.hostname(HOSTNAME);
     WiFi.begin(INFRA_SSID, INFRA_WPAKEY);
 }
 
+void WifiControl::startAccessPointMode()
+{
+#ifdef DEBUG_MODE
+    Serial.println("Starting AP Mode Wifi");
+#endif
+    IPAddress local_ip(192, 168, 1, 1);
+    IPAddress gateway(192, 168, 1, 1);
+    IPAddress subnet(255, 255, 255, 0);
+    
+    WiFi.hostname(HOSTNAME);
+    WiFi.softAP(HOSTNAME, OAT_WPAKEY);
+    WiFi.softAPConfig(local_ip, gateway, subnet);
+}
+
 void WifiControl::loop()
 {
+
     if (_status != WiFi.status()) {
         _status = WiFi.status();
 #ifdef DEBUG_MODE
@@ -55,12 +83,30 @@ void WifiControl::loop()
     }
     _mount->loop();
 
-    if (_status != WL_CONNECTED) return;
+    if (_status != WL_CONNECTED) {
+        infraToAPFailover();
+        return;
+    }
 
     tcpLoop();
     udpLoop();
 }
 
+void WifiControl::infraToAPFailover() {
+    if (_infraStart != 0 && 
+        !WiFi.isConnected() && 
+        _infraStart + _infraWait < millis()) {
+
+        WiFi.disconnect();
+        startAccessPointMode();
+        _infraStart = 0;
+
+#ifdef DEBUG_MODE
+        Serial.println("Could not connect to Infra, Starting AP.");
+#endif
+    }
+}
+
 void WifiControl::tcpLoop() {
     if (client && client.connected()) {
         while (client.available()) {
@@ -91,9 +137,7 @@ void WifiControl::udpLoop()
     int packetSize = _udp->parsePacket();
     if (packetSize)
     {
-        String lookingFor = "skyfi:";
-        lookingFor += HOSTNAME;
-        lookingFor += "?";
+        String lookingFor = "skyfi:";;
 
         String reply = "skyfi:";
         reply += HOSTNAME;
@@ -104,12 +148,12 @@ void WifiControl::udpLoop()
 #endif
         char incomingPacket[255];
         int len = _udp->read(incomingPacket, 255);
-        incomingPacket[lookingFor.length()] = 0;
+        incomingPacket[len] = 0;
 #ifdef DEBUG_MODE
         Serial.printf("Received: %s\n", incomingPacket);
 #endif
-        
-        
+
+        incomingPacket[lookingFor.length()] = 0;
         if (lookingFor.equalsIgnoreCase(incomingPacket)) {
             _udp->beginPacket(_udp->remoteIP(), 4031);
             /*unsigned char bytes[255];

Software/Arduino code/OpenAstroTracker/WifiControl.hpp

@@ -17,7 +17,8 @@ class WifiControl {
 
 private: 
     void startInfrastructureMode();
-    //void startApMode(); 
+    void startAccessPointMode();
+    void infraToAPFailover();
     void tcpLoop();
     void udpLoop();
     wl_status_t _status;
@@ -28,5 +29,8 @@ class WifiControl {
     WiFiServer* _tcpServer;
     WiFiUDP* _udp;
     WiFiClient client;
+
+    long _infraStart = 0;
+    int _infraWait = 30000; // 30 second timeout for 
 };
 #endif