[Pymesh] Added GPS feature

Author: Catalin Ioana

pymesh/pymesh_frozen/lib/ble_rpc.py

@@ -24,6 +24,11 @@
 except:
     from _pymesh_config import PymeshConfig
 
+try:
+    from gps import Gps
+except:
+    from _gps import Gps
+
 class BleRpc:
 
     def __init__(self, config, mesh):
@@ -223,9 +228,9 @@ def mesh_ip(self):
         ip = self.mesh.ip()
         return ip
 
-    def set_gps(self, lng, lat):
+    def set_gps(self, latitude, longitude):
         print('settings gps!')
-        # Gps.set_location(lat, lng)
+        Gps.set_location(latitude, longitude)
         # with open('/flash/gps', 'w') as fh:
         #     fh.write('{};{}'.format(lng, lat))
 

pymesh/pymesh_frozen/lib/ble_services.py

@@ -25,8 +25,6 @@ def _init(self):
         }
 
         bluetooth = Bluetooth(modem_sleep=False)
-        # bluetooth = Bluetooth()
-        # bluetooth.set_advertisement(name='PyGo (mac:' + str(self.mesh_mac) + ')', service_uuid=0xec00)
         adv_name = self.ble_name
         bluetooth.set_advertisement(name=adv_name, service_uuid=0xec00)
         print("BLE name:", adv_name)

pymesh/pymesh_frozen/lib/cli.py

@@ -15,6 +15,11 @@
 except:
     from _pymesh_debug import print_debug
 
+try:
+    from gps import Gps
+except:
+    from _gps import Gps
+
 __version__ = '1'
 """
 * initial draft
@@ -41,7 +46,9 @@ def process(self, arg1, arg2):
             while True:
                 time.sleep(.1)
                 cmd = input('>')
-                # print(cmd)
+                # cmd = " "
+                # time.sleep(3)
+                # print("cli")
 
                 # if cmd == 'rb':
                 #     print('resetting unpacker buffer')
@@ -118,14 +125,16 @@ def process(self, arg1, arg2):
                 elif cmd == 'rm':
                     print(self.mesh.get_rcv_message())
 
-                # elif cmd == 'gg':
-                #     print("Gps:", (Gps.lat, Gps.lon))
-
-                # elif cmd == 'gs':
-                #     lat = float(input('(lat)<'))
-                #     lon = float(input('(lon)<'))
-                #     Gps.set_location(lat, lon)
-                #     print("Gps:", (Gps.lat, Gps.lon))
+                elif cmd == 'gps':
+                    try:
+                        lat = float(input('(lat [Enter for read])<'))
+                        lon = float(input('(lon)<'))
+                    except:
+                        print("Gps:", (Gps.lat, Gps.lon))
+                        continue
+                    
+                    Gps.set_location(lat, lon)
+                    print("Gps:", (Gps.lat, Gps.lon))
 
                 elif cmd == 'sleep':
                     try:
@@ -163,11 +172,11 @@ def process(self, arg1, arg2):
                 #     res = self.mesh.statistics_get(id)
                 #     print("ok? ", res)
 
-                # elif cmd == "rst":
-                #     print("Mesh Reset NVM settings ... ")
-                #     self.mesh.mesh.mesh.mesh.deinit()
-                #     if self.sleep:
-                #         self.sleep(1)
+                elif cmd == "rst":
+                    print("Mesh Reset NVM settings ... ")
+                    self.mesh.mesh.mesh.mesh.deinit()
+                    if self.sleep:
+                        self.sleep(1)
 
                 # elif cmd == "pyb":
                 #     # print("Pybytes debug menu, Pybytes connection is ", Pybytes_wrap.is_connected())
@@ -262,6 +271,7 @@ def process(self, arg1, arg2):
                     print("ot - sends command to openthread internal CLI")
                     print("debug - set debug level")
                     print("config - print config file contents")
+                    print("gps - get/set location coordinates")
 
         except KeyboardInterrupt:
             print('cli Got Ctrl-C')

pymesh/pymesh_frozen/lib/gps.py

@@ -0,0 +1,83 @@
+
+# Copyright (c) 2019, Pycom Limited.
+#
+# This software is licensed under the GNU GPL version 3 or any
+# later version, with permitted additional terms. For more information
+# see the Pycom Licence v1.0 document supplied with this file, or
+# available at https://www.pycom.io/opensource/licensing
+
+__version__ = '1'
+"""
+* initial version
+"""
+
+import time
+# from pytrack import Pytrack
+# from L76GNSS import L76GNSS
+from machine import Timer
+
+class Gps:
+    # Pycom office GPS coordinates
+    lat = 51.45
+    lon = 5.45313
+
+    l76 = None
+    _timer = None
+    #is_set = False
+    
+    @staticmethod
+    def set_location(latitude, longitude):
+        dlat = str(type(latitude))
+        dlon = str(type(longitude))
+        if dlat == dlon == "<class 'float'>":
+            Gps.lat = latitude
+            Gps.lon = longitude            
+            is_set = True
+        else:
+            print("Error parsing ", latitude, longitude)
+
+    @staticmethod
+    def get_location():
+        return (Gps.lat, Gps.lon)
+
+    # @staticmethod
+    # def init_static():
+    #     is_pytrack = True
+    #     try:
+    #         py = Pytrack()
+    #         Gps.l76 = L76GNSS(py, timeout=30)
+    #         #l76.coordinates()
+    #         Gps._timer = Timer.Alarm(Gps.gps_periodic, 30, periodic=True)
+    #         print("Pytrack detected")
+    #     except:
+    #         is_pytrack = False
+    #         print("Pytrack NOT detected")
+    #     #TODO: how to check if GPS is conencted
+    #     return is_pytrack
+
+    # @staticmethod
+    # def gps_periodic(alarm):
+    #     t0 = time.ticks_ms()
+    #     coord = Gps.l76.coordinates()
+    #     if coord[0] != None:
+    #         Gps.lat, Gps.lon = coord
+    #         print("New coord ", coord)
+    #     dt = time.ticks_ms() - t0
+    #     print(" =====>>>> gps_periodic ", dt)
+
+    # @staticmethod
+    # def terminate():
+    #     if Gps._timer is not None:
+    #         Gps._timer.cancel()
+    #     pass
+
+"""
+from pytrack import Pytrack
+from L76GNSS import L76GNSS
+py = Pytrack()
+l76 = L76GNSS(py, timeout=30)
+t0 = time.ticks_ms()
+l76.coordinates()
+y = time.ticks_ms() - t0
+y
+"""

pymesh/pymesh_frozen/lib/loramesh.py

@@ -20,6 +20,11 @@
 except:
     from _pymesh_debug import print_debug
 
+try:
+    from gps import Gps
+except:
+    from _gps import Gps
+
 __version__ = '6'
 """
 __version__ = '6'
