Merge branch 'master' into sensorcb

cmd/rest.c

@@ -14,7 +14,7 @@
 #define MAX_REST 4
 static RestClient restClient[MAX_REST];
 static uint8_t restNum = 0xff; // index into restClient for next slot to allocate
-#define REST_CB 0xdead0000 // fudge added to callback for arduino so we can detect problems
+#define REST_CB 0xbeef0000 // fudge added to callback for arduino so we can detect problems
 
 extern uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const char* str, void *ip);
 
@@ -128,7 +128,7 @@ static void ICACHE_FLASH_ATTR
 tcpclient_recon_cb(void *arg, sint8 errType) {
   struct espconn *pCon = (struct espconn *)arg;
   RestClient* client = (RestClient *)pCon->reverse;
-  os_printf("REST $%d: conn reset\n", client-restClient);
+  os_printf("REST #%d: conn reset\n", client-restClient);
 }
 
 static void ICACHE_FLASH_ATTR

user/status.c

@@ -23,7 +23,6 @@ static void ICACHE_FLASH_ATTR setLed(int on) {
 }
 
 static uint8_t ledState = 0;
-static uint8_t wifiState = 0;
 
 // Timer callback to update the LED
 static void ICACHE_FLASH_ATTR ledTimerCb(void *v) {