MODIFIED from mbed official WiflyInterface (interface for Roving Networks Wifly modules). Numerous performance and reliability improvements (see the detailed documentation). Also, tracking changes in mbed official version to retain functional parity.

Dependents:   Smart-WiFly-WebServer PUB_WiflyInterface_Demo

Fork of WiflyInterface by mbed official

Resources

Derivative from mbed Official

  • Documentation update, improved consistency, documented parameters that were inadvertently omitted.
  • Avoid c++ string handling, which causes dynamic allocation and free, side effect, fewer CPU cycles spent for same purpose.
  • Fixed socket APIs to support non-blocking mode.
  • Increase communication baud-rate to Wifly module
  • sendCommand - added retries for improved robustness.
  • setConnectionState - method to force the connection state (used by TCPSocketServer)
  • gethostbyname - added a length parameter to the size of the buffer being written
  • flushIn - a private method to flush the input buffer
  • Changed the timeout from 500 to 2500 msec for commands - measured some at 700 to 850 msec.
  • Performance improvements - reduced some unnecessary delays.
  • Added additional security options for the wi-fi connection (that are supported by the WiFly module).
  • Added setSecurity API which permits revising the security when connecting to, or selecting from, one of several access points.
  • Improved DEBUG interface (slightly more consistent printout).
  • gathers information from the Wifly module on reboot (SW version info), which permits customizing behavior based on Wifly capabilities (like the improved security).
  • Avoid potential for recursive crash (if exit fails, it calls sendcommand, which calls exit...)
  • Update to support permissible SSID and PassCode lengths.

Robustness testing

I've had some mixed behavior with the Wifly module, some of which seems to be traceable to the module itself, and some in my derivative code. The result, after running for minutes, hours, sometimes days, it hangs and I have to reset the module.

To test, I created a fairly simple test program -

  • check for Watchdog induced reset and count it.
  • initialize the Watchdog for 60 sec timeout.
  • Init the Wifly interface and connect to my network.
  • Wait 10 seconds and force mbed_reset().

If the Watchdog induces the restart, then it is pretty clear that either:

  • The communications hung with the Wifly module causing the failure.
  • The Wifly module decided to go unresponsive.

If it gets to the end, it typically takes about 4 to 6 seconds for the boot and connect, then the 10 second delay.

But I can't really pin down the root cause easily. My strongest theory is that the Wifly module has rebooted, and since I don't store the high baud rate I configure it for, it resets back to 9600.

Also, one of the objectives for my revised send( ) is to avoid the c++ string, as that can fragment memory, and it wasn't very well bounded in behavior.

Latest tests:

Warm BootsWatchdog EventsNotes
100's30An early version of my derivative WiflyInterface, including my derivative of "send( )" API. Let's call this version 0.1.
26684My derivative WiflyInterface, but with the mbed official "send( )" API. Much improved. This was over the course of about 12 hours.
24003Most recent derivative - incremental change to "send( )", but this relative number does not rule out the Wifly module itself.

I think with these numbers, +/- 1 means that the changes have had no measurable effect. Which is good, since this incremental change eliminates the c++ string handling.

Test Software

This is pieces of a test program, clipped and copied to here. What I have compiled and run for hours and hours is almost exactly what you see. This uses this simple Watchdog library.

#include "mbed.h"
#include "WiflyInterface.h"
#include "Watchdog.h"

Serial pc(USBTX, USBRX);

Watchdog wd;
extern "C" void mbed_reset();

// Pinout for SmartBoard
WiflyInterface wifly(p9, p10, p30, p29, "ssid", "pass", WPA);

