Reordered wifi startup routine to ensure connection on power-up

Author: Eric Jennings

ScoutHandler.cpp

@@ -18,6 +18,7 @@ void PinoccioScoutHandler::setup() {
     Gainspan.connectEventHandler = hqConnectHandler;
     Gainspan.disconnectEventHandler = hqDisconnectHandler;
 
+    Scout.enableBackpackVcc();
     Serial.print("Wi-Fi backpack connecting...");
     Scout.wifi.setup();
     Scout.wifi.init();
@@ -167,15 +168,15 @@ static void fieldAnnounceConfirm(NWK_DataReq_t *req) {
   isAnnouncing = false;
 }
 
-void PinoccioScoutHandler::fieldAnnounce(int chan, char *message) {
+void PinoccioScoutHandler::fieldAnnounce(uint16_t chan, char *message) {
   int len = strlen(message);
 
   if (isAnnouncing) {
     return;
   }
 
-  Serial.print("announcing to ");
-  Serial.print(chan, DEC);
+  Serial.print("announcing to 0x");
+  Serial.print(chan, HEX);
   Serial.print(" ");
   Serial.println(message);
 

ScoutHandler.h

@@ -12,7 +12,7 @@ class PinoccioScoutHandler {
 
     void setup();
     void loop();
-    void fieldAnnounce(int chan, char *message);
+    void fieldAnnounce(uint16_t chan, char *message);
 
   protected:
 };

utility/webGainspan.cpp

@@ -123,32 +123,35 @@ uint8_t webGainspan::setup(uint32_t baud) {
 
   //(Serial.println("DEBUG: Gainspan::setup 3"));
 
-  if (!send_cmd_w_resp(CMD_AUTOCONFIGSET)) {
-    //(Serial.println("DEBUG: Gainspan::init 3.1"));
-    return 0;
-  }
-
-  //(Serial.println("DEBUG: Gainspan::setup 4"));
-
-  while (isAutoConfigSet && millis() - timeout < 10000 && !respDone) {
+  while (isAutoConfigSet && millis() - timeout < 15000 && !respDone) {
     buf = readline();
+    //Serial.print(buf.length());
+    //Serial.print(": ");
+    //Serial.println(buf);
     buf.trim();
     if (buf.startsWith("NWCONN-SUCCESS")) {
-      //(Serial.println("DEBUG: Gainspan::setup 4.1"));
+      //(Serial.println("DEBUG: Gainspan::setup 3.1"));
       //(Serial.println(buf));
       respDone = 1;
       return 1;
     }
   }
 
-  delay(100);
-  //(Serial.println("DEBUG: Gainspan::setup 5"));
+  //delay(100);
+  //(Serial.println("DEBUG: Gainspan::setup 4"));
   return 0;
 }
 
 uint8_t webGainspan::init() {
   //(Serial.println("DEBUG: Gainspan::init 1"));
 
+  // get autoconnect setting
+  //(Serial.println("DEBUG: Gainspan::init 2"));
+  if (!send_cmd_w_resp(CMD_AUTOCONFIGSET)) {
+    //(Serial.println("DEBUG: Gainspan::init 2.1"));
+    return 0;
+  }
+
   // get device ID
   //(Serial.println("DEBUG: Gainspan::init 3"));
   if (!send_cmd_w_resp(CMD_GET_MAC_ADDR)) {
@@ -352,7 +355,7 @@ uint8_t webGainspan::parse_resp(uint8_t cmd) {
 
   while (!resp_done) {
 
-    if (millis() - timeout > 15000) {
+    if (millis() - timeout > 10000) {
       // timeout, return error
       ret = 0;
       resp_done = 1;