Compare commits

...

4 Commits

Author SHA1 Message Date
Jason T Alborough
6f96e84f3f Fixes namespace issue 2020-04-27 14:22:40 -04:00
Jason T Alborough
cfb3906427 Merge branch 'development' into feature/C3ComIBridgeAdvanced
# Conflicts:
#	essentials-framework/Essentials Core/PepperDashEssentialsBase/Factory/DeviceFactory.cs
2020-04-27 14:09:14 -04:00
Jason T Alborough
39380bed82 Merge branch 'feature/changes-to-IBridgeAdvanced' into feature/C3Com+IBridgeAdvanced 2020-04-27 13:56:09 -04:00
Jason T Alborough
31eefd7aa2 Adds support for C3Com3 card. Needs testing 2020-04-23 16:48:05 -04:00
4 changed files with 395 additions and 353 deletions

View File

@@ -165,7 +165,7 @@ namespace PepperDash.Essentials.Core
[JsonConverter(typeof(ComSpecJsonConverter))]
public ComPort.ComPortSpec ComParams { get; set; }
public uint CardSlot { get; set; }
public string CresnetId { get; set; }
/// <summary>

View File

@@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;
using Crestron.SimplSharpPro;
using Crestron.SimplSharpPro.DeviceSupport;
using Newtonsoft.Json;
using PepperDash.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Devices;
using PepperDash.Essentials.Core;
using Crestron.SimplSharpPro.ThreeSeriesCards;
namespace PepperDash.Essentials.Core.CrestronIO.Cards
{
public class C3Com3Controller : CrestronGenericBaseDevice, IComPorts
{
C3com3 Card;
public C3Com3Controller(string key, string name, C3com3 card)
: base(key, key, card)
{
Card = card;
}
public CrestronCollection<ComPort> ComPorts
{
get { return Card.ComPorts; }
}
public int NumberOfComPorts
{
get { return Card.NumberOfComPorts; }
}
}
}

View File

@@ -70,6 +70,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
</Reference>
<Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
</Reference>
<Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
@@ -143,6 +147,7 @@
<Compile Include="Config\Essentials\EssentialsConfig.cs" />
<Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
<Compile Include="Crestron IO\C2nRts\C2nRthsController.cs" />
<Compile Include="Crestron IO\Cards\C3Com3Card.cs" />
<Compile Include="Crestron IO\Inputs\CenIoDigIn104Controller.cs" />
<Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
<Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />