From 50df84d31ee3359c1d74b9f411f2462e0517a347 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Fri, 9 Dec 2022 15:44:11 +0100 Subject: [PATCH] fix mqtt topics --- ADIS_Csharp/RaspiControl/MqttConstants.cs | 11 ++++++----- ADIS_Csharp/RaspiControl/Program.cs | 13 +++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ADIS_Csharp/RaspiControl/MqttConstants.cs b/ADIS_Csharp/RaspiControl/MqttConstants.cs index a8cc79a..103bd1a 100644 --- a/ADIS_Csharp/RaspiControl/MqttConstants.cs +++ b/ADIS_Csharp/RaspiControl/MqttConstants.cs @@ -7,14 +7,15 @@ using System.Threading.Tasks; namespace RaspiControl { internal static class MqttConstants { #region Publish - public static string MOBILE_NAV_TURN_TOPIC = "mobile/cmd/nav/turn"; - public static string MOBILE_NAV_MOVE_TOPIC = "mobile/cmd/nav/move"; - public static string MOBILE_NAV_STOP_TOPIC = "mobile/cmd/nav/stop"; - public static string SPLITFLAP_DISPLAY = "splitFlap/cmd/display"; + public static string MOBILE_NAV_TURN_TOPIC = "/mobile/cmd/nav/turn/"; + public static string MOBILE_NAV_MOVE_TOPIC = "/mobile/cmd/nav/move/"; + public static string MOBILE_NAV_STOP_TOPIC = "/mobile/cmd/nav/stop/"; + public static string SPLITFLAP_DISPLAY = "/splitFlap/cmd/display/"; + public static string SPLITFLAP_INIT = "/splitFlap/cmd/init/"; #endregion #region subscribe - public static string DEVICE_STATUS_APP_TOPIC = "device/status/+/app"; + public static string DEVICE_STATUS_APP_TOPIC = "/device/status/+/app"; #endregion } } diff --git a/ADIS_Csharp/RaspiControl/Program.cs b/ADIS_Csharp/RaspiControl/Program.cs index d81f287..7ed6b1b 100644 --- a/ADIS_Csharp/RaspiControl/Program.cs +++ b/ADIS_Csharp/RaspiControl/Program.cs @@ -66,21 +66,26 @@ namespace RaspiControl { APP_STATE appState = (APP_STATE)Convert.ToUInt16(value.ToString()); switch (appState) { case APP_STATE.STARTUP: - break; + Console.WriteLine("Startup"); + client.Publish(MqttConstants.SPLITFLAP_INIT, new byte[] { }, MqttMsgBase.QOS_LEVEL_AT_MOST_ONCE, false); + break; case APP_STATE.INIT: - PublishSplitFlapDisplay("INIT"); + Console.WriteLine("Init"); + PublishSplitFlapDisplay("INIT"); break; case APP_STATE.CALIBRATE: break; case APP_STATE.FOLLOW_LINE: - PublishSplitFlapDisplay("AUTO"); + Console.WriteLine("Follow line"); + PublishSplitFlapDisplay("AUTO"); break; case APP_STATE.IDLE: break; case APP_STATE.FINAL: break; case APP_STATE.READY: - PublishSplitFlapDisplay("REDY"); + Console.WriteLine("ready"); + PublishSplitFlapDisplay("REDY"); break; default: throw new ArgumentException();