Skip to content

Commit 7ef1a60

Browse files
authored
Merge pull request #108 from LTruijens/MQTTnet-update
Upgrade MQTTnet to latest version
2 parents 4e3a53e + df0c3c0 commit 7ef1a60

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageVersion Include="NUnit" Version="4.3.2" />
1919
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
2020
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
21-
<PackageVersion Include="MQTTnet" Version="4.3.7.1207" />
21+
<PackageVersion Include="MQTTnet" Version="5.0.1.1416" />
2222
<PackageVersion Include="QRCoder" Version="1.6.0" />
2323
<PackageVersion Include="SimpleExec" Version="12.0.0" />
2424
<PackageVersion Include="Spectre.Console" Version="0.49.1" />

Meshtastic.Cli/CommandHandlers/MqttProxyCommandHandler.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using Meshtastic.Data.MessageFactories;
33
using MQTTnet;
44
using Meshtastic.Protobufs;
5-
using MQTTnet.Client;
65
using Microsoft.Extensions.Logging;
6+
using System.Buffers;
77

88
namespace Meshtastic.Cli.CommandHandlers;
99

@@ -22,7 +22,7 @@ public async Task<DeviceStateContainer> Handle()
2222
public override async Task OnCompleted(FromRadio packet, DeviceStateContainer container)
2323
{
2424
// connect to mqtt server with mqttnet
25-
var factory = new MqttFactory();
25+
var factory = new MqttClientFactory();
2626
using var mqttClient = factory.CreateMqttClient();
2727
MqttClientOptions options = GetMqttClientOptions(container);
2828
await mqttClient.ConnectAsync(options, CancellationToken.None);
@@ -45,7 +45,7 @@ await mqttClient.SubscribeAsync(new MqttTopicFilterBuilder()
4545

4646
// Get bytes from utf8 string
4747
var toRadio = new ToRadioMessageFactory()
48-
.CreateMqttClientProxyMessage(e.ApplicationMessage.Topic, e.ApplicationMessage.PayloadSegment.ToArray(), e.ApplicationMessage.Retain);
48+
.CreateMqttClientProxyMessage(e.ApplicationMessage.Topic, e.ApplicationMessage.Payload.ToArray(), e.ApplicationMessage.Retain);
4949
Logger.LogDebug(toRadio.ToString());
5050
await Connection.WriteToRadio(toRadio);
5151
};

0 commit comments

Comments
 (0)