Merge pull request #96 from PepperDash/release/v1.4.33

adds version.txt creation and upload steps

.github/scripts/ZipBuildOutput.ps1

@@ -26,7 +26,7 @@ Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz
 } | Copy-Item -Destination ($destination) -Force
 Write-Host "Getting matching files..."
 # Get any files from the output folder that match the following extensions
-Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz")) } | ForEach-Object { 
+Get-ChildItem -Path $destination | Where-Object {($_.Extension -eq ".clz") -or ($_.Extension -eq ".cpz" -or ($_.Extension -eq ".cplz"))} | ForEach-Object { 
   # Replace the extensions with dll and xml and create an array 
   $filenames = @($($_ -replace "cpz|clz|cplz", "dll"), $($_ -replace "cpz|clz|cplz", "xml"))
   Write-Host "Filenames:"
@@ -36,8 +36,6 @@ Get-ChildItem -Path $destination | Where-Object { ($_.Extension -eq ".clz") -or
     Get-ChildItem -Recurse -Path "$($Env:GITHUB_WORKSPACE)" -include $filenames | Copy-Item -Destination ($destination) -Force
   }
 }
-
-Get-ChildItem -Path $destination\*.cpz | Rename-Item -NewName { "$($_.BaseName)-$($Env:VERSION)$($_.Extension)" }
 Compress-Archive -Path $destination -DestinationPath "$($Env:GITHUB_WORKSPACE)\$($Env:SOLUTION_FILE)-$($Env:VERSION).zip" -Force
 Write-Host "Output Contents post Zip"
 Get-ChildItem -Path $destination

.github/workflows/docker.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed
+  # solution name does not include extension. .sln is assumed  
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials
   # Do not edit this, we're just creating it here
@@ -78,8 +78,7 @@ jobs:
       # Create the release on the source repo
       - name: Create Release
         id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        uses: fleskesvor/create-release@feature/support-target-commitish
+        uses: actions/create-release@v1
         with:
           tag_name: ${{ env.VERSION  }}
           release_name: ${{ env.VERSION }}
@@ -144,12 +143,6 @@ jobs:
           Remove-Item -Path .\*.zip
       - name: Check directory again
         run: Get-ChildItem ./
-      # Copy Contents of output folder to root directory
-      - name: Copy Files to root & delete output directory
-        run: |
-          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
-          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
-          Remove-Item -Path .\output -Recurse
       # Commits the build output to the branch and tags it with the version
       - name: Commit build output and tag the commit
         shell: powershell

.github/workflows/master.yml

@@ -56,11 +56,21 @@ jobs:
       - name: Zip Build Output
         shell: powershell
         run: ./.github/scripts/ZipBuildOutput.ps1
+        # Write the version to a file to be consumed by the push jobs
+      - name: Write Version
+        run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
+      # Upload the build output as an artifact
       - name: Upload Build Output
         uses: actions/upload-artifact@v1
         with:
           name: Build
           path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
+      # Upload the Version file as an artifact
+      - name: Upload version.txt
+        uses: actions/upload-artifact@v1
+        with:
+          name: Version
+          path: ${{env.GITHUB_HOME}}\output\version.txt
       # Upload the build package to the release
       - name: Upload Release Package
         id: upload_release
@@ -72,3 +82,155 @@ jobs:
           asset_content_type: application/zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  Internal_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash-Engineering/essentials-builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./
+  # This step only runs if the branch is master or release/ runs and pushes the build to the public build repo
+  Public_Push_Output:
+    needs: Build_Project
+    runs-on: windows-latest
+    if: contains(github.ref, 'master') || contains(github.ref, 'release')
+    steps:
+      # Checkout the repo
+      - name: Checkout Builds Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.BUILDS_TOKEN }}
+          repository: PepperDash/Essentials-Builds
+          ref: ${{ Env.GITHUB_REF }}
+      # Download the version artifact from the build job
+      - name: Download Build Version Info
+        uses: actions/download-artifact@v1
+        with:
+          name: Version
+      - name: Check Directory
+        run: Get-ChildItem "./"
+      # Set the version number environment variable from the file we just downloaded
+      - name: Set Version Number
+        shell: powershell
+        run: |
+          Get-ChildItem "./Version"
+          $version = Get-Content -Path ./Version/version.txt
+          Write-Host "Version: $version"
+          Write-Output "::set-env name=VERSION::$version"
+          Remove-Item -Path ./Version/version.txt
+          Remove-Item -Path ./Version
+      # Checkout/Create the branch
+      - name: Create new branch
+        run: git checkout -b $($Env:GITHUB_REF -replace "refs/heads/")
+      # Download the build output into the repo
+      - name: Download Build output
+        uses: actions/download-artifact@v1
+        with:
+          name: Build
+          path: ./
+      - name: Check directory
+        run: Get-ChildItem ./
+      # Unzip the build package file
+      - name: Unzip Build file
+        run: |
+          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
+          Remove-Item -Path .\*.zip
+      - name: Check directory again
+        run: Get-ChildItem ./
+        # Copy Contents of output folder to root directory
+      - name: Copy Files to root & delete output directory
+        run: |
+          Remove-Item -Path .\* -Include @("*.cpz","*.md","*.cplz","*.json","*.dll","*.clz")  
+          Get-ChildItem -Path .\output\* | Copy-Item -Destination .\
+          Remove-Item -Path .\output -Recurse
+      # Commits the build output to the branch and tags it with the version
+      - name: Commit build output and tag the commit
+        shell: powershell
+        run: |
+          git config user.email "actions@pepperdash.com"
+          git config user.name "GitHub Actions"
+          git add .
+          $commit = "Build $($Env:GITHUB_RUN_NUMBER) from commit: https://github.com/$($Env:GITHUB_REPOSITORY)/commit/$($Env:GITHUB_SHA)"
+          Write-Host "Commit: $commit"
+          git commit -m $commit
+          git tag $($Env:VERSION)
+      # Push the commit
+      - name: Push to Builds Repo
+        shell: powershell
+        run: |
+          $branch = $($Env:GITHUB_REF) -replace "refs/heads/"
+          Write-Host "Branch: $branch"
+          git push -u origin $($branch) --force
+      # Push the tags
+      - name: Push tags
+        run: git push --tags origin
+      - name: Check Directory
+        run: Get-ChildItem ./

