Merge pull request jeelabs#3 from jeelabs/master

merge with upstream
dgjohnson · Aug 28, 2015 · 38b0e2c · 38b0e2c
2 parents c68a281 + fb1d7f6
commit 38b0e2c
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 114 deletions.
diff --git a/cmd/cmd.c b/cmd/cmd.c
@@ -88,7 +88,7 @@ CMD_Exec(const CmdList *scp, CmdPacket *packet) {
       uint32_t ret = scp->sc_function(packet);
       // if requestor asked for a response, send it
       if (packet->_return){
-        os_printf("CMD: Response: %lu, cmd: %d\r\n", ret, packet->cmd);
+        os_printf("CMD: Response: 0x%lx, cmd: %d\r\n", ret, packet->cmd);
         crc = CMD_ResponseStart(packet->cmd, 0, ret, 0);
         CMD_ResponseEnd(crc);
       } else {

diff --git a/cmd/handlers.c b/cmd/handlers.c
@@ -70,10 +70,14 @@ CMD_WifiCb(uint8_t wifiStatus) {
 // Command handler for Wifi connect command
 static uint32_t ICACHE_FLASH_ATTR
 CMD_WifiConnect(CmdPacket *cmd) {
+  os_printf("CMD: Wifi connect\n");
 	if(cmd->argc != 2 || cmd->callback == 0)
 		return 0xFFFFFFFF;
 
   wifiStatusCb = CMD_WifiCb;    // register our callback with wifi subsystem
 	wifiCallback = cmd->callback; // save the MCU's callback
+  // trigger an immediate callback with the current status
+  lastWifiStatus = 0xff;
+  CMD_WifiCb(wifiState);
   return 1;
 }