pxt-common-packages 9.4.8 → 9.4.9

package/libs/tests/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P26173(s) {
+function _main___P26203(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,25 +66,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___26414 = (undefined);
-    globals._pollEventQueue___26427 = (undefined);
-    globals._tests___26614 = (undefined);
-    globals._currentTest___26616 = (undefined);
-    globals._runSetup___26618 = (undefined);
-    globals._runTearDown___26620 = (undefined);
-    globals._testSetUp___26622 = (undefined);
-    globals._testTearDown___26624 = (undefined);
+    globals._intervals___26446 = (undefined);
+    globals._pollEventQueue___26459 = (undefined);
+    globals._tests___26646 = (undefined);
+    globals._currentTest___26648 = (undefined);
+    globals._runSetup___26650 = (undefined);
+    globals._runTearDown___26652 = (undefined);
+    globals._testSetUp___26654 = (undefined);
+    globals._testTearDown___26656 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P26173.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
-_main___P26173.continuations = [  ]
+_main___P26203.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
+_main___P26203.continuations = [  ]
 
-function _main___P26173_mk(s) {
+function _main___P26203_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P26173, depth: s.depth + 1,
+        parent: s, fn: _main___P26203, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -92,7 +92,7 @@ function _main___P26173_mk(s) {
 
 
 
-const breakpoints = setupDebugger(1, ["_tests___26614","_currentTest___26616","_runSetup___26618","_runTearDown___26620","_testSetUp___26622","_testTearDown___26624"])
+const breakpoints = setupDebugger(1, ["_tests___26646","_currentTest___26648","_runSetup___26650","_runTearDown___26652","_testSetUp___26654","_testTearDown___26656"])
 
-return _main___P26173
+return _main___P26203
 })

package/libs/thermometer/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P14338(s) {
+function _main___P14354(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___14579 = (undefined);
-    globals._pollEventQueue___14592 = (undefined);
+    globals._intervals___14597 = (undefined);
+    globals._pollEventQueue___14610 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P14338.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/base/ns.ts","functionName":"<main>","argumentNames":[]}
-_main___P14338.continuations = [  ]
+_main___P14354.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/base/ns.ts","functionName":"<main>","argumentNames":[]}
+_main___P14354.continuations = [  ]
 
-function _main___P14338_mk(s) {
+function _main___P14354_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P14338, depth: s.depth + 1,
+        parent: s, fn: _main___P14354, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P14338_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P14338
+return _main___P14354
 })

package/libs/wifi---esp32/README.md

@@ -0,0 +1,12 @@
+# Wifi ESP32
+
+
+## Developer
+
+Build instructions
+* install ESP IDF 4.3.1
+* clone https://github.com/microsoft/pxt-common-packages, link to .
+* clone https://github.com/microsoft/pxt-maker, link pxt-common-packages
+* create projects/... in maker, clone https://github.com/microsoft/pxt-jacdac
+* open wifi--esp32
+* sh run.sh

package/libs/wifi---esp32/controller.ts

@@ -47,6 +47,9 @@ namespace net {
         }
 
         public startLoginServer(hostName: string): void {
+            if (_wifi.isLoginServerEnabled())
+                return
+                
             this.disconnect()
             _wifi.startLoginServer(hostName);
             control.onEvent(_wifi.eventID(), WifiEvent.AccessPointCredentialsAvailable, () => {
@@ -60,6 +63,11 @@ namespace net {
                     control.reset();
                 }
             })
+            this.emitEvent(ControllerEvent.LoginServerStarted);
+        }
+
+        public isLoginServerEnabled(): boolean {
+            return _wifi.isLoginServerEnabled()
         }
 
         public disconnectAP() {

package/libs/wifi---esp32/enums.d.ts

@@ -10,6 +10,8 @@
     Disconnected = 3,
     //%
     AccessPointCredentialsAvailable = 4,
+    //%
+    LoginServerStarted = 5,
     }
 
 // Auto-generated. Do not edit. Really.

package/libs/wifi---esp32/httpserver.cpp

@@ -40,6 +40,8 @@ esp_err_t add_ap_handler(httpd_req_t *req)
                 if (NULL == _lastApBuffer) {
                     _lastApBuffer = buf;
                     pxt::raiseEvent(_wifi::eventID(), (int)_wifi::WifiEvent::AccessPointCredentialsAvailable);
+                    const char resp[] = "Restarting...";
+                    httpd_resp_send(req, resp, HTTPD_RESP_USE_STRLEN);
                     return ESP_OK;
                 }
             }

package/libs/wifi---esp32/login.full.html

@@ -22,14 +22,14 @@
   <body>
     <form action="/add-ap">
       <label for="ssid">WiFi:</label>
-      <input type="text" name="name" id="ssid" placeholder="WiFi" required />
+      <input type="text" name="name" id="ssid" required autocomplete="username" />
       <label for="password">Password:</label>
       <input
         type="password"
         name="password"
         id="password"
-        placeholder="Password"
         required
+        autocomplete="current-password"
       />
       <input id="submit" type="submit" value="connect" />
     </form>

package/libs/wifi---esp32/login.html

@@ -1 +1 @@
-<style>html{background:#aaa}*{font-size:xx-large;font-family:monospace}form{min-height:100vh;display:flex;justify-content:center;align-items:center;flex-direction:column;gap:.5rem}</style><meta name='viewport'content='width=device-width,initial-scale=1'><form action='/add-ap'><label for='ssid'>WiFi:</label> <input name='name'id='ssid'placeholder='WiFi'required> <label for='password'>Password:</label> <input type='password'name='password'id='password'placeholder='Password'required> <input id='submit'type='submit'value='connect'></form>
+<style>html{background:#aaa}*{font-size:xx-large;font-family:monospace}form{min-height:100vh;display:flex;justify-content:center;align-items:center;flex-direction:column;gap:.5rem}</style><meta name='viewport'content='width=device-width,initial-scale=1'><form action='/add-ap'><label for='ssid'>WiFi:</label> <input name='name'id='ssid'required autocomplete='username'> <label for='password'>Password:</label> <input type='password'name='password'id='password'required autocomplete='current-password'> <input id='submit'type='submit'value='connect'></form>

package/libs/wifi---esp32/shims.d.ts

@@ -55,6 +55,10 @@ declare namespace _wifi {
     //% shim=_wifi::isConnected
     function isConnected(): boolean;
 
+    /** Check if login server is running */
+    //% shim=_wifi::isLoginServerEnabled
+    function isLoginServerEnabled(): boolean;
+
     /** Return ipv4 address, netmask, and gateway. */
     //% shim=_wifi::ipInfo
     function ipInfo(): Buffer;

package/libs/wifi---esp32/wifi.cpp

@@ -17,7 +17,7 @@ int eventID() {
     return WIFI_ID;
 }
 
-static bool scan_done, is_connected;
+static bool scan_done, is_connected,  login_server;
 static esp_netif_ip_info_t ip_info;
 
 static void raiseWifiEvent(WifiEvent e) {
@@ -96,8 +96,12 @@ void scanStart() {
 /** Starts an HTTP server with a login dialog route */
 //%
 void startLoginServer(String hostName) {
-    init();
-    _wifi::startHttpServer(hostName->getUTF8Data());
+    if (!login_server) {
+        login_server = true;
+        init();
+        _wifi::startHttpServer(hostName->getUTF8Data());
+    }
+    raiseWifiEvent(WifiEvent::LoginServerStarted);
 }
 
 #define JD_WIFI_APFLAGS_HAS_PASSWORD 0x1
@@ -226,6 +230,12 @@ bool isConnected() {
     return is_connected;
 }
 
+/** Check if login server is running */
+//%
+bool isLoginServerEnabled() {
+    return login_server;
+}
+
 /** Return ipv4 address, netmask, and gateway. */
 //%
 Buffer ipInfo() {

package/libs/wifi---esp32/wifi.h

@@ -16,7 +16,9 @@ namespace _wifi {
         //%
         Disconnected = 3,
         //%
-        AccessPointCredentialsAvailable = 4
+        AccessPointCredentialsAvailable = 4,
+        //%
+        LoginServerStarted = 5,
     };
 
     int eventID();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-common-packages",
-  "version": "9.4.8",
+  "version": "9.4.9",
   "description": "Microsoft MakeCode (PXT) common packages",
   "keywords": [
     "MakeCode",