@@ -274,7 +279,7 @@ def neighbors_update(self):
         self.router_data.rloc16 = self.rloc16
         self.router_data.role = self.state
         self.router_data.ts = time.time()
-        self.router_data.coord = (1,2) #Gps.get_location()
+        self.router_data.coord = Gps.get_location()
 
         for nei_rec in x:
             # nei_rec = (role=3, rloc16=10240, rssi=0, age=28, mac=5)
@@ -452,7 +457,7 @@ def node_info_get(self, mac):
             data['a'] = node.age
         elif role is self.STATE_ROUTER:
             data['a'] = time.time() - node.ts
-            data['l'] = {'lng':node.coord[1], 'lat':node.coord[0]}
+            data['l'] = {'lat':node.coord[0], 'lng':node.coord[1]}
             data['nn'] = node.neigh_num()
             nei_macs = node.get_macs_set()
             data['nei'] = list()
@@ -534,7 +539,7 @@ def __init__(self, data = None):
         self.ts = 0
         self.dict = {}
         self.pack_index_last = 0
-        self.coord = (0.0, 0.0)
+        self.coord = Gps.get_location()
 
         if data is None:
             return
@@ -624,8 +629,8 @@ def as_dict(self):
         dict['ip'] = self.rloc16
         dict['role'] = self.role
         dict['age'] = time.time() - self.ts
-        dict['loc'] = self.coord[0]
-        dict['ble'] = self.coord[1]
+        dict['loc'] = {"lat":self.coord[0], "lng":self.coord[1]}
+        dict['ble'] = "ble"
         return dict
 
     def get_all_pairs(self):

pymesh/pymesh_frozen/lib/pymesh.py

@@ -102,6 +102,7 @@ def process(self, arg1, arg2):
                 # Pybytes_wrap.process()
 
                 time.sleep(.5)
+                # time.sleep(1)
                 # print("loop")
                 pass
 

pymesh/pymesh_frozen/lib/pymesh_debug.py

@@ -8,7 +8,7 @@
 
 import pycom
 
-# debug level from the most verbose to off
+# recommended debug levels, from the most verbose to off
 DEBUG_DEBG = const(5)
 DEBUG_INFO = const(4)
 DEBUG_NOTE = const(3)