remove device info stuff from DGE for now

Merge pull request #529 from PepperDash/hotfix/displayBase-fixes
Add PowerIsOnFeedback back to DisplayBase and marked it as Obsolete
2026-01-28 11:54:57 +00:00 · 2020-12-18 09:16:40 -07:00 · 2020-12-09 13:02:25 -07:00 · 2020-12-03 16:46:10 -07:00 · 2020-11-30 14:05:35 -07:00
14 changed files with 16 additions and 450 deletions
--- a/.github/scripts/GenerateVersionNumber-2.0.0.ps1
+++ b/.github/scripts/GenerateVersionNumber-2.0.0.ps1
@@ -1,23 +0,0 @@
-$latestVersion = [version]"2.0.0"
-
-$newVersion = [version]$latestVersion
-$phase = ""
-$newVersionString = ""
-
-switch -regex ($Env:GITHUB_REF) {
-  '^refs\/pull\/*.' {
-    $phase = 'beta';
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }
-  '^refs\/heads\/feature-2.0.0\/*.' {
-    $phase = 'alpha'
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }
-  'development-2.0.0' {
-    $phase = 'beta'
-    $newVersionString = "{0}-{1}-{2}" -f $newVersion, $phase, $Env:GITHUB_RUN_NUMBER
-  }  
-}
-
-
-Write-Output $newVersionString
--- a/.github/workflows/Build
+++ b/.github/workflows/Build
@@ -1,307 +0,0 @@
-name: Build Essentials 2.0.0
-
-on:
-  push:
-    branches:
-      - feature-2.0.0/*
-  pull_request:
-    types:
-      - closed
-    branches:
-      - development-2.0.0
-
-env:
-  # solution path doesn't need slashes unless there it is multiple folders deep
-  # 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
-  VERSION: 0.0.0-buildtype-buildnumber
-  # Defaults to debug for build type
-  BUILD_TYPE: Debug
-  # Defaults to main as the release branch.  Change as necessary
-  RELEASE_BRANCH: main
-jobs:
-  Build_Project:
-    runs-on: windows-latest
-    steps:
-      # First we checkout the source repo
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-        # Fetch all tags
-      - name: Fetch tags
-        run: git fetch --tags
-      # Generate the appropriate version number
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          $version = ./.github/scripts/GenerateVersionNumber-2.0.0.ps1
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      # Use the version number to set the version of the assemblies
-      - name: Update AssemblyInfo.cs
-        shell: powershell
-        run: |
-          ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }}
-      - name: restore Nuget Packages
-        run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion
-      # Login to Docker
-      - name: Login to Docker
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-      # Build the solutions in the docker image
-      - name: Build Solution
-        shell: powershell
-        run: |
-          Invoke-Expression "docker run --rm --mount type=bind,source=""$($Env:GITHUB_WORKSPACE)"",target=""c:/project"" pepperdash/sspbuilder c:\cihelpers\vsidebuild.exe -Solution ""c:\project\$($Env:SOLUTION_FILE).sln"" -BuildSolutionConfiguration $($ENV:BUILD_TYPE)"
-      # Zip up the output files as needed
-      - 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
-      # Create the release on the source repo
-      - name: Create tag for non-rc builds
-        if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
-        run: |
-          git tag $($Env:VERSION)
-          git push --tags origin
-      - name: Create Release
-        id: create_release
-        # using contributor's version to allow for pointing at the right commit
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
-        uses: fleskesvor/create-release@feature/support-target-commitish
-        with:
-          tag_name: ${{ env.VERSION  }}
-          release_name: ${{ env.VERSION }}
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload the build package to the release
-      - name: Upload Release Package
-        if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
-        id: upload_release
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_name: ${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Push_Nuget_Package:
-    needs: Build_Project
-    runs-on: windows-latest
-    steps:
-      - name: Download Build Version Info
-        uses: actions/download-artifact@v1
-        with:
-          name: Version
-      - name: Set Version Number
-        shell: powershell
-        run: |
-          Get-ChildItem "./Version"
-          $version = Get-Content -Path ./Version/version.txt
-          Write-Host "Version: $version"
-          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Remove-Item -Path ./Version/version.txt
-          Remove-Item -Path ./Version
-      - name: Download Build output
-        uses: actions/download-artifact@v1
-        with:
-          name: Build
-          path: ./
-      - name: Unzip Build file
-        run: |
-          Get-ChildItem .\*.zip | Expand-Archive -DestinationPath .\
-          Remove-Item -Path .\*.zip
-      - 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
-      - name: Add nuget.exe
-        uses: nuget/setup-nuget@v1
-      - name: Add Github Packages source
-        run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }}
-      - name: Add nuget.org API Key
-        run: nuget setApiKey ${{ secrets.NUGET_API_KEY }}
-      - name: Create nuget package
-        run: nuget pack "./PepperDash_Essentials_Core.nuspec" -version ${{ env.VERSION }}
-      - name: Publish nuget package to Github registry
-        run: nuget push **/*.nupkg -source github
-      - name: Publish nuget package to nuget.org
-        run: nuget push **/*.nupkg -Source https://api.nuget.org/v3/index.json
-  # This step always runs and pushes the build to the internal build rep
-  # Internal_Push_Output:
-  #   needs: Build_Project
-  #   runs-on: windows-latest
-  #   steps:
-  #     - name: check Github ref
-  #       run: ${{toJson(github.ref)}}
-  #     # 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"
-  #         echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  #         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 main 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, 'main') || contains(github.ref, '/release/')
-  #   steps:
-  #     # Checkout the repo
-  #     - name: check Github ref
-  #       run: ${{toJson(github.ref)}}
-  #     - 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"
-  #         echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-  #         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 ./
--- a/PepperDashEssentials.sln
+++ b/PepperDashEssentials.sln
@@ -9,9 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDashEssentials", "Pep
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Core", "essentials-framework\Essentials Core\PepperDashEssentialsBase\PepperDash_Essentials_Core.csproj", "{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E51D7C84-4906-486C-B2BA-EEB3B4E9731B} = {E51D7C84-4906-486C-B2BA-EEB3B4E9731B}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials Devices Common", "essentials-framework\Essentials Devices Common\Essentials Devices Common\Essentials Devices Common.csproj", "{892B761C-E479-44CE-BD74-243E9214AF13}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -23,8 +20,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_DM",
 		{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} = {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash_Essentials_Interfaces", "essentials-framework\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj", "{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,10 +42,6 @@ Global
 		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9199CE8A-0C9F-4952-8672-3EED798B284F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -7,7 +7,7 @@
    <ProjectGuid>{1BED5BA9-88C4-4365-9362-6F4B128071D3}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials</RootNamespace>
+    <RootNamespace>PepperDashEssentials</RootNamespace>
    <AssemblyName>PepperDashEssentials</AssemblyName>
    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92230};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
@@ -215,10 +215,6 @@
      <Project>{9199CE8A-0C9F-4952-8672-3EED798B284F}</Project>
      <Name>PepperDash_Essentials_DM</Name>
    </ProjectReference>
-    <ProjectReference Include="..\essentials-framework\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj">
-      <Project>{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}</Project>
-      <Name>PepperDash_Essentials_Interfaces</Name>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
  <ProjectExtensions>
--- a/Core/PepperDashEssentialsBase/Display/BasicIrDisplay.cs
+++ b/Core/PepperDashEssentialsBase/Display/BasicIrDisplay.cs
@@ -20,7 +20,8 @@ namespace PepperDash.Essentials.Core
 		public IrOutputPortController IrPort { get; private set; }
 		public ushort IrPulseTime { get; set; }

-        public BoolFeedback PowerIsOnFeedback { get; private set; }
+        [Obsolete("This property will be removed in version 2.0.0")]
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }

        protected Func<bool> PowerIsOnFeedbackFunc
        {
--- a/Core/PepperDashEssentialsBase/Display/DisplayBase.cs
+++ b/Core/PepperDashEssentialsBase/Display/DisplayBase.cs
@@ -18,7 +18,7 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// 
 	/// </summary>
-    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking
+    public abstract class DisplayBase : EssentialsDevice, IHasFeedback, IRoutingSinkWithSwitching, IHasPowerControl, IWarmingCooling, IUsageTracking, IPower
 	{
        public event SourceInfoChangeHandler CurrentSourceChange;

@@ -49,6 +49,9 @@ namespace PepperDash.Essentials.Core
 		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
 		public BoolFeedback IsWarmingUpFeedback { get; private set; }

+        [Obsolete("This property will be removed in version 2.0.0")]
+        public abstract BoolFeedback PowerIsOnFeedback { get; protected set; }
+
        public UsageTracking UsageTracker { get; set; }

 		public uint WarmupTime { get; set; }
@@ -261,7 +264,8 @@ namespace PepperDash.Essentials.Core

        abstract protected Func<string> CurrentInputFeedbackFunc { get; }

-        public BoolFeedback PowerIsOnFeedback { get; protected set; }
+        public override BoolFeedback PowerIsOnFeedback { get; protected set; }
+
        abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }


--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -7,7 +7,7 @@
    <ProjectGuid>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.Core</RootNamespace>
+    <RootNamespace>PepperDash_Essentials_Core</RootNamespace>
    <AssemblyName>PepperDash_Essentials_Core</AssemblyName>
    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
@@ -350,12 +350,6 @@
    <None Include="app.config" />
    <None Include="Properties\ControlSystem.cfg" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj">
-      <Project>{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}</Project>
-      <Name>PepperDash_Essentials_Interfaces</Name>
-    </ProjectReference>
-  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
  <ProjectExtensions>
    <VisualStudio>
--- a/DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs
+++ b/DM/Essentials_DM/Endpoints/DGEs/Dge100Controller.cs
@@ -39,12 +39,12 @@ namespace PepperDash.Essentials.DM.Endpoints.DGEs
        {
            _dge = device;
            _dgeEthernetInfo = _dge.ExtenderEthernetReservedSigs;
-            _dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
+            //_dgeEthernetInfo.DeviceExtenderSigChange += (extender, args) => UpdateDeviceInfo();
            _dgeEthernetInfo.Use();

            DeviceInfo = new DeviceInfo();

-            _dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };
+            //_dge.OnlineStatusChange += (currentDevice, args) => { if (args.DeviceOnLine) UpdateDeviceInfo(); };

            _dc = dc;

--- a/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
+++ b/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
@@ -154,10 +154,6 @@
      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
      <Name>PepperDash_Essentials_Core</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj">
-      <Project>{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}</Project>
-      <Name>PepperDash_Essentials_Interfaces</Name>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
  <ProjectExtensions>
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -184,10 +184,6 @@
      <Project>{A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5}</Project>
      <Name>PepperDash_Essentials_Core</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\Essentials Interfaces\PepperDash_Essentials_Interfaces\PepperDash_Essentials_Interfaces.csproj">
-      <Project>{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}</Project>
-      <Name>PepperDash_Essentials_Interfaces</Name>
-    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
  <ProjectExtensions>
--- a/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
+++ b/Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
@@ -516,16 +516,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
            SendText("xconfiguration userinterface custommessage: \"Scan the QR code with a mobile phone to get started\"");
            SendText("xconfiguration userinterface osd halfwakemessage: \"Tap the touch panel or scan the QR code with a mobile phone to get started\"");

-            var checksum = !String.IsNullOrEmpty(mcBridge.QrCodeChecksum)
-                ? String.Format("checksum: {0} ", mcBridge.QrCodeChecksum)
-                : String.Empty;
-
            SendText(String.Format(
-                "xcommand userinterface branding fetch {1}type: branding url: {0}",
-                mcBridge.QrCodeUrl, checksum));
+                            "xcommand userinterface branding fetch type: branding url: {0}",
+                            mcBridge.QrCodeUrl));
            SendText(String.Format(
-                "xcommand userinterface branding fetch {1}type: halfwakebranding url: {0}",
-                mcBridge.QrCodeUrl, checksum));
+                "xcommand userinterface branding fetch type: halfwakebranding url: {0}",
+                mcBridge.QrCodeUrl));
        }

        private void SendBrandingUrl()
--- a/Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
+++ b/Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
@@ -1,70 +0,0 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E51D7C84-4906-486C-B2BA-EEB3B4E9731B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PepperDash.Essentials.Interfaces</RootNamespace>
-    <AssemblyName>PepperDash_Essentials_Interfaces</AssemblyName>
-    <ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92500};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PlatformFamilyName>WindowsCE</PlatformFamilyName>
-    <PlatformID>E2BECB1F-8C8C-41ba-B736-9BE7D946A398</PlatformID>
-    <OSVersion>5.0</OSVersion>
-    <DeployDirSuffix>SmartDeviceProject1</DeployDirSuffix>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <NativePlatformName>Windows CE</NativePlatformName>
-    <FormFactorID>
-    </FormFactorID>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowedReferenceRelatedFileExtensions>.allowedReferenceRelatedFileExtensions</AllowedReferenceRelatedFileExtensions>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <GenerateSerializationAssemblies>off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="Properties\ControlSystem.cfg" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>rem  S# preparation will execute after these operations</PostBuildEvent>
-  </PropertyGroup>
-</Project>
--- a/Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs
+++ b/Interfaces/PepperDash_Essentials_Interfaces/Properties/AssemblyInfo.cs
@@ -1,8 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("PepperDash_Essentials_Interfaces")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PepperDash_Essentials_Interfaces")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyVersion("1.0.0.*")]
-
--- a/Interfaces/PepperDash_Essentials_Interfaces/Properties/ControlSystem.cfg
+++ b/Interfaces/PepperDash_Essentials_Interfaces/Properties/ControlSystem.cfg
Author	SHA1	Message	Date
Andrew Welker	aa61479adc	remove device info stuff from DGE for now	2020-12-18 09:16:40 -07:00
Neil Dorin	823f7447c3	Merge pull request #529 from PepperDash/hotfix/displayBase-fixes Add PowerIsOnFeedback back to DisplayBase and marked it as Obsolete	2020-12-09 13:02:25 -07:00
Andrew Welker	f9925f9ec9	Add PowerIsOnFeedback back to DisplayBase and marked it as Obsolete	2020-12-03 16:46:10 -07:00
Andrew Welker	25c4d94366	Merge pull request #517 from PepperDash/hotfix/zoom-auto-layout Fix some issues with Zoom Rooms	2020-11-30 14:05:35 -07:00