update for online upgrade

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

@@ -20,7 +20,9 @@ def _connect_wifi():
 channel = kv.get('app_upgrade_channel')
 if channel == "disable":
     pass
-elif channel == "mqtt":
+elif channel == "bt":
+    execfile('/lib/oneMinuteOnCloud.py')
+else:
     import online_upgrade
     online_upgrade.on(_on_get_url)
     try:
@@ -28,8 +30,6 @@ elif channel == "mqtt":
         #_thread.stack_size(10 * 1024)
     except Exception as e:
         print(e)
-else:
-    execfile('/lib/oneMinuteOnCloud.py')
 
 
 

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

@@ -25,9 +25,7 @@ def _connect_wifi(ssid, passwd):
 
 
 channel = kv.get('app_upgrade_channel')
-if channel == "disable":
-    pass
-else:
+if channel != "disable":
     ssid = kv.get('_amp_wifi_ssid')
     passwd = kv.get('_amp_wifi_passwd')
     if isinstance(ssid, str) and isinstance(passwd, str):

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

@@ -21,9 +21,7 @@ def _on_get_url(url):
 
 
 channel = kv.get('app_upgrade_channel')
-if channel == "disable":
-    pass
-else:
+if channel != "disable":
     import online_upgrade
     online_upgrade.on(_on_get_url)
     try:

components/py_engine/package.yaml

@@ -95,7 +95,10 @@ build_config:
     - external/libs/haas1000 ? <BOARD_HAAS100>
     - external/libs/haas1000 ? <BOARD_HAASEDUK1>
     - external/libs/rtl872xd ? <BOARD_HAAS200>
-    - external/libs/esp32 ? <ESP_PLATFORM>
+    - external/libs/esp32 ? <BOARD_NODEMCU32S>
+    - external/libs/esp32 ? <BOARD_NODEMCU32S3>
+    - external/libs/esp32 ? <BOARD_M5STACKCORE2>
+    - external/libs/espc3 ? <BOARD_NODEMCU32C3>
 
 source_file:
   # adapter

hardware/board/esp_c3_32s_kit/package.yaml

@@ -34,6 +34,7 @@ def_config:
   CONFIG_LFS_PAGE_NUM_PER_BLOCK: 16
   LFS_CONFIG_DEBUG: 0
   LFS_CONFIG_TRACE: 0
+  MICROPY_PY_CHANNEL_ENABLE: 0
 # CONFIG_LFS_PROG_SIZE: 1024 # the mininal programable size, usually page size for nand and any size for nor
 #  CONFIG_LFS_PAGE_NUM_PER_BLOCK: 4 # choose the right value for nand, and usually any value for nor
 #  CONFIG_LFS_BLOCK_NUMS: 1198 # the total block count for lfs parition

hardware/board/esp_s3_12k_kit/package.yaml

@@ -34,6 +34,7 @@ def_config:
   CONFIG_LFS_PAGE_NUM_PER_BLOCK: 16
   LFS_CONFIG_DEBUG: 0
   LFS_CONFIG_TRACE: 0
+  MICROPY_PY_CHANNEL_ENABLE: 1
 # CONFIG_LFS_PROG_SIZE: 1024 # the mininal programable size, usually page size for nand and any size for nor
 #  CONFIG_LFS_PAGE_NUM_PER_BLOCK: 4 # choose the right value for nand, and usually any value for nor
 #  CONFIG_LFS_BLOCK_NUMS: 1198 # the total block count for lfs parition

hardware/board/m5stackcore2/package.yaml

@@ -59,4 +59,5 @@ def_config:
   #  CONFIG_LFS_BLOCK_NUMS: 1198 # the total block count for lfs parition
   MICROPY_PY_UCAMERA: 1
   CONFIG_UART_CAMERA_ENABLE: 1
+  MICROPY_PY_CHANNEL_ENABLE: 1
 

hardware/board/nodemcu32s/package.yaml

@@ -34,6 +34,7 @@ def_config:
   CONFIG_LFS_PAGE_NUM_PER_BLOCK: 16
   LFS_CONFIG_DEBUG: 0
   LFS_CONFIG_TRACE: 0
+  MICROPY_PY_CHANNEL_ENABLE: 1
 # CONFIG_LFS_PROG_SIZE: 1024 # the mininal programable size, usually page size for nand and any size for nor
 #  CONFIG_LFS_PAGE_NUM_PER_BLOCK: 4 # choose the right value for nand, and usually any value for nor
 #  CONFIG_LFS_BLOCK_NUMS: 1198 # the total block count for lfs parition

solutions/py_engine_esp32_demo/package.yaml

 
 ## 第一部分： 基础信息
 name: py_engine_esp32_demo                          # <必选项> 包名称 （符合C语言变量命名规则），长度少于等于64字节
-version: master                                    # <必选项> 组件版本号
+version: master                                     # <必选项> 组件版本号
 description: start python engine esp32 demos        # <必选项> 建议至少20字以上
 type: solution                                      # <必选项> 组件类型，为：solution, board, chip, arch, drv_core, drv_peripheral, drv_external_device, kernel, common, sdk, document
 
@@ -21,7 +21,7 @@ depends:
   - amp_adapter: master
   - kv: master
   - littlefs: master
-  - esp_c3_32s_kit:  master
+  - m5stackcore2: master
 supported_boards:
   - nodemcu32s: master
   - m5stackcore2: master
@@ -87,7 +87,7 @@ supported_boards:
 #     toolchain_prefix: csky-abiv2-elf     # <可选项> 编译器前缀
 solution:
   cpu_id: cpu0
-  board_name: esp_c3_32s_kit
+  board_name: m5stackcore2
 
 ## 第四部分：编译连接信息
 # build_config:                            # <可选项> 编译配置项
@@ -158,7 +158,6 @@ def_config:
   SYSINFO_NETWORK: WIFI/BT
   SYSINFO_DEVICE_TYPE: solo
   SYSINFO_CLOUD_TYPE: aliyun
-  MICROPY_PY_CHANNEL_ENABLE: 0
 
 ## 第六部分：安装信息
 # install: