+
{% endblock %}
diff --git a/meshview/templates/node.html b/meshview/templates/node.html
index d5cb012..88f7da6 100644
--- a/meshview/templates/node.html
+++ b/meshview/templates/node.html
@@ -13,6 +13,9 @@
overflow: scroll;
top: 3em;
}
+ div.tab-pane > dl {
+ display: inline-block;
+ }
{% endblock %}
{% block body %}
@@ -27,7 +30,7 @@
{% endif %}
>
{% for packet in packets %}
{% include 'packet.html' %}
{% else %}
No packets found.
{% endfor %}
-
+
-
-
+
@@ -20,17 +20,44 @@
+
diff --git a/meshview/templates/node_graphs.html b/meshview/templates/node_graphs.html
index 7d27985..24fa0fe 100644
--- a/meshview/templates/node_graphs.html
+++ b/meshview/templates/node_graphs.html
@@ -11,7 +11,7 @@
{% if node %}
-
@@ -35,11 +38,11 @@
-
-
- short name +
- ShortName
- {{node.short_name}} -
- hw model +
- HW Model
- {{node.hw_model}} -
- role +
- Role
- {{node.role}}
-
+
@@ -63,10 +66,10 @@
+
+
{% include 'packet_list.html' %}
-
-
+
- {{ graph("power") }}
- {{ graph("chutil") }}
+
-
+
- Power +
- {{ graph("power") }} +
-
+
- ChUtil +
- {{ graph("chutil") }} +
- {{ graph("temperature") }}
- {{ graph("humidity") }}
- {{ graph("wind_speed") }}
- {{ graph("wind_direction") }}
+
-
+
- Temperature +
- {{ graph("temperature") }} +
-
+
- Humidity +
- {{ graph("humidity") }} +
-
+
- Pressure +
- {{ graph("pressure") }} +
-
+
- Indoor Air Quality +
- {{ graph("iaq") }} +
-
+
- Wind Speed +
- {{ graph("wind_speed") }} +
-
+
- Wind Direction +
- {{ graph("wind_direction") }} +
{{ graph("power_metrics") }}
diff --git a/meshview/templates/packet_list.html b/meshview/templates/packet_list.html
index 42d1757..f90c58f 100644
--- a/meshview/templates/packet_list.html
+++ b/meshview/templates/packet_list.html
@@ -1,4 +1,4 @@
-
+
{% for packet in packets %}
{% include 'packet.html' %}
{% else %}
diff --git a/meshview/web.py b/meshview/web.py
index 4c12ee9..7722e08 100644
--- a/meshview/web.py
+++ b/meshview/web.py
@@ -20,7 +20,7 @@ from jinja2 import Environment, PackageLoader, select_autoescape
from google.protobuf import text_format
from google.protobuf.message import Message
-from meshtastic.portnums_pb2 import PortNum
+from meshtastic.protobuf.portnums_pb2 import PortNum
from meshview import store
from meshview import models
from meshview import decode_payload
@@ -655,6 +655,31 @@ async def graph_humidity(request):
],
)
+@routes.get("/graph/pressure/{node_id}")
+async def graph_pressure(request):
+ return await graph_telemetry(
+ int(request.match_info['node_id']),
+ 'environment_metrics',
+ [
+ {
+ 'label': 'barometric pressure',
+ 'fields': ['barometric_pressure'],
+ },
+ ],
+ )
+
+@routes.get("/graph/iaq/{node_id}")
+async def graph_pressure(request):
+ return await graph_telemetry(
+ int(request.match_info['node_id']),
+ 'environment_metrics',
+ [
+ {
+ 'label': 'IAQ',
+ 'fields': ['iaq'],
+ },
+ ],
+ )
@routes.get("/graph/power_metrics/{node_id}")
async def graph_power_metrics(request):