From bf3af3b61133a9917b4bc436adafde26ffc9e0be Mon Sep 17 00:00:00 2001 From: Nick Genovese Date: Wed, 6 Nov 2024 19:01:09 -0500 Subject: [PATCH] feat: major refactor to namespaces to make everything a bit easier to follow --- .editorconfig | 12 + .../Bridges/BridgeBase.cs | 4 + .../Bridges/BridgeHelper.cs | 1 + .../JoinMaps/AirMediaControllerJoinMap.cs | 3 +- .../Bridges/JoinMaps/AppleTvJoinMap.cs | 3 +- .../JoinMaps/C2nRthsControllerJoinMap.cs | 3 +- .../JoinMaps/CameraControllerJoinMap.cs | 3 +- .../CenOdtOccupancySensorBaseJoinMap.cs | 3 +- .../JoinMaps/DisplayControllerJoinMap.cs | 3 +- .../DmBladeChassisControllerJoinMap.cs | 3 +- .../JoinMaps/DmChassisControllerJoinMap.cs | 3 +- .../JoinMaps/DmRmcControllerJoinMap.cs | 3 +- .../Bridges/JoinMaps/DmTxControllerJoinMap.cs | 3 +- .../DmpsAudioOutputControllerJoinMap.cs | 3 +- .../DmpsMicrophoneControllerJoinMap.cs | 3 +- .../JoinMaps/DmpsRoutingControllerJoinMap.cs | 3 +- .../JoinMaps/GenericIrControllerJoinMap.cs | 1 + .../JoinMaps/GenericLightingJoinMap.cs | 4 +- .../JoinMaps/GenericRelayControllerJoinMap.cs | 3 +- .../JoinMaps/GlsOccupancySensorBaseJoinMap.cs | 3 +- .../JoinMaps/GlsPartitionSensorJoinMap.cs | 1 + .../JoinMaps/HdMdNxM4kEControllerJoinMap.cs | 3 +- .../JoinMaps/HdMdxxxCEControllerJoinMap.cs | 3 +- .../JoinMaps/HdPsXxxControllerJoinMap.cs | 4 +- .../Hrxxx0WirelessRemoteControllerJoinMap.cs | 3 +- .../Bridges/JoinMaps/IAnalogInputJoinMap.cs | 3 +- .../JoinMaps/IBasicCommunicationJoinMap.cs | 3 +- .../Bridges/JoinMaps/IDigitalInputJoinMap.cs | 3 +- .../Bridges/JoinMaps/IDigitalOutputJoinMap.cs | 3 +- .../Bridges/JoinMaps/IRBlurayBaseJoinMap.cs | 7 +- .../Bridges/JoinMaps/PduJoinMapBase.cs | 3 +- .../JoinMaps/SetTopBoxControllerJoinMap.cs | 4 +- .../JoinMaps/StatusSignControllerJoinMap.cs | 3 +- .../Bridges/JoinMaps/SystemMonitorJoinMap.cs | 3 +- .../JoinMaps/VideoCodecControllerJoinMap.cs | 2 + .../Comm and IR/CommunicationExtras.cs | 25 - .../CecPortController.cs | 7 +- .../ComPortController.cs | 7 +- .../ComSpecJsonConverter.cs | 15 +- .../CommFactory.cs | 10 +- .../Communications/CommunicationExtras.cs | 12 + .../ConsoleCommMockDevice.cs | 11 +- .../GenericComm.cs | 14 +- .../GenericHttpClient.cs | 6 +- .../IRPortHelper.cs | 11 +- .../Config/AudioControlPointListItem.cs | 1 + .../Config/BasicConfig.cs | 1 + .../Config/ConfigPropertiesHelpers.cs | 4 +- .../Config/Essentials/ConfigReader.cs | 7 +- .../Config/Essentials/ConfigUpdater.cs | 16 +- .../Config/Essentials/ConfigWriter.cs | 8 +- .../Config/Essentials/EssentialsConfig.cs | 11 +- .../Config/ILoadConfig.cs | 8 +- .../Config/InfoConfig.cs | 1 + .../Crestron/CrestronGenericBaseDevice.cs | 10 +- .../CrestronGenericBaseDevice.cs.orig | 128 --- .../CrestronIO/GenericDigitalInputDevice.cs | 4 + .../CrestronIO/GenericRelayDevice.cs | 5 + .../GenericVersiportAnalogInputDevice.cs | 5 + .../CrestronIO/GenericVersiportInputDevice.cs | 4 + .../GenericVersiportOutputDevice.cs | 5 + .../CrestronIO/IAnalogInput.cs | 1 + .../CrestronIO/IDigitalInput.cs | 1 + .../CrestronIO/IDigitalOutput.cs | 1 + .../CrestronIO/IHasCresnetBranches.cs | 9 +- .../CrestronIO/ISwitchedOutput.cs | 1 + .../IPresentationSource.cs | 19 - .../DeviceTypeInterfaces/IChannel.cs | 9 +- .../DeviceTypeInterfaces/IColorFunctions.cs | 9 +- .../DeviceTypeInterfaces/IDPad.cs | 8 +- .../IDiscPlayerControls.cs | 7 +- .../DeviceTypeInterfaces/IDisplayBasic.cs | 8 +- .../DeviceTypeInterfaces/IDumbSource.cs | 8 +- .../DeviceTypeInterfaces/IDvr.cs | 14 +- .../IHasFarEndContentStatus.cs | 4 +- .../DeviceTypeInterfaces/IHasPhoneDialing.cs | 1 + .../DeviceTypeInterfaces/IHumiditySensor.cs | 1 + .../DeviceTypeInterfaces/ILevelControls.cs | 1 + .../DeviceTypeInterfaces/IMobileControl.cs | 1 + .../DeviceTypeInterfaces/INumeric.cs | 5 +- .../DeviceTypeInterfaces/IPasswordPrompt.cs | 6 +- .../DeviceTypeInterfaces/IPower.cs | 17 +- .../IProjectorScreenLiftControl.cs | 1 + .../ISetTopBoxControls.cs | 6 +- .../ITemperatureSensor.cs | 1 + .../DeviceTypeInterfaces/ITransport.cs | 3 +- .../DeviceTypeInterfaces/IUiDisplayInfo.cs | 2 +- .../DeviceTypeInterfaces/IWarmingCooling.cs | 8 +- .../DeviceTypeInterfaces/Template.cs | 7 +- .../Devices/AudioControlListItemBase.cs | 7 +- .../Devices/AudioInterfaces.cs | 10 +- .../Devices/CameraListItem.cs | 2 +- .../Devices/CodecInterfaces.cs | 8 +- .../Devices/CrestronProcessor.cs | 7 +- .../Devices/DestinationListItem.cs | 8 +- .../Devices/DeviceApiBase.cs | 1 + .../Devices/DeviceFeedbackExtensions.cs | 11 +- .../{Device Info => Devices}/DeviceInfo.cs | 2 +- .../DeviceInfoEventArgs.cs | 2 +- .../Devices/DeviceJsonApi.cs | 15 +- .../Devices/DeviceManager.cs | 16 +- .../Devices/DisplayUiConstants.cs | 8 +- .../Devices/EssentialsBridgeableDevice.cs | 2 +- .../Devices/EssentialsDevice.cs | 8 +- .../Devices/FIND HOMES Interfaces.cs | 14 +- .../Devices/GenericIRController.cs | 4 + .../Devices/GenericMonitoredTcpDevice.cs | 1 + .../Devices/IAttachVideoStatusExtensions.cs | 10 +- .../IDeviceInfoProvider.cs | 5 +- .../Devices/IDspPresets.cs | 6 +- .../Devices/IHasFeedbacks.cs | 4 +- .../Devices/IProjectorInterfaces.cs | 8 +- .../Devices/IUsageTracking.cs | 10 +- .../Devices/IVolumeAndAudioInterfaces.cs | 7 +- .../Devices/IrOutputPortController.cs | 15 +- .../Devices/LevelControlListItem.cs | 6 +- .../NetworkDeviceHelpers.cs | 6 +- .../Devices/PC/InRoomPc.cs | 12 +- .../Devices/PC/Laptop.cs | 14 +- .../Devices/PduInterfaces.cs | 6 +- .../Devices/PowerInterfaces.cs | 43 +- .../Devices/PresentationDeviceType.cs | 11 +- .../Devices/PresetListItem.cs | 10 +- .../Devices/ReconfigurableDevice.cs | 1 + .../Devices/SmartObjectBaseTypes.cs | 2 +- .../Devices/SourceListItem.cs | 7 +- .../Devices/VolumeDeviceChangeEventArgs.cs | 9 +- .../Display/BasicIrDisplay.cs | 12 +- .../Display/DisplayBase.cs | 20 +- .../EthernetAdapterInfo.cs | 8 +- .../Ethernet/EthernetStatistics.cs | 9 +- .../Extensions/JsonExtensions.cs | 11 +- .../Extensions/StringExtensions.cs | 7 +- .../Factory/DeviceFactory.cs | 82 +- .../Factory/IDeviceFactory.cs | 2 +- .../IProcessorExtensionDeviceFactory.cs | 8 +- .../ProcessorExtensionDeviceFactory.cs | 11 +- .../Factory/ReadyEventArgs.cs | 7 +- .../Feedbacks/BoolFeedback.cs | 13 +- .../Feedbacks/BoolFeedbackOneShot.cs | 10 +- .../Feedbacks/BoolFeedbackPulseExtender.cs | 10 +- .../Feedbacks/BoolOutputLogicals.cs | 5 +- .../Feedbacks/FeedbackBase.cs | 7 +- .../Feedbacks/FeedbackCollection.cs | 4 +- .../Feedbacks/FeedbackEventArgs.cs | 6 +- .../Feedbacks/IntFeedback.cs | 5 +- .../Feedbacks/SerialFeedback.cs | 5 +- .../Feedbacks/StringFeedback.cs | 5 +- src/PepperDash.Essentials.Core/File/FileIO.cs | 282 ------ ...lsHuddleSpaceFusionSystemControllerBase.cs | 25 +- ...entialsHuddleSpaceRoomFusionRoomJoinMap.cs | 1 + .../Fusion/FusionCustomPropertiesBridge.cs | 2 + .../{Global => }/Global.cs | 20 +- .../InUseTracking/IInUseTracking.cs | 8 +- .../InUseTracking/InUseTracking.cs | 8 +- .../JoinMaps/JoinMapBase.cs | 17 +- .../License/EssentialsLicenseManager.cs | 10 +- .../Lighting/Lighting Interfaces.cs | 1 + .../Lighting/LightingBase.cs | 5 + .../MicrophonePrivacyController.cs | 13 +- .../MicrophonePrivacyControllerConfig.cs | 10 +- ...CrestronGenericBaseCommunicationMonitor.cs | 14 +- .../Monitoring/GenericCommunicationMonitor.cs | 11 +- .../Monitoring/Interfaces.cs | 8 +- .../Monitoring/StatusMonitorBase.cs | 12 +- .../Monitoring/StatusMonitorCollection.cs | 10 +- .../Monitoring/SystemMonitorController.cs | 5 + .../EssentialsPartitionController.cs | 7 +- .../IPartitionStateProvider.cs | 3 +- .../PepperDash.Essentials.Core.csproj | 5 +- ...perDash_Essentials_Core.csproj.DotSettings | 3 - .../Plugins/IPluginDeviceFactory.cs | 5 +- .../Plugins/PluginLoader.cs | 22 +- .../Presets/DevicePresets.cs | 1 + .../Presets/DevicePresetsView.cs | 1 + .../PresetsListSubpageReferenceListItem.cs | 1 + .../Ramps and Increments/ActionIncrementer.cs | 7 +- .../Ramps and Increments/NumericalHelpers.cs | 6 +- .../UshortSigIncrementer.cs | 9 +- .../RoomOnToDefaultSourceWhenOccupied.cs | 16 +- .../Room/Combining/EssentialsRoomCombiner.cs | 15 +- .../EssentialsRoomCombinerPropertiesConfig.cs | 15 +- .../Room/Combining/IEssentialsRoomCombiner.cs | 4 +- .../Room/Combining/RoomCombinationScenario.cs | 11 +- ...sentialsDualDisplayRoomPropertiesConfig.cs | 2 +- .../EssentialsHuddleRoomPropertiesConfig.cs | 2 +- .../EssentialsHuddleVtc1PropertiesConfig.cs | 2 +- .../EssentialsNDisplayRoomPropertiesConfig.cs | 7 +- .../EssentialsPresentationPropertiesConfig.cs | 2 +- .../Room/Config/EssentialsRoomConfig.cs | 6 +- .../Config/EssentialsRoomEmergencyConfig.cs | 2 +- .../EssentialsRoomScheduledEventsConfig.cs | 9 +- .../Room/Config/EssentialsTechRoomConfig.cs | 6 +- .../Config/EssentialsVolumeLevelConfig.cs | 4 +- .../Room/Config/SimplRoomPropertiesConfig.cs | 2 +- .../EsentialsRoomEmergencyContactClosure.cs | 4 +- .../Room/EssentialsRoomBase.cs | 13 +- .../Room/IEssentialsRoom.cs | 16 +- .../Room/IRoomEventSchedule.cs | 6 +- .../Room/Interfaces.cs | 14 +- src/PepperDash.Essentials.Core/Room/Room.cs | 14 +- .../Room/iOccupancyStatusProvider.cs | 10 +- .../Routing/Extensions.cs | 7 +- .../Routing/IHasCurrentSourceInfoChange.cs | 5 +- .../Routing/IRmcRouting.cs | 4 +- .../Routing/IRmcRoutingWithFeedback.cs | 2 +- .../Routing/IRouting.cs | 5 +- .../Routing/IRoutingFeedback.cs | 4 +- .../IRoutingHasVideoInputSyncFeedbacks.cs | 13 +- .../Routing/IRoutingInputSlot.cs | 4 +- .../Routing/IRoutingInputs.cs | 3 +- .../Routing/IRoutingInputsOutputs.cs | 2 +- .../Routing/IRoutingNumeric.cs | 2 +- .../Routing/IRoutingNumericWithFeedback.cs | 2 +- .../Routing/IRoutingOutputs.cs | 3 +- .../Routing/IRoutingSink.cs | 2 +- .../Routing/IRoutingSinkWithFeedback.cs | 6 +- .../Routing/IRoutingSinkWithSwitching.cs | 4 +- .../Routing/IRoutingSource.cs | 2 +- .../Routing/IRoutingWithClear.cs | 2 +- .../Routing/IRoutingWithFeedback.cs | 3 +- .../Routing/ITxRouting.cs | 4 +- .../Routing/ITxRoutingWithFeedback.cs | 2 +- .../Routing/RouteDescriptor.cs | 5 +- .../Routing/RouteDescriptorCollection.cs | 9 +- .../Routing/RouteRequest.cs | 4 +- .../Routing/RouteSwitchDescriptor.cs | 2 +- .../Routing/RoutingFeedbackManager.cs | 3 + .../Routing/RoutingInputPort.cs | 3 +- .../RoutingInputPortWithVideoStatuses.cs | 4 +- .../Routing/RoutingNumericEventArgs.cs | 3 +- .../Routing/RoutingOutputPort.cs | 7 +- .../Routing/RoutingPort.cs | 3 +- .../Routing/RoutingPortCollection.cs | 5 +- .../Routing/RoutingPortNames.cs | 8 +- .../Routing/TieLine.cs | 6 +- .../Routing/TieLineConfig.cs | 16 +- .../Routing/eRoutingPortConnectionType.cs | 2 +- .../Routing/eRoutingSignalType.cs | 3 +- .../Secrets/CrestronGlobalSecretsProvider.cs | 3 +- .../Secrets/CrestronLocalSecretsProvider.cs | 4 +- .../Secrets/CrestronSecret.cs | 8 +- .../Secrets/Interfaces.cs | 2 +- .../Secrets/SecretsManager.cs | 2 +- .../Secrets/SecretsPropertiesConfig.cs | 11 +- .../Shades/Shade Interfaces.cs | 1 + .../Shades/ShadeBase.cs | 1 + .../SubpageReferenceList.cs | 10 +- .../SubpageReferenceListItem.cs | 10 +- .../Timers/CountdownTimer.cs | 7 +- .../{Global => Timers}/JobTimer.cs | 3 +- .../Timers/RetriggerableTimer.cs | 1 + .../{Global => Timers}/Scheduler.cs | 5 +- .../CrestronTouchpanelPropertiesConfig.cs | 3 +- .../Touchpanels/Interfaces.cs | 9 +- .../Keyboards/HabaneroKeyboardController.cs | 1 + .../Touchpanels/ModalDialog.cs | 3 +- .../Touchpanels/Mpc3Touchpanel.cs | 6 +- .../Touchpanels/TriListExtensions.cs | 8 +- .../TriListBridges/HandlerBridge.cs | 11 +- .../UI PageManagers/BlurayPageManager.cs | 5 +- .../UI PageManagers/PageManager.cs | 4 +- .../SetTopBoxThreePanelPageManager.cs | 6 +- .../SetTopBoxTwoPanelPageManager.cs | 5 +- .../UI PageManagers/SinglePageManager.cs | 6 +- .../UI/TouchpanelBase.cs | 10 +- .../Utilities/ActionSequence.cs | 1 + .../VideoStatus/VideoStatusOutputs.cs | 8 +- .../Web/EssentialsWebApi.cs | 1 + .../Web/EssentialsWebApiFactory.cs | 1 + .../Web/EssentialsWebApiHelpers.cs | 3 + .../RequestHandlers/DevJsonRequestHandler.cs | 1 + .../RequestHandlers/DevListRequestHandler.cs | 1 + .../DevMethodsRequestHandler.cs | 1 + .../RequestHandlers/DevPropsRequestHandler.cs | 1 + .../DisableAllStreamDebugRequestHandler.cs | 1 + .../GetFeedbacksForDeviceRequestHandler.cs | 2 + .../GetJoinMapForBridgeKeyRequestHandler.cs | 1 + .../GetJoinMapForDeviceKeyRequestHandler.cs | 2 + .../GetTieLinesRequestHandler.cs | 1 + .../GetTypesByFilterRequestHandler.cs | 1 + .../RequestHandlers/GetTypesRequestHandler.cs | 1 + .../LoadConfigRequestHandler.cs | 1 + .../ReportVersionsRequestHandler.cs | 1 + .../SetDeviceStreamDebugRequestHandler.cs | 1 + .../ShowConfigRequestHandler.cs | 1 + .../Audio/GenericAudioOut.cs | 3 +- .../AudioCodec/AudioCodecBase.cs | 1 + .../AudioCodec/Interfaces/IHasAudioCodec.cs | 1 + .../AudioCodec/MockAC/MockAC.cs | 1 + .../Cameras/CameraBase.cs | 6 + .../Cameras/CameraControl.cs | 1 + .../Cameras/CameraVisca.cs | 6 + .../Codec/IHasDoNotDisturb.cs | 1 + .../Codec/iCodecAudio.cs | 1 + .../Codec/iHasContentSharing.cs | 1 + .../Codec/iHasDirectory.cs | 1 + .../DSP/DspBase.cs | 2 + .../DeviceFactory.cs | 2 + .../Displays/BasicIrDisplay.cs | 4 + .../Displays/DisplayBase.cs | 10 +- .../Displays/MockDisplay.cs | 3 + .../Displays/ScreenLiftController.cs | 2 + .../Generic/GenericSink.cs | 2 + .../Generic/GenericSource.cs | 3 + .../Lighting/LightingBase.cs | 5 + ...epperDash.Essentials.Devices.Common.csproj | 2 +- .../Room/IEssentialsHuddleSpaceRoom.cs | 5 +- .../Room/IEssentialsHuddleVtc1Room.cs | 6 +- .../Room/IEssentialsRoomPropertiesConfig.cs | 4 +- .../Room/IEssentialsTechRoom.cs | 3 +- .../SetTopBox/IRSetTopBoxBase.cs | 6 + .../Shades/RelayControlledShade.cs | 1 + .../Shades/ShadeBase.cs | 1 + .../Shades/ShadeController.cs | 1 + .../SoftCodec/BlueJeansPc.cs | 6 + .../SoftCodec/GenericSoftCodec.cs | 2 + .../Sources/InRoomPc.cs | 5 + .../Sources/Laptop.cs | 5 + .../Streaming/AppleTV.cs | 7 + .../Streaming/Roku.cs | 4 + .../VideoCodec/Interfaces/IHasCodecLayouts.cs | 1 + .../Interfaces/IHasCodecSelfview.cs | 1 + .../VideoCodec/Interfaces/IHasMeetingLock.cs | 1 + .../Interfaces/IHasMeetingRecording.cs | 1 + .../VideoCodec/Interfaces/IHasParticipants.cs | 1 + .../Interfaces/IHasSelfviewPosition.cs | 1 + .../VideoCodec/Interfaces/IHasSelfviewSize.cs | 3 +- .../VideoCodec/Interfaces/IHasStandbyMode.cs | 1 + .../VideoCodec/Interfaces/IHasVideoCodec.cs | 3 + .../VideoCodec/MockVC/MockVC.cs | 3 + .../VideoCodec/VideoCodecBase.cs | 7 +- src/PepperDash.Essentials/ClassDiagram1.cd | 881 ------------------ src/PepperDash.Essentials/ControlSystem.cs | 19 +- .../Factory/DeviceFactory.cs | 20 +- .../PepperDash.Essentials.csproj | 23 - 336 files changed, 850 insertions(+), 2459 deletions(-) create mode 100644 .editorconfig delete mode 100644 src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/CecPortController.cs (96%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/ComPortController.cs (97%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/ComSpecJsonConverter.cs (95%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/CommFactory.cs (98%) create mode 100644 src/PepperDash.Essentials.Core/Communications/CommunicationExtras.cs rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/ConsoleCommMockDevice.cs (94%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/GenericComm.cs (95%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/GenericHttpClient.cs (96%) rename src/PepperDash.Essentials.Core/{Comm and IR => Communications}/IRPortHelper.cs (98%) delete mode 100644 src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs.orig delete mode 100644 src/PepperDash.Essentials.Core/DeviceControlsParentInterfaces/IPresentationSource.cs rename src/PepperDash.Essentials.Core/{Device Info => Devices}/DeviceInfo.cs (84%) rename src/PepperDash.Essentials.Core/{Device Info => Devices}/DeviceInfoEventArgs.cs (86%) rename src/PepperDash.Essentials.Core/{Device Info => Devices}/IDeviceInfoProvider.cs (76%) rename src/PepperDash.Essentials.Core/{Device Info => Devices}/NetworkDeviceHelpers.cs (98%) rename src/PepperDash.Essentials.Core/{Global => Ethernet}/EthernetAdapterInfo.cs (77%) delete mode 100644 src/PepperDash.Essentials.Core/File/FileIO.cs rename src/PepperDash.Essentials.Core/{Global => }/Global.cs (97%) delete mode 100644 src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj.DotSettings rename src/PepperDash.Essentials.Core/{Global => Timers}/JobTimer.cs (96%) rename src/PepperDash.Essentials.Core/{Global => Timers}/Scheduler.cs (99%) delete mode 100644 src/PepperDash.Essentials/ClassDiagram1.cd diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..c1322dc7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = false +insert_final_newline = false \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs b/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs index c1590704..f6a7f0e0 100644 --- a/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs +++ b/src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs @@ -11,7 +11,11 @@ using Crestron.SimplSharpPro.EthernetCommunication; using Newtonsoft.Json; using PepperDash.Core; +using PepperDash.Essentials.Core.Communications; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; using Serilog.Events; //using PepperDash.Essentials.Devices.Common.Cameras; diff --git a/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs b/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs index 0254cd0d..591d65e1 100644 --- a/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs +++ b/src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs @@ -1,4 +1,5 @@ using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; //using PepperDash.Essentials.Devices.Common.Cameras; diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs index fa5f2ac4..e5524661 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class AirMediaControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs index 7a9dfa74..4c74366f 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class AppleTvJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs index dd141c8e..b6c09fe0 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs index 5c07b4a7..3d4ecba7 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { /// /// Join map for CameraBase devices diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs index e306bf85..e364cb03 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs index 8e51c952..bbf0ca69 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DisplayControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs index 3a4c4255..df5d76dd 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges { +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced { [JoinName("IsOnline")] diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs index 539e8d29..1b1a46a5 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmChassisControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs index 56f0825c..1faa7e5a 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmRmcControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs index c6f8f89f..2df3e96e 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmTxControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs index 11509acf..7d297d27 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs index 6922c569..e822f475 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs index a0d8d7b8..9956b441 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs index 388e6ac1..6401b1df 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs @@ -1,4 +1,5 @@ using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.JoinMaps; namespace PepperDash.Essentials.Core.Bridges.JoinMaps { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs index 2a3015f1..332aa862 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs @@ -1,7 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; - -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class GenericLightingJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs index 68897767..8ddac126 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs index ded7343f..eee8f06c 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsOccupancySensorBaseJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs index cb0f07b2..145b7d3b 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/GlsPartitionSensorJoinMap.cs @@ -1,5 +1,6 @@ using System; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.JoinMaps; namespace PepperDash.Essentials.Core.Bridges.JoinMaps { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs index e69946ea..d039e3cb 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdNxM4kEControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs index 0936f75d..48977d88 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdMdxxxCEControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs index 04d75d41..dd87ef3f 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/HdPsXxxControllerJoinMap.cs @@ -1,7 +1,7 @@ using System; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs index 23305b20..055aac4a 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/Hrxxx0WirelessRemoteControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs index eaf70f3a..8bfa060c 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IAnalogInputJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class IAnalogInputJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs index 0d077284..8f745532 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IBasicCommunicationJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs index aa31ac76..e19b9ca9 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalInputJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class IDigitalInputJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs index cbe62398..797e0738 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IDigitalOutputJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class IDigitalOutputJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs index 991489e9..523cee44 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/IRBlurayBaseJoinMap.cs @@ -1,10 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { /// /// Join map for IRBlurayBase devices diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs index 0c2e9ed9..d8a15376 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/PduJoinMapBase.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class PduJoinMapBase : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs index ec0ff8d2..e0a34fa9 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SetTopBoxControllerJoinMap.cs @@ -1,7 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; - -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs index ba441ef0..2276b77f 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/StatusSignControllerJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class StatusSignControllerJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs index 9adabfce..a94e99de 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/SystemMonitorJoinMap.cs @@ -1,6 +1,7 @@ using System; +using PepperDash.Essentials.Core.JoinMaps; -namespace PepperDash.Essentials.Core.Bridges +namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class SystemMonitorJoinMap : JoinMapBaseAdvanced { diff --git a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs index 755a586e..e644eaaf 100644 --- a/src/PepperDash.Essentials.Core/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs @@ -1,5 +1,7 @@ using System; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.JoinMaps; + namespace PepperDash.Essentials.Core.Bridges.JoinMaps { public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs b/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs deleted file mode 100644 index 995004b9..00000000 --- a/src/PepperDash.Essentials.Core/Comm and IR/CommunicationExtras.cs +++ /dev/null @@ -1,25 +0,0 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; - -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core -{ - /// - /// - /// - public interface IComPortsDevice - { - IComPorts Device { get; } - } -} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs b/src/PepperDash.Essentials.Core/Communications/CecPortController.cs similarity index 96% rename from src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs rename to src/PepperDash.Essentials.Core/Communications/CecPortController.cs index 544a682f..fd933812 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs +++ b/src/PepperDash.Essentials.Core/Communications/CecPortController.cs @@ -1,16 +1,11 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DM; - using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { public class CecPortController : Device, IBasicCommunicationWithStreamDebugging { diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs b/src/PepperDash.Essentials.Core/Communications/ComPortController.cs similarity index 97% rename from src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs rename to src/PepperDash.Essentials.Core/Communications/ComPortController.cs index 41420b7c..02d6b4b4 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs +++ b/src/PepperDash.Essentials.Core/Communications/ComPortController.cs @@ -1,16 +1,11 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; - using PepperDash.Core; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { public class ComPortController : Device, IBasicCommunicationWithStreamDebugging { diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs b/src/PepperDash.Essentials.Core/Communications/ComSpecJsonConverter.cs similarity index 95% rename from src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs rename to src/PepperDash.Essentials.Core/Communications/ComSpecJsonConverter.cs index bfdccb65..0f0c988b 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs +++ b/src/PepperDash.Essentials.Core/Communications/ComSpecJsonConverter.cs @@ -1,19 +1,8 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using System; using Crestron.SimplSharpPro; - using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { /// /// This converter creates a proper ComPort.ComPortSpec struct from more-friendly JSON values. It uses diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs b/src/PepperDash.Essentials.Core/Communications/CommFactory.cs similarity index 98% rename from src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs rename to src/PepperDash.Essentials.Core/Communications/CommFactory.cs index 8fa4076a..5ef450a1 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs +++ b/src/PepperDash.Essentials.Core/Communications/CommFactory.cs @@ -1,16 +1,14 @@ - - -using System; -using Crestron.SimplSharp; +using System; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DM; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { /// /// diff --git a/src/PepperDash.Essentials.Core/Communications/CommunicationExtras.cs b/src/PepperDash.Essentials.Core/Communications/CommunicationExtras.cs new file mode 100644 index 00000000..fed87b35 --- /dev/null +++ b/src/PepperDash.Essentials.Core/Communications/CommunicationExtras.cs @@ -0,0 +1,12 @@ +using Crestron.SimplSharpPro; + +namespace PepperDash.Essentials.Core.Communications +{ + /// + /// + /// + public interface IComPortsDevice + { + IComPorts Device { get; } + } +} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDevice.cs b/src/PepperDash.Essentials.Core/Communications/ConsoleCommMockDevice.cs similarity index 94% rename from src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDevice.cs rename to src/PepperDash.Essentials.Core/Communications/ConsoleCommMockDevice.cs index fd7184aa..5ab83859 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ConsoleCommMockDevice.cs +++ b/src/PepperDash.Essentials.Core/Communications/ConsoleCommMockDevice.cs @@ -1,15 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using Crestron.SimplSharp; - using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Monitoring; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { public class ConsoleCommMockDevice : EssentialsDevice, ICommunicationMonitor { diff --git a/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs b/src/PepperDash.Essentials.Core/Communications/GenericComm.cs similarity index 95% rename from src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs rename to src/PepperDash.Essentials.Core/Communications/GenericComm.cs index ddd7ec5d..80cee58c 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/GenericComm.cs +++ b/src/PepperDash.Essentials.Core/Communications/GenericComm.cs @@ -1,19 +1,19 @@ - - -using System; +using System; using System.Collections.Generic; using Crestron.SimplSharp.CrestronSockets; using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; - using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; -using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Bridges.JoinMaps; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { /// /// Serves as a generic wrapper class for all styles of IBasicCommuncation ports diff --git a/src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs b/src/PepperDash.Essentials.Core/Communications/GenericHttpClient.cs similarity index 96% rename from src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs rename to src/PepperDash.Essentials.Core/Communications/GenericHttpClient.cs index 47632c8d..ce190e31 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/GenericHttpClient.cs +++ b/src/PepperDash.Essentials.Core/Communications/GenericHttpClient.cs @@ -1,8 +1,8 @@ -using Crestron.SimplSharp.Net.Http; +using System; +using Crestron.SimplSharp.Net.Http; using PepperDash.Core; -using System; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { [Obsolete("Please use the builtin HttpClient class instead: https://learn.microsoft.com/en-us/dotnet/fundamentals/networking/http/httpclient-guidelines")] public class GenericHttpClient : Device, IBasicCommunication diff --git a/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs b/src/PepperDash.Essentials.Core/Communications/IRPortHelper.cs similarity index 98% rename from src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs rename to src/PepperDash.Essentials.Core/Communications/IRPortHelper.cs index 498df9d2..15359664 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs +++ b/src/PepperDash.Essentials.Core/Communications/IRPortHelper.cs @@ -1,18 +1,13 @@ - - -using System; -using System.Collections.Generic; -using Crestron.SimplSharp; -using Crestron.SimplSharp.CrestronIO; +using System; using Crestron.SimplSharpPro; - using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Communications { /// /// diff --git a/src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs b/src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs index 3552c2b2..715806ec 100644 --- a/src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs +++ b/src/PepperDash.Essentials.Core/Config/AudioControlPointListItem.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/Config/BasicConfig.cs b/src/PepperDash.Essentials.Core/Config/BasicConfig.cs index 0e3e1e35..37953d55 100644 --- a/src/PepperDash.Essentials.Core/Config/BasicConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/BasicConfig.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs b/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs index 0950d62e..2992a385 100644 --- a/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs +++ b/src/PepperDash.Essentials.Core/Config/ConfigPropertiesHelpers.cs @@ -1,6 +1,4 @@ - - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs index 8549ecd8..b6d20f5f 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs @@ -1,17 +1,14 @@ - - -using System; +using System; using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.Config; using Serilog.Events; -namespace PepperDash.Essentials.Core.Config +namespace PepperDash.Essentials.Core.Config.Essentials { /// /// Loads the ConfigObject from the file diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs index 141ffc25..3d4e5e46 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs @@ -1,20 +1,12 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using Crestron.SimplSharp.Net.Http; -using Crestron.SimplSharpPro.Diagnostics; - +using Newtonsoft.Json.Linq; using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core.Config +namespace PepperDash.Essentials.Core.Config.Essentials { public static class ConfigUpdater { @@ -160,7 +152,7 @@ namespace PepperDash.Essentials.Core.Config // Moves the file and appends the .bak extension var fileDest = archiveDirectoryPath + "/" + file.Name + ".bak"; - if(!File.Exists(fileDest)) + if(!global::Crestron.SimplSharp.CrestronIO.File.Exists(fileDest)) { file.MoveTo(fileDest); } diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs index 58ced97e..020c8ce8 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigWriter.cs @@ -1,9 +1,5 @@ - - -using System; -using System.Collections.Generic; +using System; using System.Linq; -using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using Newtonsoft.Json; @@ -11,7 +7,7 @@ using Newtonsoft.Json.Linq; using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core.Config +namespace PepperDash.Essentials.Core.Config.Essentials { /// /// Responsible for updating config at runtime, and writing the updates out to a local file diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs index b42ec94c..4df4c656 100644 --- a/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs @@ -1,15 +1,8 @@ - - -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; - -using Crestron.SimplSharp.CrestronIO; using Newtonsoft.Json; -using PepperDash.Core; - -namespace PepperDash.Essentials.Core.Config +namespace PepperDash.Essentials.Core.Config.Essentials { /// /// Loads the ConfigObject from the file diff --git a/src/PepperDash.Essentials.Core/Config/ILoadConfig.cs b/src/PepperDash.Essentials.Core/Config/ILoadConfig.cs index 00bbf5f6..b8a77f0e 100644 --- a/src/PepperDash.Essentials.Core/Config/ILoadConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/ILoadConfig.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Config { public interface ILoadConfig { diff --git a/src/PepperDash.Essentials.Core/Config/InfoConfig.cs b/src/PepperDash.Essentials.Core/Config/InfoConfig.cs index 12ca49f4..1e53e51a 100644 --- a/src/PepperDash.Essentials.Core/Config/InfoConfig.cs +++ b/src/PepperDash.Essentials.Core/Config/InfoConfig.cs @@ -4,6 +4,7 @@ using Crestron.SimplSharp; using Newtonsoft.Json; using System; using System.Collections.Generic; +using PepperDash.Essentials.Core.Ethernet; namespace PepperDash.Essentials.Core.Config { diff --git a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs index 9669ca43..6417b935 100644 --- a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs +++ b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs @@ -1,13 +1,15 @@ -using System; -using System.Linq; +using System.Linq; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; -using PepperDash.Core.JsonStandardObjects; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Monitoring; using Serilog.Events; +using Feedback = PepperDash.Essentials.Core.Feedbacks.Feedback; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Crestron { public abstract class CrestronGenericBaseDevice : EssentialsDevice, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking { diff --git a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs.orig b/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs.orig deleted file mode 100644 index bef4ae01..00000000 --- a/src/PepperDash.Essentials.Core/Crestron/CrestronGenericBaseDevice.cs.orig +++ /dev/null @@ -1,128 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -using PepperDash.Core; - -namespace PepperDash.Essentials.Core -{ - /// - /// A bridge class to cover the basic features of GenericBase hardware - /// - public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking - { - public virtual GenericBase Hardware { get; protected set; } - - public BoolFeedback IsOnline { get; private set; } - public BoolFeedback IsRegistered { get; private set; } - public StringFeedback IpConnectionsText { get; private set; } - - public CrestronGenericBaseDevice(string key, string name, GenericBase hardware) - : base(key, name) - { - Hardware = hardware; - IsOnline = new BoolFeedback(CommonBoolCue.IsOnlineFeedback, () => Hardware.IsOnline); - IsRegistered = new BoolFeedback(new Cue("IsRegistered", 0, eCueType.Bool), () => Hardware.Registered); - IpConnectionsText = new StringFeedback(CommonStringCue.IpConnectionsText, () => - string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray())); - CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000); - } - - /// - /// Make sure that overriding classes call this! - /// Registers the Crestron device, connects up to the base events, starts communication monitor - /// - public override bool CustomActivate() - { - Debug.LogMessage(LogEventLevel.Information, this, "Activating"); - var response = Hardware.RegisterWithLogging(Key); - if (response != eDeviceRegistrationUnRegistrationResponse.Success) - { -<<<<<<< HEAD - Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Crestron device: {0}", response); - return false; - } -======= - Debug.LogMessage(LogEventLevel.Information, this, "ERROR: Cannot register Crestron device: {0}", response); - return false; - } ->>>>>>> origin/feature/ecs-342-neil - Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange); - CommunicationMonitor.Start(); - - return true; - } - - /// - /// This disconnects events and unregisters the base hardware device. - /// - /// - public override bool Deactivate() - { - CommunicationMonitor.Stop(); - Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange; - - return Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success; - } - - /// - /// Returns a list containing the Outputs that we want to expose. - /// - public virtual List Feedbacks - { - get - { - return new List - { - IsOnline, - IsRegistered, - IpConnectionsText - }; - } - } - - void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args) - { - IsOnline.FireUpdate(); - } - - #region IStatusMonitor Members - - public StatusMonitorBase CommunicationMonitor { get; private set; } - #endregion - - #region IUsageTracking Members - - public UsageTracking UsageTracker { get; set; } - - #endregion - } - - //*********************************************************************************** - public class CrestronGenericBaseDeviceEventIds - { - public const uint IsOnline = 1; - public const uint IpConnectionsText =2; - } - - /// - /// Adds logging to Register() failure - /// - public static class GenericBaseExtensions - { - public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key) - { - var result = device.Register(); - if (result != eDeviceRegistrationUnRegistrationResponse.Success) - { - Debug.LogMessage(LogEventLevel.Information, "Cannot register device '{0}': {1}", key, result); - } - return result; - } - - } -} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs index a5923011..a3fbb016 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs @@ -10,7 +10,11 @@ using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs index 2bc2c50b..5935c1a9 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs @@ -10,7 +10,12 @@ using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.CrestronIO diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs index af83b3d6..a278e0ee 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs @@ -14,6 +14,11 @@ using PepperDash.Essentials.Core.Bridges; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.CrestronIO diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs index 5ed1bfa8..92ce113f 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs @@ -14,6 +14,10 @@ using PepperDash.Essentials.Core.Bridges; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; using Serilog.Events; namespace PepperDash.Essentials.Core.CrestronIO diff --git a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs index 030dc613..a5b0704e 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs @@ -14,6 +14,11 @@ using PepperDash.Essentials.Core.Bridges; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.CrestronIO diff --git a/src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs index 44af9954..db0b2a43 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs index 7c63b92c..9fd781c1 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs index b4151941..9ba8ee30 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs b/src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs index a13aca1a..83e49338 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; +using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.CrestronIO { public interface IHasCresnetBranches { diff --git a/src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs b/src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs index 19f8e0df..196a6c55 100644 --- a/src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs +++ b/src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.CrestronIO { diff --git a/src/PepperDash.Essentials.Core/DeviceControlsParentInterfaces/IPresentationSource.cs b/src/PepperDash.Essentials.Core/DeviceControlsParentInterfaces/IPresentationSource.cs deleted file mode 100644 index ac45a9d4..00000000 --- a/src/PepperDash.Essentials.Core/DeviceControlsParentInterfaces/IPresentationSource.cs +++ /dev/null @@ -1,19 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using Crestron.SimplSharpPro; -//using Crestron.SimplSharpPro.DeviceSupport; - -//using PepperDash.Core; - - -//namespace PepperDash.Essentials.Core -//{ -// public interface IPresentationSource : IKeyed -// { -// string Name { get; } -// PresentationSourceType Type { get; } -// string IconName { get; set; } -// BoolFeedback HasPowerOnFeedback { get; } - -// } -//} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs index 5a38c703..a4cb93a7 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IChannel.cs @@ -1,10 +1,7 @@ -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; +using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Touchpanels; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorFunctions.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorFunctions.cs index 232362e9..16f6ca59 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorFunctions.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IColorFunctions.cs @@ -1,10 +1,7 @@ -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; +using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Touchpanels; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs index a69cfe3b..9556f478 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDPad.cs @@ -1,10 +1,8 @@ -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; +using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; +using PepperDash.Essentials.Core.Touchpanels; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDiscPlayerControls.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDiscPlayerControls.cs index 024bac27..77e79129 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDiscPlayerControls.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDiscPlayerControls.cs @@ -1,9 +1,4 @@ -using Crestron.SimplSharpPro.DeviceSupport; - -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { public interface IDiscPlayerControls : IColor, IDPad, INumericKeypad, IHasPowerControl, ITransport, IUiDisplayInfo diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDisplayBasic.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDisplayBasic.cs index 5624f77c..7d86b684 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDisplayBasic.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDisplayBasic.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core.Devices.DeviceTypeInterfaces +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { public interface IDisplayBasic { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDumbSource.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDumbSource.cs index 1d4829cd..dad82138 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDumbSource.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDumbSource.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { public interface IDumbSource { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs index 9e55702c..5166bdd4 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IDvr.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; +using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Touchpanels; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasFarEndContentStatus.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasFarEndContentStatus.cs index 21bde91f..09202768 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasFarEndContentStatus.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasFarEndContentStatus.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials.Core.DeviceTypeInterfaces +using PepperDash.Essentials.Core.Feedbacks; + +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { public interface IHasFarEndContentStatus { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPhoneDialing.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPhoneDialing.cs index cd208d4b..8e618e10 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPhoneDialing.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasPhoneDialing.cs @@ -1,5 +1,6 @@ using System; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs index 8e9a369b..d853a37c 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHumiditySensor.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILevelControls.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILevelControls.cs index f4cb4b71..c3600112 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILevelControls.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ILevelControls.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs index c30edebd..e530da54 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs index 62ea8b3f..4fd72422 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INumeric.cs @@ -1,9 +1,8 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; +using PepperDash.Essentials.Core.Touchpanels; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs index 6ecdd775..a802f280 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPasswordPrompt.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// Describes the functionality required to prompt a user to enter a password diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs index b7c3345e..fb3092f5 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IPower.cs @@ -1,17 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; -using Crestron.SimplSharpPro.Fusion; +using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Touchpanels; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs index 26895114..b674ab1a 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IProjectorScreenLiftControl.cs @@ -2,6 +2,7 @@ using System; using Newtonsoft.Json; using Newtonsoft.Json.Converters; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs index a9a92126..87066e1b 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ISetTopBoxControls.cs @@ -1,9 +1,7 @@ using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Touchpanels; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs index fe1c560c..3d4be1f5 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITemperatureSensor.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransport.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransport.cs index 1189c10b..55e01f65 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransport.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/ITransport.cs @@ -1,6 +1,7 @@ using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Touchpanels; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IUiDisplayInfo.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IUiDisplayInfo.cs index fb51f7e2..a4823c55 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IUiDisplayInfo.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IUiDisplayInfo.cs @@ -1,6 +1,6 @@ using PepperDash.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// Describes things needed to show on UI diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IWarmingCooling.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IWarmingCooling.cs index 2baf1548..d570c881 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IWarmingCooling.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IWarmingCooling.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { /// /// Defines a class that has warm up and cool down diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs index 31f71df9..7ecf333e 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/Template.cs @@ -1,9 +1,4 @@ -using Crestron.SimplSharpPro.DeviceSupport; - -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.SmartObjects; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { } \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs b/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs index 295fd25c..cedbefba 100644 --- a/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs +++ b/src/PepperDash.Essentials.Core/Devices/AudioControlListItemBase.cs @@ -1,11 +1,6 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public abstract class AudioControlListItemBase { diff --git a/src/PepperDash.Essentials.Core/Devices/AudioInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/AudioInterfaces.cs index 90aa4909..068f5d4b 100644 --- a/src/PepperDash.Essentials.Core/Devices/AudioInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/AudioInterfaces.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public enum AudioChangeType diff --git a/src/PepperDash.Essentials.Core/Devices/CameraListItem.cs b/src/PepperDash.Essentials.Core/Devices/CameraListItem.cs index d519feb4..e3fefcc8 100644 --- a/src/PepperDash.Essentials.Core/Devices/CameraListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/CameraListItem.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using PepperDash.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class CameraListItem { diff --git a/src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs index afb1da17..eafd42fa 100644 --- a/src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/CodecInterfaces.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// Adds control of codec receive volume diff --git a/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs b/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs index 57d99df8..657770c4 100644 --- a/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs +++ b/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - +using Crestron.SimplSharpPro; using PepperDash.Core; using PepperDash.Essentials.Core.CrestronIO; using Serilog.Events; @@ -17,7 +14,7 @@ namespace PepperDash.Essentials.Core.Devices { public Dictionary SwitchedOutputs { get; private set; } - public Crestron.SimplSharpPro.CrestronControlSystem Processor { get; private set; } + public CrestronControlSystem Processor { get; private set; } public CrestronProcessor(string key) : base(key) diff --git a/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs b/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs index 0c21216a..3f608570 100644 --- a/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/DestinationListItem.cs @@ -1,9 +1,7 @@ - +using Newtonsoft.Json; +using PepperDash.Essentials.Core.Routing; -using Newtonsoft.Json; -using PepperDash.Essentials.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class DestinationListItem { diff --git a/src/PepperDash.Essentials.Core/Devices/DeviceApiBase.cs b/src/PepperDash.Essentials.Core/Devices/DeviceApiBase.cs index 34669ff5..7fe7a511 100644 --- a/src/PepperDash.Essentials.Core/Devices/DeviceApiBase.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceApiBase.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Devices { diff --git a/src/PepperDash.Essentials.Core/Devices/DeviceFeedbackExtensions.cs b/src/PepperDash.Essentials.Core/Devices/DeviceFeedbackExtensions.cs index 1ef59b0f..fbd70a8b 100644 --- a/src/PepperDash.Essentials.Core/Devices/DeviceFeedbackExtensions.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceFeedbackExtensions.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; -using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public static class DeviceFeedbackExtensions { diff --git a/src/PepperDash.Essentials.Core/Device Info/DeviceInfo.cs b/src/PepperDash.Essentials.Core/Devices/DeviceInfo.cs similarity index 84% rename from src/PepperDash.Essentials.Core/Device Info/DeviceInfo.cs rename to src/PepperDash.Essentials.Core/Devices/DeviceInfo.cs index 9b03ec11..379ff03b 100644 --- a/src/PepperDash.Essentials.Core/Device Info/DeviceInfo.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceInfo.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core.DeviceInfo +namespace PepperDash.Essentials.Core.Device_Info { public class DeviceInfo { diff --git a/src/PepperDash.Essentials.Core/Device Info/DeviceInfoEventArgs.cs b/src/PepperDash.Essentials.Core/Devices/DeviceInfoEventArgs.cs similarity index 86% rename from src/PepperDash.Essentials.Core/Device Info/DeviceInfoEventArgs.cs rename to src/PepperDash.Essentials.Core/Devices/DeviceInfoEventArgs.cs index 6727bce6..7a02e622 100644 --- a/src/PepperDash.Essentials.Core/Device Info/DeviceInfoEventArgs.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceInfoEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace PepperDash.Essentials.Core.DeviceInfo +namespace PepperDash.Essentials.Core.Device_Info { public class DeviceInfoEventArgs:EventArgs { diff --git a/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs b/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs index 61985641..161f9056 100644 --- a/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceJsonApi.cs @@ -1,18 +1,15 @@ - - -using Crestron.SimplSharp; -using Newtonsoft.Json; -using PepperDash.Core; -using Serilog.Events; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Crestron.SimplSharp; +using Newtonsoft.Json; +using PepperDash.Core; +using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class DeviceJsonApi { diff --git a/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs b/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs index ae8eba03..ce90a191 100644 --- a/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs +++ b/src/PepperDash.Essentials.Core/Devices/DeviceManager.cs @@ -1,14 +1,16 @@ -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using PepperDash.Core; -using Serilog.Events; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using Crestron.SimplSharp; +using Crestron.SimplSharpPro; +using PepperDash.Core; +using PepperDash.Essentials.Core.Communications; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Routing; +using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public static class DeviceManager { diff --git a/src/PepperDash.Essentials.Core/Devices/DisplayUiConstants.cs b/src/PepperDash.Essentials.Core/Devices/DisplayUiConstants.cs index a42239fc..39229f93 100644 --- a/src/PepperDash.Essentials.Core/Devices/DisplayUiConstants.cs +++ b/src/PepperDash.Essentials.Core/Devices/DisplayUiConstants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// Integers that represent the "source type number" for given sources. diff --git a/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs b/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs index 0812ca4e..d1f4fc65 100644 --- a/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs +++ b/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs @@ -1,7 +1,7 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Essentials.Core.Bridges; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public abstract class EssentialsBridgeableDevice:EssentialsDevice, IBridgeAdvanced { diff --git a/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs b/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs index bdb8b45a..5da36805 100644 --- a/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs +++ b/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; -using System.Reflection; - using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Factory; +using PepperDash.Essentials.Core.Plugins; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// Defines the basic needs for an EssentialsDevice to enable it to be build by an IDeviceFactory class diff --git a/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs b/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs index 318f5179..3f0fe3a3 100644 --- a/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public interface IOnline { diff --git a/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs b/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs index 26718ebf..f6e5a620 100644 --- a/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs +++ b/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs @@ -9,6 +9,10 @@ using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Communications; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.Devices diff --git a/src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs b/src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs index 8929edeb..46c7992c 100644 --- a/src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs +++ b/src/PepperDash.Essentials.Core/Devices/GenericMonitoredTcpDevice.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Core; +using PepperDash.Essentials.Core.Monitoring; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs b/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs index e5218ee0..36cf7d10 100644 --- a/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs +++ b/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatusExtensions.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using System.Linq; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.VideoStatus; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public static class IAttachVideoStatusExtensions { diff --git a/src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs b/src/PepperDash.Essentials.Core/Devices/IDeviceInfoProvider.cs similarity index 76% rename from src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs rename to src/PepperDash.Essentials.Core/Devices/IDeviceInfoProvider.cs index ea9c16e6..46ab24da 100644 --- a/src/PepperDash.Essentials.Core/Device Info/IDeviceInfoProvider.cs +++ b/src/PepperDash.Essentials.Core/Devices/IDeviceInfoProvider.cs @@ -1,7 +1,6 @@ -using System; -using PepperDash.Core; +using PepperDash.Core; -namespace PepperDash.Essentials.Core.DeviceInfo +namespace PepperDash.Essentials.Core.Device_Info { public interface IDeviceInfoProvider:IKeyed { diff --git a/src/PepperDash.Essentials.Core/Devices/IDspPresets.cs b/src/PepperDash.Essentials.Core/Devices/IDspPresets.cs index 94bc3929..6496a45b 100644 --- a/src/PepperDash.Essentials.Core/Devices/IDspPresets.cs +++ b/src/PepperDash.Essentials.Core/Devices/IDspPresets.cs @@ -1,7 +1,7 @@ -using PepperDash.Core; -using System.Collections.Generic; +using System.Collections.Generic; +using PepperDash.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public interface IDspPresets { diff --git a/src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs b/src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs index 9943c738..d8032f81 100644 --- a/src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs +++ b/src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs @@ -1,10 +1,10 @@ using System; using System.Linq; - using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public interface IHasFeedback : IKeyed { diff --git a/src/PepperDash.Essentials.Core/Devices/IProjectorInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/IProjectorInterfaces.cs index c0cb33ed..21b1816e 100644 --- a/src/PepperDash.Essentials.Core/Devices/IProjectorInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/IProjectorInterfaces.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public interface IBasicVideoMute { diff --git a/src/PepperDash.Essentials.Core/Devices/IUsageTracking.cs b/src/PepperDash.Essentials.Core/Devices/IUsageTracking.cs index 968fa127..20c9e660 100644 --- a/src/PepperDash.Essentials.Core/Devices/IUsageTracking.cs +++ b/src/PepperDash.Essentials.Core/Devices/IUsageTracking.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public interface IUsageTracking { @@ -25,7 +21,7 @@ namespace PepperDash.Essentials.Core { public event EventHandler DeviceUsageEnded; - public InUseTracking InUseTracker { get; protected set; } + public InUseTracking.InUseTracking InUseTracker { get; protected set; } public bool UsageIsTracked { get; set; } @@ -39,7 +35,7 @@ namespace PepperDash.Essentials.Core { Parent = parent; - InUseTracker = new InUseTracking(); + InUseTracker = new InUseTracking.InUseTracking(); InUseTracker.InUseFeedback.OutputChange += InUseFeedback_OutputChange; //new EventHandler(); } diff --git a/src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs index 5d8e0724..8d041b74 100644 --- a/src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// Defines minimal volume and mute control methods diff --git a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs index 45c2d895..0a7727e8 100644 --- a/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs +++ b/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs @@ -1,19 +1,12 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using Crestron.SimplSharp; +using System; using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json.Linq; -using PepperDash.Essentials.Core.Config; - - using PepperDash.Core; +using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// diff --git a/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs b/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs index 4c2e83e4..ce4877f7 100644 --- a/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/LevelControlListItem.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core.Devices; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class LevelControlListItem : AudioControlListItemBase { diff --git a/src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs b/src/PepperDash.Essentials.Core/Devices/NetworkDeviceHelpers.cs similarity index 98% rename from src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs rename to src/PepperDash.Essentials.Core/Devices/NetworkDeviceHelpers.cs index a1cc1e2f..80bcdfa0 100644 --- a/src/PepperDash.Essentials.Core/Device Info/NetworkDeviceHelpers.cs +++ b/src/PepperDash.Essentials.Core/Devices/NetworkDeviceHelpers.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using PepperDash.Core; using Crestron.SimplSharp; -using PepperDash.Essentials.Core; +using PepperDash.Core; +using PepperDash.Essentials.Core.Extensions; using Serilog.Events; -namespace PepperDash.Essentials.Core.DeviceInfo +namespace PepperDash.Essentials.Core.Device_Info { public static class NetworkDeviceHelpers { diff --git a/src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs b/src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs index 31e4be22..f1ba77ae 100644 --- a/src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs +++ b/src/PepperDash.Essentials.Core/Devices/PC/InRoomPc.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; -using Crestron.SimplSharpPro; - -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Config; using PepperDash.Core; +using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.VideoStatus; using Serilog.Events; -namespace PepperDash.Essentials.Core.Devices +namespace PepperDash.Essentials.Core.Devices.PC { [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")] public class InRoomPc : EssentialsDevice, IHasFeedback, IRoutingOutputs, IAttachVideoStatus, IUiDisplayInfo, IUsageTracking diff --git a/src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs b/src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs index 921d52c2..1aa13fba 100644 --- a/src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs +++ b/src/PepperDash.Essentials.Core/Devices/PC/Laptop.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; -using Crestron.SimplSharpPro; - -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Config; using PepperDash.Core; +using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.VideoStatus; using Serilog.Events; -namespace PepperDash.Essentials.Core.Devices +namespace PepperDash.Essentials.Core.Devices.PC { [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")] @@ -75,7 +75,7 @@ namespace PepperDash.Essentials.Core.Devices public override EssentialsDevice BuildDevice(DeviceConfig dc) { Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Laptop Device"); - return new Core.Devices.Laptop(dc.Key, dc.Name); + return new Laptop(dc.Key, dc.Name); } } } \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Devices/PduInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/PduInterfaces.cs index 1c0431b5..1f37a868 100644 --- a/src/PepperDash.Essentials.Core/Devices/PduInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/PduInterfaces.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; -using Crestron.SimplSharp; +using Crestron.SimplSharp; using PepperDash.Core; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; namespace PepperDash.Essentials.Core.Devices { diff --git a/src/PepperDash.Essentials.Core/Devices/PowerInterfaces.cs b/src/PepperDash.Essentials.Core/Devices/PowerInterfaces.cs index 1fc6672a..fd0cefe9 100644 --- a/src/PepperDash.Essentials.Core/Devices/PowerInterfaces.cs +++ b/src/PepperDash.Essentials.Core/Devices/PowerInterfaces.cs @@ -1,7 +1,9 @@ using Crestron.SimplSharp; using PepperDash.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// Interface for any device that has a battery that can be monitored @@ -45,43 +47,4 @@ namespace PepperDash.Essentials.Core IntFeedback InputCurrentFeedback { get; } IntFeedback OutputCurrentFeedback { get; } } - - /// - /// Interface for any device that is able to control its power, has a configurable reboot time, and has batteries that can be monitored - /// - public interface IHasPowerCycleWithBattery : IHasPowerCycle, IHasBatteryStats - { - - } - - /// - /// Interface for any device that is able to control it's power and has a configurable reboot time - /// - public interface IHasPowerCycle : IKeyName, IHasPowerControlWithFeedback - { - /// - /// Delay between power off and power on for reboot - /// - int PowerCycleTimeMs { get; } - - /// - /// Reboot outlet - /// - void PowerCycle(); - } - - /// - /// Interface for any device that contains a collection of IHasPowerReboot Devices - /// - public interface IHasControlledPowerOutlets : IKeyName - { - /// - /// Collection of IPduOutlets - /// - ReadOnlyDictionary PduOutlets { get; } - - } - - - } \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Devices/PresentationDeviceType.cs b/src/PepperDash.Essentials.Core/Devices/PresentationDeviceType.cs index 41555ae8..ad62eab2 100644 --- a/src/PepperDash.Essentials.Core/Devices/PresentationDeviceType.cs +++ b/src/PepperDash.Essentials.Core/Devices/PresentationDeviceType.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; -using Crestron.SimplSharpPro.EthernetCommunication; -using Crestron.SimplSharpPro.UI; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public enum PresentationSourceType { diff --git a/src/PepperDash.Essentials.Core/Devices/PresetListItem.cs b/src/PepperDash.Essentials.Core/Devices/PresetListItem.cs index f539d718..80c32f8a 100644 --- a/src/PepperDash.Essentials.Core/Devices/PresetListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/PresetListItem.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; +using Newtonsoft.Json; using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class PresetListItem : AudioControlListItemBase { diff --git a/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs b/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs index 1da908a9..c56b66a1 100644 --- a/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs +++ b/src/PepperDash.Essentials.Core/Devices/ReconfigurableDevice.cs @@ -11,6 +11,7 @@ using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PepperDash.Essentials.Core.Config.Essentials; namespace PepperDash.Essentials.Core.Devices { diff --git a/src/PepperDash.Essentials.Core/Devices/SmartObjectBaseTypes.cs b/src/PepperDash.Essentials.Core/Devices/SmartObjectBaseTypes.cs index 37e62036..4c34d56e 100644 --- a/src/PepperDash.Essentials.Core/Devices/SmartObjectBaseTypes.cs +++ b/src/PepperDash.Essentials.Core/Devices/SmartObjectBaseTypes.cs @@ -1,5 +1,5 @@  -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { public class SmartObjectJoinOffsets { diff --git a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs index 6de2f35d..02d6105f 100644 --- a/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs +++ b/src/PepperDash.Essentials.Core/Devices/SourceListItem.cs @@ -1,9 +1,10 @@ -using Newtonsoft.Json; +using System.Collections.Generic; +using Newtonsoft.Json; using Newtonsoft.Json.Converters; using PepperDash.Core; -using System.Collections.Generic; +using PepperDash.Essentials.Core.Routing; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// diff --git a/src/PepperDash.Essentials.Core/Devices/VolumeDeviceChangeEventArgs.cs b/src/PepperDash.Essentials.Core/Devices/VolumeDeviceChangeEventArgs.cs index 2171cb73..b8dafbf1 100644 --- a/src/PepperDash.Essentials.Core/Devices/VolumeDeviceChangeEventArgs.cs +++ b/src/PepperDash.Essentials.Core/Devices/VolumeDeviceChangeEventArgs.cs @@ -1,13 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using PepperDash.Core; -using PepperDash.Essentials.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Devices { /// /// diff --git a/src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs b/src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs index 394fa17a..71992d73 100644 --- a/src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs +++ b/src/PepperDash.Essentials.Core/Display/BasicIrDisplay.cs @@ -1,18 +1,18 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; - using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Communications; +using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Display { [Obsolete("Please use PepperDash.Essentials.Device.Common, this will be removed in 2.1")] public class BasicIrDisplay : DisplayBase, IBasicVolumeControls, IBridgeAdvanced diff --git a/src/PepperDash.Essentials.Core/Display/DisplayBase.cs b/src/PepperDash.Essentials.Core/Display/DisplayBase.cs index a41f936f..5f06186c 100644 --- a/src/PepperDash.Essentials.Core/Display/DisplayBase.cs +++ b/src/PepperDash.Essentials.Core/Display/DisplayBase.cs @@ -1,17 +1,23 @@ - - +using System; +using System.Collections.Generic; +using System.Linq; using Crestron.SimplSharp; using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; -using System; -using System.Collections.Generic; -using System.Linq; +using Feedback = PepperDash.Essentials.Core.Feedbacks.Feedback; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Display { [Obsolete("Please use PepperDash.Essentials.Devices.Common, this will be removed in 2.1")] public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking diff --git a/src/PepperDash.Essentials.Core/Global/EthernetAdapterInfo.cs b/src/PepperDash.Essentials.Core/Ethernet/EthernetAdapterInfo.cs similarity index 77% rename from src/PepperDash.Essentials.Core/Global/EthernetAdapterInfo.cs rename to src/PepperDash.Essentials.Core/Ethernet/EthernetAdapterInfo.cs index c21df098..c7ed8bee 100644 --- a/src/PepperDash.Essentials.Core/Global/EthernetAdapterInfo.cs +++ b/src/PepperDash.Essentials.Core/Ethernet/EthernetAdapterInfo.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Ethernet { public class EthernetAdapterInfo { diff --git a/src/PepperDash.Essentials.Core/Ethernet/EthernetStatistics.cs b/src/PepperDash.Essentials.Core/Ethernet/EthernetStatistics.cs index cbdd0617..13c7e6dc 100644 --- a/src/PepperDash.Essentials.Core/Ethernet/EthernetStatistics.cs +++ b/src/PepperDash.Essentials.Core/Ethernet/EthernetStatistics.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -using PepperDash.Essentials.Core; +using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Ethernet { diff --git a/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs b/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs index 2d71c6bc..f266753a 100644 --- a/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs +++ b/src/PepperDash.Essentials.Core/Extensions/JsonExtensions.cs @@ -1,14 +1,7 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Newtonsoft.Json; +using System.Collections.Generic; using Newtonsoft.Json.Linq; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Extensions { public static class JsonExtensions { diff --git a/src/PepperDash.Essentials.Core/Extensions/StringExtensions.cs b/src/PepperDash.Essentials.Core/Extensions/StringExtensions.cs index 7bf8d5a5..70af44bf 100644 --- a/src/PepperDash.Essentials.Core/Extensions/StringExtensions.cs +++ b/src/PepperDash.Essentials.Core/Extensions/StringExtensions.cs @@ -1,11 +1,6 @@ using System; -using System.ComponentModel; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Extensions { public static class StringExtensions { diff --git a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs index 51e0069c..d785568e 100644 --- a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs @@ -1,16 +1,16 @@ - - -using Crestron.SimplSharp; +using System; +using System.Collections.Generic; +using System.Linq; using System.Reflection; +using Crestron.SimplSharp; using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Plugins; +using PepperDash.Essentials.Core.Secrets; using Serilog.Events; -using System; -using System.Collections.Generic; -using System.Linq; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Factory { public class DeviceFactoryWrapper { @@ -32,7 +32,8 @@ namespace PepperDash.Essentials.Core var assy = Assembly.GetExecutingAssembly(); PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy); - var types = assy.GetTypes().Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract); + var types = assy.GetTypes() + .Where(ct => typeof(IDeviceFactory).IsAssignableFrom(ct) && !ct.IsInterface && !ct.IsAbstract); if (types != null) { @@ -45,37 +46,41 @@ namespace PepperDash.Essentials.Core } catch (Exception e) { - Debug.LogMessage(LogEventLevel.Information, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name); + Debug.LogMessage(LogEventLevel.Information, "Unable to load type: '{1}' DeviceFactory: {0}", e, + type.Name); } } } } - /// - /// A dictionary of factory methods, keyed by config types, added by plugins. - /// These methods are looked up and called by GetDevice in this class. - /// - static Dictionary FactoryMethods = + /// + /// A dictionary of factory methods, keyed by config types, added by plugins. + /// These methods are looked up and called by GetDevice in this class. + /// + static Dictionary FactoryMethods = new Dictionary(StringComparer.OrdinalIgnoreCase); - /// - /// Adds a plugin factory method - /// - /// - /// - public static void AddFactoryForType(string typeName, Func method) - { + /// + /// Adds a plugin factory method + /// + /// + /// + public static void AddFactoryForType(string typeName, Func method) + { //Debug.LogMessage(LogEventLevel.Debug, "Adding factory method for type '{0}'", typeName); - DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method}); - } + DeviceFactory.FactoryMethods.Add(typeName, new DeviceFactoryWrapper() { FactoryMethod = method }); + } - public static void AddFactoryForType(string typeName, string description, Type Type, Func method) + public static void AddFactoryForType(string typeName, string description, Type Type, + Func method) { //Debug.LogMessage(LogEventLevel.Debug, "Adding factory method for type '{0}'", typeName); - if(FactoryMethods.ContainsKey(typeName)) + if (FactoryMethods.ContainsKey(typeName)) { - Debug.LogMessage(LogEventLevel.Information, "Unable to add type: '{0}'. Already exists in DeviceFactory", typeName); + Debug.LogMessage(LogEventLevel.Information, + "Unable to add type: '{0}'. Already exists in DeviceFactory", + typeName); return; } @@ -93,6 +98,7 @@ namespace PepperDash.Essentials.Core //var secret = GetSecret(JsonConvert.DeserializeObject(prop.Children().First().ToString())); prop.Parent.Replace(secret); } + var recurseProp = prop.Value as JObject; if (recurseProp == null) return; CheckForSecrets(recurseProp.Properties()); @@ -104,7 +110,7 @@ namespace PepperDash.Essentials.Core var secretProvider = SecretsManager.GetSecretProviderByKey(data.Provider); if (secretProvider == null) return null; var secret = secretProvider.GetSecret(data.Key); - if (secret != null) return (string) secret.Value; + if (secret != null) return (string)secret.Value; Debug.LogMessage(LogEventLevel.Debug, "Unable to retrieve secret {0}{1} - Make sure you've added it to the secrets provider", data.Provider, data.Key); @@ -183,16 +189,16 @@ namespace PepperDash.Essentials.Core } } - /// - /// Returns the device factory dictionary - /// - /// - /// - public static Dictionary GetDeviceFactoryDictionary(string filter) - { - return string.IsNullOrEmpty(filter) - ? FactoryMethods - : FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value); - } + /// + /// Returns the device factory dictionary + /// + /// + /// + public static Dictionary GetDeviceFactoryDictionary(string filter) + { + return string.IsNullOrEmpty(filter) + ? FactoryMethods + : FactoryMethods.Where(k => k.Key.Contains(filter)).ToDictionary(k => k.Key, k => k.Value); + } } } \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Factory/IDeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/IDeviceFactory.cs index 9f7eec58..1cb69477 100644 --- a/src/PepperDash.Essentials.Core/Factory/IDeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/IDeviceFactory.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Factory { /// /// Defines a class that is capable of loading device types diff --git a/src/PepperDash.Essentials.Core/Factory/IProcessorExtensionDeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/IProcessorExtensionDeviceFactory.cs index a50ab16d..1c4e54e6 100644 --- a/src/PepperDash.Essentials.Core/Factory/IProcessorExtensionDeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/IProcessorExtensionDeviceFactory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Factory { public interface IProcessorExtensionDeviceFactory { diff --git a/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs index b67dcf5b..2b82f15b 100644 --- a/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Factory/ProcessorExtensionDeviceFactory.cs @@ -1,13 +1,14 @@ - +using System; +using System.Collections.Generic; +using System.Linq; using System.Reflection; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Plugins; +using PepperDash.Essentials.Core.Secrets; using Serilog.Events; -using System; -using System.Collections.Generic; -using System.Linq; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Factory { public class ProcessorExtensionDeviceFactory diff --git a/src/PepperDash.Essentials.Core/Factory/ReadyEventArgs.cs b/src/PepperDash.Essentials.Core/Factory/ReadyEventArgs.cs index 6ccc0600..18e72547 100644 --- a/src/PepperDash.Essentials.Core/Factory/ReadyEventArgs.cs +++ b/src/PepperDash.Essentials.Core/Factory/ReadyEventArgs.cs @@ -1,11 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using PepperDash.Essentials.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Factory { public class IsReadyEventArgs : EventArgs { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedback.cs b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedback.cs index 055ed5b6..0f78805c 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedback.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedback.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { /// /// A Feedback whose output is derived from the return value of a provided Func. @@ -32,7 +29,7 @@ namespace PepperDash.Essentials.Core List LinkedInputSigs = new List(); List LinkedComplementInputSigs = new List(); - List LinkedCrestronFeedbacks = new List(); + List LinkedCrestronFeedbacks = new List(); /// /// Creates the feedback with the Func as described. @@ -121,7 +118,7 @@ namespace PepperDash.Essentials.Core /// Links a Crestron Feedback object /// /// - public void LinkCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) + public void LinkCrestronFeedback(global::Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) { LinkedCrestronFeedbacks.Add(feedback); UpdateCrestronFeedback(feedback); @@ -131,7 +128,7 @@ namespace PepperDash.Essentials.Core /// /// /// - public void UnlinkCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) + public void UnlinkCrestronFeedback(global::Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) { LinkedCrestronFeedbacks.Remove(feedback); } @@ -162,7 +159,7 @@ namespace PepperDash.Essentials.Core sig.BoolValue = !_BoolValue; } - void UpdateCrestronFeedback(Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) + void UpdateCrestronFeedback(global::Crestron.SimplSharpPro.DeviceSupport.Feedback feedback) { feedback.State = _BoolValue; } diff --git a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackOneShot.cs b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackOneShot.cs index cc183569..667dba0b 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackOneShot.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackOneShot.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +using Crestron.SimplSharp; + +namespace PepperDash.Essentials.Core.Feedbacks { public class BoolFeedbackPulse { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackPulseExtender.cs b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackPulseExtender.cs index 53a5e559..c815a491 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackPulseExtender.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/BoolFeedbackPulseExtender.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +using Crestron.SimplSharp; + +namespace PepperDash.Essentials.Core.Feedbacks { /// /// A class that wraps a BoolFeedback with logic that extends it's true state for diff --git a/src/PepperDash.Essentials.Core/Feedbacks/BoolOutputLogicals.cs b/src/PepperDash.Essentials.Core/Feedbacks/BoolOutputLogicals.cs index a8dae7b8..5f2d850d 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/BoolOutputLogicals.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/BoolOutputLogicals.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackBase.cs b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackBase.cs index c3aac50b..10903983 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackBase.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackBase.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; -using Crestron.SimplSharpPro; - using PepperDash.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { public abstract class Feedback : IKeyed { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackCollection.cs b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackCollection.cs index ed7517da..5dad41d8 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackCollection.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackCollection.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { /// /// Basically a List , with an indexer to find feedbacks by key name diff --git a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackEventArgs.cs b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackEventArgs.cs index 9a7f5c29..586a91be 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/FeedbackEventArgs.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/FeedbackEventArgs.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { public class FeedbackEventArgs : EventArgs { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/IntFeedback.cs b/src/PepperDash.Essentials.Core/Feedbacks/IntFeedback.cs index 53bae09a..dcc48d8e 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/IntFeedback.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/IntFeedback.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { public class IntFeedback : Feedback { diff --git a/src/PepperDash.Essentials.Core/Feedbacks/SerialFeedback.cs b/src/PepperDash.Essentials.Core/Feedbacks/SerialFeedback.cs index bbf135dc..0b0a4604 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/SerialFeedback.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/SerialFeedback.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { /// /// To be used for serial data feedback where the event chain / asynchronicity must be maintained diff --git a/src/PepperDash.Essentials.Core/Feedbacks/StringFeedback.cs b/src/PepperDash.Essentials.Core/Feedbacks/StringFeedback.cs index fb5cccb5..3dc58f5b 100644 --- a/src/PepperDash.Essentials.Core/Feedbacks/StringFeedback.cs +++ b/src/PepperDash.Essentials.Core/Feedbacks/StringFeedback.cs @@ -1,11 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Feedbacks { public class StringFeedback : Feedback diff --git a/src/PepperDash.Essentials.Core/File/FileIO.cs b/src/PepperDash.Essentials.Core/File/FileIO.cs deleted file mode 100644 index 6398e8c6..00000000 --- a/src/PepperDash.Essentials.Core/File/FileIO.cs +++ /dev/null @@ -1,282 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharp.CrestronIO; -using PepperDash.Core; -using Crestron.SimplSharpPro.CrestronThread; -using Serilog.Events; - -namespace PepperDash.Essentials.Core -{ - public static class FileIO - { - - static CCriticalSection fileLock = new CCriticalSection(); - public delegate void GotFileEventHandler(object sender, FileEventArgs e); - public static event GotFileEventHandler GotFileEvent; - - /// - /// Get the full file info from a path/filename, can include wildcards. - /// - /// - /// - public static FileInfo[] GetFiles(string fileName) - { - string fullFilePath = Global.FilePathPrefix + fileName; - DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath)); - var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath)); - Debug.LogMessage(LogEventLevel.Information, "FileIO found: {0}, {1}", files.Count(), fullFilePath); - if (files.Count() > 0) - { - return files; - } - else - { - return null; - } - } - - public static FileInfo GetFile(string fileName) - { - string fullFilePath = Global.FilePathPrefix + fileName; - DirectoryInfo dirInfo = new DirectoryInfo(Path.GetDirectoryName(fullFilePath)); - var files = dirInfo.GetFiles(Path.GetFileName(fullFilePath)); - Debug.LogMessage(LogEventLevel.Information, "FileIO found: {0}, {1}", files.Count(), fullFilePath); - if (files.Count() > 0) - { - return files.FirstOrDefault(); - } - else - { - return null; - } - } - - - /// - /// Get the data from string path/filename - /// - /// - /// - public static string ReadDataFromFile(string fileName) - { - try - { - return ReadDataFromFile(GetFile(fileName)); - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Information, "Error: FileIO read failed: \r{0}", e); - return ""; - } - } - - /// - /// Get the data with fileInfo object - /// - /// - /// - public static string ReadDataFromFile(FileInfo file) - { - try - { - if (fileLock.TryEnter()) - { - DirectoryInfo dirInfo = new DirectoryInfo(file.DirectoryName); - Debug.LogMessage(LogEventLevel.Verbose, "FileIO Getting Data {0}", file.FullName); - - if (File.Exists(file.FullName)) - { - using (StreamReader r = new StreamReader(file.FullName)) - { - return r.ReadToEnd(); - } - } - else - { - Debug.LogMessage(LogEventLevel.Verbose, "File {0} does not exsist", file.FullName); - return ""; - } - } - else - { - Debug.LogMessage(LogEventLevel.Information, "FileIO Unable to enter FileLock"); - return ""; - } - - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Information, "Error: FileIO read failed: \r{0}", e); - return ""; - } - finally - { - if (fileLock != null && !fileLock.Disposed) - fileLock.Leave(); - - } - } - - - public static void ReadDataFromFileASync(string fileName) - { - try - { - ReadDataFromFileASync(GetFile(fileName)); - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Information, "Error: FileIO read failed: \r{0}", e); - } - } - - public static void ReadDataFromFileASync(FileInfo file) - { - try - { - CrestronInvoke.BeginInvoke(o => _ReadDataFromFileASync(file)); - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Information, "Error: FileIO read failed: \r{0}", e); - } - } - - private static void _ReadDataFromFileASync(FileInfo file) - { - string data; - try - { - if (fileLock.TryEnter()) - { - DirectoryInfo dirInfo = new DirectoryInfo(file.Name); - Debug.LogMessage(LogEventLevel.Verbose, "FileIO Getting Data {0}", file.FullName); - - - if (File.Exists(file.FullName)) - { - using (StreamReader r = new StreamReader(file.FullName)) - { - data = r.ReadToEnd(); - } - } - else - { - Debug.LogMessage(LogEventLevel.Verbose, "File {0} Does not exsist", file.FullName); - data = ""; - } - GotFileEvent.Invoke(null, new FileEventArgs(data)); - } - else - { - Debug.LogMessage(LogEventLevel.Information, "FileIO Unable to enter FileLock"); - } - - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Information, "Error: FileIO read failed: \r{0}", e); - data = ""; - } - finally - { - if (fileLock != null && !fileLock.Disposed) - fileLock.Leave(); - - } - - - - } - - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - public static void WriteDataToFile(string data, string filePath) - { - Thread _WriteFileThread; - _WriteFileThread = new Thread((O) => _WriteFileMethod(data, Global.FilePathPrefix + "/" + filePath), null, Thread.eThreadStartOptions.CreateSuspended); - _WriteFileThread.Priority = Thread.eThreadPriority.LowestPriority; - _WriteFileThread.Start(); - Debug.LogMessage(LogEventLevel.Information, "New WriteFile Thread"); - - } - - static object _WriteFileMethod(string data, string filePath) - { - Debug.LogMessage(LogEventLevel.Information, "Attempting to write file: '{0}'", filePath); - - try - { - if (fileLock.TryEnter()) - { - - using (StreamWriter sw = new StreamWriter(filePath)) - { - sw.Write(data); - sw.Flush(); - } - - } - else - { - Debug.LogMessage(LogEventLevel.Information, "FileIO Unable to enter FileLock"); - } - - } - catch (Exception e) - { - Debug.LogMessage(LogEventLevel.Error, "Error: FileIO write failed: \r{0}", e); - } - finally - { - if (fileLock != null && !fileLock.Disposed) - fileLock.Leave(); - - } - return null; - - } - - /// - /// - /// - /// - public static bool FileIoUnitTest() - { - var testData = "Testing FileIO"; - FileIO.WriteDataToFile(testData, "\\user\\FileIOTest.pdt"); - - var file = FileIO.GetFile("\\user\\*FileIOTest*"); - - var readData = FileIO.ReadDataFromFile(file); - Debug.LogMessage(LogEventLevel.Information, "Returned {0}", readData); - File.Delete(file.FullName); - if (testData == readData) - { - return true; - } - else - { - return false; - } - } - - } - public class FileEventArgs - { - public FileEventArgs(string data) { Data = data; } - public string Data { get; private set; } // readonly - - } -} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 724220b9..4ca004d2 100644 --- a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -1,19 +1,28 @@ - - -using Crestron.SimplSharp; -using Crestron.SimplSharp.CrestronIO; +using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronXml; using Crestron.SimplSharp.CrestronXml.Serialization; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.Fusion; using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core.Config; using Serilog.Events; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; +using Crestron.SimplSharpPro.UI; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Devices.PC; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Display; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; namespace PepperDash.Essentials.Core.Fusion { @@ -301,7 +310,7 @@ namespace PepperDash.Essentials.Core.Fusion if (File.Exists(filePath)) { - var json = File.ReadToEnd(filePath, Encoding.ASCII); + var json = File.ReadAllText(filePath, Encoding.ASCII); _guiDs = JsonConvert.DeserializeObject(json); @@ -1088,7 +1097,7 @@ namespace PepperDash.Essentials.Core.Fusion } } - var laptops = dict.Where(d => d.Value.SourceDevice is Devices.Laptop); + var laptops = dict.Where(d => d.Value.SourceDevice is Laptop); i = 1; foreach (var kvp in laptops) { @@ -1213,7 +1222,7 @@ namespace PepperDash.Essentials.Core.Fusion var uiDev = dev as IHasBasicTriListWithSmartObject; if (uiDev != null) { - if (uiDev.Panel is Crestron.SimplSharpPro.UI.XpanelForSmartGraphics) + if (uiDev.Panel is XpanelForSmartGraphics) { attrNum = attrNum + touchpanelNum; diff --git a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs index 33f2fe1b..5e8af155 100644 --- a/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs +++ b/src/PepperDash.Essentials.Core/Fusion/EssentialsHuddleSpaceRoomFusionRoomJoinMap.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.JoinMaps; namespace PepperDash.Essentials.Core.Fusion diff --git a/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs b/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs index a0cd8e6e..51588192 100644 --- a/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs +++ b/src/PepperDash.Essentials.Core/Fusion/FusionCustomPropertiesBridge.cs @@ -12,6 +12,8 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Room.Behaviours; using Serilog.Events; namespace PepperDash.Essentials.Core.Fusion diff --git a/src/PepperDash.Essentials.Core/Global/Global.cs b/src/PepperDash.Essentials.Core/Global.cs similarity index 97% rename from src/PepperDash.Essentials.Core/Global/Global.cs rename to src/PepperDash.Essentials.Core/Global.cs index f3523eba..e0e29920 100644 --- a/src/PepperDash.Essentials.Core/Global/Global.cs +++ b/src/PepperDash.Essentials.Core/Global.cs @@ -1,25 +1,17 @@ - - -using System; +using System; +using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text.RegularExpressions; -using System.Globalization; using Crestron.SimplSharp; -using System.Collections.Generic; -using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharp.CrestronDataStore; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DM; - using PepperDash.Core; -using PepperDash.Essentials.License; - -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json.Schema; +using PepperDash.Essentials.Core.Ethernet; +using PepperDash.Essentials.Core.License; using Serilog.Events; - namespace PepperDash.Essentials.Core { public static class Global @@ -110,7 +102,7 @@ namespace PepperDash.Essentials.Core { get { - return Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory(); + return global::Crestron.SimplSharp.CrestronIO.Directory.GetApplicationDirectory(); } } diff --git a/src/PepperDash.Essentials.Core/InUseTracking/IInUseTracking.cs b/src/PepperDash.Essentials.Core/InUseTracking/IInUseTracking.cs index 97a7c7f6..4ee172ba 100644 --- a/src/PepperDash.Essentials.Core/InUseTracking/IInUseTracking.cs +++ b/src/PepperDash.Essentials.Core/InUseTracking/IInUseTracking.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.InUseTracking { /// /// Defines a class that uses an InUseTracker diff --git a/src/PepperDash.Essentials.Core/InUseTracking/InUseTracking.cs b/src/PepperDash.Essentials.Core/InUseTracking/InUseTracking.cs index 4bf1a551..2b7aef41 100644 --- a/src/PepperDash.Essentials.Core/InUseTracking/InUseTracking.cs +++ b/src/PepperDash.Essentials.Core/InUseTracking/InUseTracking.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.InUseTracking { /// /// Provides in use tracking. Objects can register with this. InUseFeedback can provide diff --git a/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs b/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs index 8476d734..17862b33 100644 --- a/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs +++ b/src/PepperDash.Essentials.Core/JoinMaps/JoinMapBase.cs @@ -1,21 +1,18 @@ - - -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Text; using System.Reflection; -using Crestron.SimplSharp.CrestronIO; +using System.Text; using Crestron.SimplSharp; - -using PepperDash.Core; -using PepperDash.Essentials.Core.Config; - +using Crestron.SimplSharp.CrestronIO; using Newtonsoft.Json; +using PepperDash.Core; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Extensions; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.JoinMaps { public static class JoinMapHelper { diff --git a/src/PepperDash.Essentials.Core/License/EssentialsLicenseManager.cs b/src/PepperDash.Essentials.Core/License/EssentialsLicenseManager.cs index a242591e..414f6e3d 100644 --- a/src/PepperDash.Essentials.Core/License/EssentialsLicenseManager.cs +++ b/src/PepperDash.Essentials.Core/License/EssentialsLicenseManager.cs @@ -1,17 +1,11 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronDataStore; - -using PepperDash.Essentials.Core; - using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; - -namespace PepperDash.Essentials.License +namespace PepperDash.Essentials.Core.License { public abstract class LicenseManager { diff --git a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs index 6c0eaad3..ce27130a 100644 --- a/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Lighting/Lighting Interfaces.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Lighting { diff --git a/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs b/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs index b9978b7c..61b53684 100644 --- a/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs +++ b/src/PepperDash.Essentials.Core/Lighting/LightingBase.cs @@ -10,6 +10,11 @@ using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.Lighting diff --git a/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs b/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs index 653e2b18..163927ab 100644 --- a/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs +++ b/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs @@ -1,17 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; - using PepperDash.Core; -using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.CrestronIO; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; - -namespace PepperDash.Essentials.Core.Privacy +namespace PepperDash.Essentials.Core.Microphone_Privacy { /// /// Used for applications where one or more microphones with momentary contact closure outputs are used to @@ -246,9 +243,9 @@ namespace PepperDash.Essentials.Core.Privacy public override EssentialsDevice BuildDevice(DeviceConfig dc) { Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new MIcrophonePrivacyController Device"); - var props = Newtonsoft.Json.JsonConvert.DeserializeObject(dc.Properties.ToString()); + var props = Newtonsoft.Json.JsonConvert.DeserializeObject(dc.Properties.ToString()); - return new Core.Privacy.MicrophonePrivacyController(dc.Key, props); + return new MicrophonePrivacyController(dc.Key, props); } } diff --git a/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyControllerConfig.cs b/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyControllerConfig.cs index 1c172090..b48dba72 100644 --- a/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyControllerConfig.cs +++ b/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyControllerConfig.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using System.Collections.Generic; -using PepperDash.Essentials.Core.CrestronIO; - -namespace PepperDash.Essentials.Core.Privacy +namespace PepperDash.Essentials.Core.Microphone_Privacy { public class MicrophonePrivacyControllerConfig { diff --git a/src/PepperDash.Essentials.Core/Monitoring/CrestronGenericBaseCommunicationMonitor.cs b/src/PepperDash.Essentials.Core/Monitoring/CrestronGenericBaseCommunicationMonitor.cs index bd57b70a..77d99ab9 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/CrestronGenericBaseCommunicationMonitor.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/CrestronGenericBaseCommunicationMonitor.cs @@ -1,17 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -using System.ComponentModel; - +using Crestron.SimplSharpPro; using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Monitoring { /// /// diff --git a/src/PepperDash.Essentials.Core/Monitoring/GenericCommunicationMonitor.cs b/src/PepperDash.Essentials.Core/Monitoring/GenericCommunicationMonitor.cs index aad8120d..d4ace813 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/GenericCommunicationMonitor.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/GenericCommunicationMonitor.cs @@ -1,18 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -using System.ComponentModel; - using PepperDash.Core; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Monitoring { /// /// Used for monitoring comms that are IBasicCommunication. Will send a poll string and provide an event when diff --git a/src/PepperDash.Essentials.Core/Monitoring/Interfaces.cs b/src/PepperDash.Essentials.Core/Monitoring/Interfaces.cs index 6e4a847e..c85c628a 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/Interfaces.cs @@ -1,10 +1,8 @@ - -using System; - +using System; using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Monitoring { public interface IStatusMonitor { diff --git a/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorBase.cs b/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorBase.cs index 4abb930f..916c0d7d 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorBase.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorBase.cs @@ -1,17 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -using System.ComponentModel; - using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Monitoring { public abstract class StatusMonitorBase : IStatusMonitor, IKeyName { diff --git a/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorCollection.cs b/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorCollection.cs index 7f985fe0..ede4254b 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorCollection.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/StatusMonitorCollection.cs @@ -2,16 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - -using System.ComponentModel; - using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Monitoring { /// /// diff --git a/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs b/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs index 06a4fbd9..d5deb04f 100644 --- a/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs +++ b/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs @@ -10,6 +10,11 @@ using PepperDash.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.Monitoring diff --git a/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs b/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs index aca4f008..eb54a995 100644 --- a/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs +++ b/src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs @@ -1,7 +1,8 @@ -using PepperDash.Core; -using System.Collections.Generic; +using System.Collections.Generic; +using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.PartitionSensor { /// /// Represents an abstract controller device for a partition dividing rooms that are combinable diff --git a/src/PepperDash.Essentials.Core/PartitionSensor/IPartitionStateProvider.cs b/src/PepperDash.Essentials.Core/PartitionSensor/IPartitionStateProvider.cs index 418da80c..7f734b85 100644 --- a/src/PepperDash.Essentials.Core/PartitionSensor/IPartitionStateProvider.cs +++ b/src/PepperDash.Essentials.Core/PartitionSensor/IPartitionStateProvider.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; using Newtonsoft.Json; using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.PartitionSensor { /// /// Describes the functionality of a device that senses and provides partition state diff --git a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj index d82e2cc7..a94ec846 100644 --- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj +++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj @@ -4,7 +4,7 @@ Debug;Release;Debug 4.7.2 - net472;net6 + net472;net6.0;net8.0 true bin\$(Configuration)\ PepperDash_Essentials_Core @@ -29,7 +29,4 @@ - - - \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj.DotSettings b/src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj.DotSettings deleted file mode 100644 index cb991a69..00000000 --- a/src/PepperDash.Essentials.Core/PepperDash_Essentials_Core.csproj.DotSettings +++ /dev/null @@ -1,3 +0,0 @@ - - True - False \ No newline at end of file diff --git a/src/PepperDash.Essentials.Core/Plugins/IPluginDeviceFactory.cs b/src/PepperDash.Essentials.Core/Plugins/IPluginDeviceFactory.cs index ec823007..4f1b9b4d 100644 --- a/src/PepperDash.Essentials.Core/Plugins/IPluginDeviceFactory.cs +++ b/src/PepperDash.Essentials.Core/Plugins/IPluginDeviceFactory.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using PepperDash.Core; +using PepperDash.Essentials.Core.Factory; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Plugins { /// /// Defines a class that is capable of loading custom plugin device types diff --git a/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs b/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs index 969a6acc..8f376f84 100644 --- a/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs +++ b/src/PepperDash.Essentials.Core/Plugins/PluginLoader.cs @@ -1,16 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection; using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; -using System.Reflection; - -using PepperDash.Core; -using PepperDash.Essentials.Core; -using Serilog.Events; using Newtonsoft.Json; +using PepperDash.Core; +using Serilog.Events; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.Core.Plugins { /// /// Deals with loading plugins at runtime @@ -250,14 +248,14 @@ namespace PepperDash.Essentials filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + pluginFile.Name; // Check if there is a previous file in the loadedPlugins directory and delete - if (File.Exists(filePath)) + if (global::Crestron.SimplSharp.CrestronIO.File.Exists(filePath)) { Debug.LogMessage(LogEventLevel.Information, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath); - File.Delete(filePath); + global::Crestron.SimplSharp.CrestronIO.File.Delete(filePath); } // Move the file - File.Move(pluginFile.FullName, filePath); + global::Crestron.SimplSharp.CrestronIO.File.Move(pluginFile.FullName, filePath); Debug.LogMessage(LogEventLevel.Verbose, "Moved {0} to {1}", pluginFile.FullName, filePath); } else @@ -313,14 +311,14 @@ namespace PepperDash.Essentials filePath = _loadedPluginsDirectoryPath + Global.DirectorySeparator + tempFile.Name; // Check if there is a previous file in the loadedPlugins directory and delete - if (File.Exists(filePath)) + if (global::Crestron.SimplSharp.CrestronIO.File.Exists(filePath)) { Debug.LogMessage(LogEventLevel.Information, "Found existing file in loadedPlugins: {0} Deleting and moving new file to replace it", filePath); - File.Delete(filePath); + global::Crestron.SimplSharp.CrestronIO.File.Delete(filePath); } // Move the file - File.Move(tempFile.FullName, filePath); + global::Crestron.SimplSharp.CrestronIO.File.Move(tempFile.FullName, filePath); Debug.LogMessage(LogEventLevel.Verbose, "Moved {0} to {1}", tempFile.FullName, filePath); } else diff --git a/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs b/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs index 42059c78..d0a3b125 100644 --- a/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs +++ b/src/PepperDash.Essentials.Core/Presets/DevicePresets.cs @@ -10,6 +10,7 @@ using PepperDash.Core; //using SSMono.IO; using PepperDash.Core.WebApi.Presets; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; using Serilog.Events; namespace PepperDash.Essentials.Core.Presets diff --git a/src/PepperDash.Essentials.Core/Presets/DevicePresetsView.cs b/src/PepperDash.Essentials.Core/Presets/DevicePresetsView.cs index a43a7a2c..dd51eaba 100644 --- a/src/PepperDash.Essentials.Core/Presets/DevicePresetsView.cs +++ b/src/PepperDash.Essentials.Core/Presets/DevicePresetsView.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.SmartObjects.SubpageReferencList; namespace PepperDash.Essentials.Core.Presets { diff --git a/src/PepperDash.Essentials.Core/Presets/PresetsListSubpageReferenceListItem.cs b/src/PepperDash.Essentials.Core/Presets/PresetsListSubpageReferenceListItem.cs index c4349414..7294ca0c 100644 --- a/src/PepperDash.Essentials.Core/Presets/PresetsListSubpageReferenceListItem.cs +++ b/src/PepperDash.Essentials.Core/Presets/PresetsListSubpageReferenceListItem.cs @@ -7,6 +7,7 @@ using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; +using PepperDash.Essentials.Core.SmartObjects.SubpageReferencList; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Core/Ramps and Increments/ActionIncrementer.cs b/src/PepperDash.Essentials.Core/Ramps and Increments/ActionIncrementer.cs index f63d57bf..f2893cda 100644 --- a/src/PepperDash.Essentials.Core/Ramps and Increments/ActionIncrementer.cs +++ b/src/PepperDash.Essentials.Core/Ramps and Increments/ActionIncrementer.cs @@ -1,12 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; -using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Ramps_and_Increments { /// /// An incrementer that can use the values of some other object/primitive value to do its thing. diff --git a/src/PepperDash.Essentials.Core/Ramps and Increments/NumericalHelpers.cs b/src/PepperDash.Essentials.Core/Ramps and Increments/NumericalHelpers.cs index fefeb702..919f65fa 100644 --- a/src/PepperDash.Essentials.Core/Ramps and Increments/NumericalHelpers.cs +++ b/src/PepperDash.Essentials.Core/Ramps and Increments/NumericalHelpers.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Ramps_and_Increments { public class NumericalHelpers { diff --git a/src/PepperDash.Essentials.Core/Ramps and Increments/UshortSigIncrementer.cs b/src/PepperDash.Essentials.Core/Ramps and Increments/UshortSigIncrementer.cs index 3d29be77..e46fe206 100644 --- a/src/PepperDash.Essentials.Core/Ramps and Increments/UshortSigIncrementer.cs +++ b/src/PepperDash.Essentials.Core/Ramps and Increments/UshortSigIncrementer.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using Crestron.SimplSharp; using Crestron.SimplSharpPro; - using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Ramps_and_Increments { /// /// Attaches to UShortInputSig and does incremental ramping of the signal diff --git a/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs b/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs index e96e2a23..1f2c2473 100644 --- a/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs +++ b/src/PepperDash.Essentials.Core/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs @@ -1,22 +1,16 @@ - - -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Crestron.SimplSharp; using Crestron.SimplSharp.Scheduler; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - using PepperDash.Core; -using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Config.Essentials; using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Timers; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room.Behaviours { /// /// A device that when linked to a room can power the room on when enabled during scheduled hours. diff --git a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs index f0fb5e98..107ced5a 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs @@ -1,14 +1,17 @@ -using Crestron.SimplSharp; -using PepperDash.Core; -using PepperDash.Core.Logging; -using Serilog.Events; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Crestron.SimplSharp; +using PepperDash.Core; +using PepperDash.Core.Logging; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.PartitionSensor; +using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room.Combining { public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombiner { diff --git a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs index 745f303f..46fc85f9 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs @@ -1,16 +1,9 @@ - - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -using PepperDash.Core; - +using System.Collections.Generic; using Newtonsoft.Json; +using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room.Combining { /// /// Config properties for an EssentialsRoomCombiner device diff --git a/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs b/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs index fefdc2da..9e2066b0 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs @@ -3,8 +3,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using Newtonsoft.Json; using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.PartitionSensor; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room.Combining { /// /// Describes the functionality for an EssentailsRoomCombiner device diff --git a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs index f36b807c..8f39603d 100644 --- a/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs +++ b/src/PepperDash.Essentials.Core/Room/Combining/RoomCombinationScenario.cs @@ -1,11 +1,12 @@ -using Newtonsoft.Json; +using System.Collections.Generic; +using System.Threading.Tasks; +using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Logging; -using Serilog.Events; -using System.Collections.Generic; -using System.Threading.Tasks; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room.Combining { /// /// Represents a room combination scenario diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs index 2eb56fd3..f4f13c71 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsDualDisplayRoomPropertiesConfig.cs @@ -1,5 +1,5 @@  -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class EssentialsDualDisplayRoomPropertiesConfig : EssentialsNDisplayRoomPropertiesConfig { diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs index a0b3499f..0a843632 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { /// /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs index 27164f57..13126fac 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs @@ -1,7 +1,7 @@  using Newtonsoft.Json; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class EssentialsHuddleVtc1PropertiesConfig : EssentialsConferenceRoomPropertiesConfig diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs index 6d8762fa..76c28579 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsNDisplayRoomPropertiesConfig.cs @@ -1,10 +1,9 @@ - -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { /// /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsPresentationPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsPresentationPropertiesConfig.cs index 53333f07..55dcbbf5 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsPresentationPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsPresentationPropertiesConfig.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { /// /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs index 3f457176..5e621cd3 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using Crestron.SimplSharp; using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Privacy; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Microphone_Privacy; using Serilog.Events; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class EssentialsRoomConfigHelper { diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs index 76199a91..028f70a7 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomEmergencyConfig.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { /// /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs index 617b7c9f..6ac6d0fd 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomScheduledEventsConfig.cs @@ -1,12 +1,9 @@ - - -using System.Collections.Generic; +using System.Collections.Generic; using Crestron.SimplSharp.Scheduler; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class EssentialsRoomScheduledEventsConfig { diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsTechRoomConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsTechRoomConfig.cs index 507bac5e..691d374e 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsTechRoomConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsTechRoomConfig.cs @@ -1,9 +1,7 @@ - -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; -using PepperDash.Essentials.Room.Config; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class EssentialsTechRoomConfig { diff --git a/src/PepperDash.Essentials.Core/Room/Config/EssentialsVolumeLevelConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/EssentialsVolumeLevelConfig.cs index 5b9450f2..f2f0a644 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/EssentialsVolumeLevelConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/EssentialsVolumeLevelConfig.cs @@ -1,7 +1,7 @@ using System; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { /// /// diff --git a/src/PepperDash.Essentials.Core/Room/Config/SimplRoomPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Room/Config/SimplRoomPropertiesConfig.cs index fdd9b857..02d0b96d 100644 --- a/src/PepperDash.Essentials.Core/Room/Config/SimplRoomPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Room/Config/SimplRoomPropertiesConfig.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json; -namespace PepperDash.Essentials.Room.Config +namespace PepperDash.Essentials.Core.Room.Config { public class SimplRoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig { diff --git a/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs b/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs index 7ad7f700..546603c8 100644 --- a/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs +++ b/src/PepperDash.Essentials.Core/Room/EsentialsRoomEmergencyContactClosure.cs @@ -1,8 +1,8 @@ using System; using Crestron.SimplSharpPro; -using PepperDash.Essentials.Room.Config; +using PepperDash.Essentials.Core.Room.Config; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { public class EssentialsRoomEmergencyContactClosure : EssentialsRoomEmergencyBase { diff --git a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs index 232c02ed..7f781382 100644 --- a/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs +++ b/src/PepperDash.Essentials.Core/Room/EssentialsRoomBase.cs @@ -1,18 +1,15 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharp.Scheduler; - using PepperDash.Core; -using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Microphone_Privacy; +using PepperDash.Essentials.Core.Timers; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { /// /// @@ -170,7 +167,7 @@ namespace PepperDash.Essentials.Core public EssentialsRoomEmergencyBase Emergency { get; set; } - public Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; set; } + public MicrophonePrivacyController MicrophonePrivacy { get; set; } public string LogoUrlLightBkgnd { get; set; } diff --git a/src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs b/src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs index d452c0b9..4dde7845 100644 --- a/src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs +++ b/src/PepperDash.Essentials.Core/Room/IEssentialsRoom.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using PepperDash.Essentials.Room.Config; +using PepperDash.Core; using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Timers; -using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { /// /// Describes the basic functionality of an EssentialsRoom diff --git a/src/PepperDash.Essentials.Core/Room/IRoomEventSchedule.cs b/src/PepperDash.Essentials.Core/Room/IRoomEventSchedule.cs index c2595151..416568cf 100644 --- a/src/PepperDash.Essentials.Core/Room/IRoomEventSchedule.cs +++ b/src/PepperDash.Essentials.Core/Room/IRoomEventSchedule.cs @@ -1,8 +1,8 @@ -using PepperDash.Essentials.Room.Config; -using System; +using System; using System.Collections.Generic; +using PepperDash.Essentials.Core.Room.Config; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { public interface IRoomEventSchedule { diff --git a/src/PepperDash.Essentials.Core/Room/Interfaces.cs b/src/PepperDash.Essentials.Core/Room/Interfaces.cs index c7635d7a..e2471d30 100644 --- a/src/PepperDash.Essentials.Core/Room/Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Room/Interfaces.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Microphone_Privacy; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Timers; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { /// /// For rooms with in call feedback @@ -156,7 +156,7 @@ namespace PepperDash.Essentials.Core public interface IMicrophonePrivacy { - Core.Privacy.MicrophonePrivacyController MicrophonePrivacy { get; } + MicrophonePrivacyController MicrophonePrivacy { get; } } public interface IHasAccessoryDevices : IKeyName diff --git a/src/PepperDash.Essentials.Core/Room/Room.cs b/src/PepperDash.Essentials.Core/Room/Room.cs index 5e190bc9..de4931ae 100644 --- a/src/PepperDash.Essentials.Core/Room/Room.cs +++ b/src/PepperDash.Essentials.Core/Room/Room.cs @@ -1,14 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; +using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { //*************************************************************************************************** diff --git a/src/PepperDash.Essentials.Core/Room/iOccupancyStatusProvider.cs b/src/PepperDash.Essentials.Core/Room/iOccupancyStatusProvider.cs index f46f10b1..72585ff8 100644 --- a/src/PepperDash.Essentials.Core/Room/iOccupancyStatusProvider.cs +++ b/src/PepperDash.Essentials.Core/Room/iOccupancyStatusProvider.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; +using PepperDash.Essentials.Core.Feedbacks; -using PepperDash.Essentials.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Room { public interface IOccupancyStatusProvider { diff --git a/src/PepperDash.Essentials.Core/Routing/Extensions.cs b/src/PepperDash.Essentials.Core/Routing/Extensions.cs index 6d3a98fd..c82d305c 100644 --- a/src/PepperDash.Essentials.Core/Routing/Extensions.cs +++ b/src/PepperDash.Essentials.Core/Routing/Extensions.cs @@ -1,12 +1,13 @@ -using Serilog.Events; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using Serilog.Events; using Debug = PepperDash.Core.Debug; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// diff --git a/src/PepperDash.Essentials.Core/Routing/IHasCurrentSourceInfoChange.cs b/src/PepperDash.Essentials.Core/Routing/IHasCurrentSourceInfoChange.cs index 505a8652..47e3e6db 100644 --- a/src/PepperDash.Essentials.Core/Routing/IHasCurrentSourceInfoChange.cs +++ b/src/PepperDash.Essentials.Core/Routing/IHasCurrentSourceInfoChange.cs @@ -9,7 +9,10 @@ using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Core.Routing.Interfaces */ -namespace PepperDash.Essentials.Core + +using PepperDash.Essentials.Core.Devices; + +namespace PepperDash.Essentials.Core.Routing { /// /// The handler type for a Room's SourceInfoChange diff --git a/src/PepperDash.Essentials.Core/Routing/IRmcRouting.cs b/src/PepperDash.Essentials.Core/Routing/IRmcRouting.cs index 52290bd2..48dfba6e 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRmcRouting.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRmcRouting.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials.Core +using PepperDash.Essentials.Core.Feedbacks; + +namespace PepperDash.Essentials.Core.Routing { /// /// Defines a receiver that has internal routing (DM-RMC-4K-Z-SCALER-C) diff --git a/src/PepperDash.Essentials.Core/Routing/IRmcRoutingWithFeedback.cs b/src/PepperDash.Essentials.Core/Routing/IRmcRoutingWithFeedback.cs index a8e6d5f0..d20b7e3f 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRmcRoutingWithFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRmcRoutingWithFeedback.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines an IRmcRouting with a feedback event diff --git a/src/PepperDash.Essentials.Core/Routing/IRouting.cs b/src/PepperDash.Essentials.Core/Routing/IRouting.cs index e3231858..ccd508f7 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRouting.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRouting.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines a midpoint device as have internal routing. Any devices in the middle of the diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingFeedback.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingFeedback.cs index b8b22915..d3cc49f1 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingFeedback.cs @@ -1,9 +1,7 @@ using System; - using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines an event structure for reporting output route data diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingHasVideoInputSyncFeedbacks.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingHasVideoInputSyncFeedbacks.cs index 0f6d7834..205b4d00 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingHasVideoInputSyncFeedbacks.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingHasVideoInputSyncFeedbacks.cs @@ -1,15 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DM; +using PepperDash.Essentials.Core.Feedbacks; -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public interface IRoutingHasVideoInputSyncFeedbacks diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs index faee0fe9..e7fc36a5 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials.Core.Routing +using PepperDash.Essentials.Core.Devices; + +namespace PepperDash.Essentials.Core.Routing { public interface IRoutingInputSlot: IRoutingSlot, IOnline, IVideoSync { diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingInputs.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingInputs.cs index ff96fded..9afec274 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingInputs.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingInputs.cs @@ -1,7 +1,6 @@ using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines a class that has a collection of RoutingInputPorts diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingInputsOutputs.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingInputsOutputs.cs index e202fa3c..4864746a 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingInputsOutputs.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingInputsOutputs.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// For devices like RMCs, baluns, other devices with no switching. diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingNumeric.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingNumeric.cs index d41909f1..c187b289 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingNumeric.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingNumeric.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public interface IRoutingNumeric : IRouting { diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingNumericWithFeedback.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingNumericWithFeedback.cs index e278a193..1ceff7b9 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingNumericWithFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingNumericWithFeedback.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines an IRoutingNumeric with a feedback event diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputs.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputs.cs index d3bc70de..24ff949f 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputs.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputs.cs @@ -1,7 +1,6 @@ using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines a class that has a collection of RoutingOutputPorts diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingSink.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingSink.cs index b05c7744..0e3ab2c3 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingSink.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingSink.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// For fixed-source endpoint devices diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithFeedback.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithFeedback.cs index d3d3e600..a5cd61c3 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithFeedback.cs @@ -1,8 +1,4 @@ -using PepperDash.Essentials.Core.Routing; -using System; -using System.Collections.Generic; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithSwitching.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithSwitching.cs index d6f97c07..686affc9 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithSwitching.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingSinkWithSwitching.cs @@ -1,6 +1,4 @@ -using System; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public delegate void InputChangedEventHandler(IRoutingSinkWithSwitching destination, RoutingInputPort currentPort); diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingSource.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingSource.cs index d50bcbb0..9cc699ab 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingSource.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingSource.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines an IRoutingOutputs devices as being a source - the start of the chain diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingWithClear.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingWithClear.cs index 077d4ecd..c1e02896 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingWithClear.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingWithClear.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public interface IRoutingWithClear : IRouting { diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingWithFeedback.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingWithFeedback.cs index dcf4e423..9a392195 100644 --- a/src/PepperDash.Essentials.Core/Routing/IRoutingWithFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/IRoutingWithFeedback.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using System; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public delegate void RouteChangedEventHandler(IRoutingWithFeedback midpoint, RouteSwitchDescriptor newRoute); /// diff --git a/src/PepperDash.Essentials.Core/Routing/ITxRouting.cs b/src/PepperDash.Essentials.Core/Routing/ITxRouting.cs index 0950e6a6..8df14ea1 100644 --- a/src/PepperDash.Essentials.Core/Routing/ITxRouting.cs +++ b/src/PepperDash.Essentials.Core/Routing/ITxRouting.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials.Core +using PepperDash.Essentials.Core.Feedbacks; + +namespace PepperDash.Essentials.Core.Routing { public interface ITxRouting : IRoutingNumeric { diff --git a/src/PepperDash.Essentials.Core/Routing/ITxRoutingWithFeedback.cs b/src/PepperDash.Essentials.Core/Routing/ITxRoutingWithFeedback.cs index 484fa134..a9470d07 100644 --- a/src/PepperDash.Essentials.Core/Routing/ITxRoutingWithFeedback.cs +++ b/src/PepperDash.Essentials.Core/Routing/ITxRoutingWithFeedback.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Defines an IRmcRouting with a feedback event diff --git a/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs b/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs index ee8b69ac..aa001aad 100644 --- a/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs +++ b/src/PepperDash.Essentials.Core/Routing/RouteDescriptor.cs @@ -1,12 +1,9 @@ using System.Collections.Generic; using System.Linq; -using Crestron.SimplSharpPro; - using PepperDash.Core; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Represents an collection of individual route steps between Source and Destination diff --git a/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs b/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs index 6c4a5df5..9837a8e8 100644 --- a/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs +++ b/src/PepperDash.Essentials.Core/Routing/RouteDescriptorCollection.cs @@ -1,10 +1,9 @@ -using PepperDash.Core; -using Serilog.Events; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; +using PepperDash.Core; +using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// A collection of RouteDescriptors - typically the static DefaultCollection is used diff --git a/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs b/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs index 0f51d174..a7558f1d 100644 --- a/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs +++ b/src/PepperDash.Essentials.Core/Routing/RouteRequest.cs @@ -1,7 +1,9 @@ using PepperDash.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public class RouteRequest { diff --git a/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs b/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs index c425d0a4..4522f836 100644 --- a/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs +++ b/src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Represents an individual link for a route diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs b/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs index a3b9a588..2c763bda 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs @@ -2,6 +2,9 @@ using PepperDash.Essentials.Core.Config; using System; using System.Linq; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Room; namespace PepperDash.Essentials.Core.Routing { diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs b/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs index 9e3bb1d9..f911477c 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingInputPort.cs @@ -1,7 +1,6 @@ using System; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Basic RoutingInput with no statuses. diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingInputPortWithVideoStatuses.cs b/src/PepperDash.Essentials.Core/Routing/RoutingInputPortWithVideoStatuses.cs index bd4dd489..93f0dd90 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingInputPortWithVideoStatuses.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingInputPortWithVideoStatuses.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials.Core +using PepperDash.Essentials.Core.VideoStatus; + +namespace PepperDash.Essentials.Core.Routing { /// /// A RoutingInputPort for devices like DM-TX and DM input cards. diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingNumericEventArgs.cs b/src/PepperDash.Essentials.Core/Routing/RoutingNumericEventArgs.cs index 7ede13c2..3138938c 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingNumericEventArgs.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingNumericEventArgs.cs @@ -1,7 +1,6 @@ using System; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public class RoutingNumericEventArgs : EventArgs { diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs b/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs index bebcb287..5e1fae0c 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingOutputPort.cs @@ -1,7 +1,6 @@ using System; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public class RoutingOutputPort : RoutingPort { @@ -10,7 +9,7 @@ namespace PepperDash.Essentials.Core /// public IRoutingOutputs ParentDevice { get; private set; } - public InUseTracking InUseTracker { get; private set; } + public InUseTracking.InUseTracking InUseTracker { get; private set; } /// @@ -29,7 +28,7 @@ namespace PepperDash.Essentials.Core : base(key, type, connType, selector, isInternal) { ParentDevice = parent ?? throw new ArgumentNullException(nameof(parent)); - InUseTracker = new InUseTracking(); + InUseTracker = new InUseTracking.InUseTracking(); } public override string ToString() diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingPort.cs b/src/PepperDash.Essentials.Core/Routing/RoutingPort.cs index 04e804f1..74a47343 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingPort.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingPort.cs @@ -1,7 +1,6 @@ using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Base class for RoutingInput and Output ports diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs b/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs index 0b9d765c..ef8ffac4 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingPortCollection.cs @@ -2,10 +2,7 @@ using System.Collections.Generic; using System.Linq; -using PepperDash.Core; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// Basically a List , with an indexer to find ports by key name diff --git a/src/PepperDash.Essentials.Core/Routing/RoutingPortNames.cs b/src/PepperDash.Essentials.Core/Routing/RoutingPortNames.cs index 160b4f16..5bd1fa77 100644 --- a/src/PepperDash.Essentials.Core/Routing/RoutingPortNames.cs +++ b/src/PepperDash.Essentials.Core/Routing/RoutingPortNames.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { /// /// These should correspond directly with the portNames var in the config tool. diff --git a/src/PepperDash.Essentials.Core/Routing/TieLine.cs b/src/PepperDash.Essentials.Core/Routing/TieLine.cs index 0b271272..a2c21730 100644 --- a/src/PepperDash.Essentials.Core/Routing/TieLine.cs +++ b/src/PepperDash.Essentials.Core/Routing/TieLine.cs @@ -1,8 +1,8 @@ -using Newtonsoft.Json; -using System; +using System; using System.Collections.Generic; +using Newtonsoft.Json; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public class TieLine { diff --git a/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs b/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs index 922cc61d..701fe7f5 100644 --- a/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs +++ b/src/PepperDash.Essentials.Core/Routing/TieLineConfig.cs @@ -1,18 +1,8 @@ - - -using System; -using System.Collections.Generic; -using Crestron.SimplSharp; -using Crestron.SimplSharp.CrestronIO; -using Crestron.SimplSharpPro; - -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using PepperDash.Core; -using PepperDash.Essentials.Core; +using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; -namespace PepperDash.Essentials.Core.Config +namespace PepperDash.Essentials.Core.Routing { public class TieLineConfig { diff --git a/src/PepperDash.Essentials.Core/Routing/eRoutingPortConnectionType.cs b/src/PepperDash.Essentials.Core/Routing/eRoutingPortConnectionType.cs index 436ef9e6..56a9a911 100644 --- a/src/PepperDash.Essentials.Core/Routing/eRoutingPortConnectionType.cs +++ b/src/PepperDash.Essentials.Core/Routing/eRoutingPortConnectionType.cs @@ -1,4 +1,4 @@ -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { public enum eRoutingPortConnectionType { diff --git a/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs b/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs index b5f3d9f7..ea013f60 100644 --- a/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs +++ b/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs @@ -1,7 +1,6 @@ using System; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Routing { [Flags] public enum eRoutingSignalType diff --git a/src/PepperDash.Essentials.Core/Secrets/CrestronGlobalSecretsProvider.cs b/src/PepperDash.Essentials.Core/Secrets/CrestronGlobalSecretsProvider.cs index 4614e661..a40f8546 100644 --- a/src/PepperDash.Essentials.Core/Secrets/CrestronGlobalSecretsProvider.cs +++ b/src/PepperDash.Essentials.Core/Secrets/CrestronGlobalSecretsProvider.cs @@ -4,8 +4,7 @@ using Crestron.SimplSharp.CrestronDataStore; using PepperDash.Core; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { public class CrestronGlobalSecretsProvider : ISecretProvider { diff --git a/src/PepperDash.Essentials.Core/Secrets/CrestronLocalSecretsProvider.cs b/src/PepperDash.Essentials.Core/Secrets/CrestronLocalSecretsProvider.cs index 6c355d30..ba30aba9 100644 --- a/src/PepperDash.Essentials.Core/Secrets/CrestronLocalSecretsProvider.cs +++ b/src/PepperDash.Essentials.Core/Secrets/CrestronLocalSecretsProvider.cs @@ -2,11 +2,9 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronDataStore; using PepperDash.Core; -using Crestron.SimplSharpPro; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { public class CrestronLocalSecretsProvider : ISecretProvider { diff --git a/src/PepperDash.Essentials.Core/Secrets/CrestronSecret.cs b/src/PepperDash.Essentials.Core/Secrets/CrestronSecret.cs index 27fbcdad..70c89355 100644 --- a/src/PepperDash.Essentials.Core/Secrets/CrestronSecret.cs +++ b/src/PepperDash.Essentials.Core/Secrets/CrestronSecret.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { /// /// Special container class for CrestronSecret provider diff --git a/src/PepperDash.Essentials.Core/Secrets/Interfaces.cs b/src/PepperDash.Essentials.Core/Secrets/Interfaces.cs index d2fd750a..71d3ae28 100644 --- a/src/PepperDash.Essentials.Core/Secrets/Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Secrets/Interfaces.cs @@ -1,6 +1,6 @@ using PepperDash.Core; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { /// /// All ISecrecretProvider classes must implement this interface. diff --git a/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs b/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs index 8309b7e9..68f33cdc 100644 --- a/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs +++ b/src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs @@ -5,7 +5,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { public static class SecretsManager { diff --git a/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs index f092d5d3..ca5c6a09 100644 --- a/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Secrets/SecretsPropertiesConfig.cs @@ -1,13 +1,6 @@ - +using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Newtonsoft.Json; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Secrets { /// /// Provide a way to easily deserialize into a secret object from config diff --git a/src/PepperDash.Essentials.Core/Shades/Shade Interfaces.cs b/src/PepperDash.Essentials.Core/Shades/Shade Interfaces.cs index 93fcbc52..8aa06cb3 100644 --- a/src/PepperDash.Essentials.Core/Shades/Shade Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Shades/Shade Interfaces.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Shades { diff --git a/src/PepperDash.Essentials.Core/Shades/ShadeBase.cs b/src/PepperDash.Essentials.Core/Shades/ShadeBase.cs index c44abac6..a187f454 100644 --- a/src/PepperDash.Essentials.Core/Shades/ShadeBase.cs +++ b/src/PepperDash.Essentials.Core/Shades/ShadeBase.cs @@ -6,6 +6,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core.CrestronIO; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Shades { diff --git a/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs b/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs index f92e182b..2c6bae7a 100644 --- a/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs +++ b/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs @@ -1,18 +1,12 @@ - -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using Crestron.SimplSharpPro.UI; - using PepperDash.Core; using Serilog.Events; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.SmartObjects.SubpageReferencList { ////***************************************************************************** ///// diff --git a/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceListItem.cs b/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceListItem.cs index 30e15f74..b4124850 100644 --- a/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceListItem.cs +++ b/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceListItem.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.UI; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.SmartObjects.SubpageReferencList { public class SubpageReferenceListItem { diff --git a/src/PepperDash.Essentials.Core/Timers/CountdownTimer.cs b/src/PepperDash.Essentials.Core/Timers/CountdownTimer.cs index cbb470d6..376060c7 100644 --- a/src/PepperDash.Essentials.Core/Timers/CountdownTimer.cs +++ b/src/PepperDash.Essentials.Core/Timers/CountdownTimer.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Crestron.SimplSharp; - using PepperDash.Core; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Timers { public class SecondsCountdownTimer: IKeyed { diff --git a/src/PepperDash.Essentials.Core/Global/JobTimer.cs b/src/PepperDash.Essentials.Core/Timers/JobTimer.cs similarity index 96% rename from src/PepperDash.Essentials.Core/Global/JobTimer.cs rename to src/PepperDash.Essentials.Core/Timers/JobTimer.cs index 83159c12..68dc0848 100644 --- a/src/PepperDash.Essentials.Core/Global/JobTimer.cs +++ b/src/PepperDash.Essentials.Core/Timers/JobTimer.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using Crestron.SimplSharp; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Timers { public static class JobTimer { diff --git a/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs b/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs index 968c10bb..1e318ed5 100644 --- a/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs +++ b/src/PepperDash.Essentials.Core/Timers/RetriggerableTimer.cs @@ -11,6 +11,7 @@ using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Core/Global/Scheduler.cs b/src/PepperDash.Essentials.Core/Timers/Scheduler.cs similarity index 99% rename from src/PepperDash.Essentials.Core/Global/Scheduler.cs rename to src/PepperDash.Essentials.Core/Timers/Scheduler.cs index 5e31852c..79654f27 100644 --- a/src/PepperDash.Essentials.Core/Global/Scheduler.cs +++ b/src/PepperDash.Essentials.Core/Timers/Scheduler.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using Crestron.SimplSharp; using Crestron.SimplSharp.Scheduler; - using PepperDash.Core; -using PepperDash.Essentials.Room.Config; +using PepperDash.Essentials.Core.Room.Config; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Timers { /// /// Global Scheduler for the system diff --git a/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs index aa4dac6d..05a955f3 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; +using PepperDash.Essentials.Core.Communications; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Touchpanels { public class CrestronTouchpanelPropertiesConfig { diff --git a/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs b/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs index 946f4f9d..440126e3 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro.DeviceSupport; +using Crestron.SimplSharpPro.DeviceSupport; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Touchpanels { public interface IHasBasicTriListWithSmartObject { diff --git a/src/PepperDash.Essentials.Core/Touchpanels/Keyboards/HabaneroKeyboardController.cs b/src/PepperDash.Essentials.Core/Touchpanels/Keyboards/HabaneroKeyboardController.cs index 5e068c12..92c60e2e 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/Keyboards/HabaneroKeyboardController.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/Keyboards/HabaneroKeyboardController.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using Crestron.SimplSharpPro.DeviceSupport; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Touchpanels.Keyboards { diff --git a/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs b/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs index 4dbe7158..f3f02670 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs @@ -1,10 +1,9 @@ using System; -using Crestron.SimplSharp; using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; using Serilog.Events; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Touchpanels { public class ModalDialog { diff --git a/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs b/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs index c75a95b4..6c8f2a10 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs @@ -2,9 +2,13 @@ using System.Collections.Generic; using System.Globalization; using Crestron.SimplSharpPro; +using Crestron.SimplSharpPro.DeviceSupport; using Newtonsoft.Json; using PepperDash.Core; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; +using Feedback = PepperDash.Essentials.Core.Feedbacks.Feedback; namespace PepperDash.Essentials.Core.Touchpanels { @@ -280,7 +284,7 @@ namespace PepperDash.Essentials.Core.Touchpanels Debug.LogMessage(LogEventLevel.Debug, this, "BaseEvent: eventId-'{0}', index-'{1}'", args.EventId, args.Index); } - private void _touchpanel_ButtonStateChange(GenericBase device, Crestron.SimplSharpPro.DeviceSupport.ButtonEventArgs args) + private void _touchpanel_ButtonStateChange(GenericBase device, ButtonEventArgs args) { Debug.LogMessage(LogEventLevel.Debug, this, "ButtonStateChange: buttonNumber-'{0}' buttonName-'{1}', buttonState-'{2}'", args.Button.Number, args.Button.Name, args.NewButtonState); var type = args.NewButtonState.ToString(); diff --git a/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs b/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs index bfbb73f0..f25d9c16 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs @@ -1,15 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - using Crestron.SimplSharp; using Crestron.SimplSharpPro; using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Core; - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.Touchpanels { /// /// Extensions used for more-clear attachment of Actions to user objects on sigs diff --git a/src/PepperDash.Essentials.Core/TriListBridges/HandlerBridge.cs b/src/PepperDash.Essentials.Core/TriListBridges/HandlerBridge.cs index e1a69707..402efc6a 100644 --- a/src/PepperDash.Essentials.Core/TriListBridges/HandlerBridge.cs +++ b/src/PepperDash.Essentials.Core/TriListBridges/HandlerBridge.cs @@ -1,13 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DeviceSupport; - - -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.TriListBridges { public abstract class HandlerBridge { diff --git a/src/PepperDash.Essentials.Core/UI PageManagers/BlurayPageManager.cs b/src/PepperDash.Essentials.Core/UI PageManagers/BlurayPageManager.cs index c272a65a..1dce31fb 100644 --- a/src/PepperDash.Essentials.Core/UI PageManagers/BlurayPageManager.cs +++ b/src/PepperDash.Essentials.Core/UI PageManagers/BlurayPageManager.cs @@ -1,7 +1,8 @@ using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Touchpanels; -namespace PepperDash.Essentials.Core.PageManagers +namespace PepperDash.Essentials.Core.UI_PageManagers { public class DiscPlayerMediumPageManager : MediumLeftSwitchablePageManager { diff --git a/src/PepperDash.Essentials.Core/UI PageManagers/PageManager.cs b/src/PepperDash.Essentials.Core/UI PageManagers/PageManager.cs index 1f261f87..31f07e3e 100644 --- a/src/PepperDash.Essentials.Core/UI PageManagers/PageManager.cs +++ b/src/PepperDash.Essentials.Core/UI PageManagers/PageManager.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; -namespace PepperDash.Essentials.Core.PageManagers +namespace PepperDash.Essentials.Core.UI_PageManagers { /// /// The PageManager classes are used to bridge a device to subpage diff --git a/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxThreePanelPageManager.cs b/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxThreePanelPageManager.cs index 539bb9d4..8be5f714 100644 --- a/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxThreePanelPageManager.cs +++ b/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxThreePanelPageManager.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Presets; using Serilog.Events; -namespace PepperDash.Essentials.Core.PageManagers +namespace PepperDash.Essentials.Core.UI_PageManagers { public class ThreePanelPlusOnePageManager : PageManager { @@ -72,7 +72,7 @@ namespace PepperDash.Essentials.Core.PageManagers } } - void tabSo_SigChange(Crestron.SimplSharpPro.GenericBase currentDevice, Crestron.SimplSharpPro.SmartObjectEventArgs args) + void tabSo_SigChange(global::Crestron.SimplSharpPro.GenericBase currentDevice, global::Crestron.SimplSharpPro.SmartObjectEventArgs args) { var uo = args.Sig.UserObject; if(uo is Action) diff --git a/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxTwoPanelPageManager.cs b/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxTwoPanelPageManager.cs index 2797695e..7299d955 100644 --- a/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxTwoPanelPageManager.cs +++ b/src/PepperDash.Essentials.Core/UI PageManagers/SetTopBoxTwoPanelPageManager.cs @@ -1,8 +1,9 @@ using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Presets; +using PepperDash.Essentials.Core.Touchpanels; -namespace PepperDash.Essentials.Core.PageManagers +namespace PepperDash.Essentials.Core.UI_PageManagers { /// /// A fixed-layout page manager that expects a DPad on the right, fixed portion of the page, and a two/three diff --git a/src/PepperDash.Essentials.Core/UI PageManagers/SinglePageManager.cs b/src/PepperDash.Essentials.Core/UI PageManagers/SinglePageManager.cs index dd7d605c..1af3ee81 100644 --- a/src/PepperDash.Essentials.Core/UI PageManagers/SinglePageManager.cs +++ b/src/PepperDash.Essentials.Core/UI PageManagers/SinglePageManager.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; -using Crestron.SimplSharpPro.DeviceSupport; -using PepperDash.Essentials.Core; +using Crestron.SimplSharpPro.DeviceSupport; -namespace PepperDash.Essentials.Core.PageManagers +namespace PepperDash.Essentials.Core.UI_PageManagers { /// /// A simple class that hides and shows the default subpage for a given source type diff --git a/src/PepperDash.Essentials.Core/UI/TouchpanelBase.cs b/src/PepperDash.Essentials.Core/UI/TouchpanelBase.cs index 1d83ea5b..b1706d1f 100644 --- a/src/PepperDash.Essentials.Core/UI/TouchpanelBase.cs +++ b/src/PepperDash.Essentials.Core/UI/TouchpanelBase.cs @@ -1,14 +1,12 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using PepperDash.Essentials.Core; using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; -using Crestron.SimplSharpPro.UI; using Crestron.SimplSharp.CrestronIO; using Crestron.SimplSharpPro; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Room.Combining; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Core.UI @@ -153,7 +151,7 @@ namespace PepperDash.Essentials.Core.UI SetupPanelDrivers(newRoomKey); } - private void Panel_SigChange(object currentDevice, Crestron.SimplSharpPro.SigEventArgs args) + private void Panel_SigChange(object currentDevice, SigEventArgs args) { Debug.LogMessage(LogEventLevel.Verbose, this, "Sig change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue); var uo = args.Sig.UserObject; diff --git a/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs b/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs index 5c519f60..4d653ed7 100644 --- a/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs +++ b/src/PepperDash.Essentials.Core/Utilities/ActionSequence.cs @@ -12,6 +12,7 @@ using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; namespace PepperDash.Essentials.Core.Utilities diff --git a/src/PepperDash.Essentials.Core/VideoStatus/VideoStatusOutputs.cs b/src/PepperDash.Essentials.Core/VideoStatus/VideoStatusOutputs.cs index 62d0040a..1cb78967 100644 --- a/src/PepperDash.Essentials.Core/VideoStatus/VideoStatusOutputs.cs +++ b/src/PepperDash.Essentials.Core/VideoStatus/VideoStatusOutputs.cs @@ -1,12 +1,8 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using Crestron.SimplSharpPro; -using Crestron.SimplSharpPro.DM; +using PepperDash.Essentials.Core.Feedbacks; -namespace PepperDash.Essentials.Core +namespace PepperDash.Essentials.Core.VideoStatus { /// /// Use this class to pass in values to RoutingInputPorts. Unused properties will have default diff --git a/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs b/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs index a37a78c0..ad40709f 100644 --- a/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs +++ b/src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs @@ -5,6 +5,7 @@ using Crestron.SimplSharp; using Crestron.SimplSharp.WebScripting; using PepperDash.Core; using PepperDash.Core.Web; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.Web.RequestHandlers; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Core/Web/EssentialsWebApiFactory.cs b/src/PepperDash.Essentials.Core/Web/EssentialsWebApiFactory.cs index d0610ede..a4a89978 100644 --- a/src/PepperDash.Essentials.Core/Web/EssentialsWebApiFactory.cs +++ b/src/PepperDash.Essentials.Core/Web/EssentialsWebApiFactory.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using PepperDash.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; namespace PepperDash.Essentials.Core.Web diff --git a/src/PepperDash.Essentials.Core/Web/EssentialsWebApiHelpers.cs b/src/PepperDash.Essentials.Core/Web/EssentialsWebApiHelpers.cs index d5f5af36..ffb2c439 100644 --- a/src/PepperDash.Essentials.Core/Web/EssentialsWebApiHelpers.cs +++ b/src/PepperDash.Essentials.Core/Web/EssentialsWebApiHelpers.cs @@ -4,6 +4,9 @@ using System.Linq; using System.Text; using Crestron.SimplSharp.WebScripting; using PepperDash.Core; +using PepperDash.Essentials.Core.Factory; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Plugins; namespace PepperDash.Essentials.Core.Web { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevJsonRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevJsonRequestHandler.cs index 358394ad..de3752d4 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevJsonRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevJsonRequestHandler.cs @@ -3,6 +3,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; using Serilog.Events; namespace PepperDash.Essentials.Core.Web.RequestHandlers diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevListRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevListRequestHandler.cs index a83685fb..82dc690a 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevListRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevListRequestHandler.cs @@ -2,6 +2,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevMethodsRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevMethodsRequestHandler.cs index 263eb161..7a55abdb 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevMethodsRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevMethodsRequestHandler.cs @@ -3,6 +3,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevPropsRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevPropsRequestHandler.cs index c00e47c2..ae0b041f 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevPropsRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DevPropsRequestHandler.cs @@ -2,6 +2,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DisableAllStreamDebugRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DisableAllStreamDebugRequestHandler.cs index 0e682d6c..48386daa 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/DisableAllStreamDebugRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/DisableAllStreamDebugRequestHandler.cs @@ -1,5 +1,6 @@ using Crestron.SimplSharp.WebScripting; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs index 5dd5495c..1318d22a 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetFeedbacksForDeviceRequestHandler.cs @@ -2,6 +2,8 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForBridgeKeyRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForBridgeKeyRequestHandler.cs index f2362f4b..85867de7 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForBridgeKeyRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForBridgeKeyRequestHandler.cs @@ -3,6 +3,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForDeviceKeyRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForDeviceKeyRequestHandler.cs index 6c669189..791b7a30 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForDeviceKeyRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetJoinMapForDeviceKeyRequestHandler.cs @@ -2,6 +2,8 @@ using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.JoinMaps; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTieLinesRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTieLinesRequestHandler.cs index fb1db4e7..08a4fe6d 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTieLinesRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTieLinesRequestHandler.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; using System.Linq; using System.Text; +using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesByFilterRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesByFilterRequestHandler.cs index 637c533c..5f64139c 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesByFilterRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesByFilterRequestHandler.cs @@ -2,6 +2,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Factory; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesRequestHandler.cs index 564cb00d..bef28674 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/GetTypesRequestHandler.cs @@ -2,6 +2,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Factory; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs index 61932f30..4b4ab587 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/LoadConfigRequestHandler.cs @@ -3,6 +3,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Config; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/ReportVersionsRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/ReportVersionsRequestHandler.cs index 3447a1eb..6e349598 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/ReportVersionsRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/ReportVersionsRequestHandler.cs @@ -2,6 +2,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Plugins; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs index 6378f1b2..ecd29da6 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/SetDeviceStreamDebugRequestHandler.cs @@ -3,6 +3,7 @@ using Crestron.SimplSharp.WebScripting; using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Core.Web.RequestHandlers; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Core/Web/RequestHandlers/ShowConfigRequestHandler.cs b/src/PepperDash.Essentials.Core/Web/RequestHandlers/ShowConfigRequestHandler.cs index 65af1d06..7750d1a1 100644 --- a/src/PepperDash.Essentials.Core/Web/RequestHandlers/ShowConfigRequestHandler.cs +++ b/src/PepperDash.Essentials.Core/Web/RequestHandlers/ShowConfigRequestHandler.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using PepperDash.Core.Web.RequestHandlers; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Config.Essentials; namespace PepperDash.Essentials.Core.Web.RequestHandlers { diff --git a/src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs b/src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs index 150b7818..5e68b4af 100644 --- a/src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs +++ b/src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs @@ -7,7 +7,8 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; - +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs b/src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs index 56998d46..87951085 100644 --- a/src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/AudioCodec/AudioCodecBase.cs @@ -6,6 +6,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Devices.Common.Codec; namespace PepperDash.Essentials.Devices.Common.AudioCodec diff --git a/src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IHasAudioCodec.cs b/src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IHasAudioCodec.cs index b6fa079d..26340fcb 100644 --- a/src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IHasAudioCodec.cs +++ b/src/PepperDash.Essentials.Devices.Common/AudioCodec/Interfaces/IHasAudioCodec.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Room; namespace PepperDash.Essentials.Devices.Common.AudioCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs b/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs index 502902b9..49665e29 100644 --- a/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs +++ b/src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs @@ -7,6 +7,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Devices.Common.Codec; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs index 4d59fe90..34d73655 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs @@ -17,6 +17,12 @@ using PepperDash.Essentials.Core.Presets; using PepperDash.Essentials.Devices.Common.Codec; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Cameras diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs index cbf53476..2b95f5d9 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraControl.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.Cameras { diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs index d0423946..c28c3a6e 100644 --- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs +++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs @@ -15,6 +15,12 @@ using System.Text.RegularExpressions; using System.Reflection; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Communications; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Cameras diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/IHasDoNotDisturb.cs b/src/PepperDash.Essentials.Devices.Common/Codec/IHasDoNotDisturb.cs index 7bb9b924..ba1d0490 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/IHasDoNotDisturb.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/IHasDoNotDisturb.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.Codec { diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iCodecAudio.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iCodecAudio.cs index d61f7d26..bd22ce53 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iCodecAudio.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iCodecAudio.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Devices.Common.Codec { diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iHasContentSharing.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iHasContentSharing.cs index f3c28243..817c86c8 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iHasContentSharing.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iHasContentSharing.cs @@ -6,6 +6,7 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.Codec diff --git a/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs b/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs index 6a4e62fe..69a9bdd3 100644 --- a/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs +++ b/src/PepperDash.Essentials.Devices.Common/Codec/iHasDirectory.cs @@ -12,6 +12,7 @@ using Newtonsoft.Json.Converters; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; using PepperDash.Essentials.Devices.Common.VideoCodec; namespace PepperDash.Essentials.Devices.Common.Codec diff --git a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs index a40daac5..69ff7908 100644 --- a/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/DSP/DspBase.cs @@ -6,7 +6,9 @@ using Crestron.SimplSharp; using PepperDash.Essentials.Devices.Common.Codec; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.DSP { diff --git a/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs b/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs index 0f1f973f..a8db3974 100644 --- a/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs +++ b/src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Reflection; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Factory; +using PepperDash.Essentials.Core.Plugins; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs b/src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs index d7e19d00..0133c753 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs @@ -6,7 +6,11 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Communications; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Displays diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs b/src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs index 9796599b..6b35fa73 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs @@ -8,7 +8,15 @@ using Serilog.Events; using System; using System.Collections.Generic; using System.Linq; -using Feedback = PepperDash.Essentials.Core.Feedback; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; +using Feedback = PepperDash.Essentials.Core.Feedbacks.Feedback; namespace PepperDash.Essentials.Devices.Common.Displays { diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs index 85ab7037..48be33df 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs @@ -7,7 +7,10 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Displays diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs b/src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs index 1bb7f503..8fcb0d51 100644 --- a/src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs +++ b/src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs @@ -7,7 +7,9 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.CrestronIO; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; using PepperDash.Essentials.Devices.Common; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs index cc9bc1e2..4545d408 100644 --- a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs +++ b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs @@ -4,6 +4,8 @@ using PepperDash.Essentials.Core.Config; using Serilog.Events; using System; using System.Collections.Generic; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.Devices.Common.Generic { diff --git a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs index 3c6e57d2..fc9d8500 100644 --- a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs +++ b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs @@ -9,6 +9,9 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs b/src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs index 1c67d426..7742dfee 100644 --- a/src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs @@ -11,7 +11,12 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; using PepperDash.Essentials.Core.Lighting; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Lighting diff --git a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj index b3c8169b..05573101 100644 --- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj +++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj @@ -4,7 +4,7 @@ Debug;Release;Debug 4.7.2 - net472;net6 + net472;net6.0;net8.0 true bin\$(Configuration)\ Essentials Devices Common diff --git a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs index 1af09f1c..f765ba59 100644 --- a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs +++ b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleSpaceRoom.cs @@ -1,5 +1,8 @@ using PepperDash.Essentials.Core; -using PepperDash.Essentials.Room.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Room.Config; +using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.Devices.Common.Room { diff --git a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleVtc1Room.cs b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleVtc1Room.cs index b7f1a619..295ba940 100644 --- a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleVtc1Room.cs +++ b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsHuddleVtc1Room.cs @@ -1,8 +1,12 @@ using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Room.Config; +using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Devices.Common.AudioCodec; using PepperDash.Essentials.Devices.Common.Codec; using PepperDash.Essentials.Devices.Common.VideoCodec; -using PepperDash.Essentials.Room.Config; namespace PepperDash.Essentials.Devices.Common.Room { diff --git a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs index e32be4c4..cb72a3f2 100644 --- a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs @@ -1,9 +1,9 @@ -using PepperDash.Essentials.Room.Config; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using PepperDash.Essentials.Core.Room.Config; namespace PepperDash.Essentials.Devices.Common.Room { diff --git a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsTechRoom.cs b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsTechRoom.cs index 947be5d9..6ab2cf83 100644 --- a/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsTechRoom.cs +++ b/src/PepperDash.Essentials.Devices.Common/Room/IEssentialsTechRoom.cs @@ -1,8 +1,9 @@ using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.DeviceTypeInterfaces; -using PepperDash.Essentials.Room.Config; using System.Collections.Generic; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Room.Config; using TwoWayDisplayBase = PepperDash.Essentials.Devices.Common.Displays.TwoWayDisplayBase; diff --git a/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs b/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs index 32885aec..aaa9ad11 100644 --- a/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs @@ -11,9 +11,15 @@ using Newtonsoft.Json; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Communications; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.Presets; using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs b/src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs index 085517b2..598be75a 100644 --- a/src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs +++ b/src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs @@ -4,6 +4,7 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.CrestronIO; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.Shades; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Devices.Common/Shades/ShadeBase.cs b/src/PepperDash.Essentials.Devices.Common/Shades/ShadeBase.cs index 2c506750..7fb8441e 100644 --- a/src/PepperDash.Essentials.Devices.Common/Shades/ShadeBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/Shades/ShadeBase.cs @@ -1,5 +1,6 @@ using PepperDash.Essentials.Core.Shades; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; namespace PepperDash.Essentials.Devices.Common.Shades { diff --git a/src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs b/src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs index 43ce0abc..c4fda2b1 100644 --- a/src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs +++ b/src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs @@ -2,6 +2,7 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; using PepperDash.Essentials.Core.Shades; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs b/src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs index 891f92b1..95a2e692 100644 --- a/src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs +++ b/src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs @@ -5,6 +5,12 @@ using Crestron.SimplSharp; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.InUseTracking; +using PepperDash.Essentials.Core.Room; +using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Devices.Common.Sources; using Serilog.Events; diff --git a/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs b/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs index f623c539..81768db8 100644 --- a/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs +++ b/src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs @@ -5,6 +5,8 @@ using PepperDash.Essentials.Core.Config; using Serilog.Events; using System.Collections.Generic; using System.Linq; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Routing; namespace PepperDash.Essentials.Devices.Common.SoftCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs b/src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs index 41ad7a43..e4ecf95e 100644 --- a/src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs +++ b/src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs @@ -3,6 +3,11 @@ using System.Collections.Generic; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.VideoStatus; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Sources diff --git a/src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs b/src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs index 38898209..3f3e0fe7 100644 --- a/src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs +++ b/src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs @@ -3,6 +3,11 @@ using System.Collections.Generic; using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.VideoStatus; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.Sources diff --git a/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs b/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs index a00fb5a2..2d793d2f 100644 --- a/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs +++ b/src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs @@ -13,6 +13,13 @@ using PepperDash.Core; using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Bridges; +using PepperDash.Essentials.Core.Bridges.JoinMaps; +using PepperDash.Essentials.Core.Communications; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/Streaming/Roku.cs b/src/PepperDash.Essentials.Devices.Common/Streaming/Roku.cs index 213e5835..c6a3f383 100644 --- a/src/PepperDash.Essentials.Devices.Common/Streaming/Roku.cs +++ b/src/PepperDash.Essentials.Devices.Common/Streaming/Roku.cs @@ -8,7 +8,11 @@ using Crestron.SimplSharpPro.DeviceSupport; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Communications; using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.DeviceTypeInterfaces; +using PepperDash.Essentials.Core.Routing; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs index 98a8e4f4..be36d708 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecLayouts.cs @@ -9,6 +9,7 @@ using Crestron.SimplSharp; using PepperDash.Essentials.Core; using Newtonsoft.Json; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecSelfview.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecSelfview.cs index 3b079b7d..b16412b8 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecSelfview.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasCodecSelfview.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingLock.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingLock.cs index 97fcb725..11961d1e 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingLock.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingLock.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingRecording.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingRecording.cs index b05362c3..c0553f58 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingRecording.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasMeetingRecording.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasParticipants.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasParticipants.cs index 98c94bdc..3a93bc98 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasParticipants.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasParticipants.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Collections.Generic; using PepperDash.Core; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs index d0ba25fd..25630370 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs @@ -1,4 +1,5 @@ using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; using PepperDash.Essentials.Devices.Common.VideoCodec; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewSize.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewSize.cs index 4103fa0e..c418f5b3 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewSize.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasSelfviewSize.cs @@ -1,4 +1,5 @@ -using PepperDash.Essentials.Devices.Common.VideoCodec; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Devices.Common.VideoCodec; namespace PepperDash.Essentials.Core.DeviceTypeInterfaces { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasStandbyMode.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasStandbyMode.cs index cc9dcd3d..ce62aede 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasStandbyMode.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasStandbyMode.cs @@ -5,6 +5,7 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Feedbacks; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasVideoCodec.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasVideoCodec.cs index d8494334..d6646bfc 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasVideoCodec.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IHasVideoCodec.cs @@ -5,6 +5,9 @@ using System.Text; using Crestron.SimplSharp; using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.Room; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs index 23023857..212fb67a 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs @@ -16,6 +16,9 @@ using PepperDash.Essentials.Devices.Common.Cameras; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Feedbacks; using Serilog.Events; namespace PepperDash.Essentials.Devices.Common.VideoCodec diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs index 3dc2c709..a0e0f4d8 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs @@ -17,9 +17,14 @@ using PepperDash.Essentials.Devices.Common.Cameras; using PepperDash.Essentials.Devices.Common.Codec; using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces; using PepperDash.Essentials.Core.Bridges.JoinMaps; -using Feedback = PepperDash.Essentials.Core.Feedback; +using PepperDash.Essentials.Core.Extensions; +using PepperDash.Essentials.Core.Feedbacks; +using PepperDash.Essentials.Core.JoinMaps; +using PepperDash.Essentials.Core.Monitoring; +using Feedback = PepperDash.Essentials.Core.Feedbacks.Feedback; using Serilog.Events; using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Touchpanels; namespace PepperDash.Essentials.Devices.Common.VideoCodec { diff --git a/src/PepperDash.Essentials/ClassDiagram1.cd b/src/PepperDash.Essentials/ClassDiagram1.cd deleted file mode 100644 index aa0f4ed0..00000000 --- a/src/PepperDash.Essentials/ClassDiagram1.cd +++ /dev/null @@ -1,881 +0,0 @@ - - - - - - AAAAAQAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAIAgA= - Audio\EssentialsVolumeLevelConfig.cs - - - - - - AAAAAAAAEAAAAAAAAAAAAAAAAIAAAAgBAAAAAAAAAAA= - Audio\EssentialsVolumeLevelConfig.cs - - - - - - AAAAAAAIAAAAAAAABAAAACAAIAAAAQAAAAAAAAAAEAA= - Config\ConfigReader.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAA= - Config\DeviceFactory.cs - - - - - - AAAAAAEAAAAAQAIAAAAAAAACAAAAAAAAAAAAAAEAAAA= - Config\EssentialsConfig.cs - - - - - - AAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Config\EssentialsConfig.cs - - - - - - AAAAAAAgEAAAAAAEAAAAAAAAAAAAAAAAAAAAAEAIAIA= - Configuration ORIGINAL\ConfigTieLine.cs - - - - - - AEAAAAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAgEDAADAQ= - Configuration ORIGINAL\Configuration.cs - - - - - - AAAAAAAAAAAAAAQAAAAAAAQAAACAAAAAAAAAAAAAAAA= - Configuration ORIGINAL\Configuration.cs - - - - - - AAAAAAAAAgAAAAAAAEAAAAAAAAAAAAAAAAAgAAAAAAA= - Configuration ORIGINAL\Configuration.cs - - - - - - IQAAAAAEAAAAAAADAAACABQAAAAAAAAAAAAAAAAAAAA= - Configuration ORIGINAL\Configuration.cs - - - - - - AAAAAAAAAAAAAAAAAEAAAAAAAAAAAIAAAAAgAAAIAAA= - Configuration ORIGINAL\ConfigurationHelpers.cs - - - - - - AAAAAAAAAAAQAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA= - Configuration ORIGINAL\Factories\DmFactory.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAEDAAKAA= - Configuration ORIGINAL\Factories\FactoryHelper.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAABAAAA= - Configuration ORIGINAL\Factories\FactoryHelper.cs - - - - - - AAoAgAAIAEAACAAEAIEIBICAAAAAAABAAAAAAAAAAAA= - ControlSystem.cs - - - - - - AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAA= - Devices\Amplifier.cs - - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAA= - Room\Cotija\CotijaConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAA= - Room\Cotija\CotijaConfig.cs - - - - - - CAAABAABAgACCAKGBIAAEyBAFAAACYSAgIAAAAJkAAA= - Room\Cotija\CotijaSystemController.cs - - - - - - AAQIQAAAAAAAAgAAAAAAQAAAAAAAAAAAAAAAABAAAAA= - Room\Cotija\RoomBridges\CotijaBridgeBase.cs - - - - - - AAAIAAAAIABAAkgAABgIAAAAAAAAAEAAAAAAgBAAACA= - Room\Cotija\RoomBridges\CotijaEssentialsHuddleSpaceRoomBridge.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAA= - Room\Cotija\RoomBridges\CotijaEssentialsHuddleSpaceRoomBridge.cs - - - - - - iQFBQAIAAgAAgQAEQACAMABAAABAACAQUAAQAAgCgBA= - Room\Types\EssentialsHuddleSpaceRoom.cs - - - - - - - iQFBQAIAIgQMgQAEQAigMABAAABAADIwUACQAAgCgTE= - Room\Types\EssentialsHuddleVtc1Room.cs - - - - - - - iQAEAAIACkAAAQAOQASgMAAJAABgAAAQQAAQAAgCgBA= - Room\Types\EssentialsPresentationRoom.cs - - - - - - - gQAAEAICECgCAQAEAAAUIwIyAAAAgACiAgAAAQECAgA= - Room\Types\EssentialsRoomBase.cs - - - - - - AICCIAAIGIAAAAAgCAAIAEAAAAAAAAAAAAEAIAAAAAA= - UI\CrestronTouchpanelPropertiesConfig.cs - - - - - - AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - UI\CrestronTouchpanelPropertiesConfig.cs - - - - - - AAAIAEAAAAAAAAAAAAAAAAEAAAAACKIBAAgACAAAAAA= - UI\EssentialsTouchpanelController.cs - - - - - - AAAAQAAAACAAAAABAAAAAAAAAABAAAAAAAAAAkAAAAA= - UI\HttpLogoServer.cs - - - - - - j+jWCNqEIGzi4UTaTgyn37kpncQJK7L42VMLmMgTE5A= - UI\JoinConstants\UIBoolJoin.cs - - - - - - BAggBIABCQAAGAAQAAAACAACAAAAAAAAAAIAAAAAAAA= - UI\JoinConstants\UISmartObjectJoin.cs - - - - - - BkBgIAgAAggOQAFGAYQIABACgCEBjkSQAUEAASIABCE= - UI\JoinConstants\UIStringlJoin.cs - - - - - - AAQAAAACAAAACAEAAIAAAAAAIABAIAAAABAAAEAAAAA= - UI\JoinConstants\UIUshortJoin.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA= - UI\SubpageReferenceListActivityItem.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA= - UI\SubpageReferenceListCallStagingItem.cs - - - - - - AAAABAAAAAAAAAAAAAAAAAAAAgAAAAACAAAAAABgAAA= - UI\SubpageReferenceListSourceItem.cs - - - - - - CAAIkAAAAAAQEAAAEAACAAAAAIAEABAAAgAACAAAAAA= - UIDrivers\enums and base.cs - - - - - - ABAAAAAAAhgAAAAAEAAAAAAAAIAEAAAAAAAAAAAAAAA= - UIDrivers\Essentials\EssentialsPanelMainInterfaceDriver.cs - - - - - - gTEAIIAiCggFNCQ4EA4AWBkAKJCEqAAOS4CKMAQQJQA= - UIDrivers\Essentials\EssentialsPresentationPanelAvFunctionsDriver.cs - - - - - - gRQAIICuAghENHQpEA4IWCkBMJDEsEAEC4CAMARQIBA= - UIDrivers\EssentialsHuddle\EssentialsHuddlePanelAvFunctionsDriver.cs - - - - - - GRwAIYC+oghAeHStEDAIWCdBMADEsBAcDwCAMARYIBg= - UIDrivers\EssentialsHuddleVTC\EssentialsHuddleVtc1PanelAvFunctionsDriver.cs - - - - - - - AAAQgAIAAAAAAAAAEAAAAAQAAAAEAAAAAAAAEAAAgAA= - UIDrivers\JoinedSigInterlock.cs - - - - - - AAAAAAAAAAAAAAAAEAAAQAAABIAEAAAAAAAAAAAAAAA= - UIDrivers\Page Drivers\SingleSubpageModalAndBackDriver.cs - - - - - - AAAAAAAAAAAAAAAAEAAAAAAABAAEAAAAAAAAAAAAAAA= - UIDrivers\Page Drivers\SingleSubpageModalDriver.cs - - - - - - AAAQAAIAAAAAAAAIEAAAAAAAAAAEAAAAAAAAEAAAgAA= - UIDrivers\SigInterlock.cs - - - - - - AAAAAAAACAAACBAAAAAAAAAAAAAAAAAAAAIAAAAAAQA= - UIDrivers\SmartObjectRoomsList.cs - - - - - - AAAAQAAAAAAAAAAAABAAQAAAAAAAAAACAAEAAAAAAAA= - UIDrivers\SmartObjectRoomsList.cs - - - - - - AAAAAAABAAAAAEAAAAAAAAAAAAAAAAAAAQAAAAAAAAA= - UIDrivers\VolumeAndSourceChangeArgs.cs - - - - - - IAGigRBpCgZwAIMSBBIbIgAAImAPtEBiAAgECpJgKQo= - OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs - - - - - - - AAAAAACgAIQAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAA= - OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAQAAACAAAAAAAAAAAAA= - OTHER\Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs - - - - - - AACAAAAAAgAAAIAAAAAAAAAgIBAQAAAAAAAAAAAAAQA= - OTHER\Fusion\EssentialsHuddleVtc1FusionController.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionEventHandlers.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAA= - OTHER\Fusion\FusionEventHandlers.cs - - - - - - AAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionProcessorQueries.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAEAAAA= - OTHER\Fusion\FusionProcessorQueries.cs - - - - - - AAICAAAAAAAAAAAAAAAAAACAAAATQAAAAAAAABAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAQAQAAAAAAAAQAAAAAAQAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAQAQAAAAAAAAQAAAAAAQAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAACACAAAAQAAAAAAAAAAAAAAAAAAAACAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAACAAAgAAQAAAAAAAAAAAAAAAAAAIAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAgAAQAAAAAAAAAAAAAAAAAAIAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAACAAAAAAQAAAAAAAAAAgAAAAAAAAAAABAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AABCAAAAYEAAEBIBAIAAJAQAQKAYAAAIEAAAEAACCgg= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAgAAAAAAAAAQAAAAAAAAAAAAAAAAEAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAABAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAgAQAAIAAAAAAACAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA= - OTHER\Fusion\FusionRviDataClasses.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAIAgAAQAAAAAAAAEAAAAAAA= - Room\Config\DDVC01RoomPropertiesConfig.cs - - - - - - AAAAAAAAAAAAAAAAAEAAAAQAAAAAAAAAAAAAAAAAAAA= - Room\Config\DDVC01RoomPropertiesConfig.cs - - - - - - AAAAAAAAAAAAgAAAAAAAAAAACAAAAAABAAAAAAAAABA= - Room\Config\EssentialsHuddleRoomPropertiesConfig.cs - - - - - - AAAAAAAAAAAAgAAAAAAAAAAACIAAAAABAAAAAAAAABA= - Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs - - - - - - AAAAAAACAIAAAAAAAAAAABAACAAAAAABAAAAAAAAABA= - Room\Config\EssentialsPresentationPropertiesConfig.cs - - - - - - AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAEAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AABAEQAAAAEoAAEEAAQAAAACAAAAAAgggAAAAQAAAgA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAEAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAAAAIAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAAQAAAgAAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIACQAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AACAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAA= - Room\Config\EssentialsRoomConfig.cs - - - - - - AAAAAAAAAAAAABAACAAAAAAAAAAAAAAAAAAAAAAAAAA= - Room\Config\EssentialsRoomEmergencyConfig.cs - - - - - - AAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABQAAAAAAAAA= - Room\Config\EssentialsRoomEmergencyConfig.cs - - - - - - AUAAAAgAAAACwAYAAAAAAAEAAAAAAAAAIcAAAEAAAAA= - Room\Cotija\CotijaDdvc01DeviceBridge.cs - - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\IChannelExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\IColorExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\IDPadExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\IDvrExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\INumericExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\IPowerExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\ISetTopBoxControlsExtensions.cs - - - - - - AAACAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAA= - Room\Cotija\DeviceTypeInterfaces\ITransportExtensions.cs - - - - - - gACIAAAAAAICAFAAAACAAAEIIAAAAAQAQAAAABAAAAA= - Room\Cotija\RoomBridges\CotijaDdvc01RoomBridge.cs - - - - - - - AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Room\Emergency\EsentialsRoomEmergencyContactClosure.cs - - - - - - - AAAAAAAAAAAAAAAASBAAAAAAAAAAAAAABAAAAAAAEAA= - Room\Emergency\EsentialsRoomEmergencyContactClosure.cs - - - - - - AAAQAAAAAiACDAAAGCAACgAIAABECBAgQAAAAQAAAAA= - UIDrivers\EssentialsHuddle\EssentialsHuddleTechPageDriver.cs - - - - - - XAASAoAiAagwAcBAGAUURWQEOHQFAKCmAABCNSSEDPA= - UIDrivers\VC\EssentialsVideoCodecUiDriver.cs - - - - - - AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Room\Types\EssentialsRoomBase.cs - - - - - - AAgAAAAAAAAACBAAACAAAAIBAAAEAAAEAgAAAAAAIAA= - UIDrivers\EssentialsHuddleVTC\EssentialsHuddleVtc1PanelAvFunctionsDriver.cs - - - - - - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAA= - Room\Cotija\Interfaces.cs - - - - - - AAAAAAAAQAAAAAAACAAAAAAAAAAAAAAAAAAAAAEACAA= - Room\Types\EssentialsRoomBase.cs - - - - - - AAAAAAAAACAAAAAAAAAAAAAAAAACAAAAAAAAAAEAAAA= - Room\Types\EssentialsRoomBase.cs - - - - - - AAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAIEAAAA= - Room\Types\EssentialsRoomBase.cs - - - - - - AIAAAAAAAAAAAAAAAhBAAAAAAAAAAACYAAAAAAAAAAA= - UIDrivers\enums and base.cs - - - - - - AAAAAAAAAAAAABAAAAAAAAAAAAAAACAAAEAAAAAAAAA= - UIDrivers\enums and base.cs - - - - - - AAAAAAAEAAAAAAAAAIAAAAAAAAQAAAAQAAAAAAAAAAA= - UIDrivers\enums and base.cs - - - - - - AAAAABAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAA= - UIDrivers\enums and base.cs - - - - - - AAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - UIDrivers\enums and base.cs - - - - - - AAAAgCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - UIDrivers\VolumeAndSourceChangeArgs.cs - - - - - - AAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Room\Cotija\RoomBridges\CotijaEssentialsHuddleSpaceRoomBridge.cs - - - - - - AAAAAAAAAAAAACAAACAAAAAAAAAAAAAAAAAAACAAAAA= - UIDrivers\VolumeAndSourceChangeArgs.cs - - - - \ No newline at end of file diff --git a/src/PepperDash.Essentials/ControlSystem.cs b/src/PepperDash.Essentials/ControlSystem.cs index 90a04dea..fd83e807 100644 --- a/src/PepperDash.Essentials/ControlSystem.cs +++ b/src/PepperDash.Essentials/ControlSystem.cs @@ -1,5 +1,4 @@ - -using Crestron.SimplSharp; +using Crestron.SimplSharp; using Crestron.SimplSharp.CrestronIO; using System.Reflection; using Crestron.SimplSharpPro; @@ -13,8 +12,13 @@ using PepperDash.Essentials.Core.DeviceTypeInterfaces; using PepperDash.Essentials.Core.Web; using System; using System.Linq; +using PepperDash.Essentials.Core.Config.Essentials; +using PepperDash.Essentials.Core.Devices; +using PepperDash.Essentials.Core.Factory; +using PepperDash.Essentials.Core.Plugins; using Serilog.Events; using PepperDash.Essentials.Core.Routing; +using PepperDash.Essentials.Core.Secrets; namespace PepperDash.Essentials { @@ -26,8 +30,7 @@ namespace PepperDash.Essentials private CEvent _initializeEvent; private const long StartupTime = 500; - public ControlSystem() - : base() + public ControlSystem() : base() { Thread.MaxNumberOfUserThreads = 400; Global.ControlSystem = this; @@ -103,7 +106,7 @@ namespace PepperDash.Essentials CrestronConsole.AddNewConsoleCommand(PluginLoader.ReportAssemblyVersions, "reportversions", "Reports the versions of the loaded assemblies", ConsoleAccessLevelEnum.AccessOperator); - CrestronConsole.AddNewConsoleCommand(Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator); + CrestronConsole.AddNewConsoleCommand(DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator); @@ -255,7 +258,7 @@ namespace PepperDash.Essentials PluginLoader.AddProgramAssemblies(); - _ = new Core.DeviceFactory(); + _ = new DeviceFactory(); _ = new Devices.Common.DeviceFactory(); _ = new DeviceFactory(); @@ -421,7 +424,7 @@ namespace PepperDash.Essentials if (newDev == null) - newDev = Core.DeviceFactory.GetDevice(devConf); + newDev = DeviceFactory.GetDevice(devConf); if (newDev != null) DeviceManager.AddDevice(newDev); @@ -477,7 +480,7 @@ namespace PepperDash.Essentials foreach (var roomConfig in ConfigReader.ConfigObject.Rooms) { - var room = Core.DeviceFactory.GetDevice(roomConfig); + var room = DeviceFactory.GetDevice(roomConfig); DeviceManager.AddDevice(room); if (room is ICustomMobileControl) diff --git a/src/PepperDash.Essentials/Factory/DeviceFactory.cs b/src/PepperDash.Essentials/Factory/DeviceFactory.cs index 262130f1..f4162479 100644 --- a/src/PepperDash.Essentials/Factory/DeviceFactory.cs +++ b/src/PepperDash.Essentials/Factory/DeviceFactory.cs @@ -1,21 +1,13 @@ - - -using System; -using System.Collections.Generic; +using System; using System.Linq; -using Crestron.SimplSharp; -using Crestron.SimplSharp.CrestronIO; -using Crestron.SimplSharpPro; using System.Reflection; - -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using PepperDash.Core; -using PepperDash.Essentials.Core; -using PepperDash.Essentials.Core.Config; +using PepperDash.Essentials.Core.Factory; +using PepperDash.Essentials.Core.Plugins; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.Factory { + /* /// /// Responsible for loading all of the device types for this library /// @@ -45,5 +37,5 @@ namespace PepperDash.Essentials } } } - } + }*/ } diff --git a/src/PepperDash.Essentials/PepperDash.Essentials.csproj b/src/PepperDash.Essentials/PepperDash.Essentials.csproj index fb31f91f..3da326c8 100644 --- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj +++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj @@ -25,29 +25,6 @@ pdbonly - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - -