Merge pull request #33 from meshtastic/wip

thebentern · web-flow · commit 81739bbdb96e · 2023-04-09T15:23:50.000-05:00
More progress in fixing bugs and more verbose logging hopefully
diff --git a/Meshtastic.Cli/CommandHandlers/ChannelCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/ChannelCommandHandler.cs
@@ -61,7 +61,7 @@ public override async Task OnCompleted(FromRadio fromRadio, DeviceStateContainer
         var adminMessage = adminMessageFactory.CreateSetChannelMessage(channel!);
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage), (fromRadio, container) =>
         {
-            return Task.FromResult(fromRadio.GetMessage<Routing>()?.ErrorReason == Routing.Types.Error.None);
+            return Task.FromResult(fromRadio.GetPayload<Routing>()?.ErrorReason == Routing.Types.Error.None);
         });
 
         await CommitEditSettings(adminMessageFactory);
diff --git a/Meshtastic.Cli/CommandHandlers/FileCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/FileCommandHandler.cs
@@ -33,7 +33,7 @@ public override async Task OnCompleted(FromRadio _, DeviceStateContainer contain
         fileRequest.XmodemPacket.Buffer = ByteString.CopyFromUtf8(path);
         await Connection.WriteToRadio(fileRequest, async (fromRadio, container) =>
         {
-            var xmodem = fromRadio.GetMessage<XModem>();
+            var xmodem = fromRadio.GetPayload<XModem>();
             if (xmodem == null)
                 return false;
 
diff --git a/Meshtastic.Cli/CommandHandlers/FixedPositionCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/FixedPositionCommandHandler.cs
@@ -57,7 +57,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
 
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage), (fromRadio, container) =>
         {
-            return Task.FromResult(fromRadio.GetMessage<Routing>() != null);
+            return Task.FromResult(fromRadio.GetPayload<Routing>() != null);
         });
 
         await CommitEditSettings(adminMessageFactory);
diff --git a/Meshtastic.Cli/CommandHandlers/GetCannedMessagesCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/GetCannedMessagesCommandHandler.cs
@@ -28,7 +28,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage),
             (fromRadio, container) =>
             {
-                var adminMessage = fromRadio.GetMessage<AdminMessage>();
+                var adminMessage = fromRadio.GetPayload<AdminMessage>();
                 if (adminMessage?.PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.GetCannedMessageModuleMessagesResponse)
                 {
                     Logger.LogInformation($"Canned messages: {adminMessage?.GetCannedMessageModuleMessagesResponse}");
diff --git a/Meshtastic.Cli/CommandHandlers/ImportCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/ImportCommandHandler.cs
@@ -47,17 +47,14 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
 
         if (deviceProfile.HasLongName) 
         {
-            var myNode = container.GetDeviceNodeInfo();
-            if (myNode != null && myNode.User != null) 
+            Logger.LogInformation("Setting long / short name...");
+            var user = new User()
             {
-                Logger.LogInformation("Setting long / short name...");
-                myNode.User!.LongName = deviceProfile.LongName;
-                myNode.User!.ShortName = deviceProfile.ShortName;
-                var setOwner = adminMessageFactory.CreateSetOwnerMessage(myNode.User);
-                await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(setOwner), AnyResponseReceived);
-            }
-            else 
-                Logger.LogError("Could not set long / short name because we were unable to retrieve User from NodeDB");
+                LongName = deviceProfile.LongName,
+                ShortName = deviceProfile.ShortName
+            };
+            var setOwner = adminMessageFactory.CreateSetOwnerMessage(user);
+            await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(setOwner), AnyResponseReceived);
         }
         
         if (deviceProfile.HasChannelUrl) 
@@ -70,6 +67,11 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         else 
             Logger.LogDebug("No Config profile specified. Skipping...");
 
+        if (deviceProfile.ModuleConfig != null)
+            await SetModuleConfigs(container, deviceProfile, adminMessageFactory);
+        else
+            Logger.LogDebug("No ModuleConfig profile specified. Skipping...");
+
 
         await CommitEditSettings(adminMessageFactory);
     }
