diff --git a/src/c3nav/mesh/models.py b/src/c3nav/mesh/models.py
index cd57ae7f..176faba9 100644
--- a/src/c3nav/mesh/models.py
+++ b/src/c3nav/mesh/models.py
@@ -122,7 +122,7 @@ class MeshNodeQuerySet(models.QuerySet):
fw_desc.get_lookup(): fw_desc for fw_desc in
(build.firmware_description for build in FirmwareBuild.objects.filter(
sha256_hash__in=set(
- node.last_messages[MeshMessageType.CONFIG_FIRMWARE].parsed.app_desc.app_elf_sha256
+ node.last_messages[MeshMessageType.CONFIG_FIRMWARE].parsed.content.app_desc.app_elf_sha256
for node in self._result_cache
if node.last_messages[MeshMessageType.CONFIG_FIRMWARE]
)
@@ -144,7 +144,7 @@ class MeshNodeQuerySet(models.QuerySet):
)
try:
created_lookup = {
- msg.parsed.app_desc.app_elf_sha256: msg.datetime
+ msg.parsed.content.app_desc.app_elf_sha256: msg.datetime
for msg in NodeMessage.objects.filter(
message_type=MeshMessageType.CONFIG_FIRMWARE.name,
data__app_elf_sha256__in=(node._firmware_description.sha256_hash
@@ -382,7 +382,7 @@ class NodeMessage(models.Model):
return '(#%d) %s at %s' % (self.pk, self.get_message_type_display(), self.datetime)
@cached_property
- def parsed(self) -> Self:
+ def parsed(self) -> MeshMessage:
return MeshMessage.model_validate(self.data)
diff --git a/src/c3nav/mesh/templates/mesh/mesh_messages.html b/src/c3nav/mesh/templates/mesh/mesh_messages.html
index 5ef3d22e..633cadcc 100644
--- a/src/c3nav/mesh/templates/mesh/mesh_messages.html
+++ b/src/c3nav/mesh/templates/mesh/mesh_messages.html
@@ -72,11 +72,11 @@
{% endif %}
{% elif msg.message_type == "CONFIG_FIRMWARE" %}
- Firmware: {{ msg.parsed.app_desc.project_name }} {{ msg.parsed.app_desc.version }} (IDF {{ msg.parsed.app_desc.idf_version }})
+ Firmware: {{ msg.parsed.content.app_desc.project_name }} {{ msg.parsed.content.app_desc.version }} (IDF {{ msg.parsed.content.app_desc.idf_version }})
- Compile Date: {{ msg.parsed.app_desc.compile_date }} {{ msg.parsed.app_desc.compile_time }}
+ Compile Date: {{ msg.parsed.content.app_desc.compile_date }} {{ msg.parsed.content.app_desc.compile_time }}
- SHA256: {{ msg.parsed.app_desc.app_elf_sha256 }}
+ SHA256: {{ msg.parsed.content.app_desc.app_elf_sha256 }}
{% elif msg.message_type == "CONFIG_UPLINK" %}
Enabled: {{ msg.parsed.enabled }},