more beautiful fixes for message parsing

This commit is contained in:
Laura Klünder 2024-03-29 16:05:17 +01:00
parent 117be4238c
commit 8432c1b783

View file

@ -292,11 +292,11 @@ class MeshNode(models.Model):
# noinspection PyTypeChecker # noinspection PyTypeChecker
hardware_msg: ConfigHardwareMessage = hw_msg.parsed hardware_msg: ConfigHardwareMessage = hw_msg.parsed
return FirmwareDescription( return FirmwareDescription(
chip=hardware_msg.chip, chip=hardware_msg.content.chip,
project_name=firmware_msg.app_desc.project_name, project_name=firmware_msg.content.app_desc.project_name,
version=firmware_msg.app_desc.version, version=firmware_msg.content.app_desc.version,
idf_version=firmware_msg.app_desc.idf_version, idf_version=firmware_msg.content.app_desc.idf_version,
sha256_hash=firmware_msg.app_desc.app_elf_sha256, sha256_hash=firmware_msg.content.app_desc.app_elf_sha256,
) )
@cached_property @cached_property
@ -306,8 +306,8 @@ class MeshNode(models.Model):
hw_msg = self.last_messages[MeshMessageType.CONFIG_HARDWARE] hw_msg = self.last_messages[MeshMessageType.CONFIG_HARDWARE]
board_msg = self.last_messages[MeshMessageType.CONFIG_BOARD] board_msg = self.last_messages[MeshMessageType.CONFIG_BOARD]
return HardwareDescription( return HardwareDescription(
chip=hw_msg.parsed.chip if hw_msg else None, chip=hw_msg.parsed.content.chip if hw_msg else None,
board=board_msg.parsed.board_config.board if board_msg else None, board=board_msg.parsed.content.board_config.board if board_msg else None,
) )
# overriden by prefetch_firmwares() # overriden by prefetch_firmwares()