@@ -90,6 +92,21 @@ private async Task SetConfigs(DeviceStateContainer container, DeviceProfile devi
         }
     }
 
+    private async Task SetModuleConfigs(DeviceStateContainer container, DeviceProfile deviceProfile, AdminMessageFactory adminMessageFactory)
+    {
+        foreach(var section in deviceProfile.ModuleConfig.GetProperties())
+        {
+            var instance = section.GetValue(deviceProfile.ModuleConfig);
+            if (instance == null) {
+                Logger.LogDebug($"No {section.Name} profile specified. Skipping...");
+                continue;
+            }
+            Logger.LogInformation($"Sending {section.Name} config to device...");
+            var adminMessage = adminMessageFactory.CreateSetModuleConfigMessage(instance);
+            await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage), AnyResponseReceived);
+        }
+    }
+
     private async Task SetChannels(AdminMessageFactory adminMessageFactory, string url)
     {
         var urlParser = new UrlParser(url);
diff --git a/Meshtastic.Cli/CommandHandlers/MetadataCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/MetadataCommandHandler.cs
@@ -27,7 +27,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage),
             (fromRadio, container) =>
             {
-                var adminMessage = fromRadio.GetMessage<AdminMessage>();
+                var adminMessage = fromRadio.GetPayload<AdminMessage>();
                 if (adminMessage?.PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.GetDeviceMetadataResponse)
                 {
                     var printer = new ProtobufPrinter(container, OutputFormat);
diff --git a/Meshtastic.Cli/CommandHandlers/SendTextCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/SendTextCommandHandler.cs
@@ -32,7 +32,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(textMessage),
              (fromRadio, container) =>
              {
-                 var routingResult = fromRadio.GetMessage<Routing>();
+                 var routingResult = fromRadio.GetPayload<Routing>();
                  if (routingResult != null && fromRadio.Packet.Priority == MeshPacket.Types.Priority.Ack)
                  {
                      if (routingResult.ErrorReason == Routing.Types.Error.None)
diff --git a/Meshtastic.Cli/CommandHandlers/TraceRouteCommandHandler.cs b/Meshtastic.Cli/CommandHandlers/TraceRouteCommandHandler.cs
@@ -27,7 +27,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co
         await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(message),
             (fromRadio, container) =>
             {
-                var routeDiscovery = fromRadio.GetMessage<RouteDiscovery>();
+                var routeDiscovery = fromRadio.GetPayload<RouteDiscovery>();
                 if (routeDiscovery != null)
                 {
                     if (routeDiscovery.Route.Count > 0)
diff --git a/Meshtastic.Test/CommandHandlers/CommandHandlerTests.cs b/Meshtastic.Test/CommandHandlers/CommandHandlerTests.cs
@@ -44,8 +44,8 @@ public async Task MetadataCommandHandler_Should_ReceiveMetadataResponse()
         ReceivedWantConfigPayloads();
         InformationLogsContain("Getting device metadata");
         container.FromRadioMessageLog.Should()
-            .Contain(fromRadio => fromRadio.GetMessage<AdminMessage>() != null && 
-                fromRadio.GetMessage<AdminMessage>()!.GetDeviceMetadataResponse != null);
+            .Contain(fromRadio => fromRadio.GetPayload<AdminMessage>() != null && 
+                fromRadio.GetPayload<AdminMessage>()!.GetDeviceMetadataResponse != null);
     }
 
     [Test]
@@ -97,8 +97,8 @@ public async Task FixedPositionCommandHandler_Should_Acknowledge()
         var container = await handler.Handle();
         InformationLogsContain("Sending position to device");
         InformationLogsContain("Setting Position.FixedPosition to True");
-        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetMessage<Routing>() != null);
-        routingPacket.GetMessage<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
+        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetPayload<Routing>() != null);
+        routingPacket.GetPayload<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
     }
 
     [Test]
@@ -109,8 +109,8 @@ public async Task ChannelCommandHandler_Should_SavePrimaryChannel()
         var handler = new ChannelCommandHandler(channelSettings, ConnectionContext, CommandContext);
         var container = await handler.Handle();
         InformationLogsContain("Writing channel");
-        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetMessage<Routing>() != null);
-        routingPacket.GetMessage<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
+        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetPayload<Routing>() != null);
+        routingPacket.GetPayload<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
         var adminMessages = container.ToRadioMessageLog.Where(toRadio => toRadio?.Packet?.Decoded.Portnum == PortNum.AdminApp);
         adminMessages.Should().Contain(adminMessage =>
             AdminMessage.Parser.ParseFrom(adminMessage.Packet.Decoded.Payload).PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.SetChannel);
