Skip to content

Commit

Permalink
Merge pull request #18 from PepperDash/feature/4series-and-actions-ud…
Browse files Browse the repository at this point in the history
…pates

Feature/4series and actions udpates
  • Loading branch information
jkdevito authored Oct 1, 2024
2 parents 9304975 + 75c24ad commit 7c019c6
Show file tree
Hide file tree
Showing 14 changed files with 114 additions and 112 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/EssentialsPlugins-builds-caller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ on:
jobs:
getVersion:
uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-getversion.yml@main
secrets: inherit
secrets: inherit

build-3Series:
uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-3Series-builds.yml@main
secrets: inherit
Expand All @@ -19,6 +20,7 @@ jobs:
version: ${{ needs.getVersion.outputs.version }}
tag: ${{ needs.getVersion.outputs.tag }}
channel: ${{ needs.getVersion.outputs.channel }}

build-4Series:
uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-4Series-builds.yml@main
secrets: inherit
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ICommandBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public interface ICommandBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion src/IpCommandBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public class IpCommandBuilder:ICommandBuilder
{
Expand Down
186 changes: 93 additions & 93 deletions src/PanasonicInput.cs
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using System;
using System.Collections.Generic;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using System;
using System.Collections.Generic;

namespace PanasonicProjectorEpi
{
#if SERIES4
public class PanasonicInputs : ISelectableItems<byte>
{
private Dictionary<byte, ISelectableItem> _items = new Dictionary<byte, ISelectableItem>();

public Dictionary<byte, ISelectableItem> Items
{
get
{
return _items;
}
set
{
if (_items == value)
return;

_items = value;

ItemsUpdated?.Invoke(this, null);
}
}

private byte _currentItem;

public byte CurrentItem
{
get
{
return _currentItem;
}
set
{
if (_currentItem == value)
return;

_currentItem = value;

CurrentItemChanged?.Invoke(this, null);
}
}

public event EventHandler ItemsUpdated;
public event EventHandler CurrentItemChanged;

}

public class PanasonicInput : ISelectableItem
{
private bool _isSelected;

private readonly PanasonicProjectorController _parent;

private Action _inputMethod;

public PanasonicInput(string key, string name, PanasonicProjectorController parent, Action inputMethod)
{
Key = key;
Name = name;
_parent = parent;
_inputMethod = inputMethod;
}

public string Key { get; private set; }
public string Name { get; private set; }

public event EventHandler ItemUpdated;

public bool IsSelected
{
get { return _isSelected; }
set
{
if (value == _isSelected)
return;

_isSelected = value;
var handler = ItemUpdated;
if (handler != null)
handler(this, EventArgs.Empty);
}
}

public void Select()
{
_inputMethod();
}
}
#endif
#if SERIES4
public class PanasonicInputs : ISelectableItems<byte>
{
private Dictionary<byte, ISelectableItem> _items = new Dictionary<byte, ISelectableItem>();

public Dictionary<byte, ISelectableItem> Items
{
get
{
return _items;
}
set
{
if (_items == value)
return;

_items = value;

ItemsUpdated?.Invoke(this, null);
}
}

private byte _currentItem;

public byte CurrentItem
{
get
{
return _currentItem;
}
set
{
if (_currentItem == value)
return;

_currentItem = value;

CurrentItemChanged?.Invoke(this, null);
}
}

public event EventHandler ItemsUpdated;
public event EventHandler CurrentItemChanged;

}

public class PanasonicInput : ISelectableItem
{
private bool _isSelected;

private readonly PanasonicProjectorController _parent;

private Action _inputMethod;

public PanasonicInput(string key, string name, PanasonicProjectorController parent, Action inputMethod)
{
Key = key;
Name = name;
_parent = parent;
_inputMethod = inputMethod;
}

public string Key { get; private set; }
public string Name { get; private set; }

public event EventHandler ItemUpdated;

public bool IsSelected
{
get { return _isSelected; }
set
{
if (value == _isSelected)
return;

_isSelected = value;
var handler = ItemUpdated;
if (handler != null)
handler(this, EventArgs.Empty);
}
}

public void Select()
{
_inputMethod();
}
}
#endif
}
2 changes: 1 addition & 1 deletion src/PanasonicIpStatusMonitor.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using PepperDash.Core;
using PepperDash.Essentials.Core;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public class PanasonicStatusMonitor : StatusMonitorBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/PanasonicProjectorConfig.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Newtonsoft.Json;
using PepperDash.Essentials.Core;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
/// <summary>
/// Plugin device configuration object
Expand Down
2 changes: 1 addition & 1 deletion src/PanasonicProjectorController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using PepperDash.Essentials.Core.Routing;
#endif

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
/// <summary>
/// Plugin device template for third party devices that use IBasicCommunication
Expand Down
2 changes: 1 addition & 1 deletion src/PanasonicProjectorFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using PepperDash.Essentials.Core.Config;
using System.Collections.Generic;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
/// <summary>
/// Plugin device factory for devices that use IBasicCommunication
Expand Down
2 changes: 1 addition & 1 deletion src/QueueMessage.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using PepperDash.Essentials.Core.Queues;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public class QueueMessage : IQueueMessage
{
Expand Down
2 changes: 1 addition & 1 deletion src/SerialCommandBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public class SerialCommandBuilder : ICommandBuilder
{
Expand Down
2 changes: 1 addition & 1 deletion src/eInputTypes.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace PepperDash.Essentials.Plugins.Display.Panasonic.Projector
namespace PanasonicProjectorEpi
{
public enum eInputTypes
{
Expand Down
16 changes: 8 additions & 8 deletions src/epi-display-panasonic-projector.4Series.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Pepperdash.Essentials.Plugins.Display.Panasonic.Projector</RootNamespace>
<RootNamespace>PanasonicProjectorEpi</RootNamespace>
<Deterministic>false</Deterministic>
<AssemblyTitle>EPI.Panasonic.Projector</AssemblyTitle>
<AssemblyTitle>PepperDash.Essentials.Plugin.PanasonicProjector</AssemblyTitle>
<Company>PepperDash Technologies</Company>
<Description>This software is a plugin designed to work as a part of PepperDash Essentials for Crestron control processors. This plugin allows for control of Panasonic Projectors.</Description>
<Copyright>Copyright 2024</Copyright>
Expand All @@ -17,8 +17,8 @@
<InformationalVersion>$(Version)</InformationalVersion>
<OutputPath>4Series\bin\$(Configuration)\</OutputPath>
<Authors>PepperDash Technologies</Authors>
<PackageId>Pepperdash.Essentials.Plugins.Display.Sony.Bravia</PackageId>
<PackageProjectUrl>https://github.com/PepperDash/epi-panasonic-projectors</PackageProjectUrl>
<PackageId>Pepperdash.Essentials.Plugin.4Series.PanasonicProjector</PackageId>
<PackageProjectUrl>https://github.com/PepperDash/epi-panasonic-projector</PackageProjectUrl>
<PackageTags>crestron 4series panasonic projector</PackageTags>
</PropertyGroup>

Expand All @@ -40,12 +40,12 @@
<PackageReference Include="PepperDashEssentials" Version="2.0.0-alpha-2472" />
</ItemGroup>

<ItemGroup>
<None Remove="../output\epi-display-panasonic-projector.4Series.1.0.0-local.cplz" />
<ItemGroup>
<None Remove="../output\epi-display-panasonic-projector.4Series.1.0.0-local.cplz" />
</ItemGroup>

<ItemGroup>
<None Remove="../output\epi-display-panasonic-projector.4Series.1.0.0-local.cplz" />
<ItemGroup>
<None Remove="../output\epi-display-panasonic-projector.4Series.1.0.0-local.cplz" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/epi-display-panasonic-projector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{B986CEE5-DAC4-40BF-BCFE-0C2CA83350FE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PepperDash.Essentials</RootNamespace>
<RootNamespace>PanasonicProjectorEpi</RootNamespace>
<AssemblyName>PepperDash.Essentials.Plugin.PanasonicProjector</AssemblyName>
<ProjectTypeGuids>{0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PlatformFamilyName>WindowsCE</PlatformFamilyName>
Expand Down

0 comments on commit 7c019c6

Please sign in to comment.