add uilite demos for HaaS EDU K1 and M5StackCore2

Signed-off-by: ethan.lcz <[email protected]>

Author: ethanlcz

components/netmgr/src/netmgr_wifi.c

@@ -307,7 +307,7 @@ static int wifi_recvmsg_task()
 
 static void wifi_connect_failed_cb(uint32_t event_id, const void *param, void *context)
 {
-    NETMGR_WIFI_LOGE("%s:%d err=%d\n", __func__, __LINE__, event_id);
+    NETMGR_WIFI_LOGI("%s:%d err=%d\n", __func__, __LINE__, event_id);
     if(event_id == RET_WIFI_INVALID_PASSWORD) {
         g_handshake_failed_retry = NETMGR_WIFI_HANDSHAKE_FAILED_MAX_RETRY;
         //netmgr_stat_chg_event(m, NOTIFY_WIFI_HANDSHAKE_FAILED, param);
@@ -980,10 +980,10 @@ static int read_config_value(char** pos, const char* obj,int* line, netmgr_wifi_
             *pos = pos_end;
             NETMGR_WIFI_LOGI("%s:%d len :%d %s ", __func__, __LINE__, len, pos_start);
             if(strncmp(obj,"ssid", 4) == 0) {
-                int contain_chinese = ssid_contain_chinese_check(config->ssid);
                 strncpy(config->ssid, pos_start, len);
                 config->ssid[len]='\0';
                 NETMGR_WIFI_LOGI("%s:%d ssid=%s\n", __func__, __LINE__, config->ssid);
+                int contain_chinese = ssid_contain_chinese_check(config->ssid);
                 if((1 == contain_chinese) && (0 != string_convert((uint8_t *)config->gbk_ssid, MAX_SSID_SIZE, (uint8_t *)config->ssid, strlen(config->ssid), UTF8_TO_GBK))) {
                    config->contain_chinese = true;
                 } else {
@@ -1122,7 +1122,7 @@ static int get_wifi_config(const char *name, netmgr_wifi_ap_config_t* saved_ap_c
 
     fd = open(name, O_RDONLY);
     if(fd < 0) {
-        NETMGR_WIFI_LOGE("%s:%d open %s failed:%s\n", __func__, __LINE__, name, strerror(errno));
+        NETMGR_WIFI_LOGI("%s:%d open %s failed:%s\n", __func__, __LINE__, name, strerror(errno));
         return -1;
     }
 
@@ -1227,9 +1227,10 @@ static void wifi_activation_report_task()
 #ifdef MICROPY_PY_CHANNEL_ENABLE
 static void py_app_ota_handle(void* arg)
 {
-    printf("save wifi info to kv and start ota channel\n");
+    NETMGR_WIFI_LOGD("save wifi info to kv and start ota channel\n");
     extern int save_ssid_and_password(char *ssid, char *passwd);
     save_ssid_and_password(_amp_ssid, _amp_password);
+    usleep(1000 * 1000);
     extern int on_get_url(char *url);
     extern int check_channel_enable(void);
     if(check_channel_enable() == 0)
@@ -2202,7 +2203,7 @@ static int wifi_start_sta(netmgr_hdl_t hdl, netmgr_conn_t *conn, const char *ssi
     if((conn->state == CONN_STATE_DISCONNECTED) ||
        (conn->state == CONN_STATE_CONNECTING)) {
         int ret = 0;
-        NETMGR_WIFI_LOGE("%s:%d start wifi\n", __func__, __LINE__);
+        NETMGR_WIFI_LOGI("%s:%d start wifi\n", __func__, __LINE__);
         ret = ioctl(hdl, WIFI_DEV_CMD_CONNECT, &type);
         if(ret != 0) {
             NETMGR_WIFI_LOGE("%s:%d wifi connect failed=%d\n", __func__, __LINE__, ret);
@@ -2418,9 +2419,9 @@ int netmgr_wifi_connect(netmgr_hdl_t hdl, netmgr_wifi_params_t *params)
         /* get wifi config */
         if(-1 == get_wifi_config(NETMGR_WIFI_TEMP_CONF, saved_ap_conf, READ_SPECIFIC_CONFIG)) {
             if(-1 == get_wifi_config(NETMGR_WIFI_CONF, saved_ap_conf, READ_SPECIFIC_CONFIG)) {
-                NETMGR_WIFI_LOGE("%s:%d no temp config found\n", __func__, __LINE__);
+                NETMGR_WIFI_LOGI("%s:%d no temp config found\n", __func__, __LINE__);
             } else {
-                NETMGR_WIFI_LOGE("%s:%d no config found\n", __func__, __LINE__);
+                NETMGR_WIFI_LOGI("%s:%d no config found\n", __func__, __LINE__);
             }
         }
     }
@@ -3040,7 +3041,7 @@ int netmgr_wifi_get_config(netmgr_hdl_t hdl, netmgr_wifi_config_t* config)
     memset(config, 0, sizeof(netmgr_wifi_ap_config_t));
     if(-1 == get_wifi_config(NETMGR_WIFI_TEMP_CONF, config, READ_ALL_CONFIG)) {
         if(-1 == get_wifi_config(NETMGR_WIFI_CONF, config, READ_ALL_CONFIG)) {
-            NETMGR_WIFI_LOGE("%s:%d no config found\n", __func__, __LINE__);
+            NETMGR_WIFI_LOGI("%s:%d no config found\n", __func__, __LINE__);
             return -1;
         }
     }
@@ -3457,7 +3458,7 @@ static void handle_netmgr_wifi_help_cmd()
     NETMGR_WIFI_LOGI("netmgr -t wifi -s\n");
     NETMGR_WIFI_LOGI("netmgr -t wifi -p\n");
     NETMGR_WIFI_LOGI("netmgr -t wifi -r\n");
-    NETMGR_WIFI_LOGI("netmgr -t wifi -w network={\\nssid=\"xxxxxx\"\\npassword=\"xxxxxxxx\"\\nchannel=\"1\"\\n}\\n");
+    NETMGR_WIFI_LOGI("netmgr -t wifi -w network={\\nssid=\"apple\"\\npassword=\"aos123456\"\\nchannel=\"1\"\\n}\\n");
     NETMGR_WIFI_LOGI("netmgr -t wifi -d\n");
     NETMGR_WIFI_LOGI("netmgr -t wifi -n 0\n");
     NETMGR_WIFI_LOGI("netmgr -t wifi -e\n");

components/py_engine/README.md

@@ -1,6 +1,6 @@
 @page py_engine py_engine
 
-[更正文档](https://gitee.com/alios-things/py_engine/edit/master/README.md)      [贡献说明](https://help.aliyun.com/document_detail/302301.html)
+[更正文档](https://gitee.com/alios-things/py_engine/edit/rel_3.3.0/README.md)      [贡献说明](https://help.aliyun.com/document_detail/302301.html)
 
 # 概述
 py_engine (Python轻应用引擎) 以MicroPython为基础打造而成.可以快速实现IoT场景连云、控端、AI等最常见功能。快速上手文档和编程接口请参考[Python轻应用编程参考](https://g.alicdn.com/HaaSAI/PythonDoc/quickstart/index.html)
@@ -80,7 +80,7 @@ def_config:
 
 ```yaml
 depends:
-  - py_engine: master # helloworld_demo中引入py_engine组件
+  - py_engine: dev_aos # helloworld_demo中引入py_engine组件
 ```
 
 ## 步骤3 下载组件

components/py_engine/adapter/esp32/boards/M5STACK_CORE2/sdkconfig.board

@@ -47,3 +47,11 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
 
 # 配置MBEDTLS 使用外部内存
 CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
+
+# m5stackcore2 和nodemcu32s的wifi和lwip的配置保持一致，减少20KB内存
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=8
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=8
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=8
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=8

components/py_engine/adapter/esp32/fs/boot.py

@@ -21,10 +21,9 @@ def _connect_wifi():
 if bt_disabled != "no":
     uos.plussys_mm()
 
+
 channel = kv.get('app_upgrade_channel')
-if channel == "disable":
-    pass
-else:
+if channel == "enable":
     import online_upgrade
     online_upgrade.on(_on_get_url)
     try:
@@ -34,6 +33,14 @@ def _connect_wifi():
         print(e)
 
 
+app_upgrade = kv.get('_amp_app_upgrade')
+if app_upgrade == "enable":
+    print("App is being upgraded. It will take about 10 seconds.")
+    execfile('/lib/appUpgrade.py')
+    kv.remove('_amp_app_upgrade')
+    print("App upgrade finished.")
+
+
 
 
 

components/py_engine/adapter/esp32/fs/lib/appUpgrade.py

@@ -0,0 +1,158 @@
+import uos as os
+import uerrno as errno
+import ujson as json
+import uzlib
+import upip_utarfile as tarfile
+import gc
+import time
+import ussl
+import usocket
+import kv
+import network
+import time
+
+file_buf = bytearray(128)
+
+def install_pkg(package_url, install_path):
+    gzdict_sz = 16 + 15
+    f1 = url_open(package_url)
+    if(isinstance(f1, (str, bytes, bytearray)) == True):
+        return f1
+    try:
+        f2 = uzlib.DecompIO(f1, gzdict_sz)
+        f3 = tarfile.TarFile(fileobj=f2)
+        install_tar(f3, install_path)
+    except Exception as e:
+        print(e)
+        return("UNTAR_FILE_FAIL")
+    finally:
+        f1.close()
+    del f3
+    del f2
+    gc.collect()
+
+    return 'SUCCESS'
+
+
+
+def download_save_file(file_url, fname):
+    global file_buf
+    f1 = url_open(file_url)
+
+    if(isinstance(f1, (str, bytes, bytearray)) == True):
+        return f1
+
+    _makedirs(fname)
+    with open(fname, "wb") as outf:
+        while True:
+            sz = f1.readinto(file_buf)
+            if not sz:
+                break
+            outf.write(file_buf, sz)
+        outf.close()
+    f1.close()
+    del f1
+    return 'SUCCESS'
+
+
+def url_open(url):
+    proto, _, host, urlpath = url.split('/', 3)
+    try:
+        port = 443
+        if ":" in host:
+            host, port = host.split(":")
+            port = int(port)
+        ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
+    except OSError as e:
+        print("Error:", "Unable to resolve %s (no Internet?)" % host, e)
+        return 'HOST_RESOLVED_FAIL'
+    ai = ai[0]
+    s = usocket.socket(ai[0], ai[1], ai[2])
+    try:
+        s.connect(ai[-1])
+        if proto == "https:":
+            s = ussl.wrap_socket(s, server_hostname=host)
+        s.write("GET /%s HTTP/1.0\r\nHost: %s:%s\r\n\r\n" % (urlpath, host, port))
+        l = s.readline()
+        protover, status, msg = l.split(None, 2)
+        if status != b"200":
+            if status == b"404" or status == b"301":
+                return("Package not found")
+            else:
+                print("status is {}".format(status))
+            return(status)
+        while True:
+            l = s.readline()
+            if not l:
+                return("Unexpected EOF in HTTP headers")
+            if l == b'\r\n':
+                break
+    except Exception as e:
+        s.close()
+        print(e)
+        return('SOCKET_ERROR')
+    return s
+
+
+def _makedirs(name, mode=0o777):
+    ret = False
+    s = ""
+    comps = name.rstrip("/").split("/")[:-1]
+    if comps[0] == "":
+        s = "/"
+    for c in comps:
+        if s and s[-1] != "/":
+            s += "/"
+        s += c
+        try:
+            os.mkdir(s)
+            ret = True
+        except OSError as e:
+            if e.args[0] != errno.EEXIST and e.args[0] != errno.EISDIR:
+                print(e)
+            ret = False
+    return ret
+
+
+def install_tar(f, prefix):
+    for info in f:
+        fname = info.name
+        #try:
+            #fname = fname[fname.index("/") + 1:]
+        #except ValueError:
+            #fname = ""
+        outfname = prefix + fname
+        if info.type != tarfile.DIRTYPE:
+            _makedirs(outfname)
+            subf = f.extractfile(info)
+            save_file(outfname, subf)
+
+def save_file(fname, subf):
+    global file_buf
+    with open(fname, "wb") as outf:
+        while True:
+            sz = subf.readinto(file_buf)
+            if not sz:
+                break
+            outf.write(file_buf, sz)
+        outf.close()
+
+#download_save_file(url,"/data/pyamp/main.py")
+
+def connect_wifi(ssid,passwd):
+    sta_if = network.WLAN(network.STA_IF)
+    sta_if.active(True)
+    sta_if.scan()
+    sta_if.connect(ssid,passwd)
+    time.sleep(5)
+    return sta_if.isconnected()
+
+if __name__ == "__main__":
+    ssid = kv.get('_amp_wifi_ssid')
+    passwd = kv.get('_amp_wifi_passwd')
+    if isinstance(ssid,str) and isinstance(passwd,str):
+        if connect_wifi(ssid,passwd):
+            url = kv.get('_amp_pyapp_url')
+            if isinstance(url,str):
+                install_pkg(url,"/data/pyamp/")
+                kv.remove('_amp_pyapp_url')