@@ -124,8 +124,8 @@ public async Task ChannelCommandHandler_Should_SavePrimaryChannelWithNoPsk()
         var handler = new ChannelCommandHandler(channelSettings, ConnectionContext, CommandContext);
         var container = await handler.Handle();
         InformationLogsContain("Writing channel");
-        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetMessage<Routing>() != null);
-        routingPacket.GetMessage<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
+        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetPayload<Routing>() != null);
+        routingPacket.GetPayload<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
         var adminMessages = container.ToRadioMessageLog.Where(toRadio => toRadio?.Packet?.Decoded.Portnum == PortNum.AdminApp);
         adminMessages.Should().Contain(adminMessage =>
             AdminMessage.Parser.ParseFrom(adminMessage.Packet.Decoded.Payload).PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.SetChannel);
@@ -139,8 +139,8 @@ public async Task ChannelCommandHandler_Should_SavePrimaryChannelWithPsk()
         var handler = new ChannelCommandHandler(channelSettings, ConnectionContext, CommandContext);
         var container = await handler.Handle();
         InformationLogsContain("Writing channel");
-        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetMessage<Routing>() != null);
-        routingPacket.GetMessage<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
+        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetPayload<Routing>() != null);
+        routingPacket.GetPayload<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
         var adminMessages = container.ToRadioMessageLog.Where(toRadio => toRadio?.Packet?.Decoded.Portnum == PortNum.AdminApp);
         adminMessages.Should().Contain(adminMessage =>
             AdminMessage.Parser.ParseFrom(adminMessage.Packet.Decoded.Payload).PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.SetChannel);
@@ -154,8 +154,8 @@ public async Task ChannelCommandHandler_Should_AllowEnableOfSecondary()
         var handler = new ChannelCommandHandler(channelSettings, ConnectionContext, CommandContext);
         var container = await handler.Handle();
         InformationLogsContain("Writing channel");
-        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetMessage<Routing>() != null);
-        routingPacket.GetMessage<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
+        var routingPacket = container.FromRadioMessageLog.First(fromRadio => fromRadio.GetPayload<Routing>() != null);
+        routingPacket.GetPayload<Routing>()!.ErrorReason.Should().Be(Routing.Types.Error.None);
         var adminMessages = container.ToRadioMessageLog.Where(toRadio => toRadio?.Packet?.Decoded.Portnum == PortNum.AdminApp);
         adminMessages.Should().Contain(adminMessage =>
             AdminMessage.Parser.ParseFrom(adminMessage.Packet.Decoded.Payload).PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.SetChannel);
diff --git a/Meshtastic.Test/Data/FromDeviceMessageTests.cs b/Meshtastic.Test/Data/FromDeviceMessageTests.cs
@@ -47,6 +47,6 @@ public void FromDeviceMessage_GivesResult_Given_ValidFromRadioPayload()
             }
         };
         var result = fromDeviceMessage.ParsedFromRadio(fromRadio.ToByteArray());
-        result!.GetMessage<AdminMessage>()!.BeginEditSettings.Should().BeTrue();
+        result!.GetPayload<AdminMessage>()!.BeginEditSettings.Should().BeTrue();
     }
 }
