将py代码移植到sdk

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/Makefile b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/Makefile
index b4f6454..2c2fe78 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/Makefile
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/Makefile
@@ -893,13 +893,25 @@ frozen_mpy_list =         $(BUILD)/_boot.mpy \
                                        $(BUILD)/uwebsocket.mpy \
                                        $(BUILD)/uping.mpy \
                                        $(BUILD)/ymodem.mpy \
+                                       $(BUILD)/alarm.mpy \
+                                       $(BUILD)/appAlipay.mpy \
+                                       $(BUILD)/appFactoryMode.mpy \
+                                       $(BUILD)/appWechat.mpy \
+                                       $(BUILD)/btn_device_ec800m.mpy \
+                                       $(BUILD)/capacitive_hynitron_cst816d_update.mpy \
+                                       $(BUILD)/code.mpy \
+                                       $(BUILD)/common.mpy \
+                                       $(BUILD)/constants.mpy \
+                                       $(BUILD)/EventMesh.mpy \
+                                       $(BUILD)/initTP.mpy \
+                                       $(BUILD)/lcd.mpy \
+                                       $(BUILD)/location.mpy \
                                        $(BUILD)/mgr.mpy \
+                                       $(BUILD)/protocol.mpy \
                                        $(BUILD)/ui.mpy \
+                                       $(BUILD)/ui_main_menu.mpy \
                                        $(BUILD)/ui_setting.mpy \
-                                       $(BUILD)/appAlipay.mpy \
-                                       $(BUILD)/appWechat.mpy \
                                        $(BUILD)/ui_WatchFaceScreen.mpy \
-                                       $(BUILD)/ui_main_menu.mpy \
 
 endif
 

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/alarm.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/alarm.py
index 84eeef9..3cc4089 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/alarm.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/alarm.py
@@ -2,10 +2,10 @@ import modem
 import osTimer
 import utime
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 from ui import Screen
-from ext.common import Abstract, LogAdapter
+from common import Abstract, LogAdapter
 from machine import RTC
 import ujson
 import ql_fs
@@ -41,7 +41,7 @@ style_cont_alarm.set_pad_bottom(0)
 # style_font_white = lv.style_t()
 # style_font_white.init()
 # style_font_white.set_text_color(lv.color_make(0xff, 0xff, 0xff))
-# style_font_white.set_text_font_v2("font_22.bin",22,0)
+# style_font_white.set_text_font_v2("font_24.bin",24,0)
 # style_font_white.set_border_width(0)
 # style_font_white.set_pad_left(0)
 # style_font_white.set_pad_right(0)
@@ -51,7 +51,7 @@ style_cont_alarm.set_pad_bottom(0)
 style_font_yellow = lv.style_t()
 style_font_yellow.init()
 style_font_yellow.set_text_color(lv.color_make(0xF1, 0xA3, 0x3B))
-style_font_yellow.set_text_font_v2("font_22.bin",22,0)
+style_font_yellow.set_text_font_v2("font_24.bin",24,0)
 
 #背景样式
 style_alarm_screen_default = lv.style_t()
@@ -746,7 +746,7 @@ class ClkListScreen(Screen):
                     repeart = each["repeart"]
                     _output = [self.weekdays_list[x] for x in _new_list]
                     _btn_label3 = lv.label(_btn)
-                    _btn_label3.set_pos(10, 40)
+                    _btn_label3.set_pos(5, 40)
                     _btn_label3.set_size(200, 40)
                     print("_new_list:{} repeart:{}".format(_new_list,repeart))
                     if repeart == 1:
@@ -759,24 +759,24 @@ class ClkListScreen(Screen):
                     _btn_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
                     _btn_label3.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
 