int main() {
    pc.baud(460800);                         // I like a snappy terminal
    
    wd.Configure(60.0);                     // Set time limit for the test to 1 minute
    LPC_RTC->GPREG0++;                      // Count boots here
    if (wd.WatchdogCausedReset()) {
        LPC_RTC->GPREG1++;                  // Count Watchdog events here
        pc.printf("\r\n\r\nWatchdog event.\r\n");
    }
    pc.printf("\r\nWifly Test: %d boots, %d watchdogs. %s %s\r\n", LPC_RTC->GPREG0, LPC_RTC->GPREG1, __DATE__, __TIME__);
    
    wifly.init(); // use DHCP
    pc.printf("Connect...  ");
    while (!wifly.connect());               // join the network
    pc.printf("Address is %s.  ", wifly.getIPAddress());
    pc.printf("Disconnect...  ");
    wifly.disconnect();
    pc.printf("OK. Reset in 10 sec...\r\n");
    wait(10);
    if (pc.readable()) {
        if (pc.getc() == 'r') {             // secret 'r'eset of the counters
            LPC_RTC->GPREG0 = 0;
            LPC_RTC->GPREG1 = 0;
            pc.printf("counters reset\r\n");
        }
    }
    mbed_reset();                           // reset here indicates successful communication
}
Committer:
WiredHome
Date:
Sat Mar 01 17:16:55 2014 +0000
Revision:
58:f49aab8072ec
Parent:
56:eba4aabaad3e
Child:
59:8e15d2ca7bd5
Update to support long SSIDs.; Add Wifly module software update API.; Increase time-out to 2500 ms to accommodate Wifly module behavior.; Update documentation.; Clean up dead code.; Revise the debug interface.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:fb4494783863 1 /* Copyright (C) 2012 mbed.org, MIT License
samux 1:fb4494783863 2 *
samux 1:fb4494783863 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:fb4494783863 4 * and associated documentation files (the "Software"), to deal in the Software without restriction,
samux 1:fb4494783863 5 * including without limitation the rights to use, copy, modify, merge, publish, distribute,
samux 1:fb4494783863 6 * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
samux 1:fb4494783863 7 * furnished to do so, subject to the following conditions:
samux 1:fb4494783863 8 *
samux 1:fb4494783863 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:fb4494783863 10 * substantial portions of the Software.
samux 1:fb4494783863 11 *
samux 1:fb4494783863 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:fb4494783863 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:fb4494783863 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:fb4494783863 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:fb4494783863 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:fb4494783863 17 */
samux 1:fb4494783863 18
samux 1:fb4494783863 19 #include "mbed.h"
samux 1:fb4494783863 20 #include "Wifly.h"
samux 1:fb4494783863 21 #include <string>
samux 1:fb4494783863 22 #include <algorithm>
WiredHome 35:2dc12224cbd6 23 #include <ctype.h>
samux 1:fb4494783863 24
WiredHome 58:f49aab8072ec 25 // Defined to disable remote configuration via telnet which increases security of this device.
WiredHome 58:f49aab8072ec 26 // Available in Wifly module SW 2.27 and higher. If you want to retain remote telnet, undefine
WiredHome 58:f49aab8072ec 27 // or comment this.
WiredHome 51:a4831b1cb9a4 28 #define INCREASE_SECURITY
WiredHome 25:a740eb74a86a 29
WiredHome 58:f49aab8072ec 30
WiredHome 58:f49aab8072ec 31 #define DEBUG "WiFi" //Debug is disabled by default
WiredHome 20:906b0f951bc3 32
WiredHome 58:f49aab8072ec 33 // How to use this debug macro
WiredHome 58:f49aab8072ec 34 //
WiredHome 58:f49aab8072ec 35 // #define DEBUG "myfile"
WiredHome 58:f49aab8072ec 36 // #include "Utility.h"
WiredHome 58:f49aab8072ec 37 // ...
WiredHome 58:f49aab8072ec 38 // INFO("Stuff to show %d", var); // new-line is automatically appended
WiredHome 58:f49aab8072ec 39 // [I myfile 23] Stuff to show 23\r\n
WiredHome 58:f49aab8072ec 40 //
WiredHome 20:906b0f951bc3 41 #if (defined(DEBUG) && !defined(TARGET_LPC11U24))
WiredHome 58:f49aab8072ec 42 #define INFO(x, ...) std::printf("[INF %s %3d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
WiredHome 58:f49aab8072ec 43 #define WARN(x, ...) std::printf("[WRN %s %3d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
WiredHome 58:f49aab8072ec 44 #define ERR(x, ...) std::printf("[ERR %s %3d] "x"\r\n", DEBUG, __LINE__, ##__VA_ARGS__);
samux 1:fb4494783863 45 #else
WiredHome 58:f49aab8072ec 46 #define INFO(x, ...)
samux 1:fb4494783863 47 #define WARN(x, ...)
samux 1:fb4494783863 48 #define ERR(x, ...)
samux 1:fb4494783863 49 #endif
samux 1:fb4494783863 50
WiredHome 58:f49aab8072ec 51
samux 1:fb4494783863 52 #define MAX_TRY_JOIN 3
samux 1:fb4494783863 53
samux 1:fb4494783863 54 Wifly * Wifly::inst;
samux 1:fb4494783863 55
samux 1:fb4494783863 56 Wifly::Wifly( PinName tx, PinName rx, PinName _reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec):
WiredHome 20:906b0f951bc3 57 wifi(tx, rx), reset_pin(_reset), tcp_status(tcp_status), baudrate(9600), buf_wifly(256)
samux 1:fb4494783863 58 {
WiredHome 58:f49aab8072ec 59 INFO("Wifly constructor");
samux 1:fb4494783863 60 memset(&state, 0, sizeof(state));
samux 1:fb4494783863 61 state.sec = sec;
samux 1:fb4494783863 62
WiredHome 24:5012a535b1d5 63 FixPhrase(&this->ssid, ssid);
WiredHome 24:5012a535b1d5 64 FixPhrase(&this->phrase, phrase);
samux 1:fb4494783863 65
samux 1:fb4494783863 66 inst = this;
samux 1:fb4494783863 67 attach_rx(false);
WiredHome 58:f49aab8072ec 68 state.cmd_mode = false;
WiredHome 25:a740eb74a86a 69 wiflyVersionString = NULL;
WiredHome 58:f49aab8072ec 70 INFO(" const. exit");
samux 1:fb4494783863 71 }
samux 1:fb4494783863 72
WiredHome 25:a740eb74a86a 73 Wifly::~Wifly()
WiredHome 25:a740eb74a86a 74 {
WiredHome 58:f49aab8072ec 75 INFO("~Wifly()");
WiredHome 25:a740eb74a86a 76 if (ssid) {
WiredHome 25:a740eb74a86a 77 free(ssid);
WiredHome 25:a740eb74a86a 78 ssid = NULL;
WiredHome 25:a740eb74a86a 79 }
WiredHome 25:a740eb74a86a 80 if (phrase) {
WiredHome 25:a740eb74a86a 81 free(phrase);
WiredHome 25:a740eb74a86a 82 phrase = NULL;
WiredHome 25:a740eb74a86a 83 }
WiredHome 25:a740eb74a86a 84 if (wiflyVersionString) {
WiredHome 25:a740eb74a86a 85 free(wiflyVersionString);
WiredHome 25:a740eb74a86a 86 wiflyVersionString = NULL;
WiredHome 25:a740eb74a86a 87 }
WiredHome 25:a740eb74a86a 88 }
WiredHome 25:a740eb74a86a 89
WiredHome 45:21b7bbaad62b 90 void Wifly::SetSecurity(const char * ssid, const char * phrase, Security sec)
WiredHome 45:21b7bbaad62b 91 {
WiredHome 45:21b7bbaad62b 92 state.sec = sec;
WiredHome 47:97303e1970c1 93 free(&this->ssid); // release the old versions
WiredHome 47:97303e1970c1 94 free(&this->phrase);
WiredHome 45:21b7bbaad62b 95 FixPhrase(&this->ssid, ssid);
WiredHome 45:21b7bbaad62b 96 FixPhrase(&this->phrase, phrase);
WiredHome 45:21b7bbaad62b 97 }
WiredHome 25:a740eb74a86a 98
samux 1:fb4494783863 99 bool Wifly::join()
samux 1:fb4494783863 100 {
WiredHome 58:f49aab8072ec 101 char cmd[80]; // room for command with maximum ssid or passphrase
samux 1:fb4494783863 102
WiredHome 31:e4422f192d25 103 INFO("join");
samux 1:fb4494783863 104 for (int i= 0; i < MAX_TRY_JOIN; i++) {
samux 2:8e54830d0df7 105
samux 2:8e54830d0df7 106 // no auto join
samux 2:8e54830d0df7 107 if (!sendCommand("set w j 0\r", "AOK"))
samux 2:8e54830d0df7 108 continue;
samux 2:8e54830d0df7 109
WiredHome 27:8509ec4a0a0a 110 // no echo
samux 2:8e54830d0df7 111 if (!sendCommand("set u m 1\r", "AOK"))
samux 2:8e54830d0df7 112 continue;
samux 2:8e54830d0df7 113
WiredHome 27:8509ec4a0a0a 114 // set comm time to flush (ms)
samux 4:0bcec6272784 115 if (!sendCommand("set c t 30\r", "AOK"))
samux 1:fb4494783863 116 continue;
samux 1:fb4494783863 117
WiredHome 27:8509ec4a0a0a 118 // set comm size to auto-send
WiredHome 27:8509ec4a0a0a 119 if (!sendCommand("set c s 1420\r", "AOK"))
samux 1:fb4494783863 120 continue;
samux 1:fb4494783863 121
WiredHome 29:49876a8c445b 122 // set comm idle time to auto-close (sec)
WiredHome 29:49876a8c445b 123 //if (!sendCommand("set c i 5\r", "AOK"))
WiredHome 29:49876a8c445b 124 // continue;
WiredHome 29:49876a8c445b 125
samux 1:fb4494783863 126 // red led on when tcp connection active
samux 1:fb4494783863 127 if (!sendCommand("set s i 0x40\r", "AOK"))
samux 1:fb4494783863 128 continue;
samux 1:fb4494783863 129
WiredHome 27:8509ec4a0a0a 130 // no hello string sent to the tcp client
samux 1:fb4494783863 131 if (!sendCommand("set c r 0\r", "AOK"))
samux 1:fb4494783863 132 continue;
samux 1:fb4494783863 133
samux 1:fb4494783863 134 // tcp protocol
samux 1:fb4494783863 135 if (!sendCommand("set i p 2\r", "AOK"))
samux 1:fb4494783863 136 continue;
samux 1:fb4494783863 137
WiredHome 27:8509ec4a0a0a 138 // tcp retry (retry enabled, Nagle alg, retain link)
samux 1:fb4494783863 139 if (!sendCommand("set i f 0x7\r", "AOK"))
samux 1:fb4494783863 140 continue;
WiredHome 20:906b0f951bc3 141
WiredHome 25:a740eb74a86a 142 #ifdef INCREASE_SECURITY
WiredHome 25:a740eb74a86a 143 // tcp-mode 0x10 = disable remote configuration
WiredHome 25:a740eb74a86a 144 // only in SW 2.27 and higher (see 2.3.39)
WiredHome 25:a740eb74a86a 145 if ((swVersion >= 2.27) && (!sendCommand("set i t 0x10\r", "AOK")))
WiredHome 25:a740eb74a86a 146 continue;
WiredHome 25:a740eb74a86a 147 #endif
WiredHome 25:a740eb74a86a 148
samux 2:8e54830d0df7 149 // set dns server
samux 2:8e54830d0df7 150 if (!sendCommand("set d n rn.microchip.com\r", "AOK"))
samux 1:fb4494783863 151 continue;
samux 1:fb4494783863 152
samux 1:fb4494783863 153 //dhcp
samux 1:fb4494783863 154 sprintf(cmd, "set i d %d\r", (state.dhcp) ? 1 : 0);
samux 1:fb4494783863 155 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 156 continue;
samux 1:fb4494783863 157
samux 1:fb4494783863 158 // ssid
samux 1:fb4494783863 159 sprintf(cmd, "set w s %s\r", ssid);
samux 1:fb4494783863 160 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 161 continue;
samux 1:fb4494783863 162
samux 1:fb4494783863 163 //auth
samux 1:fb4494783863 164 sprintf(cmd, "set w a %d\r", state.sec);
samux 1:fb4494783863 165 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 166 continue;
samux 1:fb4494783863 167
samux 1:fb4494783863 168 // if no dhcp, set ip, netmask and gateway
samux 1:fb4494783863 169 if (!state.dhcp) {
WiredHome 58:f49aab8072ec 170 INFO("not dhcp");
samux 1:fb4494783863 171 sprintf(cmd, "set i a %s\r\n", ip);
samux 1:fb4494783863 172 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 173 continue;
samux 1:fb4494783863 174
samux 1:fb4494783863 175 sprintf(cmd, "set i n %s\r", netmask);
samux 1:fb4494783863 176 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 177 continue;
samux 1:fb4494783863 178
samux 1:fb4494783863 179 sprintf(cmd, "set i g %s\r", gateway);
samux 1:fb4494783863 180 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 181 continue;
samux 1:fb4494783863 182 }
samux 1:fb4494783863 183
samux 1:fb4494783863 184 //key step
WiredHome 30:f500260463b7 185 cmd[0] = '\0';
WiredHome 30:f500260463b7 186 switch (state.sec) {
WiredHome 30:f500260463b7 187 case WPE_64: // google searching suggests this is a typo and should be WEP_64
WiredHome 30:f500260463b7 188 case WEP_128:
samux 1:fb4494783863 189 sprintf(cmd, "set w k %s\r", phrase);
WiredHome 30:f500260463b7 190 break;
WiredHome 30:f500260463b7 191 case WPA1:
WiredHome 30:f500260463b7 192 case WPA_MIXED: // alias WPA
WiredHome 30:f500260463b7 193 case WPA2_PSK:
WiredHome 30:f500260463b7 194 sprintf(cmd, "set w p %s\r", phrase);
WiredHome 30:f500260463b7 195 break;
WiredHome 30:f500260463b7 196 case ADHOC:
WiredHome 30:f500260463b7 197 case NONE:
WiredHome 30:f500260463b7 198 default:
WiredHome 30:f500260463b7 199 break;
samux 1:fb4494783863 200 }
WiredHome 30:f500260463b7 201 if (cmd[0] && !sendCommand(cmd, "AOK"))
WiredHome 30:f500260463b7 202 continue;
samux 1:fb4494783863 203
samux 2:8e54830d0df7 204 //join the network (10s timeout)
samux 1:fb4494783863 205 if (state.dhcp) {
samux 2:8e54830d0df7 206 if (!sendCommand("join\r", "DHCP=ON", NULL, 10000))
samux 2:8e54830d0df7 207 continue;
samux 2:8e54830d0df7 208 } else {
samux 2:8e54830d0df7 209 if (!sendCommand("join\r", "Associated", NULL, 10000))
samux 1:fb4494783863 210 continue;
samux 1:fb4494783863 211 }
samux 1:fb4494783863 212
samux 2:8e54830d0df7 213 if (!sendCommand("save\r", "Stor"))
samux 2:8e54830d0df7 214 continue;
samux 2:8e54830d0df7 215
samux 1:fb4494783863 216 exit();
samux 1:fb4494783863 217
samux 1:fb4494783863 218 state.associated = true;
WiredHome 30:f500260463b7 219 // Don't advertise this info
WiredHome 30:f500260463b7 220 //INFO("\r\nssid: %s\r\nphrase: %s\r\nsecurity: %s\r\n\r\n", this->ssid, this->phrase, getStringSecurity());
samux 1:fb4494783863 221 return true;
samux 1:fb4494783863 222 }
samux 1:fb4494783863 223 return false;
samux 1:fb4494783863 224 }
samux 1:fb4494783863 225
samux 1:fb4494783863 226
samux 1:fb4494783863 227 bool Wifly::setProtocol(Protocol p)
samux 1:fb4494783863 228 {
samux 1:fb4494783863 229 // use udp auto pairing
samux 1:fb4494783863 230 char cmd[20];
samux 1:fb4494783863 231 sprintf(cmd, "set i p %d\r", p);
samux 1:fb4494783863 232 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 233 return false;
samux 1:fb4494783863 234
samux 1:fb4494783863 235 switch(p) {
samux 1:fb4494783863 236 case TCP:
samux 1:fb4494783863 237 // set ip flags: tcp retry enabled
samux 1:fb4494783863 238 if (!sendCommand("set i f 0x07\r", "AOK"))
samux 1:fb4494783863 239 return false;
samux 1:fb4494783863 240 break;
samux 1:fb4494783863 241 case UDP:
samux 1:fb4494783863 242 // set ip flags: udp auto pairing enabled
samux 1:fb4494783863 243 if (!sendCommand("set i h 0.0.0.0\r", "AOK"))
samux 1:fb4494783863 244 return false;
samux 4:0bcec6272784 245 if (!sendCommand("set i f 0x40\r", "AOK"))
samux 1:fb4494783863 246 return false;
samux 1:fb4494783863 247 break;
samux 1:fb4494783863 248 }
samux 1:fb4494783863 249 state.proto = p;
samux 1:fb4494783863 250 return true;
samux 1:fb4494783863 251 }
samux 1:fb4494783863 252
WiredHome 25:a740eb74a86a 253
samux 1:fb4494783863 254 char * Wifly::getStringSecurity()
samux 1:fb4494783863 255 {
samux 1:fb4494783863 256 switch(state.sec) {
WiredHome 30:f500260463b7 257 case NONE: // 0
samux 1:fb4494783863 258 return "NONE";
WiredHome 30:f500260463b7 259 case WEP_128: // 1
samux 1:fb4494783863 260 return "WEP_128";
WiredHome 30:f500260463b7 261 case WPA1: // 2
WiredHome 30:f500260463b7 262 return "WPA1";
WiredHome 30:f500260463b7 263 case WPA: // 3
samux 1:fb4494783863 264 return "WPA";
WiredHome 30:f500260463b7 265 case WPA2_PSK: // 4
WiredHome 30:f500260463b7 266 return "WPA2_PSK";
WiredHome 30:f500260463b7 267 case ADHOC: // 6
WiredHome 30:f500260463b7 268 return "ADHOC";
WiredHome 30:f500260463b7 269 case WPE_64: // 8
WiredHome 30:f500260463b7 270 return "WPE_64";
WiredHome 30:f500260463b7 271 default: // ?
WiredHome 30:f500260463b7 272 return "UNKNOWN";
samux 1:fb4494783863 273 }
samux 1:fb4494783863 274 }
samux 1:fb4494783863 275
WiredHome 25:a740eb74a86a 276
samux 1:fb4494783863 277 bool Wifly::connect(const char * host, int port)
samux 1:fb4494783863 278 {
samux 1:fb4494783863 279 char rcv[20];
samux 1:fb4494783863 280 char cmd[20];
samux 1:fb4494783863 281
samux 2:8e54830d0df7 282 // try to open
samux 2:8e54830d0df7 283 sprintf(cmd, "open %s %d\r", host, port);
samux 2:8e54830d0df7 284 if (sendCommand(cmd, "OPEN", NULL, 10000)) {
samux 2:8e54830d0df7 285 state.tcp = true;
WiredHome 25:a740eb74a86a 286 exit();
samux 2:8e54830d0df7 287 return true;
samux 1:fb4494783863 288 }
samux 1:fb4494783863 289
samux 2:8e54830d0df7 290 // if failed, retry and parse the response
samux 2:8e54830d0df7 291 if (sendCommand(cmd, NULL, rcv, 5000)) {
samux 1:fb4494783863 292 if (strstr(rcv, "OPEN") == NULL) {
samux 1:fb4494783863 293 if (strstr(rcv, "Connected") != NULL) {
samux 1:fb4494783863 294 if (!sendCommand("close\r", "CLOS"))
samux 1:fb4494783863 295 return false;
samux 2:8e54830d0df7 296 if (!sendCommand(cmd, "OPEN", NULL, 10000))
samux 1:fb4494783863 297 return false;
samux 1:fb4494783863 298 } else {
samux 1:fb4494783863 299 return false;
samux 1:fb4494783863 300 }
samux 1:fb4494783863 301 }
samux 1:fb4494783863 302 } else {
samux 1:fb4494783863 303 return false;
samux 1:fb4494783863 304 }
samux 2:8e54830d0df7 305
samux 1:fb4494783863 306 state.tcp = true;
WiredHome 25:a740eb74a86a 307 exit();
samux 1:fb4494783863 308 return true;
samux 1:fb4494783863 309 }
samux 1:fb4494783863 310
samux 1:fb4494783863 311
samux 1:fb4494783863 312 bool Wifly::gethostbyname(const char * host, char * ip)
samux 1:fb4494783863 313 {
samux 1:fb4494783863 314 string h = host;
samux 1:fb4494783863 315 char cmd[30], rcv[100];
samux 1:fb4494783863 316 int l = 0;
samux 1:fb4494783863 317 char * point;
samux 1:fb4494783863 318 int nb_digits = 0;
samux 1:fb4494783863 319
samux 1:fb4494783863 320 // no dns needed
samux 1:fb4494783863 321 int pos = h.find(".");
samux 1:fb4494783863 322 if (pos != string::npos) {
samux 1:fb4494783863 323 string sub = h.substr(0, h.find("."));
samux 1:fb4494783863 324 nb_digits = atoi(sub.c_str());
samux 1:fb4494783863 325 }
samux 1:fb4494783863 326 //printf("substrL %s\r\n", sub.c_str());
samux 1:fb4494783863 327 if (count(h.begin(), h.end(), '.') == 3 && nb_digits > 0) {
samux 1:fb4494783863 328 strcpy(ip, host);
samux 1:fb4494783863 329 }
samux 1:fb4494783863 330 // dns needed
samux 1:fb4494783863 331 else {
samux 1:fb4494783863 332 nb_digits = 0;
samux 1:fb4494783863 333 sprintf(cmd, "lookup %s\r", host);
samux 1:fb4494783863 334 if (!sendCommand(cmd, NULL, rcv))
samux 1:fb4494783863 335 return false;
samux 1:fb4494783863 336
samux 1:fb4494783863 337 // look for the ip address
samux 1:fb4494783863 338 char * begin = strstr(rcv, "=") + 1;
samux 1:fb4494783863 339 for (int i = 0; i < 3; i++) {
samux 1:fb4494783863 340 point = strstr(begin + l, ".");
WiredHome 29:49876a8c445b 341 INFO("str: %s", begin + l);
samux 1:fb4494783863 342 l += point - (begin + l) + 1;
samux 1:fb4494783863 343 }
WiredHome 29:49876a8c445b 344 INFO("str: %s", begin + l);
samux 1:fb4494783863 345 while(*(begin + l + nb_digits) >= '0' && *(begin + l + nb_digits) <= '9') {
WiredHome 29:49876a8c445b 346 INFO("digit: %c", *(begin + l + nb_digits));
samux 1:fb4494783863 347 nb_digits++;
samux 1:fb4494783863 348 }
samux 1:fb4494783863 349 memcpy(ip, begin, l + nb_digits);
samux 1:fb4494783863 350 ip[l+nb_digits] = 0;
WiredHome 29:49876a8c445b 351 INFO("ip from dns: %s", ip);
samux 1:fb4494783863 352 }
samux 1:fb4494783863 353 return true;
samux 1:fb4494783863 354 }
samux 1:fb4494783863 355
samux 1:fb4494783863 356
samux 1:fb4494783863 357 void Wifly::flush()
samux 1:fb4494783863 358 {
WiredHome 51:a4831b1cb9a4 359 #if 0 and defined(DEBUG)
WiredHome 29:49876a8c445b 360 char chatter[500];
WiredHome 29:49876a8c445b 361 int count = 0;
WiredHome 29:49876a8c445b 362 char c;
WiredHome 29:49876a8c445b 363
WiredHome 29:49876a8c445b 364 while (buf_wifly.available()) {
WiredHome 29:49876a8c445b 365 buf_wifly.dequeue(&c);
WiredHome 29:49876a8c445b 366 chatter[count++] = c;
WiredHome 29:49876a8c445b 367 }
WiredHome 29:49876a8c445b 368 chatter[count] = '\0';
WiredHome 29:49876a8c445b 369 if (count)
WiredHome 29:49876a8c445b 370 DBG("Wifly::flush {%s}", chatter);
WiredHome 29:49876a8c445b 371 #endif
samux 1:fb4494783863 372 buf_wifly.flush();
samux 1:fb4494783863 373 }
samux 1:fb4494783863 374
WiredHome 25:a740eb74a86a 375
samux 1:fb4494783863 376 bool Wifly::sendCommand(const char * cmd, const char * ack, char * res, int timeout)
samux 1:fb4494783863 377 {
WiredHome 20:906b0f951bc3 378 int tries = 1;
WiredHome 29:49876a8c445b 379
WiredHome 34:52e4eec8b790 380 INFO("sendCommand %s", cmd);
WiredHome 20:906b0f951bc3 381 while (tries <= 2) {
WiredHome 53:3dd2e7f9edc0 382 if (cmdMode()) { // some influences to the wifi module sometimes kick it out
WiredHome 53:3dd2e7f9edc0 383 if (send(cmd, strlen(cmd), ack, res, timeout) >= 0) {
WiredHome 58:f49aab8072ec 384 INFO(" sendCommand exit true");
WiredHome 53:3dd2e7f9edc0 385 return true;
WiredHome 53:3dd2e7f9edc0 386 }
WiredHome 20:906b0f951bc3 387 }
WiredHome 58:f49aab8072ec 388 state.cmd_mode = false; // must not really be in cmd mode
WiredHome 29:49876a8c445b 389 ERR("sendCommand: failure %d when sending: %s", tries, cmd);
WiredHome 20:906b0f951bc3 390 tries++;
samux 1:fb4494783863 391 }
WiredHome 58:f49aab8072ec 392 INFO(" sendCommand exit false");
WiredHome 17:213844a1864f 393 return false;
samux 1:fb4494783863 394 }
samux 1:fb4494783863 395
WiredHome 25:a740eb74a86a 396
samux 1:fb4494783863 397 bool Wifly::cmdMode()
samux 1:fb4494783863 398 {
samux 1:fb4494783863 399 // if already in cmd mode, return
WiredHome 29:49876a8c445b 400 if (state.cmd_mode) {
WiredHome 58:f49aab8072ec 401 #if 1
WiredHome 58:f49aab8072ec 402 return true;
WiredHome 58:f49aab8072ec 403 #else // for deeper debugging
WiredHome 29:49876a8c445b 404 // Quick verify to ensure we really are in cmd mode
WiredHome 29:49876a8c445b 405 flushIn(0);
WiredHome 51:a4831b1cb9a4 406 //INFO(" send \\r to test for cmdMode");
WiredHome 29:49876a8c445b 407 if (send("\r", 1, ">") == 1) {
WiredHome 51:a4831b1cb9a4 408 //INFO(" is cmdMode");
WiredHome 29:49876a8c445b 409 return true;
WiredHome 34:52e4eec8b790 410 } else {
WiredHome 58:f49aab8072ec 411 ERR(" failed to detect command mode");
WiredHome 58:f49aab8072ec 412 state.cmd_mode = false;
WiredHome 34:52e4eec8b790 413 }
WiredHome 58:f49aab8072ec 414 #endif
WiredHome 58:f49aab8072ec 415 } else {
WiredHome 58:f49aab8072ec 416 wait_ms(260); // manual 1.2.1 (250 msec before and after)
WiredHome 58:f49aab8072ec 417 if (send("$$$", 3, "CMD") == -1) { // the module controls the 'after' delay
WiredHome 58:f49aab8072ec 418 ERR("cannot enter in cmd mode");
WiredHome 58:f49aab8072ec 419 return false;
WiredHome 58:f49aab8072ec 420 }
WiredHome 58:f49aab8072ec 421 state.cmd_mode = true;
WiredHome 29:49876a8c445b 422 }
samux 1:fb4494783863 423 return true;
samux 1:fb4494783863 424 }
samux 1:fb4494783863 425
WiredHome 25:a740eb74a86a 426
samux 1:fb4494783863 427 bool Wifly::disconnect()
samux 1:fb4494783863 428 {
samux 1:fb4494783863 429 // if already disconnected, return
samux 1:fb4494783863 430 if (!state.associated)
samux 1:fb4494783863 431 return true;
samux 2:8e54830d0df7 432
samux 1:fb4494783863 433 if (!sendCommand("leave\r", "DeAuth"))
samux 1:fb4494783863 434 return false;
samux 1:fb4494783863 435 exit();
samux 2:8e54830d0df7 436
samux 1:fb4494783863 437 state.associated = false;
samux 1:fb4494783863 438 return true;
samux 1:fb4494783863 439 }
samux 1:fb4494783863 440
WiredHome 25:a740eb74a86a 441
samux 1:fb4494783863 442 bool Wifly::is_connected()
samux 1:fb4494783863 443 {
samux 1:fb4494783863 444 return (tcp_status.read() == 1) ? true : false;
samux 1:fb4494783863 445 }
samux 1:fb4494783863 446
samux 1:fb4494783863 447
samux 1:fb4494783863 448 void Wifly::reset()
samux 1:fb4494783863 449 {
samux 1:fb4494783863 450 reset_pin = 0;
WiredHome 25:a740eb74a86a 451 wifi.baud(9600);
WiredHome 55:0729959263b7 452 wait_ms(400);
samux 1:fb4494783863 453 reset_pin = 1;
WiredHome 25:a740eb74a86a 454 GatherLogonInfo();
WiredHome 58:f49aab8072ec 455 INFO("swver %3.2f, {%s}", getWiflyVersion(), getWiflyVersionString());
samux 1:fb4494783863 456 }
samux 1:fb4494783863 457
WiredHome 25:a740eb74a86a 458
samux 3:9aa05e19c62e 459 bool Wifly::reboot()
samux 3:9aa05e19c62e 460 {
WiredHome 26:78a1a09afdc9 461 if (sendCommand("reboot\r", "Reboot")) {
WiredHome 58:f49aab8072ec 462 state.cmd_mode = false;
WiredHome 26:78a1a09afdc9 463 wait_ms(500);
WiredHome 26:78a1a09afdc9 464 wifi.baud(9600);
WiredHome 26:78a1a09afdc9 465 baud(baudrate);
WiredHome 26:78a1a09afdc9 466 exit();
WiredHome 26:78a1a09afdc9 467 return true;
WiredHome 26:78a1a09afdc9 468 } else {
samux 3:9aa05e19c62e 469 return false;
WiredHome 26:78a1a09afdc9 470 }
samux 3:9aa05e19c62e 471 }
samux 3:9aa05e19c62e 472
WiredHome 25:a740eb74a86a 473
samux 1:fb4494783863 474 bool Wifly::close()
samux 1:fb4494783863 475 {
WiredHome 50:cc173c24a316 476 if (!state.tcp) {
WiredHome 34:52e4eec8b790 477 return true; // already closed
WiredHome 50:cc173c24a316 478 }
WiredHome 50:cc173c24a316 479 if (!sendCommand("close\r", "*CLOS*")) {
WiredHome 34:52e4eec8b790 480 return false; // failed to close
WiredHome 50:cc173c24a316 481 }
WiredHome 45:21b7bbaad62b 482 #if 1
WiredHome 34:52e4eec8b790 483 // It appears that the close exits cmd mode
WiredHome 50:cc173c24a316 484 // so we won't bother trying to close which
WiredHome 34:52e4eec8b790 485 // could cause it to open command mode to
WiredHome 50:cc173c24a316 486 // send the close (which add more 0.5s delays).
WiredHome 58:f49aab8072ec 487 state.cmd_mode = false;
WiredHome 45:21b7bbaad62b 488 #else
WiredHome 34:52e4eec8b790 489 flushIn();
WiredHome 34:52e4eec8b790 490 exit();
WiredHome 45:21b7bbaad62b 491 #endif
samux 1:fb4494783863 492 state.tcp = false;
WiredHome 34:52e4eec8b790 493 return true; // succeeded to close
samux 1:fb4494783863 494 }
samux 1:fb4494783863 495
samux 1:fb4494783863 496
samux 1:fb4494783863 497 int Wifly::putc(char c)
samux 1:fb4494783863 498 {
WiredHome 25:a740eb74a86a 499 while (!wifi.writeable())
WiredHome 25:a740eb74a86a 500 ;
samux 1:fb4494783863 501 return wifi.putc(c);
samux 1:fb4494783863 502 }
samux 1:fb4494783863 503
samux 1:fb4494783863 504
samux 1:fb4494783863 505 bool Wifly::exit()
samux 1:fb4494783863 506 {
WiredHome 34:52e4eec8b790 507 if (!sendCommand("exit\r", "EXIT")) {
WiredHome 34:52e4eec8b790 508 ERR(" failed to exit.");
samux 1:fb4494783863 509 return false;
WiredHome 34:52e4eec8b790 510 }
WiredHome 58:f49aab8072ec 511 state.cmd_mode = false;
samux 1:fb4494783863 512 return true;
samux 1:fb4494783863 513 }
samux 1:fb4494783863 514
samux 1:fb4494783863 515
samux 1:fb4494783863 516 int Wifly::readable()
samux 1:fb4494783863 517 {
samux 1:fb4494783863 518 return buf_wifly.available();
samux 1:fb4494783863 519 }
samux 1:fb4494783863 520
WiredHome 25:a740eb74a86a 521
samux 1:fb4494783863 522 int Wifly::writeable()
samux 1:fb4494783863 523 {
samux 1:fb4494783863 524 return wifi.writeable();
samux 1:fb4494783863 525 }
samux 1:fb4494783863 526
WiredHome 25:a740eb74a86a 527
samux 1:fb4494783863 528 char Wifly::getc()
samux 1:fb4494783863 529 {
WiredHome 58:f49aab8072ec 530 char c = 0xCC; // avoid compiler warning of uninitialized var.
WiredHome 58:f49aab8072ec 531
WiredHome 25:a740eb74a86a 532 while (!buf_wifly.available())
WiredHome 25:a740eb74a86a 533 ;
samux 1:fb4494783863 534 buf_wifly.dequeue(&c);
samux 1:fb4494783863 535 return c;
samux 1:fb4494783863 536 }
samux 1:fb4494783863 537
WiredHome 25:a740eb74a86a 538
samux 1:fb4494783863 539 void Wifly::handler_rx(void)
samux 1:fb4494783863 540 {
samux 1:fb4494783863 541 //read characters
samux 1:fb4494783863 542 while (wifi.readable())
samux 1:fb4494783863 543 buf_wifly.queue(wifi.getc());
samux 1:fb4494783863 544 }
samux 1:fb4494783863 545
WiredHome 25:a740eb74a86a 546
samux 1:fb4494783863 547 void Wifly::attach_rx(bool callback)
samux 1:fb4494783863 548 {
samux 1:fb4494783863 549 if (!callback)
samux 1:fb4494783863 550 wifi.attach(NULL);
samux 1:fb4494783863 551 else
samux 1:fb4494783863 552 wifi.attach(this, &Wifly::handler_rx);
samux 1:fb4494783863 553 }
samux 1:fb4494783863 554
samux 1:fb4494783863 555
samux 1:fb4494783863 556 int Wifly::send(const char * str, int len, const char * ACK, char * res, int timeout)
samux 1:fb4494783863 557 {
samux 1:fb4494783863 558 char read;
WiredHome 34:52e4eec8b790 559 int ackIndex = 0;
samux 1:fb4494783863 560 Timer tmr;
samux 1:fb4494783863 561 int result = 0;
samux 1:fb4494783863 562
samux 1:fb4494783863 563 attach_rx(false);
WiredHome 20:906b0f951bc3 564 tmr.start();
WiredHome 51:a4831b1cb9a4 565 //INFO("send(%s) at %d", str, tmr.read_ms());
WiredHome 51:a4831b1cb9a4 566 for (int i = 0; i < len; i++)
WiredHome 51:a4831b1cb9a4 567 result = (putc(str[i]) == str[i]) ? result + 1 : result; // count successful sends
samux 1:fb4494783863 568 if (!ACK || !strcmp(ACK, "NO")) {
WiredHome 51:a4831b1cb9a4 569 ;
samux 1:fb4494783863 570 } else {
WiredHome 58:f49aab8072ec 571 //INFO(" .");
samux 1:fb4494783863 572 while (1) {
samux 1:fb4494783863 573 if (tmr.read_ms() > timeout) {
WiredHome 18:18ab3993d00d 574 flushIn();
WiredHome 55:0729959263b7 575 WARN("Timeout at %d ms seeking [%s] from [\r\n%s\r\n]", tmr.read_ms(), ACK, str);
samux 1:fb4494783863 576 attach_rx(true);
samux 1:fb4494783863 577 return -1;
samux 1:fb4494783863 578 } else if (wifi.readable()) {
samux 1:fb4494783863 579 read = wifi.getc();
WiredHome 51:a4831b1cb9a4 580 //INFO(" getc %2X %d", read, tmr.read_ms());
WiredHome 36:8d868fea6fe6 581 if (tolower(read) != tolower(ACK[ackIndex]))
WiredHome 36:8d868fea6fe6 582 ackIndex = 0;
WiredHome 35:2dc12224cbd6 583 if (tolower(read) == tolower(ACK[ackIndex])) {
WiredHome 34:52e4eec8b790 584 ackIndex++;
WiredHome 34:52e4eec8b790 585 if (ackIndex == strlen(ACK))
WiredHome 34:52e4eec8b790 586 break;
WiredHome 34:52e4eec8b790 587 }
WiredHome 51:a4831b1cb9a4 588 } else {
WiredHome 51:a4831b1cb9a4 589 ; // INFO(" waiting %d", tmr.read_ms());
samux 1:fb4494783863 590 }
samux 1:fb4494783863 591 }
WiredHome 58:f49aab8072ec 592 INFO(" found %s.", ACK);
samux 1:fb4494783863 593 attach_rx(true);
samux 1:fb4494783863 594 return result;
samux 1:fb4494783863 595 }
samux 1:fb4494783863 596
samux 1:fb4494783863 597 //the user wants the result from the command (ACK == NULL, res != NULL)
WiredHome 58:f49aab8072ec 598 if (res != NULL) {
samux 1:fb4494783863 599 int i = 0;
WiredHome 58:f49aab8072ec 600 INFO(" get result");
samux 1:fb4494783863 601 while (1) {
WiredHome 19:b0c2488222a3 602 if (tmr.read_ms() > timeout) {
WiredHome 19:b0c2488222a3 603 res[i] = '\0';
samux 1:fb4494783863 604 if (i == 0) {
samux 1:fb4494783863 605 res = NULL;
samux 1:fb4494783863 606 }
WiredHome 58:f49aab8072ec 607 INFO("timeout awaiting response to %s", str);
WiredHome 55:0729959263b7 608 //wait_ms(100);
samux 1:fb4494783863 609 break;
samux 1:fb4494783863 610 } else {
samux 1:fb4494783863 611 if (wifi.readable()) {
samux 1:fb4494783863 612 read = wifi.getc();
WiredHome 58:f49aab8072ec 613 // this used to drop \r and \n, but should we since
WiredHome 58:f49aab8072ec 614 // it is for user code, it should not.
WiredHome 51:a4831b1cb9a4 615 //if ( read != '\r' && read != '\n') {
WiredHome 51:a4831b1cb9a4 616 res[i++] = read;
WiredHome 51:a4831b1cb9a4 617 //}
samux 1:fb4494783863 618 }
samux 1:fb4494783863 619 }
samux 1:fb4494783863 620 }
samux 1:fb4494783863 621 }
WiredHome 18:18ab3993d00d 622 flushIn();
samux 1:fb4494783863 623 attach_rx(true);
WiredHome 58:f49aab8072ec 624 //INFO(" send exit %d", result);
samux 1:fb4494783863 625 return result;
WiredHome 18:18ab3993d00d 626 }
WiredHome 18:18ab3993d00d 627
WiredHome 19:b0c2488222a3 628
WiredHome 18:18ab3993d00d 629 void Wifly::flushIn(int timeout_ms)
WiredHome 18:18ab3993d00d 630 {
WiredHome 18:18ab3993d00d 631 Timer tmr;
WiredHome 51:a4831b1cb9a4 632 #if 0 and defined(DEBUG)
WiredHome 18:18ab3993d00d 633 char chatter[500];
WiredHome 18:18ab3993d00d 634 int count = 0;
WiredHome 18:18ab3993d00d 635 int c;
WiredHome 18:18ab3993d00d 636 #endif
WiredHome 18:18ab3993d00d 637
WiredHome 34:52e4eec8b790 638 if (timeout_ms <= 0) {
WiredHome 34:52e4eec8b790 639 timeout_ms = 1; // 2 * 10000 / baudrate; // compute minimal timeout
WiredHome 18:18ab3993d00d 640 }
WiredHome 18:18ab3993d00d 641 tmr.start();
WiredHome 18:18ab3993d00d 642 while (wifi.readable() || (tmr.read_ms() < timeout_ms)) {
WiredHome 18:18ab3993d00d 643 if (wifi.readable()) {
WiredHome 51:a4831b1cb9a4 644 #if 0 and defined(DEBUG)
WiredHome 29:49876a8c445b 645 c = wifi.getc();
WiredHome 34:52e4eec8b790 646 if (count < sizeof(chatter)-1) // guard overflow
WiredHome 34:52e4eec8b790 647 chatter[count++] = c;
WiredHome 18:18ab3993d00d 648 #else
WiredHome 29:49876a8c445b 649 wifi.getc();
WiredHome 18:18ab3993d00d 650 #endif
WiredHome 18:18ab3993d00d 651 tmr.reset();
WiredHome 18:18ab3993d00d 652 tmr.start(); // start should not be necessary
WiredHome 18:18ab3993d00d 653 }
WiredHome 18:18ab3993d00d 654 }
WiredHome 51:a4831b1cb9a4 655 #if 0 and defined(DEBUG)
WiredHome 18:18ab3993d00d 656 chatter[count] = '\0';
WiredHome 29:49876a8c445b 657 if (count)
WiredHome 51:a4831b1cb9a4 658 INFO("Wifly::flushIn(%d) {%s}", count, chatter);
WiredHome 18:18ab3993d00d 659 #endif
WiredHome 18:18ab3993d00d 660 }
WiredHome 20:906b0f951bc3 661
WiredHome 20:906b0f951bc3 662
WiredHome 20:906b0f951bc3 663 // The ARM uart and the Wifly uart have to be in sync or we get
WiredHome 20:906b0f951bc3 664 // no meaningful response, so then have to try the possibilities.
WiredHome 20:906b0f951bc3 665 //
WiredHome 20:906b0f951bc3 666 // First try is at the currently configured ARM uart baud, if
WiredHome 20:906b0f951bc3 667 // that fails then it shifts the ARM uart baud through the probable
WiredHome 20:906b0f951bc3 668 // speeds, trying to establish contact with the Wifly module.
WiredHome 43:df984bf61580 669 // Once contact is demonstrated (by response to the 'ver' command),
WiredHome 20:906b0f951bc3 670 // then it sets the Wifly module and then the ARM uart.
WiredHome 20:906b0f951bc3 671 bool Wifly::baud(int _targetBaud)
WiredHome 20:906b0f951bc3 672 {
WiredHome 20:906b0f951bc3 673 // in testing, 460800 and 921600 may change the Wifly module where you can't
WiredHome 20:906b0f951bc3 674 // change it back w/o a reset. So, we won't even permit those speeds.
WiredHome 43:df984bf61580 675 const int baudrates[] = {2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}; //, 460800, 921600};
WiredHome 20:906b0f951bc3 676 #define BRCOUNT (sizeof(baudrates)/sizeof(baudrates[0]))
WiredHome 51:a4831b1cb9a4 677 char cmd[26]; // sized for "set u i 460800\r" [15+1], plus margin [4]
WiredHome 20:906b0f951bc3 678 int tryIndex = 0;
WiredHome 20:906b0f951bc3 679 bool res = false;
WiredHome 20:906b0f951bc3 680 int userIndex;
WiredHome 20:906b0f951bc3 681
WiredHome 51:a4831b1cb9a4 682 sprintf(cmd, "set uart instant %d\r", _targetBaud);
WiredHome 20:906b0f951bc3 683 // set u i # should cause it to exit command mode (manual 2.3.64),
WiredHome 20:906b0f951bc3 684 // but testing indicates that it does not.
WiredHome 20:906b0f951bc3 685 for (userIndex=0; userIndex < BRCOUNT; userIndex++) {
WiredHome 20:906b0f951bc3 686 if (_targetBaud == baudrates[userIndex]) {
WiredHome 20:906b0f951bc3 687 while (tryIndex <= BRCOUNT) {
WiredHome 51:a4831b1cb9a4 688 //INFO("baud() try: %d: %d", tryIndex, _targetBaud);
WiredHome 20:906b0f951bc3 689 sendCommand(cmd); // shift Wifly to desired speed [it may not respond (see 2.3.64)]
WiredHome 51:a4831b1cb9a4 690 flushIn(10);
WiredHome 58:f49aab8072ec 691 //state.cmd_mode = false; // see note above why this is disabled
WiredHome 20:906b0f951bc3 692 wifi.baud(_targetBaud); // shift the ARM uart to match
WiredHome 51:a4831b1cb9a4 693 if (sendCommand("ver\r", "wifly", NULL, 125)) { // use this to verify communications
WiredHome 20:906b0f951bc3 694 baudrate = _targetBaud;
WiredHome 20:906b0f951bc3 695 res = true;
WiredHome 20:906b0f951bc3 696 break; // success
WiredHome 20:906b0f951bc3 697 }
WiredHome 20:906b0f951bc3 698 // keep trying baudrates between ARM and WiFly
WiredHome 20:906b0f951bc3 699 if (tryIndex < BRCOUNT) {
WiredHome 51:a4831b1cb9a4 700 //INFO(" baud() set to %d", baudrates[tryIndex]);
WiredHome 20:906b0f951bc3 701 wifi.baud(baudrates[tryIndex]);
WiredHome 20:906b0f951bc3 702 }
WiredHome 20:906b0f951bc3 703 tryIndex++;
WiredHome 20:906b0f951bc3 704 }
WiredHome 20:906b0f951bc3 705 break; // if they selected a legitimate baud, try no others
WiredHome 20:906b0f951bc3 706 }
WiredHome 20:906b0f951bc3 707 }
WiredHome 51:a4831b1cb9a4 708 //INFO(" baud() result: %d", res);
WiredHome 20:906b0f951bc3 709 return res;
WiredHome 20:906b0f951bc3 710 }
WiredHome 20:906b0f951bc3 711
WiredHome 25:a740eb74a86a 712
WiredHome 24:5012a535b1d5 713 void Wifly::FixPhrase(char ** dst, const char * src)
WiredHome 24:5012a535b1d5 714 {
WiredHome 24:5012a535b1d5 715 *dst = (char *)malloc(strlen(src)+1);
WiredHome 24:5012a535b1d5 716 if (*dst) {
WiredHome 24:5012a535b1d5 717 strcpy(*dst, src);
WiredHome 46:4722f7d72aab 718 // change all ' ' to '$' in ssid or passphrase
WiredHome 24:5012a535b1d5 719 for (int i = 0; i < strlen(*dst); i++) {
WiredHome 24:5012a535b1d5 720 if ((*dst)[i] == ' ')
WiredHome 24:5012a535b1d5 721 (*dst)[i] = '$';
WiredHome 24:5012a535b1d5 722 }
WiredHome 24:5012a535b1d5 723 } else {
WiredHome 24:5012a535b1d5 724 *dst = NULL;
WiredHome 24:5012a535b1d5 725 }
WiredHome 24:5012a535b1d5 726 }
WiredHome 25:a740eb74a86a 727
WiredHome 25:a740eb74a86a 728
WiredHome 25:a740eb74a86a 729 void Wifly::GatherLogonInfo()
WiredHome 25:a740eb74a86a 730 {
WiredHome 25:a740eb74a86a 731 Timer timer;
WiredHome 25:a740eb74a86a 732 char logonText[200];
WiredHome 25:a740eb74a86a 733 int i = 0;
WiredHome 25:a740eb74a86a 734 char *p;
WiredHome 25:a740eb74a86a 735
WiredHome 25:a740eb74a86a 736 timer.start();
WiredHome 25:a740eb74a86a 737 if (wiflyVersionString) {
WiredHome 25:a740eb74a86a 738 free(wiflyVersionString);
WiredHome 25:a740eb74a86a 739 wiflyVersionString = NULL;
WiredHome 25:a740eb74a86a 740 }
WiredHome 25:a740eb74a86a 741 logonText[i] = '\0';
WiredHome 25:a740eb74a86a 742 while (timer.read_ms() < 500) {
WiredHome 56:eba4aabaad3e 743 while (wifi.readable() && (i <sizeof(logonText)-1)) {
WiredHome 25:a740eb74a86a 744 logonText[i++] = wifi.getc();
WiredHome 25:a740eb74a86a 745 }
WiredHome 25:a740eb74a86a 746 }
WiredHome 25:a740eb74a86a 747 logonText[i] = '\0';
WiredHome 25:a740eb74a86a 748 p = strchr(logonText, '\r');
WiredHome 25:a740eb74a86a 749 if (p)
WiredHome 25:a740eb74a86a 750 *p = '\0';
WiredHome 25:a740eb74a86a 751 wiflyVersionString = (char *)malloc(strlen(logonText)+1);
WiredHome 51:a4831b1cb9a4 752 if (wiflyVersionString) {
WiredHome 25:a740eb74a86a 753 strcpy(wiflyVersionString, logonText);
WiredHome 51:a4831b1cb9a4 754 }
WiredHome 51:a4831b1cb9a4 755 p = strstr(logonText, "Ver "); // "Ver 4.00" for ver <= 4.00
WiredHome 51:a4831b1cb9a4 756 if (!p) p = strstr(logonText, "Ver: "); // "Ver: 4.40" new in ver 4.40
WiredHome 25:a740eb74a86a 757 if (p) {
WiredHome 51:a4831b1cb9a4 758 while (*p && (*p < '0' || *p > '9'))
WiredHome 51:a4831b1cb9a4 759 p++;
WiredHome 25:a740eb74a86a 760 swVersion = atof(p);
WiredHome 25:a740eb74a86a 761 }
WiredHome 58:f49aab8072ec 762 WARN("swVersion: %3.2f,\r\nverString: {%s}", swVersion, wiflyVersionString);
WiredHome 25:a740eb74a86a 763 }
WiredHome 25:a740eb74a86a 764
WiredHome 25:a740eb74a86a 765
WiredHome 25:a740eb74a86a 766 float Wifly::getWiflyVersion()
WiredHome 25:a740eb74a86a 767 {
WiredHome 58:f49aab8072ec 768 INFO("swVersion: %3.2f", swVersion);
WiredHome 25:a740eb74a86a 769 return swVersion;
WiredHome 25:a740eb74a86a 770 }
WiredHome 25:a740eb74a86a 771
WiredHome 25:a740eb74a86a 772
WiredHome 25:a740eb74a86a 773 char * Wifly::getWiflyVersionString()
WiredHome 25:a740eb74a86a 774 {
WiredHome 58:f49aab8072ec 775 INFO("version string: %s", wiflyVersionString);
WiredHome 25:a740eb74a86a 776 return wiflyVersionString;
WiredHome 25:a740eb74a86a 777 }
WiredHome 25:a740eb74a86a 778
WiredHome 58:f49aab8072ec 779 bool Wifly::SWUpdateWifly()
WiredHome 58:f49aab8072ec 780 {
WiredHome 58:f49aab8072ec 781 bool success = false;
WiredHome 58:f49aab8072ec 782
WiredHome 58:f49aab8072ec 783 if (is_connected()) {
WiredHome 58:f49aab8072ec 784 // once connected, send command to update firmware
WiredHome 58:f49aab8072ec 785 if (sendCommand("set ftp address 0\r", "AOK")) {
WiredHome 58:f49aab8072ec 786 if (sendCommand("set dns name rn.microchip.com\r", "AOK")) {
WiredHome 58:f49aab8072ec 787 if (sendCommand("save\r", "Stor")) {
WiredHome 58:f49aab8072ec 788 if (sendCommand("ftp update\r", "FTP OK", NULL, 30000)) {
WiredHome 58:f49aab8072ec 789 if (sendCommand("factory RESET\r")) {
WiredHome 58:f49aab8072ec 790 if (reboot()) {
WiredHome 58:f49aab8072ec 791 success = true;
WiredHome 58:f49aab8072ec 792 }
WiredHome 58:f49aab8072ec 793 }
WiredHome 58:f49aab8072ec 794 }
WiredHome 58:f49aab8072ec 795 }
WiredHome 58:f49aab8072ec 796 }
WiredHome 58:f49aab8072ec 797 }
WiredHome 58:f49aab8072ec 798 }
WiredHome 58:f49aab8072ec 799 return success;
WiredHome 58:f49aab8072ec 800 }
WiredHome 58:f49aab8072ec 801
WiredHome 26:78a1a09afdc9 802
WiredHome 26:78a1a09afdc9 803 void Wifly::setConnectionState(bool value)
WiredHome 26:78a1a09afdc9 804 {
WiredHome 26:78a1a09afdc9 805 state.tcp = value;
WiredHome 26:78a1a09afdc9 806 }
WiredHome 26:78a1a09afdc9 807