Skip to content

Add "(MQTT)" in nodes after node name when appropriate #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lachesis wants to merge 2 commits into from
Closed

Add "(MQTT)" in nodes after node name when appropriate #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9968952
Add "(MQTT)" after node name when appropriate
lachesis Oct 19, 2024
a29eef9
Add missing camel to snake conversion
lachesis Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions meshtastic/mesh_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,19 @@ def getTimeAgo(ts) -> Optional[str]:
if not includeSelf and node["num"] == self.localNode.nodeNum:
continue

mqtt_suffix = ' (MQTT)' if node.get('viaMqtt') else ''
presumptive_id = f"!{node['num']:08x}"
row = {
"N": 0,
"User": f"Meshtastic {presumptive_id[-4:]}",
"User": f"Meshtastic {presumptive_id[-4:]}" + mqtt_suffix,
"ID": presumptive_id,
}

user = node.get("user")
if user:
row.update(
{
"User": user.get("longName", "N/A"),
"User": user.get("longName", "N/A") + mqtt_suffix,
"AKA": user.get("shortName", "N/A"),
"ID": user["id"],
"Hardware": user.get("hwModel", "UNSET"),
Expand Down
2 changes: 1 addition & 1 deletion meshtastic/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def onResponseRequestSettings(self, p):
)
return
if config_values is not None:
raw_config = getattr(getattr(adminMessage['raw'], oneof), field)
raw_config = getattr(getattr(adminMessage['raw'], oneof), camel_to_snake(field))
config_values.CopyFrom(raw_config)
print(f"{str(camel_to_snake(field))}:\n{str(config_values)}")

Expand Down