-                    _btn_switch = lv.switch(_btn)
-                    _btn_switch.set_pos(174, 29)
-                    _btn_switch.set_size(50, 25)
-                    _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR)
-                    _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR| lv.STATE.CHECKED)
-                    _btn_switch.add_event_cb(lambda e:
-                                            self.switch_event_cb(e),
-                                            lv.EVENT.VALUE_CHANGED,
-                                            None)
-
-                    _btn_switch.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED)
-                    _btn_switch.set_style_bg_color(lv.color_make(0x3d, 0x3d, 0x3d),lv.PART.KNOB)
-
-                    _btn_switch.set_ext_click_area(40)
-                    if each["enabled"]:
-                        _btn_switch.add_state(lv.STATE.CHECKED)
-                    else:
-                        _btn_switch.clear_state(lv.STATE.CHECKED)
+                    # _btn_switch = lv.switch(_btn)
+                    # _btn_switch.set_pos(178, 29)
+                    # _btn_switch.set_size(50, 25)
+                    # _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR)
+                    # _btn_switch.set_style_bg_color(lv.color_make(0xff, 0xff, 0xff),lv.PART.INDICATOR| lv.STATE.CHECKED)
+                    # _btn_switch.add_event_cb(lambda e:
+                    #                         self.switch_event_cb(e),
+                    #                         lv.EVENT.VALUE_CHANGED,
+                    #                         None)
+
+                    # _btn_switch.set_style_bg_color(lv.color_make(0xf1, 0xa3, 0x3b),lv.PART.KNOB| lv.STATE.CHECKED)
+                    # _btn_switch.set_style_bg_color(lv.color_make(0x3d, 0x3d, 0x3d),lv.PART.KNOB)
+
+                    # _btn_switch.set_ext_click_area(40)
+                    # if each["enabled"]:
+                    #     _btn_switch.add_state(lv.STATE.CHECKED)
+                    # else:
+                    #     _btn_switch.clear_state(lv.STATE.CHECKED)
             else:
                 no_add_alarm_img.clear_flag(lv.obj.FLAG.HIDDEN)
                 no_add_alarm.clear_flag(lv.obj.FLAG.HIDDEN) 
@@ -803,32 +803,32 @@ class ClkListScreen(Screen):
         EventMesh.publish("add_alarm")
         self.alarm_draw_btn()
 
-    def switch_event_cb(self, e):
-        obj = e.get_target()
-        idx = int(e.get_target().get_parent().get_child(0).get_text())
-        clock_info = self.clock_list[idx]
-        print("修改闹钟开关：",self.clock_list[idx])
-        clock_info["idx"] = idx
-        if obj.has_state(lv.STATE.CHECKED):
-            print("ON ~~~")
-            clock_info["enabled"] = True
-        else:
-            print("OFF ~~~")
-            clock_info["enabled"] = False
-        EventMesh.publish("push_clock_info", clock_info)
-        EventMesh.publish("set_rtc_alarm")
-
-        print("sw_event_cb ~~~")
+    # def switch_event_cb(self, e):
+    #     obj = e.get_target()
+    #     idx = int(e.get_target().get_parent().get_child(0).get_text())
+    #     clock_info = self.clock_list[idx]
+    #     print("修改闹钟开关：",self.clock_list[idx])
+    #     clock_info["idx"] = idx
+    #     if obj.has_state(lv.STATE.CHECKED):
+    #         print("ON ~~~")
+    #         clock_info["enabled"] = True
+    #     else:
+    #         print("OFF ~~~")
+    #         clock_info["enabled"] = False
+    #     EventMesh.publish("push_clock_info", clock_info)
+    #     EventMesh.publish("set_rtc_alarm")
+
+    #     print("sw_event_cb ~~~")
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
                
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
-
-    def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
 
+    def btn8_press(self):
+        EventMesh.publish("watch_top_show")
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class NewEditClk(Screen):
     NAME = "new_edit_clk"

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py
index 5bf65c1..d968b40 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appAlipay.py
@@ -2,12 +2,12 @@ import modem
 import sim
 import osTimer
 import ALIPAY
-from ext.common import Lock, Abstract, LogAdapter
+from common import Lock, Abstract, LogAdapter
 import utime
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
-from ext import constants
+import constants
 from misc import Power
 import pm
 from ui import Screen

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
index 2ec4df0..79dc97b 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
@@ -1,8 +1,8 @@
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import osTimer
-from ext import constants
+import constants
 import ujson
 import ql_fs
 import audio
@@ -10,7 +10,7 @@ from machine import Pin
 from ui import style_font_youyuan_20,style_screen,Screen,style_font_youyuan_20_black,style_img
 import audio
 from machine import Pin
