Merge branch 'dev' into update-pacox-multibyte

lib/helpers/cayenne_lpp.dart

@@ -96,6 +96,34 @@ class CayenneLpp {
         }
 
         switch (type) {
+          case lppDigitalInput:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppDigitalOutput:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppAnalogInput:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 100,
+            });
+            break;
+          case lppAnalogOutput:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 100,
+            });
+            break;
           case lppGenericSensor:
             telemetry.add({
               'channel': channel,
@@ -131,6 +159,17 @@ class CayenneLpp {
               'value': buffer.readUInt8() / 2,
             });
             break;
+          case lppAccelerometer:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'x': buffer.readInt16BE() / 1000,
+                'y': buffer.readInt16BE() / 1000,
+                'z': buffer.readInt16BE() / 1000,
+              },
+            });
+            break;
           case lppBarometricPressure:
             telemetry.add({
               'channel': channel,
@@ -138,6 +177,13 @@ class CayenneLpp {
               'value': buffer.readUInt16BE() / 10,
             });
             break;
+          case lppAltitude:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE(),
+            });
+            break;
           case lppVoltage:
             telemetry.add({
               'channel': channel,
@@ -152,6 +198,13 @@ class CayenneLpp {
               'value': buffer.readInt16BE() / 1000,
             });
             break;
+          case lppFrequency:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE(),
+            });
+            break;
           case lppPercentage:
             telemetry.add({
               'channel': channel,
@@ -173,6 +226,56 @@ class CayenneLpp {
               'value': buffer.readUInt16BE(),
             });
             break;
+          case lppDistance:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE() / 1000,
+            });
+            break;
+          case lppEnergy:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE() / 1000,
+            });
+            break;
+          case lppDirection:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppUnixTime:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE(),
+            });
+            break;
+          case lppGyrometer:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'x': buffer.readInt16BE() / 100,
+                'y': buffer.readInt16BE() / 100,
+                'z': buffer.readInt16BE() / 100,
+              },
+            });
+            break;
+          case lppColour:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'red': buffer.readUInt8(),
+                'green': buffer.readUInt8(),
+                'blue': buffer.readUInt8(),
+              },
+            });
+            break;
           case lppGps:
             telemetry.add({
               'channel': channel,
@@ -184,6 +287,24 @@ class CayenneLpp {
               },
             });
             break;
+          case lppSwitch:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppPolyline:
+            final size = buffer.readUInt8();
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'size': size,
+                'data': _bytesToHex(_readPolylinePayload(buffer, size)),
+              },
+            });
+            break;
           default:
             return telemetry;
         }
@@ -216,6 +337,19 @@ class CayenneLpp {
         );
 
         switch (type) {
+          case lppDigitalInput:
+            channelData['values']['digitalInput'] = buffer.readUInt8();
+            break;
+          case lppDigitalOutput:
+            channelData['values']['digitalOutput'] = buffer.readUInt8();
+            break;
+          case lppAnalogInput:
+            channelData['values']['analogInput'] = buffer.readInt16BE() / 100.0;
+            break;
+          case lppAnalogOutput:
+            channelData['values']['analogOutput'] =
+                buffer.readInt16BE() / 100.0;
+            break;
           case lppGenericSensor:
             channelData['values']['generic'] = buffer.readUInt32BE();
             break;
@@ -231,15 +365,29 @@ class CayenneLpp {
           case lppRelativeHumidity:
             channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
             break;
+          case lppAccelerometer:
+            channelData['values']['accelerometer'] = {
+              'x': buffer.readInt16BE() / 1000.0,
+              'y': buffer.readInt16BE() / 1000.0,
+              'z': buffer.readInt16BE() / 1000.0,
+            };
+            break;
           case lppBarometricPressure:
             channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
             break;
+          case lppAltitude:
+            // MeshCore encodes standalone barometric altitude as LPP type 121.
+            channelData['values']['altitude'] = buffer.readInt16BE();
+            break;
           case lppVoltage:
             channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
             break;
           case lppCurrent:
             channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
             break;
+          case lppFrequency:
+            channelData['values']['frequency'] = buffer.readUInt32BE();
+            break;
           case lppPercentage:
             channelData['values']['percentage'] = buffer.readUInt8();
             break;
@@ -249,6 +397,32 @@ class CayenneLpp {
           case lppPower:
             channelData['values']['power'] = buffer.readUInt16BE();
             break;
+          case lppDistance:
+            channelData['values']['distance'] = buffer.readUInt32BE() / 1000.0;
+            break;
+          case lppEnergy:
+            channelData['values']['energy'] = buffer.readUInt32BE() / 1000.0;
+            break;
+          case lppDirection:
+            channelData['values']['direction'] = buffer.readUInt16BE();
+            break;
+          case lppUnixTime:
+            channelData['values']['time'] = buffer.readUInt32BE();
+            break;
+          case lppGyrometer:
+            channelData['values']['gyrometer'] = {
+              'x': buffer.readInt16BE() / 100.0,
+              'y': buffer.readInt16BE() / 100.0,
+              'z': buffer.readInt16BE() / 100.0,
+            };
+            break;
+          case lppColour:
+            channelData['values']['colour'] = {
+              'red': buffer.readUInt8(),
+              'green': buffer.readUInt8(),
+              'blue': buffer.readUInt8(),
+            };
+            break;
           case lppGps:
             channelData['values']['gps'] = {
               'latitude': buffer.readInt24BE() / 10000.0,
@@ -256,22 +430,48 @@ class CayenneLpp {
               'altitude': buffer.readInt24BE() / 100.0,
             };
             break;
-          // Add more types as needed...
+          case lppSwitch:
+            channelData['values']['switch'] = buffer.readUInt8() != 0;
+            break;
+          case lppPolyline:
+            final size = buffer.readUInt8();
+            channelData['values']['polyline'] = {
+              'size': size,
+              'data': _bytesToHex(_readPolylinePayload(buffer, size)),
+            };
+            break;
           default:
-            //Stopped parsing to avoid misalignment
-            return channels.values.toList();
+            // Stop parsing to avoid losing alignment on an unknown LPP type.
+            return _sortedChannelValues(channels);
         }
       }
 
-      final List<Map<String, dynamic>> channelsOut = channels.values.toList();
-      channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
-      return channelsOut;
+      return _sortedChannelValues(channels);
     } catch (e) {
       // Handle parsing errors, possibly due to malformed data
       appLogger.error('Error parsing Cayenne LPP data: $e');
-      return <
-        Map<String, dynamic>
-      >[]; // Return an empty list on error to avoid crashing the app
+      // Preserve any fields parsed before the malformed value.
+      return _sortedChannelValues(channels);
     }
   }
+
+  static Uint8List _readPolylinePayload(BufferReader buffer, int size) {
+    final declaredPayloadSize = size > 0 ? size - 1 : 0;
+    final availablePayloadSize = declaredPayloadSize <= buffer.remaining
+        ? declaredPayloadSize
+        : buffer.remaining;
+    return buffer.readBytes(availablePayloadSize);
+  }
+
+  static List<Map<String, dynamic>> _sortedChannelValues(
+    Map<int, Map<String, dynamic>> channels,
+  ) {
+    final channelsOut = channels.values.toList();
+    channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
+    return channelsOut;
+  }
+
+  static String _bytesToHex(Uint8List bytes) {
+    return bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join();
+  }
 }

lib/helpers/contact_ui.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+
+import '../connector/meshcore_protocol.dart';
+import '../utils/emoji_utils.dart';
+
+IconData contactTypeIcon(int type) {
+  switch (type) {
+    case advTypeChat:
+      return Icons.chat;
+    case advTypeRepeater:
+      return Icons.cell_tower;
+    case advTypeRoom:
+      return Icons.group;
+    case advTypeSensor:
+      return Icons.sensors;
+    default:
+      return Icons.device_unknown;
+  }
+}
+
+Color contactTypeColor(int type) {
+  switch (type) {
+    case advTypeChat:
+      return Colors.blue;
+    case advTypeRepeater:
+      return Colors.orange;
+    case advTypeRoom:
+      return Colors.purple;
+    case advTypeSensor:
+      return Colors.green;
+    default:
+      return Colors.grey;
+  }
+}
+
+Color colorForName(String name) {
+  const colors = [
+    Colors.blue,
+    Colors.green,
+    Colors.orange,
+    Colors.purple,
+    Colors.pink,
+    Colors.teal,
+    Colors.indigo,
+    Colors.cyan,
+    Colors.amber,
+    Colors.deepOrange,
+  ];
+  return colors[name.hashCode.abs() % colors.length];
+}
+
+String firstCharacterOrEmoji(String name) {
+  if (name.isEmpty) return '?';
+  final emoji = firstEmoji(name);
+  if (emoji != null) return emoji;
+  final runes = name.runes.toList();
+  if (runes.isEmpty) return '?';
+  return String.fromCharCode(runes[0]).toUpperCase();
+}

lib/helpers/path_helper.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
-import '../models/contact.dart';
+
 import '../connector/meshcore_protocol.dart';
+import '../models/contact.dart';
 
 class PathHelper {
   static String formatPathHex(List<int> pathBytes) {
@@ -9,12 +10,30 @@ class PathHelper {
         .join(',');
   }
 
+  static String hopHex(int byte) {
+    return byte.toRadixString(16).padLeft(2, '0').toUpperCase();
+  }
+
   static String formatHopHex(List<int> hopBytes) {
     return hopBytes
         .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
         .join();
   }
 
+  static String? hopName(int byte, List<Contact> allContacts) {
+    final matches = allContacts
+        .where(
+          (c) =>
+              c.publicKey.isNotEmpty &&
+              c.publicKey.first == byte &&
+              (c.type == advTypeRepeater || c.type == advTypeRoom),
+        )
+        .toList();
+    if (matches.isEmpty) return null;
+    if (matches.length == 1) return matches.first.name;
+    return matches.map((c) => c.name).join(' | ');
+  }
+
   static List<Uint8List> splitPathBytes(
     List<int> pathBytes,
     int hashByteWidth,
@@ -34,7 +53,7 @@ class PathHelper {
   }
 
   /// Resolves path bytes to contact names, supporting multi-byte hash widths.
-
+  ///
   /// Groups path bytes according to [hashByteWidth]:
   /// - 1: Single byte per hop (256 unique nodes)
   /// - 2: Two bytes per hop (65K unique nodes)
@@ -52,11 +71,9 @@ class PathHelper {
     for (final hopBytes in splitPathBytes(pathBytes, hashByteWidth)) {
       final hex = formatHopHex(hopBytes);
 
-      // Find matching contacts by comparing public key prefix
       final matches = allContacts.where((c) {
         if (c.publicKey.length < hopBytes.length) return false;
         if (c.type != advTypeRepeater && c.type != advTypeRoom) return false;
-        // Compare bytes using listEquals for multi-byte support
         return listEquals(c.publicKey.sublist(0, hopBytes.length), hopBytes);
       }).toList();