2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

typo corrections

Browse source
This commit is contained in:
Laura Klünder 2023-10-20 23:18:15 +02:00
parent 3267e65fb1
commit 22027cc8af
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/control/templates/control/mesh_node_detail.html
View file

@ -12,7 +12,7 @@
<strong>Name:</strong> {% if node.name %}{{ node.name }}{% else %}<em>{% trans '(no name)' %}</em>{% endif %}
</p>
<p>
<strong>Uplink:</strong> <a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a><br>
<strong>Uplink:</strong> {% if node.uplink %}<a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a><br>{% endif %}
<strong>Last signin:</strong>
{{ node.last_signin.date }} {{ node.last_signin.time|date:"H:i:s" }}

2
src/c3nav/control/templates/control/mesh_nodes.html
View file

@ -66,7 +66,7 @@
{{ timesince }} ago
{% endblocktrans %}
</td>
<td><a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a></td>
<td>{% if node.uplink %}<a href="{% url "control.mesh.node.detail" pk=node.uplink.address %}">{{ node.uplink }}</a>{% endif %}</td>
</tr>
{% endfor %}
</table>

9
src/c3nav/mesh/baseformats.py
View file

@ -216,7 +216,7 @@ class VarArrayFormat(BaseVarFormat):
def tojson(self, data):
return [
item.tojson(item) for item in data
self.child_type.tojson(item) for item in data
]
def get_c_parts(self):
@ -647,6 +647,13 @@ def normalize_name(name):
r"\1_\2",
name
).lower()
name = re.sub(
r"(ota)([a-z])",
r"\1_\2",
name
).lower()
name = name.replace('config', 'cfg')
name = name.replace('position', 'pos')
name = name.replace('mesh_', '')

4
src/c3nav/mesh/messages.py
View file

@ -312,8 +312,8 @@ class OTAFragmentMessage(MeshMessage, msg_type=MeshMessageType.OTA_FRAGMENT):
@dataclass
class OTAFRequestMessage(MeshMessage, msg_type=MeshMessageType.OTA_REQUEST_FRAGMENT):
""" request fragment after we haven't gottan one for a while """
class OTARequestFragmentMessage(MeshMessage, msg_type=MeshMessageType.OTA_REQUEST_FRAGMENT):
""" request fragment after we haven't gotten one for a while """
update_id: int = field(metadata={"format": SimpleFormat('I')})
offset_bytes: int = field(metadata={"format": SimpleFormat('I')})