PepperDashEssentials/AppServer/Messengers/SystemMonitorMessenger.cs

@@ -1,5 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Monitoring;
 
@@ -17,11 +23,11 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
             SysMon = sysMon;
 
-            SysMon.SystemMonitorPropertiesChanged += SysMon_SystemMonitorPropertiesChanged;
+            SysMon.SystemMonitorPropertiesChanged += new EventHandler<EventArgs>(SysMon_SystemMonitorPropertiesChanged);
 
             foreach (var p in SysMon.ProgramStatusFeedbackCollection)
             {
-                p.Value.ProgramInfoChanged += ProgramInfoChanged;
+                p.Value.ProgramInfoChanged += new EventHandler<ProgramInfoEventArgs>(ProgramInfoChanged);
             }
 
             CrestronConsole.AddNewConsoleCommand(s => SendFullStatusMessage(), "SendFullSysMonStatus", "Sends the full System Monitor Status", ConsoleAccessLevelEnum.AccessOperator);
@@ -66,15 +72,18 @@ namespace PepperDash.Essentials.AppServer.Messengers
             Debug.Console(1, "Posting System Monitor Status Message.");
 
             // This takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke(o => PostStatusMessage(new
+            CrestronInvoke.BeginInvoke((o) =>
             {
-                timeZone = SysMon.TimeZoneFeedback.IntValue,
-                timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
-                ioControllerVersion = SysMon.IoControllerVersionFeedback.StringValue,
-                snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
-                bacnetVersion = SysMon.BaCnetAppVersionFeedback.StringValue,
-                controllerVersion = SysMon.ControllerVersionFeedback.StringValue
-            }));
+                PostStatusMessage(new
+                {
+                    timeZone = SysMon.TimeZoneFeedback.IntValue,
+                    timeZoneName = SysMon.TimeZoneTextFeedback.StringValue,
+                    ioControllerVersion = SysMon.IOControllerVersionFeedback.StringValue,
+                    snmpVersion = SysMon.SnmpVersionFeedback.StringValue,
+                    bacnetVersion = SysMon.BACnetAppVersionFeedback.StringValue,
+                    controllerVersion = SysMon.ControllerVersionFeedback.StringValue
+                });
+            });
         }
 
         protected override void CustomRegisterWithAppServer(MobileControlSystemController appServerController)

PepperDashEssentials/Bridges/JoinMaps/SystemMonitorJoinMap.cs

@@ -1,4 +1,9 @@
-using PepperDash.Essentials.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Essentials.Core;
 
 namespace PepperDash.Essentials.Bridges
 {
@@ -9,21 +14,11 @@ namespace PepperDash.Essentials.Bridges
         /// </summary>
         public uint ProgramStartJoin { get; set; }
 
-        /// <summary>
-        /// Offset to indicate where the range of iterated Ethernet joins will start
-        /// </summary>
-        public uint EthernetStartJoin { get; set; }
-
         /// <summary>
         /// Offset between each program join set
         /// </summary>
         public uint ProgramOffsetJoin { get; set; }
 
-        /// <summary>
-        /// Offset between each Ethernet Interface join set
-        /// </summary>
-        public uint EthernetOffsetJoin { get; set; }
-
         #region Digitals
         /// <summary>
         /// Range Sets and reports whether the corresponding program slot is started
@@ -92,68 +87,6 @@ namespace PepperDash.Essentials.Bridges
         /// Serialized JSON output that aggregates the program info of the corresponding program
         /// </summary>
         public uint AggregatedProgramInfo { get; set; }
-        /// <summary>
-        /// Reports the controller serial number
-        /// </summary>
-        public uint SerialNumber { get; set; }
-        /// <summary>
-        /// Reports the controller model
-        /// </summary>
-        public uint Model { get; set; }
-        /// <summary>
-        /// Reports the Host name set on the corresponding interface
-        /// </summary>
-        public uint HostName { get; set; }
-        /// <summary>
-        /// Reports the Current IP address set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned address.
-        /// </summary>
-        public uint CurrentIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Current Default Gateway set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned gateway
-        /// </summary>
-        public uint CurrentDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint CurrentSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the Static IP address set on the corresponding interface. If DHCP is disabled, this will match the Current IP address
-        /// </summary>
-        public uint StaticIpAddress { get; set; }
-        /// <summary>
-        /// Reporst the Static Default Gateway set on the corresponding interface. If DHCP is disabled, this will match the Current gateway
-        /// </summary>
-        public uint StaticDefaultGateway { get; set; }
-        /// <summary>
-        /// Reports the Current Subnet Mask set on the corresponding interface. If DHCP is enabled, this will be the DHCP assigned subnet mask
-        /// </summary>
-        public uint StaticSubnetMask { get; set; }
-        /// <summary>
-        /// Reports the current DomainFeedback on the corresponding interface
-        /// </summary>
-        public uint Domain { get; set; }
-        /// <summary>
-        /// Reports the current DNS Servers on the corresponding interface
-        /// </summary>
-        public uint DnsServer { get; set; }
-        /// <summary>
-        /// Reports the MAC Address of the corresponding interface
-        /// </summary>
-        public uint MacAddress { get; set; }
-        /// <summary>
-        /// Reports the DHCP Status of the corresponding interface
-        /// </summary>
-        public uint DhcpStatus { get; set; }
-
-        /// <summary>
-        /// Reports the current uptime. Updated in 5 minute intervals.
-        /// </summary>
-        public uint Uptime { get; set; }
-
-        /// <summary>
-        /// Reports the date of the last boot
-        /// </summary>
-        public uint LastBoot { get; set; }
         #endregion
 
         public SystemMonitorJoinMap()
@@ -165,10 +98,6 @@ namespace PepperDash.Essentials.Bridges
             SnmpAppVersion = 3;
             BACnetAppVersion = 4;
             ControllerVersion = 5;
-            SerialNumber = 6;
-            Model = 7;
-            Uptime = 8;
-            LastBoot = 9;
 
 
             ProgramStartJoin = 10;
@@ -186,23 +115,6 @@ namespace PepperDash.Essentials.Bridges
             ProgramCrestronDatabaseVersion = 3;
             ProgramEnvironmentVersion = 4;
             AggregatedProgramInfo = 5;
-
-            EthernetStartJoin = 75;
-
-            EthernetOffsetJoin = 15;
-
-            // Offset in groups of 15
-            HostName = 1;
-            CurrentIpAddress = 2;
-            CurrentSubnetMask = 3;
-            CurrentDefaultGateway = 4;
-            StaticIpAddress = 5;
-            StaticSubnetMask = 6;
-            StaticDefaultGateway = 7;
-            Domain = 8;
-            DnsServer = 9;
-            MacAddress = 10;
-            DhcpStatus = 11;
         }
 
         public override void OffsetJoinNumbers(uint joinStart)
