merge regressions

cmd/handlers.c

@@ -131,9 +131,7 @@ CMD_WifiConnect(CmdPacket *cmd) {
   wifiStatusCb = CMD_WifiCb;    // register our callback with wifi subsystem
   CMD_AddCb("wifiCb", (uint32_t)cmd->callback); // save the MCU's callback
   lastWifiStatus = wifiIsDisconnected;
-  if (statusWifiState() != wifiIsDisconnected) {
+  CMD_WifiCb(wifiState);
-    CMD_WifiCb(statusWifiState());
-  }
 
   return 1;
 }

esp-link.vcxproj

@@ -44,7 +44,7 @@
     <NMakeCleanCommandLine>espmake clean</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <NMakeBuildCommandLine>espmake baseflash</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>espmake all wiflash</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>espmake clean all</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>espmake clean</NMakeCleanCommandLine>
   </PropertyGroup>

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) {