diff --git a/Meshtastic.Test/Extensions/FromRadioExtensionsTests.cs b/Meshtastic.Test/Extensions/FromRadioExtensionsTests.cs
@@ -11,24 +11,24 @@ public class FromRadioExtensionsTests
         public void GetMessage_Should_ReturnNullForBadPackets()
         {
             FromRadio fromRadio = new();
-            var result = fromRadio.GetMessage<AdminMessage>();
+            var result = fromRadio.GetPayload<AdminMessage>();
             result.Should().BeNull();
             fromRadio.Packet = new MeshPacket();
-            result = fromRadio.GetMessage<AdminMessage>();
+            result = fromRadio.GetPayload<AdminMessage>();
             result.Should().BeNull();
             fromRadio.Packet = new MeshPacket
             {
                 Decoded = new Protobufs.Data()
             };
-            result = fromRadio.GetMessage<AdminMessage>();
+            result = fromRadio.GetPayload<AdminMessage>();
             result.Should().BeNull();
         }
 
         [Test]
         public void GetMessage_Should_ReturnValidAdminMessage()
         {
             FromRadio fromRadio = new();
-            var result = fromRadio.GetMessage<AdminMessage>();
+            var result = fromRadio.GetPayload<AdminMessage>();
             fromRadio.Packet = new MeshPacket
             {
                 Decoded = new Protobufs.Data()
@@ -37,7 +37,7 @@ public void GetMessage_Should_ReturnValidAdminMessage()
                     Payload = new AdminMessage().ToByteString()
                 }
             };
-            result = fromRadio.GetMessage<AdminMessage>();
+            result = fromRadio.GetPayload<AdminMessage>();
             result.Should().NotBeNull();
             result.Should().BeOfType<AdminMessage>();
         }
@@ -46,7 +46,7 @@ public void GetMessage_Should_ReturnValidAdminMessage()
         public void GetMessage_Should_ReturnValidRouteDiscovery()
         {
             FromRadio fromRadio = new();
-            var result = fromRadio.GetMessage<RouteDiscovery>();
+            var result = fromRadio.GetPayload<RouteDiscovery>();
             fromRadio.Packet = new MeshPacket
             {
                 Decoded = new Protobufs.Data()
@@ -55,7 +55,7 @@ public void GetMessage_Should_ReturnValidRouteDiscovery()
                     Payload = new RouteDiscovery().ToByteString()
                 }
             };
-            result = fromRadio.GetMessage<RouteDiscovery>();
+            result = fromRadio.GetPayload<RouteDiscovery>();
             result.Should().NotBeNull();
             result.Should().BeOfType<RouteDiscovery>();
         }
@@ -64,7 +64,7 @@ public void GetMessage_Should_ReturnValidRouteDiscovery()
         public void GetMessage_Should_ReturnValidRouting()
         {
             FromRadio fromRadio = new();
-            var result = fromRadio.GetMessage<Routing>();
+            var result = fromRadio.GetPayload<Routing>();
             fromRadio.Packet = new MeshPacket
             {
                 Decoded = new Protobufs.Data()
@@ -73,7 +73,7 @@ public void GetMessage_Should_ReturnValidRouting()
                     Payload = new Routing().ToByteString()
                 }
             };
-            result = fromRadio.GetMessage<Routing>();
+            result = fromRadio.GetPayload<Routing>();
             result.Should().NotBeNull();
             result.Should().BeOfType<Routing>();
         }
@@ -89,7 +89,7 @@ public void GetMessage_Should_ReturnValidXModemPacket()
                     Control = XModem.Types.Control.Stx
                 }
             };
-            var result = fromRadio.GetMessage<XModem>();
+            var result = fromRadio.GetPayload<XModem>();
             result.Should().NotBeNull();
             result.Should().BeOfType<XModem>();
             result!.Control.Should().Be(XModem.Types.Control.Stx);
diff --git a/Meshtastic/Connections/DeviceConnection.cs b/Meshtastic/Connections/DeviceConnection.cs
@@ -1,4 +1,5 @@
 using Meshtastic.Data;
+using Meshtastic.Extensions;
 using Meshtastic.Protobufs;
 using Microsoft.Extensions.Logging;
 
@@ -72,4 +73,23 @@ protected async Task<bool> ParsePackets(byte item, Func<FromRadio, DeviceStateCo
         }
         return false;
     }
