From cc06c7bfd85861b02a8d44333695ee58804441c7 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Tue, 28 May 2024 14:43:31 -0500 Subject: [PATCH] fix: add nullable props where necessary --- .../Comm and IR/ComSpecJsonConverter.cs | 6 ++--- .../Comm and IR/CommFactory.cs | 12 ++++----- .../CrestronTouchpanelPropertiesConfig.cs | 25 +++++++++++-------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs b/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs index 62296bd8..bfdccb65 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/ComSpecJsonConverter.cs @@ -23,12 +23,12 @@ namespace PepperDash.Essentials.Core { public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { - if (objectType == typeof(ComPort.ComPortSpec)) + if (objectType == typeof(ComPort.ComPortSpec?)) { var newSer = new JsonSerializer(); newSer.Converters.Add(new ComSpecPropsJsonConverter()); newSer.ObjectCreationHandling = ObjectCreationHandling.Replace; - return newSer.Deserialize(reader); + return newSer.Deserialize(reader); } return null; } @@ -38,7 +38,7 @@ namespace PepperDash.Essentials.Core /// public override bool CanConvert(Type objectType) { - return objectType == typeof(ComPort.ComPortSpec); + return objectType == typeof(ComPort.ComPortSpec?); } public override bool CanRead { get { return true; } } diff --git a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs b/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs index 26b29d51..8fa4076a 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs @@ -51,7 +51,7 @@ namespace PepperDash.Essentials.Core switch (controlConfig.Method) { case eControlMethod.Com: - comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams, controlConfig); + comm = new ComPortController(deviceConfig.Key + "-com", GetComPort, controlConfig.ComParams.Value, controlConfig); break; case eControlMethod.Cec: comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort, controlConfig); @@ -115,7 +115,7 @@ namespace PepperDash.Essentials.Core var comPar = config.ComParams; var dev = GetIComPortsDeviceFromManagedDevice(config.ControlPortDevKey); if (dev != null && config.ControlPortNumber <= dev.NumberOfComPorts) - return dev.ComPorts[config.ControlPortNumber]; + return dev.ComPorts[config.ControlPortNumber.Value]; Debug.LogMessage(LogEventLevel.Information, "GetComPort: Device '{0}' does not have com port {1}", config.ControlPortDevKey, config.ControlPortNumber); return null; } @@ -205,11 +205,11 @@ namespace PepperDash.Essentials.Core ControlPropertiesConfig { - [JsonProperty("comParams")] + [JsonProperty("comParams", NullValueHandling = NullValueHandling.Ignore)] [JsonConverter(typeof(ComSpecJsonConverter))] - public ComPort.ComPortSpec ComParams { get; set; } + public ComPort.ComPortSpec? ComParams { get; set; } - [JsonProperty("cresnetId")] + [JsonProperty("cresnetId", NullValueHandling = NullValueHandling.Ignore)] public string CresnetId { get; set; } /// @@ -231,7 +231,7 @@ namespace PepperDash.Essentials.Core } } - [JsonProperty("infinetId")] + [JsonProperty("infinetId", NullValueHandling = NullValueHandling.Ignore)] public string InfinetId { get; set; } /// diff --git a/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs index 9b6639db..aa4dac6d 100644 --- a/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Touchpanels/CrestronTouchpanelPropertiesConfig.cs @@ -23,16 +23,16 @@ namespace PepperDash.Essentials.Core public string ProjectName { get; set; } [JsonProperty("showVolumeGauge", NullValueHandling = NullValueHandling.Ignore)] - public bool ShowVolumeGauge { get; set; } + public bool? ShowVolumeGauge { get; set; } [JsonProperty("usesSplashPage", NullValueHandling = NullValueHandling.Ignore)] - public bool UsesSplashPage { get; set; } + public bool? UsesSplashPage { get; set; } [JsonProperty("showDate", NullValueHandling = NullValueHandling.Ignore)] - public bool ShowDate { get; set; } + public bool? ShowDate { get; set; } [JsonProperty("showTime", NullValueHandling = NullValueHandling.Ignore)] - public bool ShowTime { get; set; } + public bool? ShowTime { get; set; } [JsonProperty("setup", NullValueHandling = NullValueHandling.Ignore)] public UiSetupPropertiesConfig Setup { get; set; } @@ -41,13 +41,13 @@ namespace PepperDash.Essentials.Core public string HeaderStyle { get; set; } [JsonProperty("includeInFusionRoomHealth", NullValueHandling = NullValueHandling.Ignore)] - public bool IncludeInFusionRoomHealth { get; set; } + public bool? IncludeInFusionRoomHealth { get; set; } [JsonProperty("screenSaverTimeoutMin", NullValueHandling = NullValueHandling.Ignore)] - public uint ScreenSaverTimeoutMin { get; set; } + public uint? ScreenSaverTimeoutMin { get; set; } [JsonProperty("screenSaverMovePositionIntervalMs", NullValueHandling = NullValueHandling.Ignore)] - public uint ScreenSaverMovePositionIntervalMs { get; set; } + public uint? ScreenSaverMovePositionIntervalMs { get; set; } /// @@ -55,17 +55,20 @@ namespace PepperDash.Essentials.Core /// Defaults to 5 /// [JsonProperty("sourcesOverflowCount", NullValueHandling = NullValueHandling.Ignore)] - public int SourcesOverflowCount { get; set; } + public int? SourcesOverflowCount { get; set; } - public CrestronTouchpanelPropertiesConfig() + public CrestronTouchpanelPropertiesConfig() : this(false) { } + + public CrestronTouchpanelPropertiesConfig(bool setDefaultValues = false) { + if(!setDefaultValues) { return; } SourcesOverflowCount = 5; - HeaderStyle = CrestronTouchpanelPropertiesConfig.Habanero; + HeaderStyle = Habanero; // Default values ScreenSaverTimeoutMin = 5; ScreenSaverMovePositionIntervalMs = 15000; - } + } /// /// "habanero"