moreeee data

mesht_device.py

@@ -5,6 +5,8 @@ import logging
 logger = logging.getLogger(__name__)
 from mesht_models import *
 from mesht_protobuf_extra import *
+from protobufs_extra.position_proto import *
+from protobufs_extra.telemetry_proto import *
 
 
 DATA_SCHEMA = [
@@ -59,15 +61,12 @@ USER_SCHEMA = [
     ("string", "id", 1),
     ("string", "long_name", 2),
     ("string", "short_name", 3),
+    ("bytes", "macaddr", 4),
     ("int32", "hw_model", 5),
     ("bool", "is_licensed", 6),
     ("int32", "role", 7),
     ("bytes", "public_key", 8),
-]
-
-DEVICEMETRICS_SCHEMA = [
-    ("uint32", "battery_level", 1),
-    ("float", "voltage", 2),
+    ("bool", "is_unmessagable", 9)
 ]
 
 MYNODEINFO_SCHEMA = [
@@ -83,10 +82,17 @@ MYNODEINFO_SCHEMA = [
 NODEINFO_SCHEMA = [
     ("uint32", "num", 1),
     (USER_SCHEMA, "user", 2),
+    (POSITION_SCHEME, "position", 3),
     ("float", "snr", 4),
     ("fixed32", "last_heard", 5),
-    (DEVICEMETRICS_SCHEMA, "device_metrics", 6),
+    (DEVICE_METRICS_SCHEME, "device_metrics", 6),
+    ("uint32", "channel", 7),
+    ("bool", "via_mqtt", 8),
     ("uint32", "hops_away", 9),
+    ("bool", "is_favorite", 10),
+    ("bool", "is_ignored", 11),
+    ("bool", "is_key_manually_verified", 12),
+    ("bool", "is_muted", 13)
 ]
 
 LORACONFIG_SCHEMA = [