+
+    protected void VerboseLogPacket(ToRadio toRadio)
+    {
+        Logger.LogDebug($"Sent: {toRadio}");
+        var payload = toRadio.GetPayload<AdminMessage>()?.ToString() ??
+            toRadio.GetPayload<XModem>()?.ToString() ??
+            toRadio.GetPayload<NodeInfo>()?.ToString() ??
+            toRadio.GetPayload<Position>()?.ToString() ??
+            toRadio.GetPayload<Waypoint>()?.ToString() ??
+            toRadio.GetPayload<Telemetry>()?.ToString() ??
+            toRadio.GetPayload<Routing>()?.ToString() ??
+            toRadio.GetPayload<RouteDiscovery>()?.ToString() ??
+            toRadio.GetPayload<string>()?.ToString();
+
+        if (!String.IsNullOrWhiteSpace(payload))
+        {
+            Logger.LogDebug($"Payload decoded: {payload}");
+        }
+    }
 }
diff --git a/Meshtastic/Connections/SerialConnection.cs b/Meshtastic/Connections/SerialConnection.cs
@@ -3,7 +3,6 @@
 using Meshtastic.Protobufs;
 using Microsoft.Extensions.Logging;
 using System.IO.Ports;
-using System;
 
 namespace Meshtastic.Connections;
 
@@ -57,7 +56,7 @@ public override async Task<DeviceStateContainer> WriteToRadio(ToRadio packet, Fu
             serialPort.Open();
         await serialPort.BaseStream.WriteAsync(PacketFraming.SERIAL_PREAMBLE.AsMemory(0, PacketFraming.SERIAL_PREAMBLE.Length));
         await serialPort.BaseStream.WriteAsync(toRadio);
-        Logger.LogDebug($"Sent: {packet}");
+        VerboseLogPacket(packet);
         await ReadFromRadio(isComplete);
         return DeviceStateContainer;
     }
@@ -73,7 +72,7 @@ public override async Task WriteToRadio(ToRadio packet)
         var toRadio = PacketFraming.CreatePacket(packet.ToByteArray());
         await serialPort.BaseStream.WriteAsync(toRadio);
         await serialPort.BaseStream.FlushAsync();
-        Logger.LogDebug($"Sent: {packet}");
+        VerboseLogPacket(packet);
     }
 
     public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, Task<bool>> isComplete, int readTimeoutMs = Resources.DEFAULT_READ_TIMEOUT)
diff --git a/Meshtastic/Connections/TcpConnection.cs b/Meshtastic/Connections/TcpConnection.cs
@@ -27,7 +27,7 @@ public override async Task<DeviceStateContainer> WriteToRadio(ToRadio packet, Fu
         var toRadio = PacketFraming.CreatePacket(packet.ToByteArray());
         networkStream = client.GetStream();
         await networkStream.WriteAsync(toRadio);
-        Logger.LogDebug($"Sent: {packet}");
+        VerboseLogPacket(packet);
         await ReadFromRadio(isComplete);
         return DeviceStateContainer;
     }
@@ -38,7 +38,7 @@ public override async Task WriteToRadio(ToRadio packet)
         var toRadio = PacketFraming.CreatePacket(packet.ToByteArray());
         await networkStream!.WriteAsync(toRadio);
         await networkStream.FlushAsync();
-        Logger.LogDebug($"Sent: {packet}");
+        VerboseLogPacket(packet);
     }
 
     public override async Task ReadFromRadio(Func<FromRadio, DeviceStateContainer, Task<bool>> isComplete, int readTimeoutMs = Resources.DEFAULT_READ_TIMEOUT)