@@ -219,7 +131,6 @@ namespace PepperDash.Essentials.Bridges
 
             // Sets the initial join value where the iterated program joins will begin
             ProgramStartJoin = ProgramStartJoin + joinOffset;
-            EthernetStartJoin = EthernetStartJoin + joinOffset;
         }
     }
 }

PepperDashEssentials/Bridges/SystemMonitorBridge.cs

@@ -1,4 +1,9 @@
-using Crestron.SimplSharpPro.DeviceSupport;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.Diagnostics;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -12,7 +17,7 @@ namespace PepperDash.Essentials.Bridges
     {
         public static void LinkToApi(this SystemMonitorController systemMonitorController, BasicTriList trilist, uint joinStart, string joinMapKey)
         {
-            var joinMap = new SystemMonitorJoinMap();
+            SystemMonitorJoinMap joinMap = new SystemMonitorJoinMap();
 
             var joinMapSerialized = JoinMapHelper.GetJoinMapForDevice(joinMapKey);
 
@@ -25,71 +30,36 @@ namespace PepperDash.Essentials.Bridges
             Debug.Console(2, systemMonitorController, "Linking API starting at join: {0}", joinStart);
 
             systemMonitorController.TimeZoneFeedback.LinkInputSig(trilist.UShortInput[joinMap.TimeZone]);
+            //trilist.SetUShortSigAction(joinMap.TimeZone, new Action<ushort>(u => systemMonitorController.SetTimeZone(u)));
             systemMonitorController.TimeZoneTextFeedback.LinkInputSig(trilist.StringInput[joinMap.TimeZoneName]);
 
-            systemMonitorController.IoControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
+            systemMonitorController.IOControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.IOControllerVersion]);
             systemMonitorController.SnmpVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.SnmpAppVersion]);
-            systemMonitorController.BaCnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
+            systemMonitorController.BACnetAppVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.BACnetAppVersion]);
             systemMonitorController.ControllerVersionFeedback.LinkInputSig(trilist.StringInput[joinMap.ControllerVersion]);
-            systemMonitorController.SerialNumberFeedback.LinkInputSig(trilist.StringInput[joinMap.SerialNumber]);
-            systemMonitorController.ModelFeedback.LinkInputSig(trilist.StringInput[joinMap.Model]);
-            systemMonitorController.UptimeFeedback.LinkInputSig(trilist.StringInput[joinMap.Uptime]);
-            systemMonitorController.LastStartFeedback.LinkInputSig(trilist.StringInput[joinMap.LastBoot]);
 
             // iterate the program status feedback collection and map all the joins
-            LinkProgramInfoJoins(systemMonitorController, trilist, joinMap);
-
-            LinkEthernetInfoJoins(systemMonitorController, trilist, joinMap);
-        }
-
-        private static void LinkEthernetInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist, SystemMonitorJoinMap joinMap)
-        {
-            var ethernetSlotJoinStart = joinMap.EthernetStartJoin;
-
-            foreach (var fb in systemMonitorController.EthernetStatusFeedbackCollection)
-            {
-                fb.Value.CurrentIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentIpAddress]);
-                fb.Value.CurrentSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentSubnetMask]);
-                fb.Value.CurrentDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.CurrentDefaultGateway]);
-                fb.Value.StaticIpAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticIpAddress]);
-                fb.Value.StaticSubnetMaskFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticSubnetMask]);
-                fb.Value.StaticDefaultGatewayFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.StaticDefaultGateway]);
-                fb.Value.HostNameFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.HostName]);
-                fb.Value.MacAddressFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.MacAddress]);
-                fb.Value.DomainFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.Domain]);
-                fb.Value.DnsServerFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DnsServer]);
-                fb.Value.DhcpStatusFeedback.LinkInputSig(trilist.StringInput[ethernetSlotJoinStart + joinMap.DhcpStatus]);
-
-                ethernetSlotJoinStart += joinMap.EthernetOffsetJoin;
-            }
-        }
-
-        private static void LinkProgramInfoJoins(SystemMonitorController systemMonitorController, BasicTriList trilist,
-            SystemMonitorJoinMap joinMap)
-        {
             var programSlotJoinStart = joinMap.ProgramStartJoin;
 
             foreach (var p in systemMonitorController.ProgramStatusFeedbackCollection)
             {
                 var programNumber = p.Value.Program.Number;
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStart, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Start));
                 p.Value.ProgramStartedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStart]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStop,
-                    b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramStop, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].OperatingState = eProgramOperatingState.Stop));
                 p.Value.ProgramStoppedFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramStop]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramRegister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register);
-                p.Value.ProgramRegisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramRegister, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Register));
+                p.Value.ProgramRegisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramRegister]);
 
