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

full support for the raw ftm stuff

Browse source
This commit is contained in:
Laura Klünder 2023-10-28 19:56:03 +02:00
parent 6abdd6d959
commit f2f0186e33
6 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/c3nav/control/templates/control/mesh_messages.html
View file

@ -89,6 +89,33 @@
{% endfor %}
</ul>
{% elif msg.message_type == "LOCATE_RAW_FTM_RESULTS" %}
<strong>peer:</strong> {{ msg.parsed.peer }}<br>
<table class="smalltable">
<tr>
<th>i</th>
<th>token</th>
<th>rssi</th>
<th>rtt</th>
<th>t1</th>
<th>t2</th>
<th>t3</th>
<th>t4</th>
</tr>
{% for entry in msg.parsed.results %}
<tr>
<td>{{ forloop.counter0 }}</td>
<td>{{ entry.dlog_token }}</td>
<td>{{ entry.rssi }}</td>
<td>{{ entry.rtt }}</td>
<td>{{ entry.t1 }}</td>
<td>{{ entry.t2 }}</td>
<td>{{ entry.t3 }}</td>
<td>{{ entry.t4 }}</td>
</tr>
{% endfor %}
</table>
{% else %}
{% for key, value in msg.data.items %}
{% if key != "src" and key != "dst" and key != "msg_type" %}

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

@ -79,7 +79,7 @@ class SimpleFormat(BaseFormat):
"b": "int8_t",
"h": "int16_t",
"i": "int32_t",
"q": "uint64_t",
"q": "int64_t",
"s": "char",
}

2
src/c3nav/mesh/consumers.py
View file

@ -56,6 +56,8 @@ class MeshConsumer(WebsocketConsumer):
traceback.print_exc()
return
print(msg)
if msg.dst != messages.MESH_ROOT_ADDRESS and msg.dst != messages.MESH_PARENT_ADDRESS:
# message not adressed to us, forward it
print('Received message for forwarding:', msg)

2
src/c3nav/mesh/dataformats.py
View file

@ -144,7 +144,7 @@ class RangeResultItem(StructType):
@dataclass
class RawFTMEntry(StructType, existing_c_struct="wifi_ftm_report_entry_t"):
class RawFTMEntry(StructType):
dlog_token: int = field(metadata={"format": SimpleFormat('B')})
rssi: int = field(metadata={"format": SimpleFormat('b')})
rtt: int = field(metadata={"format": SimpleFormat('I')})

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

@ -347,5 +347,5 @@ class LocateRangeResults(MeshMessage, msg_type=MeshMessageType.LOCATE_RANGE_RESU
@dataclass
class LocateRawFTMResults(MeshMessage, msg_type=MeshMessageType.LOCATE_RAW_FTM_RESULTS):
""" reports distance to given nodes """
distribute_to: str = field(metadata={"format": MacAddressFormat()})
peer: str = field(metadata={"format": MacAddressFormat()})
results: list[RawFTMEntry] = field(metadata={"format": VarArrayFormat(RawFTMEntry)})

6
src/c3nav/site/static/site/css/c3nav.scss
View file

@ -1359,3 +1359,9 @@ button + button {
margin-bottom: 0.5rem;
font-size: 80%;
}
.smalltable {
font-size:80%;
td, th {
padding: 2px;
}
}