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

Merged in bugfix/ecs-1131 (pull request #21)

Browse Source 
Bugfix/ecs 1131

Approved-by: Neil Dorin <ndorin@pepperdash.com>
This commit is contained in:
Neil Dorin
2019-07-18 20:16:48 +00:00
parent 42a79f0e1e ddfd1d0586
commit 447caccd6a
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1
View File

@@ -1,17 +1,4 @@
#Set-ExecutionPolicy RemoteSigned function Update-SourceVersion
function Usage
{
echo "This is ";
echo “Usage: “;
echo ” from cmd.exe: “;
echo ” powershell.exe SetVersion.ps1 2.8.3.0″;
echo ” “;
echo ” from powershell.exe prompt: “;
echo ” .\SetVersion.ps1 2.8.3.0″;
echo ” “;
}
function Update-SourceVersion
{ {
Param ([string]$Version) Param ([string]$Version)
$NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’; $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’;
@@ -35,14 +22,14 @@ function Update-AllAssemblyInfoFiles ( $version )
# validate arguments # validate arguments
$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$"); $r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$");
if ($r.Success) if ($r.Success)
{ {
Update-AllAssemblyInfoFiles $args[0]; Update-AllAssemblyInfoFiles $args[0];
} }
else else
{ {
echo ” “; echo ” “;
echo “Bad Input!” echo “Error: Input version does not match x.y.z format!”
echo ” “; echo ” “;
Usage ; echo "Unable to apply version to AssemblyInfo.cs files";
} }

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

@@ -37,7 +37,7 @@ namespace PepperDash.Essentials.DM
// Catch constructor failures, mainly dues to IPID // Catch constructor failures, mainly dues to IPID
try try
{ {
if(typeName.StartsWith("dmTx200")) if(typeName.StartsWith("dmtx200"))
return new DmTx200Controller(key, name, new DmTx200C2G(ipid, Global.ControlSystem)); return new DmTx200Controller(key, name, new DmTx200C2G(ipid, Global.ControlSystem));
if (typeName.StartsWith("dmtx201")) if (typeName.StartsWith("dmtx201"))
return new DmTx201XController(key, name, new DmTx201S(ipid, Global.ControlSystem)); return new DmTx201XController(key, name, new DmTx201S(ipid, Global.ControlSystem));
@@ -93,7 +93,7 @@ namespace PepperDash.Essentials.DM
chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps || chassis is DmMd32x32Cpu3 || chassis is DmMd8x8Cpu3rps ||
chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps) chassis is DmMd16x16Cpu3rps || chassis is DmMd32x32Cpu3rps)
{ {
if (typeName.StartsWith("dmTx200")) if (typeName.StartsWith("dmtx200"))
return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num])); return new DmTx200Controller(key, name, new DmTx200C2G(chassis.Inputs[num]));
if (typeName.StartsWith("dmtx201")) if (typeName.StartsWith("dmtx201"))
return new DmTx201XController(key, name, new DmTx201C(chassis.Inputs[num])); return new DmTx201XController(key, name, new DmTx201C(chassis.Inputs[num]));
@@ -112,7 +112,7 @@ namespace PepperDash.Essentials.DM
} }
else else
{ {
if (typeName.StartsWith("dmTx200")) if (typeName.StartsWith("dmtx200"))
return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num])); return new DmTx200Controller(key, name, new DmTx200C2G(ipid, chassis.Inputs[num]));
if (typeName.StartsWith("dmtx201")) if (typeName.StartsWith("dmtx201"))
return new DmTx201XController(key, name, new DmTx201C(ipid, chassis.Inputs[num])); return new DmTx201XController(key, name, new DmTx201C(ipid, chassis.Inputs[num]));