Batch telemetry updates

Author: abraha2d

backend.py

@@ -127,6 +127,36 @@ def update_node_batt(self, n_id, batt):
         }
         self.endpoint(mutation)
 
+    def update_node_telemetry(self, n_id, temp, batt, heading, source="TELEMETRY"):
+        mutation = \
+            """
+            mutation {
+              updateNode(id: "%(id)s", node: {
+                pose: {
+                  orientation: {
+                    heading: %(heading).2f
+                    source: %(source)s
+                  }
+                }
+                telemetry: {
+                  temp: %(temp).2f
+                  batt: %(batt).2f
+                }
+              }) {
+                id
+              }
+            }
+            """
+
+        mutation = mutation % {
+            'id': n_id,
+            'temp': temp,
+            'batt': batt,
+            'heading': heading,
+            'source': source
+        }
+        self.endpoint(mutation)
+
     def translate_node_to_gps_coords(self, node):
         if not self.base_1_node or not self.base_2_node:
             return node.x, node.y

eng_display.py

@@ -111,6 +111,17 @@ def move_to(self, x, y):
 #       "batt": float,
 #   }
 # }
+#
+# {
+#   "cmd": "backend_update_node_telemetry"
+#   "args": {
+#       "id": str,
+#       "temp": float,
+#       "batt": float,
+#       "heading": float,
+#       "source": TELEMETRY or POSITION
+#   }
+# }
 
 class EngDisplay:
     def __init__(self, src=None):
@@ -229,6 +240,14 @@ def main_loop(self):
                             self.backend.update_node_temp(msg['args']['id'], msg['args']['temp'])
                         elif msg['cmd'] == "backend_update_node_batt":
                             self.backend.update_node_batt(msg['args']['id'], msg['args']['batt'])
+                        elif msg['cmd'] == "backend_update_node_telemetry":
+                            try:
+                                self.backend.update_node_telemetry(msg['args']['id'], msg['args']['temp'],
+                                                                   msg['args']['batt'], msg['args']['heading'],
+                                                                   msg['args']['source'])
+                            except KeyError:
+                                self.backend.update_node_telemetry(msg['args']['id'], msg['args']['temp'],
+                                                                   msg['args']['batt'], msg['args']['heading'])
                         else:
                             print(f"Unknown command: {msg['cmd']}")
                     else:
@@ -373,10 +392,10 @@ def draw_circle(self, args):
         self.create_circle(x, y, r, extra_tags=tags, fill=fill, width=width, outline=outline)
 
         if text is not None:
-            ypos = y-r-20
+            ypos = y - r - 20
             if ypos < 0:
-                ypos = y+r+20
-            self.create_text(x,ypos,text=text)
+                ypos = y + r + 20
+            self.create_text(x, ypos, text=text)
 
     def connect_points(self, args):
         pos1 = self.get_val_from_args(args, "pos1")
@@ -399,7 +418,8 @@ def connect_points(self, args):
         pos2_scaled = (pos2[0] * self.meas_to_map * self.universal_scale + self.canvas.x_pos,
                        pos2[1] * self.meas_to_map * self.universal_scale + self.canvas.y_pos)
 
-        self._connect_points(pos1_scaled, pos2_scaled, text=text, text_size=text_size, text_color=text_color, dashed=dashed, color=color)
+        self._connect_points(pos1_scaled, pos2_scaled, text=text, text_size=text_size, text_color=text_color,
+                             dashed=dashed, color=color)
 
     def create_circle(self, x, y, r, extra_tags=[], **kwargs):
         (x, y) = self.translate_canvas_pos_to_screen_pos(x, y)
@@ -409,11 +429,12 @@ def create_circle(self, x, y, r, extra_tags=[], **kwargs):
     def create_text(self, x, y, text="", extra_tags=[], **kwargs):
         (x, y) = self.translate_canvas_pos_to_screen_pos(x, y)
         tags = ["obj"]
-        self.canvas.create_text(x,y,text=text,
-                fill="white", font=font.Font(family='Courier New', size=14),
-                justify=tk.LEFT,tags=(tags + extra_tags))
+        self.canvas.create_text(x, y, text=text,
+                                fill="white", font=font.Font(family='Courier New', size=14),
+                                justify=tk.LEFT, tags=(tags + extra_tags))
 
-    def _connect_points(self, node1_pos, node2_pos, text=None, text_size=None, text_color=None, dashed=True, color="#3c4048"):
+    def _connect_points(self, node1_pos, node2_pos, text=None, text_size=None, text_color=None, dashed=True,
+                        color="#3c4048"):
         if node2_pos[0] is None or node2_pos[1] is None or node1_pos[0] is None or node1_pos[1] is None:
             return
         if text is not None:

main.py

@@ -214,15 +214,20 @@ def process_stats(self, packet):
         p_heading = float(p_heading)
         p_temp = float(p_temp)
         p_batt = volts_to_percentage(float(p_batt))
+        # self.multi_pipe.send(
+        #     {"cmd": "backend_update_node_heading", "args": {"id": p_from, "heading": p_heading}}) if self.multi_pipe \
+        #     else self.backend.update_node_heading(p_from, p_heading, "TELEMETRY")
+        # self.multi_pipe.send(
+        #     {"cmd": "backend_update_node_temp", "args": {"id": p_from, "temp": p_temp}}) if self.multi_pipe \
+        #     else self.backend.update_node_temp(p_from, p_temp)
+        # self.multi_pipe.send(
+        #     {"cmd": "backend_update_node_batt", "args": {"id": p_from, "batt": p_batt}}) if self.multi_pipe \
+        #     else self.backend.update_node_batt(p_from, p_batt)
         self.multi_pipe.send(
-            {"cmd": "backend_update_node_heading", "args": {"id": p_from, "heading": p_heading}}) if self.multi_pipe \
-            else self.backend.update_node_heading(p_from, p_heading, "TELEMETRY")
-        self.multi_pipe.send(
-            {"cmd": "backend_update_node_temp", "args": {"id": p_from, "temp": p_temp}}) if self.multi_pipe \
-            else self.backend.update_node_temp(p_from, p_temp)
-        self.multi_pipe.send(
-            {"cmd": "backend_update_node_batt", "args": {"id": p_from, "batt": p_batt}}) if self.multi_pipe \
-            else self.backend.update_node_batt(p_from, p_batt)
+            {"cmd": "backend_update_node_telemetry",
+             "args": {"id": p_from, "temp": p_temp, "batt": p_batt, "heading": p_heading,
+                      "source": "TELEMETRY"}}) if self.multi_pipe \
+            else self.backend.update_node_telemetry(p_from, p_temp, p_batt, p_heading, "TELEMETRY")
 
 
 #################
@@ -236,7 +241,7 @@ def __init__(self, outputPipe):
         self.outputPipe = outputPipe
 
     def run(self):
-        # Infinate loop (kinda sucks)
+        # Infinite loop (kinda sucks)
         while (True):
             # See if we have anything to read in
             if sys.stdin in select.select([sys.stdin], [], [], 0)[0]: