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

Merge branch 'development' into hotfix/dm-rmc4kz100-build

Browse Source
This commit is contained in:
Andrew Welker
2020-06-01 23:51:10 -06:00
committed by GitHub
parent 083a3662e0 f0eeae0432
commit f823abacc1
78 changed files with 2943 additions and 1686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
View File

@@ -28,16 +28,16 @@ namespace PepperDash.Essentials.DM
/// <param name="props"></param>
/// <returns></returns>
public static DmTxControllerBase GetDmTxController(string key, string name, string typeName, DmTxPropertiesConfig props)
{
// switch on type name... later...
{
// switch on type name... later...
typeName = typeName.ToLower();
//uint ipid = Convert.ToUInt16(props.Id, 16);
var ipid = props.Control.IpIdInt;
var pKey = props.ParentDeviceKey.ToLower();
typeName = typeName.ToLower();
//uint ipid = Convert.ToUInt16(props.Id, 16);
var ipid = props.Control.IpIdInt;
var pKey = props.ParentDeviceKey.ToLower();
if (pKey == "processor")
{
if (pKey == "processor")
{
// Catch constructor failures, mainly dues to IPID
try
{