chore: remove 4SERIES compiler directive

2026-04-13 04:26:49 +00:00 · 2025-03-25 10:21:17 -05:00 · 2025-03-25 10:21:17 -05:00 · f6f731b470
commit f6f731b470
parent 8316ee22b6
34 changed files with 53 additions and 223 deletions
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/AudioCodecBaseMessenger.cs
@ -30,11 +30,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
            codec.CallStatusChange += Codec_CallStatusChange;
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
+
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CameraBaseMessenger.cs
@ -46,11 +46,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            );
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DevicePresetsModelMessenger.cs
@ -40,11 +40,8 @@ namespace PepperDash.Essentials.AppServer.Messengers

        #region Overrides of MessengerBase

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
+
        {
            AddAction("/presets/fullStatus", (id, content) => {
                this.LogInformation("getting full status for client {id}", id);
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceVolumeMessenger.cs
@ -47,11 +47,8 @@ namespace PepperDash.Essentials.AppServer.Messengers

        #region Overrides of MessengerBase

-#if SERIES4
+
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/fullStatus", (id, content) => SendStatus());

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/GenericMessenger.cs
@ -10,11 +10,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        {
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasScheduleAwarenessMessenger.cs
@ -20,11 +20,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            ScheduleSource.CodecSchedule.MeetingEventChange += new EventHandler<MeetingEventArgs>(CodecSchedule_MeetingEventChange);
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/schedule/fullStatus", (id, content) => SendFullScheduleObject());
        }
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRunRouteActionMessenger.cs
@ -31,11 +31,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            SendRoutingFullMessageObject();
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/fullStatus", (id, content) => SendRoutingFullMessageObject());

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISwitchedOutputMessenger.cs
@ -21,11 +21,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            this.device = device;
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/LightingBaseMessenger.cs
@ -30,11 +30,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            PostStatusMessage(state);
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/MessengerBase.cs
@ -13,11 +13,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
    /// <summary>
    /// Provides a messaging bridge
    /// </summary>
-#if SERIES4
    public abstract class MessengerBase : EssentialsDevice, IMobileControlMessenger
-#else
-    public abstract class MessengerBase: EssentialsDevice
-#endif
    {
        protected IKeyName _device;

@ -30,11 +26,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// <summary>
        /// 
        /// </summary>
-#if SERIES4
+
        public IMobileControl AppServerController { get; private set; }
-#else
-        public MobileControlSystemController AppServerController { get; private set; }
-#endif

        public string MessagePath { get; private set; }

@ -76,11 +69,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// Registers this messenger with appserver controller
        /// </summary>
        /// <param name="appServerController"></param>
-#if SERIES4
        public void RegisterWithAppServer(IMobileControl appServerController)
-#else
-        public void RegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AppServerController = appServerController ?? throw new ArgumentNullException("appServerController");

@ -133,11 +122,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// Implemented in extending classes. Wire up API calls and feedback here
        /// </summary>
        /// <param name="appServerController"></param>
-#if SERIES4
        protected virtual void RegisterActions()
-#else
-        protected virtual void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {

        }
@ -174,7 +159,6 @@ namespace PepperDash.Essentials.AppServer.Messengers
            }
        }

-#if SERIES4 
        protected void PostStatusMessage(string type, DeviceStateMessageBase deviceState, string clientId = null)
        {
            try
@ -195,7 +179,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                Debug.LogMessage(ex, "Exception posting status message", this);
            }
        }
-#endif
+
        protected void PostStatusMessage(JToken content, string type = "", string clientId = null)
        {
            try
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/RoomEventScheduleMessenger.cs
@ -21,11 +21,7 @@ namespace PepperDash.Essentials.AppServer.Messengers

        #region Overrides of MessengerBase

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/saveScheduledEvents", (id, content) => SaveScheduledEvents(content.ToObject<List<ScheduledEventConfig>>()));
            AddAction("/status", (id, content) =>
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLAtcMessenger.cs
@ -57,11 +57,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// 
        /// </summary>
        /// <param name="appServerController"></param>
-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            //EISC.SetStringSigAction(SCurrentDialString, s => PostStatusMessage(new { currentDialString = s }));

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLCameraMessenger.cs
@ -32,11 +32,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        }


-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/fullStatus", (id, content) => SendCameraFullMessageObject());

@ -84,11 +80,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            cameraAction(state.Value.Equals("true", StringComparison.InvariantCultureIgnoreCase));
        }

-#if SERIES4
-        public void CustomUnregsiterWithAppServer(IMobileControl appServerController)
-#else   
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-#endif
+        public void CustomUnregisterWithAppServer(IMobileControl appServerController)
        {
            appServerController.RemoveAction(MessagePath + "/fullStatus");

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLDirectRouteMessenger.cs
@ -26,11 +26,7 @@ namespace PepperDash.Essentials.AppServer.Messengers

        #region Overrides of MessengerBase

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController controller)
-#endif
        {
            Debug.Console(2, "********** Direct Route Messenger CustomRegisterWithAppServer **********");

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLRouteMessenger.cs
@ -30,11 +30,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            _eisc.SetStringSigAction(_joinStart + StringJoin.CurrentSource, SendRoutingFullMessageObject);
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/fullStatus",
                (id, content) => SendRoutingFullMessageObject(_eisc.GetString(_joinStart + StringJoin.CurrentSource)));
@ -47,11 +43,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            });
        }

-#if SERIES4
-        public void CustomUnregsiterWithAppServer(IMobileControl appServerController)
-#else
-        public void CustomUnregsiterWithAppServer(MobileControlSystemController appServerController)
-#endif
+        public void CustomUnregisterWithAppServer(IMobileControl appServerController)
        {
            appServerController.RemoveAction(MessagePath + "/fullStatus");
            appServerController.RemoveAction(MessagePath + "/source");
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SIMPLVtcMessenger.cs
@ -43,11 +43,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// 
        /// </summary>
        /// <param name="appServerController"></param>
-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {            
            _eisc.SetStringSigAction(JoinMap.HookState.JoinNumber, s =>
            {
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ShadeBaseMessenger.cs
@ -16,11 +16,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            device = shades;
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/SystemMonitorMessenger.cs
@ -83,11 +83,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            ));
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            AddAction("/fullStatus", (id, content) => SendFullStatusMessage());
        }
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/TwoWayDisplayBaseMessenger.cs
@ -1,8 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
-using TwoWayDisplayBase = PepperDash.Essentials.Devices.Common.Displays.TwoWayDisplayBase;
+using PepperDash.Essentials.Devices.Common.Displays;

 namespace PepperDash.Essentials.AppServer.Messengers
 {
@ -33,11 +32,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
            PostStatusMessage(messageObj);
        }

-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            base.RegisterActions();

--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/VideoCodecBaseMessenger.cs
@ -152,11 +152,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
        /// Called from base's RegisterWithAppServer method
        /// </summary>
        /// <param name="appServerController"></param>
-#if SERIES4
        protected override void RegisterActions()
-#else
-        protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)
-#endif
        {
            try
            {