diff --git a/src/c3nav/mesh/consumers.py b/src/c3nav/mesh/consumers.py index 202e2067..2fde981d 100644 --- a/src/c3nav/mesh/consumers.py +++ b/src/c3nav/mesh/consumers.py @@ -17,8 +17,8 @@ from django.utils import timezone from c3nav.mesh import messages from c3nav.mesh.messages import (MESH_BROADCAST_ADDRESS, MESH_NONE_ADDRESS, MESH_ROOT_ADDRESS, OTA_CHUNK_SIZE, MeshMessage, MeshMessageType) -from c3nav.mesh.models import MeshNode, MeshUplink, NodeMessage, OTAUpdate, OTAUpdateRecipient, OTARecipientStatus -from c3nav.mesh.utils import MESH_ALL_UPLINKS_GROUP, UPLINK_PING, get_mesh_uplink_group, MESH_ALL_OTA_GROUP +from c3nav.mesh.models import MeshNode, MeshUplink, NodeMessage, OTARecipientStatus, OTAUpdate, OTAUpdateRecipient +from c3nav.mesh.utils import MESH_ALL_OTA_GROUP, MESH_ALL_UPLINKS_GROUP, UPLINK_PING, get_mesh_uplink_group from c3nav.routing.rangelocator import RangeLocator diff --git a/src/c3nav/mesh/messages.py b/src/c3nav/mesh/messages.py index 14cdf643..0309c88a 100644 --- a/src/c3nav/mesh/messages.py +++ b/src/c3nav/mesh/messages.py @@ -269,7 +269,6 @@ class ConfigUplinkMessage(MeshMessage, msg_type=MeshMessageType.CONFIG_UPLINK): port: int = field(metadata={"format": SimpleFormat('H')}) - @unique class OTADeviceStatus(EnumSchemaByNameMixin, IntEnum): """ ota status, the ones >= 0x10 denote a permanent failure """ diff --git a/src/c3nav/mesh/models.py b/src/c3nav/mesh/models.py index 8f847dc8..fc708673 100644 --- a/src/c3nav/mesh/models.py +++ b/src/c3nav/mesh/models.py @@ -8,7 +8,6 @@ from operator import attrgetter from typing import Any, Mapping, Optional, Self import channels -from asgiref.sync import async_to_sync from django.contrib.auth import get_user_model from django.core.validators import RegexValidator from django.db import NotSupportedError, models @@ -23,7 +22,7 @@ from c3nav.mesh.dataformats import BoardType, ChipType, FirmwareImage from c3nav.mesh.messages import ConfigFirmwareMessage, ConfigHardwareMessage from c3nav.mesh.messages import MeshMessage as MeshMessage from c3nav.mesh.messages import MeshMessageType -from c3nav.mesh.utils import UPLINK_TIMEOUT, MESH_ALL_OTA_GROUP +from c3nav.mesh.utils import MESH_ALL_OTA_GROUP, UPLINK_TIMEOUT from c3nav.routing.rangelocator import RangeLocator FirmwareLookup = namedtuple('FirmwareLookup', ('sha256_hash', 'chip', 'project_name', 'version', 'idf_version')) @@ -528,4 +527,3 @@ class OTAUpdateRecipient(models.Model): "update": self.update_id, "status": self.status, } -