-                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramUnregister,
-                    b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister);
-                p.Value.ProgramUnregisteredFeedback.LinkInputSig(
-                    trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
+                trilist.SetBoolSigAction(programSlotJoinStart + joinMap.ProgramUnregister, new Action<bool>
+                    (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister));
+                p.Value.ProgramUnregisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]);
 
                 p.Value.ProgramNameFeedback.LinkInputSig(trilist.StringInput[programSlotJoinStart + joinMap.ProgramName]);
                 p.Value.ProgramCompileTimeFeedback.LinkInputSig(

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolFeedback.cs

@@ -34,34 +34,18 @@ namespace PepperDash.Essentials.Core
 
         List<Crestron.SimplSharpPro.DeviceSupport.Feedback> LinkedCrestronFeedbacks = new List<Crestron.SimplSharpPro.DeviceSupport.Feedback>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(Func<bool> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public BoolFeedback(string key, Func<bool> valueFunc)
             : base(key)
         {
             ValueFunc = valueFunc;
         }
 
+
         public override void FireUpdate()
         {
             bool newValue = InTestMode ? TestValue : ValueFunc.Invoke();

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntFeedback.cs

@@ -23,28 +23,11 @@ namespace PepperDash.Essentials.Core
         Func<int> ValueFunc;
         List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(Func<int> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public IntFeedback(string key, Func<int> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringFeedback.cs

@@ -7,7 +7,6 @@ using Crestron.SimplSharpPro;
 
 namespace PepperDash.Essentials.Core
 {
-
     public class StringFeedback : Feedback
     {
         public override string StringValue { get { return _StringValue; } } // ValueFunc.Invoke(); } }
@@ -19,33 +18,16 @@ namespace PepperDash.Essentials.Core
         public string TestValue { get; private set; }
 
         /// <summary>
-        /// Evaluated on FireUpdate
+        /// Evalutated on FireUpdate
         /// </summary>
         public Func<string> ValueFunc { get; private set; }
         List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(Func<string> valueFunc)
             : this(null, valueFunc)
         {
         }
 
-        /// <summary>
-        /// Creates the feedback with the Func as described.
-        /// </summary>
-        /// <remarks>
-        /// While the linked sig value will be updated with the current value stored when it is linked to a EISC Bridge,
-        /// it will NOT reflect an actual value from a device until <seealso cref="FireUpdate"/> has been called
-        /// </remarks>
-        /// <param name="key">Key to find this Feedback</param>
-        /// <param name="valueFunc">Delegate to invoke when this feedback needs to be updated</param>
         public StringFeedback(string key, Func<string> valueFunc)
             : base(key)
         {

essentials-framework/Essentials Core/PepperDashEssentialsBase/Monitoring/SystemMonitorController.cs

@@ -1,8 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro.Diagnostics;
+
 using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -14,32 +19,18 @@ namespace PepperDash.Essentials.Core.Monitoring
     /// </summary>
     public class SystemMonitorController : Device
     {
-        private const long UptimePollTime = 300000;
-        private CTimer _uptimePollTimer;
-
-        private string _uptime;
-        private string _lastStart;
-
         public event EventHandler<EventArgs> SystemMonitorPropertiesChanged;
 
         public Dictionary<uint, ProgramStatusFeedbacks> ProgramStatusFeedbackCollection;
-        public Dictionary<short, EthernetStatusFeedbacks> EthernetStatusFeedbackCollection;
 
-        public IntFeedback TimeZoneFeedback { get; protected set; }
-        public StringFeedback TimeZoneTextFeedback { get; protected set; }
-
-        public StringFeedback IoControllerVersionFeedback { get; protected set; }
-        public StringFeedback SnmpVersionFeedback { get; protected set; }
-        public StringFeedback BaCnetAppVersionFeedback { get; protected set; }
-        public StringFeedback ControllerVersionFeedback { get; protected set; }
-
-        //new feedbacks. Issue #50
-        public StringFeedback SerialNumberFeedback { get; protected set; }
-        public StringFeedback ModelFeedback { get; set; }
-
-        public StringFeedback UptimeFeedback { get; set; }
-        public StringFeedback LastStartFeedback { get; set; }
+        public IntFeedback TimeZoneFeedback { get; set; }
+        public StringFeedback TimeZoneTextFeedback { get; set; }
 
+        public StringFeedback IOControllerVersionFeedback { get; set; }
+        public StringFeedback SnmpVersionFeedback { get; set; }
+        public StringFeedback BACnetAppVersionFeedback { get; set; }
+        public StringFeedback ControllerVersionFeedback { get; set; }
+        
         public SystemMonitorController(string key)
             : base(key)
         {
@@ -47,18 +38,21 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             SystemMonitor.ProgramInitialization.ProgramInitializationUnderUserControl = true;
 
-            TimeZoneFeedback = new IntFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneNumber);
-            TimeZoneTextFeedback = new StringFeedback(() => SystemMonitor.TimeZoneInformation.TimeZoneName);
+            //CrestronConsole.AddNewConsoleCommand(RefreshSystemMonitorData, "RefreshSystemMonitor", "Refreshes System Monitor Feedbacks", ConsoleAccessLevelEnum.AccessOperator);
 
-            IoControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.IOPVersion);
-            SnmpVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.SNMPVersion);
-            BaCnetAppVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.BACNetVersion);
-            ControllerVersionFeedback = new StringFeedback(() => SystemMonitor.VersionInformation.ControlSystemVersion);
+            TimeZoneFeedback = new IntFeedback(new Func<int>( () => SystemMonitor.TimeZoneInformation.TimeZoneNumber));
+            TimeZoneTextFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.TimeZoneInformation.TimeZoneName));
 
-            SerialNumberFeedback = new StringFeedback(() => CrestronEnvironment.SystemInfo.SerialNumber);
-            ModelFeedback = new StringFeedback(() => InitialParametersClass.ControllerPromptName);
-            UptimeFeedback = new StringFeedback(() => _uptime);
-            LastStartFeedback = new StringFeedback(()=> _lastStart);
+            IOControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.IOPVersion));
+            SnmpVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.SNMPVersion));
+            BACnetAppVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.BACNetVersion));
+            ControllerVersionFeedback = new StringFeedback(new Func<string>( () => SystemMonitor.VersionInformation.ControlSystemVersion));
+
+            //var status = string.Format("System Monitor Status: \r TimeZone: {0}\rTimeZoneText: {1}\rIOControllerVersion: {2}\rSnmpAppVersionFeedback: {3}\rBACnetAppVersionFeedback: {4}\rControllerVersionFeedback: {5}",
+            //    SystemMonitor.TimeZoneInformation.TimeZoneNumber, SystemMonitor.TimeZoneInformation.TimeZoneName, SystemMonitor.VersionInformation.IOPVersion, SystemMonitor.VersionInformation.SNMPVersion,
+            //    SystemMonitor.VersionInformation.BACNetVersion, SystemMonitor.VersionInformation.ControlSystemVersion);
+                
+            //Debug.Console(1, this, status);
 
             ProgramStatusFeedbackCollection = new Dictionary<uint, ProgramStatusFeedbacks>();
 