diff --git a/Meshtastic/Extensions/FromRadioExtensions.cs b/Meshtastic/Extensions/FromRadioExtensions.cs
diff --git a/Meshtastic/Extensions/ToRadioExtensions.cs b/Meshtastic/Extensions/ToRadioExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public override async Task OnCompleted(FromRadio fromRadio, DeviceStateContainer`
`61`	`61`	`var adminMessage = adminMessageFactory.CreateSetChannelMessage(channel!);`
`62`	`62`	`await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage), (fromRadio, container) =>`
`63`	`63`	`{`
`64`		`- return Task.FromResult(fromRadio.GetMessage<Routing>()?.ErrorReason == Routing.Types.Error.None);`
	`64`	`+ return Task.FromResult(fromRadio.GetPayload<Routing>()?.ErrorReason == Routing.Types.Error.None);`
`65`	`65`	`});`
`66`	`66`
`67`	`67`	`await CommitEditSettings(adminMessageFactory);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override async Task OnCompleted(FromRadio _, DeviceStateContainer contain`
`33`	`33`	`fileRequest.XmodemPacket.Buffer = ByteString.CopyFromUtf8(path);`
`34`	`34`	`await Connection.WriteToRadio(fileRequest, async (fromRadio, container) =>`
`35`	`35`	`{`
`36`		`- var xmodem = fromRadio.GetMessage<XModem>();`
	`36`	`+ var xmodem = fromRadio.GetPayload<XModem>();`
`37`	`37`	`if (xmodem == null)`
`38`	`38`	`return false;`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co`
`57`	`57`
`58`	`58`	`await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage), (fromRadio, container) =>`
`59`	`59`	`{`
`60`		`- return Task.FromResult(fromRadio.GetMessage<Routing>() != null);`
	`60`	`+ return Task.FromResult(fromRadio.GetPayload<Routing>() != null);`
`61`	`61`	`});`
`62`	`62`
`63`	`63`	`await CommitEditSettings(adminMessageFactory);`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co`
`28`	`28`	`await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage),`
`29`	`29`	`(fromRadio, container) =>`
`30`	`30`	`{`
`31`		`- var adminMessage = fromRadio.GetMessage<AdminMessage>();`
	`31`	`+ var adminMessage = fromRadio.GetPayload<AdminMessage>();`
`32`	`32`	`if (adminMessage?.PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.GetCannedMessageModuleMessagesResponse)`
`33`	`33`	`{`
`34`	`34`	`Logger.LogInformation($"Canned messages: {adminMessage?.GetCannedMessageModuleMessagesResponse}");`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co`
`27`	`27`	`await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(adminMessage),`
`28`	`28`	`(fromRadio, container) =>`
`29`	`29`	`{`
`30`		`- var adminMessage = fromRadio.GetMessage<AdminMessage>();`
	`30`	`+ var adminMessage = fromRadio.GetPayload<AdminMessage>();`
`31`	`31`	`if (adminMessage?.PayloadVariantCase == AdminMessage.PayloadVariantOneofCase.GetDeviceMetadataResponse)`
`32`	`32`	`{`
`33`	`33`	`var printer = new ProtobufPrinter(container, OutputFormat);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override async Task OnCompleted(FromRadio packet, DeviceStateContainer co`
`32`	`32`	`await Connection.WriteToRadio(ToRadioMessageFactory.CreateMeshPacketMessage(textMessage),`
`33`	`33`	`(fromRadio, container) =>`
`34`	`34`	`{`
`35`		`- var routingResult = fromRadio.GetMessage<Routing>();`
	`35`	`+ var routingResult = fromRadio.GetPayload<Routing>();`
`36`	`36`	`if (routingResult != null && fromRadio.Packet.Priority == MeshPacket.Types.Priority.Ack)`
`37`	`37`	`{`
`38`	`38`	`if (routingResult.ErrorReason == Routing.Types.Error.None)`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ public void FromDeviceMessage_GivesResult_Given_ValidFromRadioPayload()`
`47`	`47`	`}`
`48`	`48`	`};`
`49`	`49`	`var result = fromDeviceMessage.ParsedFromRadio(fromRadio.ToByteArray());`
`50`		`- result!.GetMessage<AdminMessage>()!.BeginEditSettings.Should().BeTrue();`
	`50`	`+ result!.GetPayload<AdminMessage>()!.BeginEditSettings.Should().BeTrue();`
`51`	`51`	`}`
`52`	`52`	`}`