improve

.gitignore

@@ -2,6 +2,7 @@
 /log/
 /screenshots/
 /maptile/*
+/modules/test_code/
 /courses/.current
 /courses/ridewithgps/*
 /courses/*html*
@@ -28,4 +29,4 @@ nohup.out
 !.gitkeep
 screenlog.*
 gmon.out
-
+.DS_Store

modules/pyqt/pyqt_item.py

@@ -81,7 +81,7 @@ def update_value(self, value):
             self.value.setText(value)
         elif np.isnan(value):
             self.value.setText("-")
-        elif "Speed" in self.name:
+        elif self.name.startswith("Speed"):
             self.value.setText(self.itemformat.format(value * 3.6))  # m/s to km/h
         elif "SPD" in self.name:
             self.value.setText(self.itemformat.format(value * 3.6))  # m/s to km/h

modules/sensor/ant/ant_device_ctrl.py

@@ -47,7 +47,7 @@ def add_struct_pattern(self):
     def on_data(self, data):
         (self.values["ctrl_cmd"],) = self.structPattern[self.name].unpack(data[0:8])
         if self.values["ctrl_cmd"] in self.ctrl_cmd.keys():
-            self.config.press_button(
+            self.config.button_config.press_button(
                 "Edge_Remote", *(self.ctrl_cmd[self.values["ctrl_cmd"]])
             )
         else:

modules/sensor/gps/dummy.py

@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from modules.utils.geo import calc_azimuth
+from modules.utils.geo import calc_azimuth, get_track_str
 from .base import AbstractSensorGPS
 
 
@@ -25,6 +25,7 @@ def set_position_from_log(self, current_position):
             self.values["lon"] = np.nan
         if self.values["track"] is None:
             self.values["track"] = self.values["pre_track"]
+            self.values["track_str"] = get_track_str(self.values["track"])
 
     def set_position_from_course(self, course, idx):
         lat = course.latitude
@@ -49,6 +50,8 @@ def set_position_from_course(self, course, idx):
                 )
             )[0]
         )
+        if not np.isnan(self.values["track"]):
+            self.values["track_str"] = get_track_str(self.values["track"])
 
     async def update(self):
         if self.config.G_DUMMY_OUTPUT:

modules/sensor/i2c/button_shim.py

@@ -47,7 +47,7 @@ def __init__(self, config):
         _FUNC["E_LONG"] = self.press_E_LONG
 
     def press_button(self, button, index):
-        self.config.press_button("Button_Shim", button, index)
+        self.config.button_config.press_button("Button_Shim", button, index)
 
     def press_A(self):
         self.press_button("A", 0)

modules/sensor/sensor_gpio.py

@@ -52,12 +52,12 @@ def my_callback(self, channel):
                     sw_counter
                     >= self.config.button_config.G_BUTTON_LONG_PRESS * self.interval_inv
                 ):
-                    self.config.press_button(
+                    self.config.button_config.press_button(
                         self.config.G_DISPLAY, channel, 1
                     )  # long press
                     break
             else:
-                self.config.press_button(self.config.G_DISPLAY, channel, 0)
+                self.config.button_config.press_button(self.config.G_DISPLAY, channel, 0)
                 break
             time.sleep(self.interval)
 

modules/utils/geo.py

@@ -119,6 +119,8 @@ def get_mod_lat_np(lat):
 
 
 def get_track_str(drc):
+    if np.isnan(drc):
+        return None
     track_int = int((drc + 22.5) / 45.0)
     return TRACK_STR[track_int]
 

modules/utils/map.py

@@ -3,8 +3,11 @@
 import shutil
 
 
-def get_maptile_filename(map_name, z, x, y):
-    return f"maptile/{map_name}/{z}/{x}/{y}.png"
+def get_maptile_filename(map_name, z, x, y, basetime=None, validtime=None):
+    if basetime and validtime:
+        return f"maptile/{map_name}/{basetime}/{validtime}/{z}/{x}/{y}.png"
+    else:
+        return f"maptile/{map_name}/{z}/{x}/{y}.png"
 
 
 def get_lon_lat_from_tile_xy(z, x, y):