@@ -68,132 +62,43 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramStatusFeedbackCollection.Add(prog.Number, program);
             }
 
-            CreateEthernetStatusFeedbacks();
-            UpdateEthernetStatusFeeedbacks();
-
-            _uptimePollTimer = new CTimer(PollUptime,null,0, UptimePollTime);
-
-            SystemMonitor.ProgramChange += SystemMonitor_ProgramChange;
-            SystemMonitor.TimeZoneInformation.TimeZoneChange += TimeZoneInformation_TimeZoneChange;
-            CrestronEnvironment.EthernetEventHandler += CrestronEnvironmentOnEthernetEventHandler;
-            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironmentOnProgramStatusEventHandler;
-        }
-
-        private void CrestronEnvironmentOnProgramStatusEventHandler(eProgramStatusEventType programEventType)
-        {
-            if (programEventType != eProgramStatusEventType.Stopping) return;
-
-            _uptimePollTimer.Stop();
-            _uptimePollTimer.Dispose();
-            _uptimePollTimer = null;
-        }
-
-        private void PollUptime(object obj)
-        {
-            var consoleResponse = string.Empty;
-
-            CrestronConsole.SendControlSystemCommand("uptime", ref consoleResponse);
-
-            ParseUptime(consoleResponse);
-
-            UptimeFeedback.FireUpdate();
-            LastStartFeedback.FireUpdate();
-        }
-
-        private void ParseUptime(string response)
-        {
-            var splitString = response.Trim().Split('\r', '\n');
-
-            var lastStartRaw = splitString[2];
-            var lastStartIndex = lastStartRaw.IndexOf(':');
-
-            _lastStart = lastStartRaw.Substring(lastStartIndex + 1).Trim();
-
-            var uptimeRaw = splitString[0];
-
-            var forIndex = uptimeRaw.IndexOf("for", StringComparison.Ordinal);
-
-            //4 => "for " to get what's on the right
-            _uptime = uptimeRaw.Substring(forIndex + 4);
-        }
-
-        private void CrestronEnvironmentOnEthernetEventHandler(EthernetEventArgs ethernetEventArgs)
-        {
-            if (ethernetEventArgs.EthernetEventType != eEthernetEventType.LinkUp) return;
-
-            foreach (var fb in EthernetStatusFeedbackCollection)
-            {
-                fb.Value.UpdateEthernetStatus();
-            }
-        }
-
-        private void CreateEthernetStatusFeedbacks()
-        {
-            EthernetStatusFeedbackCollection = new Dictionary<short, EthernetStatusFeedbacks>();
-
-            Debug.Console(2, "Creating {0} EthernetStatusFeedbacks", InitialParametersClass.NumberOfEthernetInterfaces);
-
-            for (short i = 0; i < InitialParametersClass.NumberOfEthernetInterfaces; i++)
-            {
-                Debug.Console(2, "Creating EthernetStatusFeedback for Interface {0}", i);
-                var ethernetInterface = new EthernetStatusFeedbacks(i);
-                EthernetStatusFeedbackCollection.Add(i, ethernetInterface);
-            }
-        }
-
-        private void UpdateEthernetStatusFeeedbacks()
-        {
-            foreach (var iface in EthernetStatusFeedbackCollection)
-            {
-                iface.Value.CurrentIpAddressFeedback.FireUpdate();
-                iface.Value.CurrentSubnetMaskFeedback.FireUpdate();
-                iface.Value.CurrentDefaultGatewayFeedback.FireUpdate();
-                iface.Value.StaticIpAddressFeedback.FireUpdate();
-                iface.Value.StaticSubnetMaskFeedback.FireUpdate();
-                iface.Value.StaticDefaultGatewayFeedback.FireUpdate();
-                iface.Value.HostNameFeedback.FireUpdate();
-                iface.Value.DnsServerFeedback.FireUpdate();
-                iface.Value.DomainFeedback.FireUpdate();
-                iface.Value.DhcpStatusFeedback.FireUpdate();
-                iface.Value.MacAddressFeedback.FireUpdate();
-            }
+            SystemMonitor.ProgramChange += new ProgramStateChangeEventHandler(SystemMonitor_ProgramChange);
+            SystemMonitor.TimeZoneInformation.TimeZoneChange += new TimeZoneChangeEventHandler(TimeZoneInformation_TimeZoneChange);
         }
 
         /// <summary>
         /// Gets data in separate thread
         /// </summary>
-        private void RefreshSystemMonitorData()
+        /// <param name="command"></param>
+        void RefreshSystemMonitorData(string command)
         {
             // this takes a while, launch a new thread
-            CrestronInvoke.BeginInvoke(UpdateFeedback);
+            CrestronInvoke.BeginInvoke((o) =>
+                {
+                    TimeZoneFeedback.FireUpdate();
+                    TimeZoneTextFeedback.FireUpdate();
+                    IOControllerVersionFeedback.FireUpdate();
+                    SnmpVersionFeedback.FireUpdate();
+                    BACnetAppVersionFeedback.FireUpdate();
+                    ControllerVersionFeedback.FireUpdate();
+
+                    OnSystemMonitorPropertiesChanged();
+                }
+            );
         }
 
