From 49a1b1fbeb4029f8ff3f6c47190cfb9f128cb333 Mon Sep 17 00:00:00 2001 From: Hacuchino-hash <246103064+Hacuchino-hash@users.noreply.github.com> Date: Wed, 5 Aug 2026 14:58:50 -0500 Subject: [PATCH 1/3] Add self node telemetry screen --- lib/screens/companion_radio_stats_screen.dart | 34 ++++++++++ lib/screens/telemetry_screen.dart | 67 ++++++++++++++----- 2 files changed, 83 insertions(+), 18 deletions(-) diff --git a/lib/screens/companion_radio_stats_screen.dart b/lib/screens/companion_radio_stats_screen.dart index f7d8f46e..d3f0df0e 100644 --- a/lib/screens/companion_radio_stats_screen.dart +++ b/lib/screens/companion_radio_stats_screen.dart @@ -1,6 +1,11 @@ +import 'dart:typed_data'; + import 'package:flutter/material.dart'; import 'package:meshcore_open/connector/meshcore_connector.dart'; +import 'package:meshcore_open/connector/meshcore_protocol.dart'; import 'package:meshcore_open/models/companion_radio_stats.dart'; +import 'package:meshcore_open/models/contact.dart'; +import 'package:meshcore_open/screens/telemetry_screen.dart'; import 'package:meshcore_open/l10n/l10n.dart'; import 'package:meshcore_open/theme/mesh_theme.dart'; import 'package:meshcore_open/widgets/mesh_ui.dart'; @@ -77,6 +82,35 @@ class _CompanionRadioStatsScreenState extends State { appBar: AppBar( title: Text(l10n.radioStats_screenTitle), centerTitle: true, + actions: [ + IconButton( + icon: const Icon(Icons.thermostat), + tooltip: l10n.contact_telemetry, + onPressed: () { + final connector = Provider.of( + context, + listen: false, + ); + final selfKey = connector.selfPublicKey; + if (selfKey == null || selfKey.isEmpty) return; + final selfContact = Contact( + publicKey: selfKey, + name: connector.selfName ?? '', + type: advTypeChat, + pathLength: 0, + path: Uint8List(0), + lastSeen: DateTime.now(), + ); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + TelemetryScreen(contact: selfContact, isSelf: true), + ), + ); + }, + ), + ], ), body: Selector( selector: (_, c) => ( diff --git a/lib/screens/telemetry_screen.dart b/lib/screens/telemetry_screen.dart index 96a59c75..adb0c09e 100644 --- a/lib/screens/telemetry_screen.dart +++ b/lib/screens/telemetry_screen.dart @@ -24,8 +24,9 @@ import '../widgets/mesh_ui.dart'; class TelemetryScreen extends StatefulWidget { final Contact contact; + final bool isSelf; - const TelemetryScreen({super.key, required this.contact}); + const TelemetryScreen({super.key, required this.contact, this.isSelf = false}); @override State createState() => _TelemetryScreenState(); @@ -158,7 +159,7 @@ class _TelemetryScreenState extends State { void _handleTelemetryResponse(Uint8List frame) { final parsedTelemetry = CayenneLpp.parseByChannel(frame); final batteryMv = _extractTelemetryBatteryMillivolts(parsedTelemetry); - if (batteryMv != null) { + if (batteryMv != null && !widget.isSelf) { final connector = Provider.of(context, listen: false); connector.updateRepeaterBatterySnapshot( widget.contact.publicKeyHex, @@ -204,18 +205,47 @@ class _TelemetryScreenState extends State { }); try { final connector = Provider.of(context, listen: false); - final selection = await connector.preparePathForContactSend( - _resolveContact(connector), - ); - _pendingStatusSelection = selection; Uint8List frame; - if (widget.contact.type != advTypeChat) { - frame = buildSendBinaryReq( - widget.contact.publicKey, - payload: buildTelemetryBinaryPayload(), - ); + if (widget.isSelf) { + // ask the connected node for its own telemetry, no mesh path involved + frame = buildSendTelemetryReq(null); + final isAutoRefreshRequest = _activeTelemetryRequestIsAutoRefresh; + _statusTimeout?.cancel(); + _statusTimeout = Timer(const Duration(seconds: 5), () { + if (!mounted) return; + setState(() { + _isLoading = false; + _isLoaded = false; + if (isAutoRefreshRequest && _isAutoRefreshEnabled) { + _autoRefreshLastAttemptFailed = true; + } + _activeTelemetryRequestIsAutoRefresh = false; + }); + if (!isAutoRefreshRequest) { + showDismissibleSnackBar( + context, + content: Text(context.l10n.telemetry_requestTimeout), + backgroundColor: Theme.of(context).colorScheme.error, + ); + } + if (isAutoRefreshRequest && _isAutoRefreshEnabled) { + _scheduleNextAutoRefreshAttempt(); + } + _recordTelemetryResult(false); + }); } else { - frame = buildSendTelemetryReq(widget.contact.publicKey); + final selection = await connector.preparePathForContactSend( + _resolveContact(connector), + ); + _pendingStatusSelection = selection; + if (widget.contact.type != advTypeChat) { + frame = buildSendBinaryReq( + widget.contact.publicKey, + payload: buildTelemetryBinaryPayload(), + ); + } else { + frame = buildSendTelemetryReq(widget.contact.publicKey); + } } await connector.sendFrame(frame); } catch (e) { @@ -353,12 +383,13 @@ class _TelemetryScreenState extends State { centerTitle: true, bottom: const SyncProgressAppBarBottom(), actions: [ - IconButton( - icon: Icon(isFloodMode ? Icons.waves : Icons.route), - tooltip: l10n.repeater_routingMode, - onPressed: () => - ContactRoutingSheet.show(context, contact: widget.contact), - ), + if (!widget.isSelf) + IconButton( + icon: Icon(isFloodMode ? Icons.waves : Icons.route), + tooltip: l10n.repeater_routingMode, + onPressed: () => + ContactRoutingSheet.show(context, contact: widget.contact), + ), IconButton( icon: _isLoading ? const SizedBox( From bc79c01d0e9a3799471369334716698b4a02e439 Mon Sep 17 00:00:00 2001 From: Hacuchino-hash <246103064+Hacuchino-hash@users.noreply.github.com> Date: Thu, 6 Aug 2026 08:03:55 -0500 Subject: [PATCH 2/3] Show humidity with percent sign and add telemetry entry to settings --- lib/screens/companion_radio_stats_screen.dart | 28 +----------------- lib/screens/settings_screen.dart | 11 +++++++ lib/screens/telemetry_screen.dart | 29 +++++++++++++++++-- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/lib/screens/companion_radio_stats_screen.dart b/lib/screens/companion_radio_stats_screen.dart index d3f0df0e..82f4d271 100644 --- a/lib/screens/companion_radio_stats_screen.dart +++ b/lib/screens/companion_radio_stats_screen.dart @@ -1,10 +1,6 @@ -import 'dart:typed_data'; - import 'package:flutter/material.dart'; import 'package:meshcore_open/connector/meshcore_connector.dart'; -import 'package:meshcore_open/connector/meshcore_protocol.dart'; import 'package:meshcore_open/models/companion_radio_stats.dart'; -import 'package:meshcore_open/models/contact.dart'; import 'package:meshcore_open/screens/telemetry_screen.dart'; import 'package:meshcore_open/l10n/l10n.dart'; import 'package:meshcore_open/theme/mesh_theme.dart'; @@ -86,29 +82,7 @@ class _CompanionRadioStatsScreenState extends State { IconButton( icon: const Icon(Icons.thermostat), tooltip: l10n.contact_telemetry, - onPressed: () { - final connector = Provider.of( - context, - listen: false, - ); - final selfKey = connector.selfPublicKey; - if (selfKey == null || selfKey.isEmpty) return; - final selfContact = Contact( - publicKey: selfKey, - name: connector.selfName ?? '', - type: advTypeChat, - pathLength: 0, - path: Uint8List(0), - lastSeen: DateTime.now(), - ); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => - TelemetryScreen(contact: selfContact, isSelf: true), - ), - ); - }, + onPressed: () => pushSelfTelemetryScreen(context), ), ], ), diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart index 17cca639..f938c42f 100644 --- a/lib/screens/settings_screen.dart +++ b/lib/screens/settings_screen.dart @@ -19,6 +19,7 @@ import 'app_settings_screen.dart'; import 'app_debug_log_screen.dart'; import 'ble_debug_log_screen.dart'; import '../widgets/radio_stats_entry.dart'; +import 'telemetry_screen.dart'; import '../widgets/sync_progress_overlay.dart'; import 'region_management_screen.dart'; @@ -469,6 +470,16 @@ class _SettingsScreenState extends State { : null, ), const Divider(height: 1, indent: 16), + _tappableTile( + context, + icon: Icons.thermostat_outlined, + title: l10n.contact_telemetry, + subtitle: l10n.repeater_telemetrySubtitle, + onTap: connector.isConnected + ? () => pushSelfTelemetryScreen(context) + : null, + ), + const Divider(height: 1, indent: 16), _tappableTile( context, icon: Icons.route_outlined, diff --git a/lib/screens/telemetry_screen.dart b/lib/screens/telemetry_screen.dart index adb0c09e..a877a82a 100644 --- a/lib/screens/telemetry_screen.dart +++ b/lib/screens/telemetry_screen.dart @@ -22,11 +22,36 @@ import '../widgets/telemetry_location_map.dart'; import '../theme/mesh_theme.dart'; import '../widgets/mesh_ui.dart'; +/// Opens the telemetry screen for the locally connected node. +void pushSelfTelemetryScreen(BuildContext context) { + final connector = Provider.of(context, listen: false); + final selfKey = connector.selfPublicKey; + if (selfKey == null || selfKey.isEmpty) return; + final selfContact = Contact( + publicKey: selfKey, + name: connector.selfName ?? '', + type: advTypeChat, + pathLength: 0, + path: Uint8List(0), + lastSeen: DateTime.now(), + ); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => TelemetryScreen(contact: selfContact, isSelf: true), + ), + ); +} + class TelemetryScreen extends StatefulWidget { final Contact contact; final bool isSelf; - const TelemetryScreen({super.key, required this.contact, this.isSelf = false}); + const TelemetryScreen({ + super.key, + required this.contact, + this.isSelf = false, + }); @override State createState() => _TelemetryScreenState(); @@ -526,7 +551,7 @@ class _TelemetryScreenState extends State { _temperatureText(value, isImperialUnits), ); case 'humidity': - return _TelemetryFieldDisplay(l10n.telemetry_humidityLabel, text); + return _TelemetryFieldDisplay(l10n.telemetry_humidityLabel, '$text%'); case 'accelerometer': return _TelemetryFieldDisplay( l10n.telemetry_accelerometerLabel, From d7d197ca841ae741f522e64f1b6e564c23f960c8 Mon Sep 17 00:00:00 2001 From: zjs81 Date: Sun, 27 Sep 2026 12:10:10 -0700 Subject: [PATCH 3/3] Fix self telemetry timeout handling and disconnected stats button - Cancel the self-request timeout when sendFrame throws, so a failed send no longer shows a second timeout snackbar or reschedules auto-refresh twice. - Do not wait for respCodeSent on self requests: none is sent for a local request, so any that arrives belongs to another send and replaced the 5s self timeout. - Disable the Radio Stats telemetry button while disconnected, matching the Settings tile. --- lib/screens/companion_radio_stats_screen.dart | 13 +++++++++---- lib/screens/telemetry_screen.dart | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/screens/companion_radio_stats_screen.dart b/lib/screens/companion_radio_stats_screen.dart index 78618036..748f4a20 100644 --- a/lib/screens/companion_radio_stats_screen.dart +++ b/lib/screens/companion_radio_stats_screen.dart @@ -79,10 +79,15 @@ class _CompanionRadioStatsScreenState extends State { title: Text(l10n.radioStats_screenTitle), centerTitle: true, actions: [ - IconButton( - icon: const Icon(Icons.thermostat), - tooltip: l10n.contact_telemetry, - onPressed: () => pushSelfTelemetryScreen(context), + Selector( + selector: (_, c) => c.isConnected, + builder: (context, connected, _) => IconButton( + icon: const Icon(Icons.thermostat), + tooltip: l10n.contact_telemetry, + onPressed: connected + ? () => pushSelfTelemetryScreen(context) + : null, + ), ), ], ), diff --git a/lib/screens/telemetry_screen.dart b/lib/screens/telemetry_screen.dart index 10b68592..76cff5be 100644 --- a/lib/screens/telemetry_screen.dart +++ b/lib/screens/telemetry_screen.dart @@ -275,10 +275,13 @@ class _TelemetryScreenState extends State { frame = buildSendTelemetryReq(widget.contact.publicKey); } } - _awaitingSent = true; + // A local self request gets no respCodeSent, so any that arrives belongs + // to another send and must not replace the 5s self timeout. + _awaitingSent = !widget.isSelf; await connector.sendFrame(frame); } catch (e) { _awaitingSent = false; + _statusTimeout?.cancel(); if (mounted) { setState(() { _isLoading = false;