From 8d736025099de6a08b16ca528a8d613b5f7bba94 Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Sun, 1 Mar 2026 14:36:04 -0800
Subject: [PATCH]  add flags for manual contact addition and telemetry mode
 handling

---
 lib/connector/meshcore_connector.dart | 79 ++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 19 deletions(-)

diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart
index ad2a074..14d62dd 100644
--- a/lib/connector/meshcore_connector.dart
+++ b/lib/connector/meshcore_connector.dart
@@ -163,6 +163,12 @@ class MeshCoreConnector extends ChangeNotifier {
   bool _autoAddRoomServers = false;
   bool _autoAddSensors = false;
   bool _overwriteOldest = false;
+  bool _manualAddContacts = false;
+  int _telemetryModeBase = 0;
+  int _telemetryModeLoc = 0;
+  int _telemetryModeEnv = 0;
+  int _advertLocPolicy = 0;
+  int _multiAcks = 0;
 
   static const int _defaultMaxContacts = 32;
   static const int _defaultMaxChannels = 8;
@@ -1095,6 +1101,7 @@ class MeshCoreConnector extends ChangeNotifier {
     await requestBatteryStatus(force: true);
     await sendFrame(buildGetCustomVarsFrame());
     await sendFrame(buildGetAutoAddFlagsFrame());
+
     _scheduleSelfInfoRetry();
   }
 
@@ -1980,6 +1987,7 @@ class MeshCoreConnector extends ChangeNotifier {
         break;
       case respCodeAutoAddConfig:
         _handleAutoAddConfig(frame);
+        _checkManualAddContacts();
         break;
       case respCodeBattAndStorage:
         _handleBatteryAndStorage(frame);
@@ -2052,28 +2060,35 @@ class MeshCoreConnector extends ChangeNotifier {
     // [56] = sf
     // [57] = cr
     // [58+] = node_name
-    if (frame.length < 4 + pubKeySize) return;
+    final reader = BufferReader(frame);
+    try {
+      reader.skipBytes(2);
+      _currentTxPower = reader.readByte();
+      _maxTxPower = reader.readByte();
+      _selfPublicKey = reader.readBytes(pubKeySize);
+      _selfLatitude = reader.readInt32LE() / 1000000.0;
+      _selfLongitude = reader.readInt32LE() / 1000000.0;
+      _multiAcks = reader.readByte();
+      _advertLocPolicy = reader.readByte();
 
-    _currentTxPower = frame[2];
-    _maxTxPower = frame[3];
-    _selfPublicKey = Uint8List.fromList(frame.sublist(4, 4 + pubKeySize));
-    _selfLatitude = readInt32LE(frame, 36) / 1000000.0;
-    _selfLongitude = readInt32LE(frame, 40) / 1000000.0;
+      final telemetryFlag = reader.readByte();
+      _telemetryModeBase = telemetryFlag & 0x03;
+      _telemetryModeEnv = telemetryFlag >> 2 & 0x03;
+      _telemetryModeLoc = telemetryFlag >> 4 & 0x03;
 
-    if (frame.length >= 48 && frame[47] == 0x00) {
-      sendFrame(buildSetOtherParamsFrame(0, 0, 0));
-    }
+      _manualAddContacts = reader.readByte() & 0x01 == 0x00;
 
-    // Radio settings (if frame is long enough)
-    if (frame.length >= 58) {
-      _currentFreqHz = readUint32LE(frame, 48);
-      _currentBwHz = readUint32LE(frame, 52);
-      _currentSf = frame[56];
-      _currentCr = frame[57];
-    }
-    // Node name starts at offset 58 if frame is long enough
-    if (frame.length > 58) {
-      _selfName = readCString(frame, 58, frame.length - 58);
+      _currentFreqHz = reader.readUInt32LE();
+      _currentBwHz = reader.readUInt32LE();
+      _currentSf = reader.readByte();
+      _currentCr = reader.readByte();
+
+      _selfName = reader.readString();
+    } catch (e) {
+      _appDebugLogService?.error(
+        'Error parsing SELF_INFO frame: $e',
+        tag: 'Connector',
+      );
     }
     _awaitingSelfInfo = false;
     _selfInfoRetryTimer?.cancel();
@@ -2151,6 +2166,32 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
+  void _checkManualAddContacts() async {
+    // If manual add contacts is enabled, set auto add config and other params.
+    // and disable it after
+    if (_manualAddContacts) {
+      await sendFrame(
+        buildSetAutoAddConfigFrame(
+          autoAddChat: true,
+          autoAddRepeater: true,
+          autoAddRoomServer: true,
+          autoAddSensor: true,
+          overwriteOldest: _overwriteOldest,
+        ),
+      );
+      await sendFrame(
+        buildSetOtherParamsFrame(
+          (_telemetryModeEnv << 4) |
+              (_telemetryModeLoc << 2) |
+              (_telemetryModeBase),
+          _advertLocPolicy,
+          _multiAcks,
+        ),
+      );
+      _manualAddContacts = false;
+    }
+  }
+
   /// Calculate timeout for a message based on radio settings and path length
   /// Returns timeout in milliseconds, considering number of hops
   int calculateTimeout({required int pathLength, int messageBytes = 100}) {