-        private void UpdateFeedback(object o)
-        {
-            TimeZoneFeedback.FireUpdate();
-            TimeZoneTextFeedback.FireUpdate();
-            IoControllerVersionFeedback.FireUpdate();
-            SnmpVersionFeedback.FireUpdate();
-            BaCnetAppVersionFeedback.FireUpdate();
-            ControllerVersionFeedback.FireUpdate();
-            SerialNumberFeedback.FireUpdate();
-            ModelFeedback.FireUpdate();
-
-            OnSystemMonitorPropertiesChanged();
-        }
-
-        private void OnSystemMonitorPropertiesChanged()
+        void OnSystemMonitorPropertiesChanged()
         {
             var handler = SystemMonitorPropertiesChanged;
             if (handler != null)
             {
-                handler(this, new EventArgs());
+                handler(this, new EventArgs());   
             }
         }
 
         public override bool CustomActivate()
         {
-            RefreshSystemMonitorData();
+            RefreshSystemMonitorData(null);
 
             return base.CustomActivate();
         }
@@ -209,41 +114,46 @@ namespace PepperDash.Essentials.Core.Monitoring
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="args"></param>
-        private void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
+        void SystemMonitor_ProgramChange(Program sender, ProgramEventArgs args)
         {
             Debug.Console(2, this, "Program Change Detected for slot: {0}", sender.Number);
             Debug.Console(2, this, "Event Type: {0}", args.EventType);
 
             var program = ProgramStatusFeedbackCollection[sender.Number];
 
-            switch (args.EventType)
+            if (args.EventType == eProgramChangeEventType.OperatingState)
             {
-                case eProgramChangeEventType.OperatingState:
-                    program.ProgramStartedFeedback.FireUpdate();
-                    program.ProgramStoppedFeedback.FireUpdate();
-                    program.ProgramInfo.OperatingState = args.OperatingState;
-                    if (args.OperatingState == eProgramOperatingState.Start)
-                        program.GetProgramInfo();
-                    else
-                    {
-                        program.AggregatedProgramInfoFeedback.FireUpdate();
-                        program.OnProgramInfoChanged();
-                    }
-                    break;
-                case eProgramChangeEventType.RegistrationState:
-                    program.ProgramRegisteredFeedback.FireUpdate();
-                    program.ProgramUnregisteredFeedback.FireUpdate();
-                    program.ProgramInfo.RegistrationState = args.RegistrationState;
-                    program.GetProgramInfo();
-                    break;
+                program.ProgramStartedFeedback.FireUpdate();
+                program.ProgramStoppedFeedback.FireUpdate();
+
+                program.ProgramInfo.OperatingState = args.OperatingState;
+
+				//program.GetProgramInfo();
+
+				if (args.OperatingState == eProgramOperatingState.Start)
+					program.GetProgramInfo();
+				else
+				{
+					program.AggregatedProgramInfoFeedback.FireUpdate();
+					program.OnProgramInfoChanged();
+				}
             }
+            else if (args.EventType == eProgramChangeEventType.RegistrationState)
+            {
+                program.ProgramRegisteredFeedback.FireUpdate();
+                program.ProgramUnregisteredFeedback.FireUpdate();
+
+                program.ProgramInfo.RegistrationState = args.RegistrationState;
+
+                program.GetProgramInfo();
+            }         
         }
 
         /// <summary>
         /// Responds to time zone changes and updates the appropriate feedbacks
         /// </summary>
         /// <param name="args"></param>
-        private void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
+        void TimeZoneInformation_TimeZoneChange(TimeZoneEventArgs args)
         {
             Debug.Console(2, this, "Time Zone Change Detected.");
             TimeZoneFeedback.FireUpdate();
@@ -252,121 +162,6 @@ namespace PepperDash.Essentials.Core.Monitoring
             OnSystemMonitorPropertiesChanged();
         }
 
-        public class EthernetStatusFeedbacks
-        {
-            public StringFeedback HostNameFeedback { get; protected set; }
-            public StringFeedback DnsServerFeedback { get; protected set; }
-            public StringFeedback DomainFeedback { get; protected set; }
-            public StringFeedback MacAddressFeedback { get; protected set; }
-            public StringFeedback DhcpStatusFeedback { get; protected set; }
-
-            public StringFeedback CurrentIpAddressFeedback { get; protected set; }
-            public StringFeedback CurrentSubnetMaskFeedback { get; protected set; }
-            public StringFeedback CurrentDefaultGatewayFeedback { get; protected set; }
-            
-            public StringFeedback StaticIpAddressFeedback { get; protected set; }
-            public StringFeedback StaticSubnetMaskFeedback { get; protected set; }
-            public StringFeedback StaticDefaultGatewayFeedback { get; protected set; }
-
-            public EthernetStatusFeedbacks(short adapterIndex)
-            {
-                Debug.Console(2, "Ethernet Information for interface {0}", adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Hostname: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current IP Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current Subnet Mask: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Current Router: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static IP Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_IPADDRESS, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static Subnet Mask: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_IPMASK, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Static Router: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_STATIC_ROUTER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} DNS Servers: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} DHCP State: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} Domain Name: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterIndex), adapterIndex);
-                Debug.Console(2, "Adapter Index: {1} MAC Address: {0}", CrestronEthernetHelper.GetEthernetParameter(
-                    CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterIndex), adapterIndex);
-                HostNameFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, adapterIndex));
-
-                CurrentIpAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
-                CurrentDefaultGatewayFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
-                CurrentSubnetMaskFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
-                StaticIpAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, adapterIndex));
-                StaticDefaultGatewayFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, adapterIndex));
-                StaticSubnetMaskFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, adapterIndex));
-                DomainFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, adapterIndex));
-                DnsServerFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DNS_SERVER, adapterIndex));
-                MacAddressFeedback =
-                    new StringFeedback(
-                        () =>
-                            CrestronEthernetHelper.GetEthernetParameter(
-                                CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, adapterIndex));
-
-                DhcpStatusFeedback = new StringFeedback(
-                    () =>
-                        CrestronEthernetHelper.GetEthernetParameter(
-                            CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, adapterIndex));
-            }
-
-            public void UpdateEthernetStatus()
-            {
-                HostNameFeedback.FireUpdate();
-                CurrentIpAddressFeedback.FireUpdate();
-                CurrentSubnetMaskFeedback.FireUpdate();
-                CurrentDefaultGatewayFeedback.FireUpdate();
-                StaticIpAddressFeedback.FireUpdate();
-                StaticSubnetMaskFeedback.FireUpdate();
-                StaticDefaultGatewayFeedback.FireUpdate();
-                DomainFeedback.FireUpdate();
-                DnsServerFeedback.FireUpdate();
-                MacAddressFeedback.FireUpdate();
-                DhcpStatusFeedback.FireUpdate();
-            }
-        }
-
 
         public class ProgramStatusFeedbacks
         {
@@ -397,19 +192,17 @@ namespace PepperDash.Essentials.Core.Monitoring
                 ProgramInfo.OperatingState = Program.OperatingState;
                 ProgramInfo.RegistrationState = Program.RegistrationState;
 
-                ProgramStartedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Start);
-                ProgramStoppedFeedback = new BoolFeedback(() => Program.OperatingState == eProgramOperatingState.Stop);
-                ProgramRegisteredFeedback =
-                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Register);
-                ProgramUnregisteredFeedback =
-                    new BoolFeedback(() => Program.RegistrationState == eProgramRegistrationState.Unregister);
+                ProgramStartedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Start));
+                ProgramStoppedFeedback = new BoolFeedback(new Func<bool>( () => Program.OperatingState == eProgramOperatingState.Stop));
+                ProgramRegisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Register));
+                ProgramUnregisteredFeedback = new BoolFeedback(new Func<bool>( () => Program.RegistrationState == eProgramRegistrationState.Unregister));
 
