From 3bd6e819f385b8fe0523efd60325a20f43953814 Mon Sep 17 00:00:00 2001 From: JackSun-qc Date: Wed, 20 Apr 2022 18:47:47 +0800 Subject: [PATCH] update: 1. net error callback, 2. readme --- code/test_tracker.py | 47 +++++++++++++++++++++++++++++++++---- code/tracker.py | 19 ++++++++++----- code/tracker_collector.py | 4 +--- code/tracker_devicecheck.py | 6 ++--- readme.md | 4 ++-- 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/code/test_tracker.py b/code/test_tracker.py index 6b41d97..dbf0ea5 100644 --- a/code/test_tracker.py +++ b/code/test_tracker.py @@ -12,8 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +import net +import utime +import dataCall + from usr.tracker import tracker from usr.settings import Settings +from usr.modules.logging import getLogger +from usr.tracker_devicecheck import DeviceCheck + +log = getLogger(__name__) def test_settings(): @@ -56,15 +64,44 @@ def test_settings(): print("[test_settings] ALL: %s SUCCESS: %s, FAILED: %s." % (res["all"], res["success"], res["failed"])) +def nw_callback(args): + log.debug("[nw_callback][args] %s" % str(args)) + if args[1] != 1: + res = net.setModemFun(0) + log.debug("net.setModemFun(0): %s" % res) + DeviceCheck().net() + utime.sleep(3) + DeviceCheck().net() + res = net.setModemFun(1) + log.debug("net.setModemFun(1): %s" % res) + DeviceCheck().net() + utime.sleep(3) + DeviceCheck().net() + else: + DeviceCheck().net() + + +def test_net(): + log.debug("[test_net] Start") + dataCall.setCallback(nw_callback) + res = net.setModemFun(0) + log.debug("net.setModemFun(0): %s" % res) + DeviceCheck().net() + utime.sleep(10) + log.debug("[test_net] End") + + def test_tracker(): tracker() -def main(): - test_funs = ["test_settings", "test_tracker"] - for test_fun in test_funs: - if callable(locals().get(test_fun)): - locals()[test_fun]() +def main(test_fun="test_net"): + test_funs = ["test_settings", "test_tracker", "test_net"] + if test_fun not in test_funs and callable(locals().get(test_fun)): + print("test_fun[%s] is not exists." % test_fun) + return + + locals()[test_fun]() if __name__ == "__main__": diff --git a/code/tracker.py b/code/tracker.py index 7765170..4ea2f61 100644 --- a/code/tracker.py +++ b/code/tracker.py @@ -13,7 +13,9 @@ # limitations under the License. import sim +import net import modem +import utime import dataCall from usr.modules.sensor import Sensor @@ -68,12 +70,17 @@ def usb_callback(status): def nw_callback(args): net_check_res = DeviceCheck().net() if args[1] != 1: - if net_check_res[0] == 1 and net_check_res[1] != 1: - log.warn("SIM abnormal!") - alert_code = 30004 - alert_info = {"local_time": Collector().__get_local_time()} - alert_data = Collector().__get_alert_data(alert_code, alert_info) - Controller().device_data_report(event_data=alert_data, msg="sim_abnormal") + net.setModemFun(0) + utime.sleep(3) + net.setModemFun(1) + utime.sleep(3) + net_check_res = DeviceCheck().net() + # if net_check_res[0] == 1 and net_check_res[1] != 1: + # log.warn("SIM abnormal!") + # alert_code = 30004 + # alert_info = {"local_time": Collector().__get_local_time()} + # alert_data = Collector().__get_alert_data(alert_code, alert_info) + # Controller().device_data_report(event_data=alert_data, msg="sim_abnormal") else: if net_check_res == (3, 1): pass diff --git a/code/tracker_collector.py b/code/tracker_collector.py index d2cb985..7ff6cf9 100644 --- a/code/tracker_collector.py +++ b/code/tracker_collector.py @@ -337,11 +337,9 @@ class Collector(Singleton): log.debug("GxGGA Satellite Num %s" % gga_satellite) gsv_satellite = self.__gps_parse.GxGSV_satellite_num(self.__gps_match.GxGSV(gps_data)) log.debug("GxGSV Satellite Num %s" % gsv_satellite) + # Get gps speed device_data.update(self.__check_speed(gps_data)) - # Get gps speed - device_data.update(self.__check_speed()) - # Get battery energy battery_data = self.__read_battery() device_data.update(battery_data) diff --git a/code/tracker_devicecheck.py b/code/tracker_devicecheck.py index f7bbd8f..9531232 100644 --- a/code/tracker_devicecheck.py +++ b/code/tracker_devicecheck.py @@ -15,9 +15,9 @@ import utime import checkNet -from usr.moudules.sensor import Sensor -from usr.moudules.logging import getLogger -from usr.moudules.location import Location +from usr.modules.sensor import Sensor +from usr.modules.logging import getLogger +from usr.modules.location import Location from usr.settings import PROJECT_NAME, PROJECT_VERSION, settings log = getLogger(__name__) diff --git a/readme.md b/readme.md index b762121..6a83ef3 100644 --- a/readme.md +++ b/readme.md @@ -119,11 +119,11 @@ QPYCom的使用文档，参见安装目录下的`docs`文件夹。 1 拉取主项目代码 -- `git clone https://gitee.com/qpy-solutions/tracker-v2.0-internal.git` +- `git clone https://gitee.com/qpy-solutions/tracker-v2.git` 2 进入项目根目录 -- `cd tracker-v2.0-internal/` +- `cd tracker-v2/` 3 切换对应的主项目分支