-from ext.protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
+from protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
 
 style_wechat_r_btn =  lv.style_t()
 style_wechat_r_btn.init()

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
index 06d1a4f..a074d6d 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
@@ -1,5 +1,5 @@
-from ext.common import Abstract, LogAdapter
-from ext import EventMesh
+from common import Abstract, LogAdapter
+import EventMesh
 import usocket
 import ql_fs
 import ujson
@@ -11,13 +11,13 @@ import net
 import dataCall
 import checkNet
 import osTimer
-from ext import constants
+import constants
 import sms
-from ext.common import Lock, Abstract, LogAdapter
-from ext.location import GPS, GPSMatch,CellLocator
+from common import Lock, Abstract, LogAdapter
+from location import GPS, GPSMatch,CellLocator
 from misc import USB, Power, ADC
 from machine import ExtInt, Pin,Timer,RTC,UART
-from ext import EventMesh
+import EventMesh
 import audio
 from Gsensor import SC7A20
 from Hsensor import GH3018
@@ -607,7 +607,7 @@ class DeviceInfoManager(Abstract):
             self.KA_time = time_tmp
             EventMesh.publish(constants.PROTOCOL.KA_SEND)
         self.upload_time = EventMesh.publish("get_upload_data")
-        print("self.upload_time:{}".format(self.upload_time))
+        
         if self.upload_time != None:
             if  math.fabs(time_tmp - self.UD_time) > self.upload_time: #7分钟一次定位
                 self.UD_time = time_tmp
@@ -1733,7 +1733,6 @@ class getHrTimeManager(Abstract):
         self.set_time = 0
         self.set_hr = 0 #0关闭 1手动 2 自动测量按照时间间隔测试心率
         self.set_spo2 = 0
-        self.upload_time = 1800
         check = ql_fs.path_exists("/ext/static/storage_file/config.json")
         if check == True:
             with open("/ext/static/storage_file/config.json","r") as fd:

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modGsensor_SC7A20.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modGsensor_SC7A20.c
index 08b5aa8..459a943 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modGsensor_SC7A20.c
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modGsensor_SC7A20.c
@@ -100,7 +100,7 @@ static bool           SL_SWAY_STATUS           = 0;
 static bool           SL_SWAY_ENABLE           = 0;
 
 static unsigned char  SL_INT_TIME_CNT          = 0;
-#define SL_INT_TIME_TH   12  //per lsb is 0.5s
+#define SL_INT_TIME_TH   6  //per lsb is 0.5s
 unsigned char sl_sleep_sys_hour;
 
 typedef struct _SC7A20_obj_t
@@ -297,7 +297,7 @@ unsigned int  SL_SC7A20_PEDO_KCAL_WRIST_SLEEP_SWAY_L_ALGO(void)
 #if SL_Sensor_Algo_Release_Enable==0x00
        if(SL_SLEEP_CNT>39)//1min
 #else
-       if(SL_SLEEP_CNT>119)//1min      
+       if(SL_SLEEP_CNT>30)//1min       
 #endif
        {
 #if SL_Sensor_Algo_Release_Enable==0

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modHsensor_GH3018.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modHsensor_GH3018.c
index 917eaf5..2f696f6 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modHsensor_GH3018.c
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modHsensor_GH3018.c
@@ -226,8 +226,8 @@ mp_obj_t mp_GH3018_init(mp_obj_t self_in)
        gpio_struct.dir = HELIOS_GPIO_OUTPUT;
        gpio_struct.pull = HELIOS_PULL_NONE;
        gpio_struct.value = HELIOS_LVL_LOW;
-       Helios_GPIO_Init(25, &gpio_struct);//体温
-       Helios_GPIO_Init(31, &gpio_struct);//体温
+       //Helios_GPIO_Init(25, &gpio_struct);//体温
+       Helios_GPIO_Init(31, &gpio_struct);//复位
 
        gpio_struct.dir = HELIOS_GPIO_INPUT;
        gpio_struct.pull = HELIOS_PULL_NONE;
@@ -254,8 +254,9 @@ mp_obj_t mp_GH3018_init(mp_obj_t self_in)
        Helios_GPIO_SetLevel(self->power, HELIOS_LVL_LOW);
        Helios_msleep(10);
        Helios_GPIO_SetLevel(self->power, HELIOS_LVL_HIGH);
+       Helios_GPIO_SetLevel(31, HELIOS_LVL_LOW);
        Helios_msleep(20);
-       
+       Helios_GPIO_SetLevel(31, HELIOS_LVL_HIGH);
                
        //gh30x_module_start_without_adt(GH30X_RUN_MODE_HB);
        //gh30x_module_start(GH30X_RUN_MODE_SPO2);
@@ -312,10 +313,12 @@ void GH3018_test(mp_obj_t self_in,uint32_t mode)
        
        
        GH3018_obj_t *self = MP_OBJ_TO_PTR(self_in);
-       Helios_GPIO_SetLevel(self->power, HELIOS_LVL_LOW);
-       Helios_msleep(10);
-       Helios_GPIO_SetLevel(self->power, HELIOS_LVL_HIGH);
-       Helios_msleep(20);
+       // Helios_GPIO_SetLevel(self->power, HELIOS_LVL_LOW);
+       // Helios_msleep(10);
+       // Helios_GPIO_SetLevel(self->power, HELIOS_LVL_HIGH);
+       // Helios_GPIO_SetLevel(31, HELIOS_LVL_LOW);//复位脚
+       // Helios_msleep(20);
+       // Helios_GPIO_SetLevel(31, HELIOS_LVL_HIGH);//复位脚
        int ret = gh30x_module_init();
        GH3018_LOG("mp_GH3018_open_heart gh30x_module_init:ret:%d\r\n",ret);
        if(ret == 1)

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
index e5d9b18..acf2226 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
@@ -1,11 +1,11 @@
 import utime
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 import voiceCall
 import osTimer
-from ext import constants
+import constants
 from misc import Power
 import pm
 import ujson
@@ -14,7 +14,7 @@ import ql_fs
 import audio
 import sms
 from machine import Pin
-from ext.lcd import lcd,lcd_ctrl,tp_cst816
+from lcd import lcd,lcd_ctrl,tp_cst816
 from misc import PWM
 import uos
 import gc
@@ -155,7 +155,7 @@ style_circle.set_radius(0x7FFF)
 
 
 
-from ext.common import Abstract
+from common import Abstract
 
 class Screen(Abstract):
     def __init__(self):
@@ -1395,7 +1395,7 @@ class HeartrateScreen(Screen):
             self.heart_value = 0
         if self.heart_value != 0:
             heartrate_start_label.set_text(" ")
-            heartrate_bpm_label.set_text("{}  bpm".format(self.heart_value))
+            heartrate_bpm_label.set_text("{} bpm".format(self.heart_value))
         else:
             heartrate_bpm_label.set_text(" ")
             if self.point%4 == 0 :
@@ -1414,7 +1414,7 @@ class HeartrateScreen(Screen):
                 EventMesh.publish(constants.PROTOCOL.HEART_SEND,self.heart_value)
             if self.heart_value != 0:
                 heartrate_start_label.set_text(" ")
-                heartrate_bpm_label.set_text("{}bpm".format(self.heart_value))
+                heartrate_bpm_label.set_text("{} bpm".format(self.heart_value))
                 heartrate_done_label.set_text("测量完成")
             else:
                 heartrate_start_label.set_text("退出，请重新测量")

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
index d003e9b..cbe295c 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
@@ -1,9 +1,9 @@
 #表盘
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import osTimer
-from ext import constants
+import constants
 from ui import Screen,style_screen
 import ql_fs
 import ujson

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_main_menu.py
index 1193069..f8a70c9 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -2,11 +2,11 @@
 import utime
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 import voiceCall
 import osTimer
-from ext import constants
+import constants
 from misc import Power
 import pm
 from ui import Screen

diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py
index fa4c719..7c57206 100644 (file)
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py
@@ -1,15 +1,15 @@
 
 import lvgl as lv
 import ql_fs
-from ext import EventMesh
+import EventMesh
 from misc import Power
 from ui import style_screen,style_font_youyuan_20,ContStyle,style_btn,style_img,Screen,style_contact_btn
-from ext import constants
+import constants
 import osTimer
 import audio
 from machine import Pin
 import ujson
-from ext.lcd import style_font_youyuan_40
+from lcd import style_font_youyuan_40
 # -------------------------------------------setting screen----------------------------------------------------------
 
 style_bar = lv.style_t() 

diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/DBG.7z b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/DBG.7z
index 09fd8ea..08ff2fb 100644 (file)
Binary files a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/DBG.7z and b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/DBG.7z differ

diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index e9f0185..d20ec8e 100644 (file)
Binary files a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ

diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/include/app_link_start_addr.h b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/include/app_link_start_addr.h
index 63d19ad..626db58 100644 (file)
--- a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/include/app_link_start_addr.h
+++ b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/include/app_link_start_addr.h
@@ -2,8 +2,8 @@
 #ifndef __APP_LINK_START_ADDR_H__
 #define __APP_LINK_START_ADDR_H__
 
-#define APP_LINK_START_ADDR  0x8063D000
-#define APP_FLASH_MAX_SIZE 0x140000
+#define APP_LINK_START_ADDR  0x805FD000
+#define APP_FLASH_MAX_SIZE 0x180000
 
 #define APP_RAM_START 0x7E3E0000
 #define APP_RAM_MAX_SIZE 0x180000

diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/libHeliosAPI.lib b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/libHeliosAPI.lib
index 81a5b6a..0294d92 100644 (file)
Binary files a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/libHeliosAPI.lib and b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/libHeliosAPI.lib differ

diff --git a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/ql_common_api.lib b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/ql_common_api.lib
index ca60fdf..2ed0569 100644 (file)
Binary files a/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/ql_common_api.lib and b/2.sdk/Helios_SDK/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/libraries/ql_common_api.lib differ

diff --git a/3.code/1.watch/2.code/alarm.py b/3.code/1.watch/2.code/alarm.py
index b77f628..3cc4089 100644 (file)
--- a/3.code/1.watch/2.code/alarm.py
+++ b/3.code/1.watch/2.code/alarm.py
@@ -2,10 +2,10 @@ import modem
 import osTimer
 import utime
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 from ui import Screen
-from ext.common import Abstract, LogAdapter
+from common import Abstract, LogAdapter
 from machine import RTC
 import ujson
 import ql_fs

diff --git a/3.code/1.watch/2.code/appAlipay.py b/3.code/1.watch/2.code/appAlipay.py
index 5bf65c1..d968b40 100644 (file)
--- a/3.code/1.watch/2.code/appAlipay.py
+++ b/3.code/1.watch/2.code/appAlipay.py
@@ -2,12 +2,12 @@ import modem
 import sim
 import osTimer
 import ALIPAY
-from ext.common import Lock, Abstract, LogAdapter
+from common import Lock, Abstract, LogAdapter
 import utime
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
-from ext import constants
+import constants
 from misc import Power
 import pm
 from ui import Screen

diff --git a/3.code/1.watch/2.code/appFactoryMode.py b/3.code/1.watch/2.code/appFactoryMode.py
index 7d0c67a..078e0d7 100644 (file)
--- a/3.code/1.watch/2.code/appFactoryMode.py
+++ b/3.code/1.watch/2.code/appFactoryMode.py
@@ -1,8 +1,8 @@
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import osTimer
-from ext import constants
+import constants
 import ujson
 import ql_fs
 import audio

diff --git a/3.code/1.watch/2.code/appWechat.py b/3.code/1.watch/2.code/appWechat.py
index 2ec4df0..79dc97b 100644 (file)
--- a/3.code/1.watch/2.code/appWechat.py
+++ b/3.code/1.watch/2.code/appWechat.py
@@ -1,8 +1,8 @@
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import osTimer
-from ext import constants
+import constants
 import ujson
 import ql_fs
 import audio
@@ -10,7 +10,7 @@ from machine import Pin
 from ui import style_font_youyuan_20,style_screen,Screen,style_font_youyuan_20_black,style_img
 import audio
 from machine import Pin
-from ext.protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
+from protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
 
 style_wechat_r_btn =  lv.style_t()
 style_wechat_r_btn.init()

diff --git a/3.code/1.watch/2.code/btn_device_ec800m.py b/3.code/1.watch/2.code/btn_device_ec800m.py
index a31bf4d..310e0be 100644 (file)
--- a/3.code/1.watch/2.code/btn_device_ec800m.py
+++ b/3.code/1.watch/2.code/btn_device_ec800m.py
@@ -1,8 +1,8 @@
-from ext.common import Abstract
+from common import Abstract
 import machine
 import osTimer
 from misc import PowerKey
-from ext import EventMesh
+import EventMesh
 from machine import Pin
 
 

diff --git a/3.code/1.watch/2.code/initTP.py b/3.code/1.watch/2.code/initTP.py
index 127d482..54b7ad2 100644 (file)
--- a/3.code/1.watch/2.code/initTP.py
+++ b/3.code/1.watch/2.code/initTP.py
@@ -4,8 +4,8 @@ import utime
 from machine import Pin
 import uos
 
-# from ext import capacitive_hynitron_cst816d_update_new
-from ext import capacitive_hynitron_cst816d_update
+# import capacitive_hynitron_cst816d_update_new
+import capacitive_hynitron_cst816d_update
 
 TP_HYN_I2C_UPDATE_WRITE_ADDR = (0x6A<<1)  
 TP_HYN_I2C_UPDATE_READ_ADDR =  ((0x6A<<1)|1)

diff --git a/3.code/1.watch/2.code/lcd.py b/3.code/1.watch/2.code/lcd.py
index 2e45733..5dcd488 100644 (file)
--- a/3.code/1.watch/2.code/lcd.py
+++ b/3.code/1.watch/2.code/lcd.py
@@ -3,9 +3,9 @@ from machine import LCD, Pin
 from tp import cst816
 import _thread
 import utime
-from ext import EventMesh
+import EventMesh
 from misc import PWM
-from ext import initTP
+import initTP
     
 init_data = (
 
@@ -143,7 +143,7 @@ tp_cst816 = cst816(i2c_no = 2,irq=33, reset=32)
 tp_cst816.activate()
 tp_cst816.init()
 print("cst816 init...")
-from ext.btn_device_ec800m import BtnDevice
+from btn_device_ec800m import BtnDevice
 btn_device = BtnDevice(tp_cst816)
 btn_device.start()
 

diff --git a/3.code/1.watch/2.code/location.py b/3.code/1.watch/2.code/location.py
index dad1490..b546faf 100644 (file)
--- a/3.code/1.watch/2.code/location.py
+++ b/3.code/1.watch/2.code/location.py
@@ -589,7 +589,7 @@ class GPS(object):
         return self.__get_gps_data()
 
     def __internal_read(self):
-        from ext import EventMesh
+        import EventMesh
         log.debug("__internal_read start.")
         """Read internal GPS data
 

diff --git a/3.code/1.watch/2.code/main.py b/3.code/1.watch/2.code/main.py
index e3501ad..019bbb9 100644 (file)
--- a/3.code/1.watch/2.code/main.py
+++ b/3.code/1.watch/2.code/main.py
@@ -42,18 +42,18 @@ if __name__ == '__main__':
         uos.mount(ldev,'/ext')
     res = uos.statvfs("/ext")
     res = list(res)
-    print('æ\80»ext空é\97´:{} MBï¼\8cå\89©ä½\99空é\97´:{} MB'.format((((res[0] * res[2]) / 1024 / 1024)),((res[0] * res[3]) / 1024 / 1024)))
+    print('æ\80»ext空é\97´:{} MBï¼\8cå\89©ä½\99空é\97?:{} 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 ext.btn_device_ec800m import BtnDevice
+    from btn_device_ec800m import BtnDevice
     from ui_main_menu import MainMenuScreen
     # from ui_WatchFaceScreen import WatchFaceScreen
     
-    from ext.appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen 
+    from appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen 
     import ui as _ui
     print("init4:{}".format(utime.localtime()))
     ui = _ui.UI()
@@ -77,7 +77,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui.ContactsScreen()) 
     from appWechat import WechatScreen,TK_ProtoCol,MESSAGE_ProtoCol,NewWechatPopupScreen
     ui.add_screen(WechatScreen()) 
-    from ext.alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
+    from alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
     ui.add_screen(ClkListScreen()) 
     ui.add_screen(_ui.CountdownEndScreen()) 
     ui.add_screen(NewEditClk()) 
@@ -129,7 +129,7 @@ if __name__ == '__main__':
     print("init6:{}".format(utime.localtime()))
     
 
-    from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\
+    from protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\
         WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol
     import mgr as mgr
     print("init7:{}".format(utime.localtime()))

diff --git a/3.code/1.watch/2.code/main_1.py b/3.code/1.watch/2.code/main_1.py
index 4098d63..b115eeb 100644 (file)
--- a/3.code/1.watch/2.code/main_1.py
+++ b/3.code/1.watch/2.code/main_1.py
@@ -44,17 +44,17 @@ if __name__ == '__main__':
     res = list(res)
     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 ui_main_menu import MainMenuScreen
     # from ui_WatchFaceScreen import WatchFaceScreen
     
-    from ext.appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen 
-    from ext import ui as _ui
+    from appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen 
+    import ui as _ui
     # import ui as _ui
     print("init4:{}".format(utime.localtime()))
     ui = _ui.UI()
@@ -78,7 +78,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui.ContactsScreen()) 
     from appWechat import WechatScreen,TK_ProtoCol,MESSAGE_ProtoCol,NewWechatPopupScreen
     ui.add_screen(WechatScreen()) 
-    from ext.alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
+    from alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
     ui.add_screen(ClkListScreen()) 
     ui.add_screen(_ui.CountdownEndScreen()) 
     ui.add_screen(NewEditClk()) 
@@ -130,12 +130,12 @@ if __name__ == '__main__':
     print("init6:{}".format(utime.localtime()))
     
 
-    from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\
+    from protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,CENTER_ProtoCol,UPLOAD_ProtoCol,TEMP_ProtoCol,DLT_ProtoCol,\
         WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol,MONITOR_ProtoCol
     import mgr as mgr
     print("init7:{}".format(utime.localtime()))
     
-    from ext.mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, \
+    from mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager,gethistoryDataManager,getUpLoadDataManager, \
     NetManager,AddrBookManager,MsgdetailManager,PhoneCallingManager,getStorageDataManager,getBrightnessManager,getHrTimeManager
     print("init8:{}".format(utime.localtime()))
     

diff --git a/3.code/1.watch/2.code/main_t.py b/3.code/1.watch/2.code/main_t.py
index 9763e9b..4eb9b25 100644 (file)
--- a/3.code/1.watch/2.code/main_t.py
+++ b/3.code/1.watch/2.code/main_t.py
@@ -1,7 +1,7 @@
-from ext import EventMesh
-from ext.common import Abstract
-from ext.lcd import gpio_backlight,tp_cst816
-from ext.btn_device_ec800m import BtnDevice
+import EventMesh
+from common import Abstract
+from lcd import gpio_backlight,tp_cst816
+from btn_device_ec800m import BtnDevice
 
 
 class App(object):
@@ -41,12 +41,12 @@ if __name__ == '__main__':
     # ldev = uos.VfsLfs1(32, 32, 32, "ext_fs",0,3)
     # uos.mount(ldev,'/ext')
     #import ui as _ui
-    from ext.protocol import LK_ProtoCol,PING_ProtoCol, CR_ProtoCol,UD_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver
+    from protocol import LK_ProtoCol,PING_ProtoCol, CR_ProtoCol,UD_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver
     import mgr as mgr
     import ui as _ui
     from mgr import ConfigStoreManager, DeviceInfoManager, LocationManager, SockManager, \
     NetManager, BatteryManager
-    from ext.Alipay import Alipay
+    from Alipay import Alipay
     from ui_WatchFaceScreen import WatchFaceScreen
 
     btn_device = BtnDevice(tp_cst816)

diff --git a/3.code/1.watch/2.code/mgr.py b/3.code/1.watch/2.code/mgr.py
index 2f56b9b..a074d6d 100644 (file)
--- a/3.code/1.watch/2.code/mgr.py
+++ b/3.code/1.watch/2.code/mgr.py
@@ -1,5 +1,5 @@
-from ext.common import Abstract, LogAdapter
-from ext import EventMesh
+from common import Abstract, LogAdapter
+import EventMesh
 import usocket
 import ql_fs
 import ujson
@@ -11,13 +11,13 @@ import net
 import dataCall
 import checkNet
 import osTimer
-from ext import constants
+import constants
 import sms
-from ext.common import Lock, Abstract, LogAdapter
-from ext.location import GPS, GPSMatch,CellLocator
+from common import Lock, Abstract, LogAdapter
+from location import GPS, GPSMatch,CellLocator
 from misc import USB, Power, ADC
 from machine import ExtInt, Pin,Timer,RTC,UART
-from ext import EventMesh
+import EventMesh
 import audio
 from Gsensor import SC7A20
 from Hsensor import GH3018

diff --git a/3.code/1.watch/2.code/protocol.py b/3.code/1.watch/2.code/protocol.py
index 6e4673f..0d1f090 100644 (file)
--- a/3.code/1.watch/2.code/protocol.py
+++ b/3.code/1.watch/2.code/protocol.py
@@ -1,8 +1,8 @@
 import ujson
 import utime
-from ext import EventMesh
-from ext import constants
-from ext.common import Abstract
+import EventMesh
+import constants
+from common import Abstract
 import uhashlib
 import ubinascii
 from misc import Power

diff --git a/3.code/1.watch/2.code/test_sms.py b/3.code/1.watch/2.code/test_sms.py
index d2fc666..0955ecc 100644 (file)
--- a/3.code/1.watch/2.code/test_sms.py
+++ b/3.code/1.watch/2.code/test_sms.py
@@ -2,15 +2,15 @@
 
 
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import sms
 from ui import style_screen,style_font_youyuan_20_black,style_font_youyuan_20,Screen,style_contact_btn,style_img,style_line
-from ext.common import Abstract
+from common import Abstract
 import voiceCall
 import ql_fs
 import ujson
-from ext.protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
-from ext import constants
+from protocol import ProtoCol,UnicodeHexStr_To_Utf8Str
+import constants
 import osTimer
 import utime
 from machine import RTC

diff --git a/3.code/1.watch/2.code/ui.py b/3.code/1.watch/2.code/ui.py
index 6fbae57..acf2226 100644 (file)
--- a/3.code/1.watch/2.code/ui.py
+++ b/3.code/1.watch/2.code/ui.py
@@ -1,11 +1,11 @@
 import utime
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 import voiceCall
 import osTimer
-from ext import constants
+import constants
 from misc import Power
 import pm
 import ujson
@@ -14,7 +14,7 @@ import ql_fs
 import audio
 import sms
 from machine import Pin
-from ext.lcd import lcd,lcd_ctrl,tp_cst816
+from lcd import lcd,lcd_ctrl,tp_cst816
 from misc import PWM
 import uos
 import gc
@@ -155,7 +155,7 @@ style_circle.set_radius(0x7FFF)
 
 
 
-from ext.common import Abstract
+from common import Abstract
 
 class Screen(Abstract):
     def __init__(self):

diff --git a/3.code/1.watch/2.code/ui_WatchFaceScreen.py b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
index d003e9b..cbe295c 100644 (file)
--- a/3.code/1.watch/2.code/ui_WatchFaceScreen.py
+++ b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
@@ -1,9 +1,9 @@
 #表盘
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 import osTimer
-from ext import constants
+import constants
 from ui import Screen,style_screen
 import ql_fs
 import ujson

diff --git a/3.code/1.watch/2.code/ui_main_menu.py b/3.code/1.watch/2.code/ui_main_menu.py
index 1193069..f8a70c9 100644 (file)
--- a/3.code/1.watch/2.code/ui_main_menu.py
+++ b/3.code/1.watch/2.code/ui_main_menu.py
@@ -2,11 +2,11 @@
 import utime
 import osTimer
 import lvgl as lv
-from ext import EventMesh
+import EventMesh
 from machine import Timer
 import voiceCall
 import osTimer
-from ext import constants
+import constants
 from misc import Power
 import pm
 from ui import Screen

diff --git a/3.code/1.watch/2.code/ui_setting.py b/3.code/1.watch/2.code/ui_setting.py
index fa4c719..7c57206 100644 (file)
--- a/3.code/1.watch/2.code/ui_setting.py
+++ b/3.code/1.watch/2.code/ui_setting.py
@@ -1,15 +1,15 @@
 
 import lvgl as lv
 import ql_fs
-from ext import EventMesh
+import EventMesh
 from misc import Power
 from ui import style_screen,style_font_youyuan_20,ContStyle,style_btn,style_img,Screen,style_contact_btn
-from ext import constants
+import constants
 import osTimer
 import audio
 from machine import Pin
 import ujson
-from ext.lcd import style_font_youyuan_40
+from lcd import style_font_youyuan_40
 # -------------------------------------------setting screen----------------------------------------------------------
 
 style_bar = lv.style_t()