-                ProgramNameFeedback = new StringFeedback(() => ProgramInfo.ProgramFile);
-                ProgramCompileTimeFeedback = new StringFeedback(() => ProgramInfo.CompileTime);
-                CrestronDataBaseVersionFeedback = new StringFeedback(() => ProgramInfo.CrestronDb);
-                EnvironmentVersionFeedback = new StringFeedback(() => ProgramInfo.Environment);
+                ProgramNameFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.ProgramFile));
+                ProgramCompileTimeFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CompileTime));
+                CrestronDataBaseVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.CrestronDB));
+                EnvironmentVersionFeedback = new StringFeedback(new Func<string>(() => ProgramInfo.Environment));
 
-                AggregatedProgramInfoFeedback = new StringFeedback(() => JsonConvert.SerializeObject(ProgramInfo));
+                AggregatedProgramInfoFeedback = new StringFeedback(new Func<string>(() => JsonConvert.SerializeObject(ProgramInfo)));
 
                 GetProgramInfo();
             }
@@ -419,99 +212,74 @@ namespace PepperDash.Essentials.Core.Monitoring
             /// </summary>
             public void GetProgramInfo()
             {
-                CrestronInvoke.BeginInvoke(GetProgramInfo);
-            }
-
-            private void GetProgramInfo(object o)
-            {
-                Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
-
-                string response = null;
-
-                if (Program.RegistrationState == eProgramRegistrationState.Unregister || Program.OperatingState == eProgramOperatingState.Stop)
+                CrestronInvoke.BeginInvoke((o) =>
                 {
-                    Debug.Console(2, "Program {0} not registered. Setting default values for program information.",
-                        Program.Number);
+                    Debug.Console(2, "Attempting to get program info for slot: {0}", Program.Number);
 
-                    ProgramInfo = new ProgramInfo(Program.Number)
+                    string response = null;
+
+                    var success = CrestronConsole.SendControlSystemCommand(string.Format("progcomments:{0}", Program.Number), ref response);
+
+                    if (success)
                     {
-                        OperatingState = Program.OperatingState,
-                        RegistrationState = Program.RegistrationState
-                    };
+                        //Debug.Console(2, "Progcomments Response: \r{0}", response);
 
-                    return;
-                }
+                        if (!response.ToLower().Contains("bad or incomplete"))
+                        {
+                            // Shared properteis
+                            ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
+                            ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
+                            ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
+                            ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
 
-                var success = CrestronConsole.SendControlSystemCommand(
-                    string.Format("progcomments:{0}", Program.Number), ref response);
 
-                if (!success)
-                {
-                    Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
-                    UpdateFeedbacks();
-                    return;
-                }
 
-                if (response.ToLower().Contains("bad or incomplete"))
-                {
-                    Debug.Console(2,
-                        "Program in slot {0} not running.  Setting default ProgramInfo for slot: {0}",
-                        Program.Number);
+                            if (ProgramInfo.ProgramFile.Contains(".dll"))
+                            {
+                                // SSP Program
+                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
+                                ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
+                                ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
+                                ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ", "\n");
+                                ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
+                            }
+                            else if (ProgramInfo.ProgramFile.Contains(".smw"))
+                            {
+                                // SIMPL Windows Program
+                                ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
+                                ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
+                                ProgramInfo.CrestronDB = ParseConsoleData(response, "CrestronDB", ": ", "\n");
+                                ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
+                                ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
 
-                    // Assume no valid program info.  Constructing a new object will wipe all properties
-                    ProgramInfo = new ProgramInfo(Program.Number)
+                            }
+                            //Debug.Console(2, "ProgramInfo: \r{0}", JsonConvert.SerializeObject(ProgramInfo));
+                        }
+                        else
+                        {
+                            Debug.Console(2, "Bad or incomplete console command response.  Initializing ProgramInfo for slot: {0}", Program.Number);
+
+                            // Assume no valid program info.  Constructing a new object will wipe all properties
+                            ProgramInfo = new ProgramInfo(Program.Number);
+
+                            ProgramInfo.OperatingState = Program.OperatingState;
+                            ProgramInfo.RegistrationState = Program.RegistrationState;
+                        }
+                    }
+                    else
                     {
-                        OperatingState = Program.OperatingState,
-                        RegistrationState = Program.RegistrationState
-                    };
+                        Debug.Console(2, "Progcomments Attempt Unsuccessful for slot: {0}", Program.Number);
+                    }
 
-                    UpdateFeedbacks();
+                    ProgramNameFeedback.FireUpdate();
+                    ProgramCompileTimeFeedback.FireUpdate();
+                    CrestronDataBaseVersionFeedback.FireUpdate();
+                    EnvironmentVersionFeedback.FireUpdate();
 
-                    return;
-                }
+                    AggregatedProgramInfoFeedback.FireUpdate();
 
