From: d15521469561 <d155214695615@qq.com>
Date: Mon, 8 May 2023 08:00:02 +0000 (+0800)
Subject: Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=97ac96e44b7f30fc98c0f584e40176e534007dfe;p=mirrors%2FASR1603_G5.git

Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	3.code/1.watch/2.code/main.py
#	3.code/1.watch/2.code/main_1.py
---

97ac96e44b7f30fc98c0f584e40176e534007dfe
diff --cc 3.code/1.watch/2.code/main.py
index 26d28818,019bbb96..ba2c50b8
--- a/3.code/1.watch/2.code/main.py
+++ b/3.code/1.watch/2.code/main.py
@@@ -42,14 -42,14 +42,14 @@@ if __name__ == '__main__'
          uos.mount(ldev,'/ext')
      res = uos.statvfs("/ext")
      res = list(res)
-     print('总ext空间:{} MB，剩余空间:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
 -    print('总ext空间:{} MB，剩余空é—?:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
++    print('总ext空间:{} MB，剩余空�:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
      print("init1:{}".format(utime.localtime()))
-     from ext import EventMesh
-     from ext.common import Abstract
+     import EventMesh
+     from common import Abstract
      print("init2:{}".format(utime.localtime()))
-     from ext.lcd import tp_cst816
+     from lcd import tp_cst816
      print("init3:{}".format(utime.localtime()))
- 
+     from btn_device_ec800m import BtnDevice
      from ui_main_menu import MainMenuScreen
      # from ui_WatchFaceScreen import WatchFaceScreen