pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-06 00:05:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(wip): still working on re-arranging base classes

Browse Source
This commit is contained in:
Nick Genovese
2023-11-06 15:46:07 -05:00
parent c66b239e02
commit ba9cc9f00c
4 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/PepperDash.Essentials.Devices.Common/Factory/DeviceFactory.cs → src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs
View File

@@ -2,24 +2,9 @@
using System;
using System.Linq;
using System.Collections.Generic;
using Crestron.SimplSharp;
using Crestron.SimplSharp.CrestronIO;
using Crestron.SimplSharpPro;
using Crestron.SimplSharpPro.GeneralIO;
using Crestron.SimplSharp.Reflection;
using Full.Newtonsoft.Json;
using Full.Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.CrestronIO;
using PepperDash.Essentials.Devices.Common;
using PepperDash.Essentials.Devices.Common.DSP;
using PepperDash.Essentials.Devices.Common.VideoCodec;
using PepperDash.Essentials.Devices.Common.Environment;
namespace PepperDash.Essentials.Devices.Common
{

12
src/PepperDash.Essentials.Devices.Common/Environment/Somfy/RelayControlledShade.cs → src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs
View File

@@ -1,16 +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;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.CrestronIO;
using PepperDash.Essentials.Core.Shades;
namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
namespace PepperDash.Essentials.Devices.Common.Shades
{
/// <summary>
/// Controls a single shade using three relays
@@ -122,9 +118,9 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Environment.Somfy.RelayControlledShadeConfigProperties>(dc.Properties.ToString());
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<RelayControlledShadeConfigProperties>(dc.Properties.ToString());
return new Environment.Somfy.RelayControlledShade(dc.Key, dc.Name, props);
return new RelayControlledShade(dc.Key, dc.Name, props);
}
}

17
src/PepperDash.Essentials.Core/Shades/ShadeController.cs → src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs
View File

@@ -1,13 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;
using System.Collections.Generic;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Shades;
namespace PepperDash.Essentials.Core.Shades
namespace PepperDash.Essentials.Devices.Common.Shades
{
/// <summary>
/// Class that contains the shades to be controlled in a room
@@ -40,7 +37,7 @@ namespace PepperDash.Essentials.Core.Shades
return base.CustomActivate();
}
void AddShade(ShadeBase shade)
void AddShade(IShadesOpenCloseStop shade)
{
Shades.Add(shade);
}
@@ -67,9 +64,9 @@ namespace PepperDash.Essentials.Core.Shades
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new ShadeController Device");
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Core.Shades.ShadeControllerConfigProperties>(dc.Properties.ToString());
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ShadeControllerConfigProperties>(dc.Properties.ToString());
return new Core.Shades.ShadeController(dc.Key, dc.Name, props);
return new ShadeController(dc.Key, dc.Name, props);
}
}

1
src/PepperDash.Essentials/UIDrivers/Environment Drivers/EssentialsShadeDriver.cs
View File

@@ -8,7 +8,6 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Shades;
using PepperDash.Essentials.Devices.Common.Environment.Somfy;
namespace PepperDash.Essentials
{