-
-                // Shared properteis
-                ProgramInfo.ProgramFile = ParseConsoleData(response, "Program File", ": ", "\n");
-                ProgramInfo.CompilerRevision = ParseConsoleData(response, "Compiler Rev", ": ", "\n");
-                ProgramInfo.CompileTime = ParseConsoleData(response, "Compiled On", ": ", "\n");
-                ProgramInfo.Include4Dat = ParseConsoleData(response, "Include4.dat", ": ", "\n");
-
-
-                if (ProgramInfo.ProgramFile.Contains(".dll"))
-                {
-                    // SSP Program
-                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ": ", "\n");
-                    ProgramInfo.ApplicationName = ParseConsoleData(response, "Application Name", ": ", "\n");
-                    ProgramInfo.ProgramTool = ParseConsoleData(response, "Program Tool", ": ", "\n");
-                    ProgramInfo.MinFirmwareVersion = ParseConsoleData(response, "Min Firmware Version", ": ",
-                        "\n");
-                    ProgramInfo.PlugInVersion = ParseConsoleData(response, "PlugInVersion", ": ", "\n");
-                }
-                else if (ProgramInfo.ProgramFile.Contains(".smw"))
-                {
-                    // SIMPL Windows Program
-                    ProgramInfo.FriendlyName = ParseConsoleData(response, "Friendly Name", ":", "\n");
-                    ProgramInfo.SystemName = ParseConsoleData(response, "System Name", ": ", "\n");
-                    ProgramInfo.CrestronDb = ParseConsoleData(response, "CrestronDB", ": ", "\n");
-                    ProgramInfo.Environment = ParseConsoleData(response, "Source Env", ": ", "\n");
-                    ProgramInfo.Programmer = ParseConsoleData(response, "Programmer", ": ", "\n");
-                }
-                Debug.Console(2, "Program info for slot {0} successfully updated", Program.Number);
-
-                UpdateFeedbacks();
-            }
-
-            private void UpdateFeedbacks()
-            {
-                ProgramNameFeedback.FireUpdate();
-                ProgramCompileTimeFeedback.FireUpdate();
-                CrestronDataBaseVersionFeedback.FireUpdate();
-                EnvironmentVersionFeedback.FireUpdate();
-
-                AggregatedProgramInfoFeedback.FireUpdate();
-
-                OnProgramInfoChanged();
+                    OnProgramInfoChanged();
+                });
             }
 
             public void OnProgramInfoChanged()
@@ -526,28 +294,30 @@ namespace PepperDash.Essentials.Core.Monitoring
 
             private string ParseConsoleData(string data, string line, string startString, string endString)
             {
-                var outputData = "";
+                string outputData = "";
 
-                if (data.Length <= 0) return outputData;
+                if (data.Length > 0)
+                {
+                    try
+                    {
 
-                try
-                {
-                    //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
-                    var linePosition = data.IndexOf(line, StringComparison.Ordinal);
-                    var startPosition = data.IndexOf(startString, linePosition, StringComparison.Ordinal) +
-                                        startString.Length;
-                    var endPosition = data.IndexOf(endString, startPosition, StringComparison.Ordinal);
-                    outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
-                    //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
+                        //Debug.Console(2, "ParseConsoleData Data: {0}, Line {1}, startStirng {2}, endString {3}", data, line, startString, endString);
+                        var linePosition = data.IndexOf(line);
+                        var startPosition = data.IndexOf(startString, linePosition) + startString.Length;
+                        var endPosition = data.IndexOf(endString, startPosition);
+                        outputData = data.Substring(startPosition, endPosition - startPosition).Trim();
+                        //Debug.Console(2, "ParseConsoleData Return: {0}", outputData);
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(1, "Error Parsing Console Data:\r{0}", e);
+                    }
                 }
 
                 return outputData;
             }
         }
+
     }
 
     /// <summary>
@@ -560,39 +330,32 @@ namespace PepperDash.Essentials.Core.Monitoring
         [JsonProperty("programNumber")]
         public uint ProgramNumber { get; private set; }
 
-        [JsonConverter(typeof (StringEnumConverter))]
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("operatingState")]
         public eProgramOperatingState OperatingState { get; set; }
 
-        [JsonConverter(typeof (StringEnumConverter))]
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("registrationState")]
         public eProgramRegistrationState RegistrationState { get; set; }
 
         [JsonProperty("programFile")]
         public string ProgramFile { get; set; }
-
         [JsonProperty("friendlyName")]
         public string FriendlyName { get; set; }
-
         [JsonProperty("compilerRevision")]
         public string CompilerRevision { get; set; }
-
         [JsonProperty("compileTime")]
         public string CompileTime { get; set; }
-
         [JsonProperty("include4Dat")]
         public string Include4Dat { get; set; }
 
         // SIMPL Windows properties
         [JsonProperty("systemName")]
         public string SystemName { get; set; }
-
         [JsonProperty("crestronDb")]
-        public string CrestronDb { get; set; }
-
+        public string CrestronDB { get; set; }
         [JsonProperty("environment")]
         public string Environment { get; set; }
-
         [JsonProperty("programmer")]
         public string Programmer { get; set; }
 
@@ -600,13 +363,10 @@ namespace PepperDash.Essentials.Core.Monitoring
         // SSP Properties
         [JsonProperty("applicationName")]
         public string ApplicationName { get; set; }
-
         [JsonProperty("programTool")]
         public string ProgramTool { get; set; }
-
         [JsonProperty("minFirmwareVersion")]
         public string MinFirmwareVersion { get; set; }
-
         [JsonProperty("plugInVersion")]
         public string PlugInVersion { get; set; }
 
@@ -621,7 +381,7 @@ namespace PepperDash.Essentials.Core.Monitoring
             Include4Dat = "";
 
             SystemName = "";
-            CrestronDb = "";
+            CrestronDB = "";
             Environment = "";
             Programmer = "";
 

essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj

@@ -84,7 +84,7 @@
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />