Compare commits

..

3 Commits

Author SHA1 Message Date
Aviv Cohn
68301503bb fix: move items to correct places 2025-04-30 14:05:54 -04:00
Aviv Cohn
639c74489d fix: Move button visibility to online status change 2025-04-30 13:13:44 -04:00
Aviv Cohn
ab97e8140c fix: move RegisterForExtenders method to panel online event 2025-04-30 12:54:08 -04:00
5 changed files with 34 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>2.4.0-local</Version>
<Version>2.4.0-local</Version>
<InformationalVersion>$(Version)</InformationalVersion>
<Authors>PepperDash Technology</Authors>
<Company>PepperDash Technology</Company>
@@ -19,6 +19,5 @@
<ItemGroup>
<None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
<None Include="..\..\README.md" Pack="true" PackagePath=""/>
<None Include=".\build\**" Pack="true" PackagePath="build"/>
</ItemGroup>
</Project>

View File

@@ -196,18 +196,10 @@ namespace PepperDash.Essentials.Core
/// </summary>
public abstract class EssentialsPluginDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDeviceFactory where T : EssentialsDevice
{
#if ESSENTIALS_VERSION
/// <summary>
/// Specifies the minimum version of Essentials required for a plugin to run. Must use the format Major.Minor.Build (ex. "1.4.33")
/// </summary>
public string MinimumEssentialsFrameworkVersion { get; protected set; } = ESSENTIALS_VERSION
#else
/// <summary>
/// Specifies the minimum version of Essentials required for a plugin to run. Must use the format Major.Minor.Build (ex. "1.4.33")
/// </summary>
public string MinimumEssentialsFrameworkVersion { get; protected set; }
#endif
}
public abstract class EssentialsPluginDevelopmentDeviceFactory<T> : EssentialsDeviceFactory<T>, IPluginDevelopmentDeviceFactory where T : EssentialsDevice

View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configurations>Debug;Release;Debug 4.7.2</Configurations>
<DefineConstants>$(DefineConstants);ESSENTIALS_VERSION=$(Version)</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net472</TargetFramework>

View File

@@ -174,6 +174,8 @@ namespace PepperDash.Essentials.Touchpanel
x70Panel.ExtenderButtonToolbarReservedSigs.HideButtonToolbar();
x70Panel.ExtenderButtonToolbarReservedSigs.Button2Off();
}
};
@@ -271,6 +273,31 @@ namespace PepperDash.Essentials.Touchpanel
}
}
private void UpdatePanelHardButtons()
{
if(Panel is TswX70Base x70Panel)
{
x70Panel.ExtenderButtonToolbarReservedSigs.Button1Off();
x70Panel.ExtenderButtonToolbarReservedSigs.Button3Off();
x70Panel.ExtenderButtonToolbarReservedSigs.Button4Off();
x70Panel.ExtenderButtonToolbarReservedSigs.Button5Off();
x70Panel.ExtenderButtonToolbarReservedSigs.Button6Off();
if (!x70Panel.ExtenderApplicationControlReservedSigs.HideOpenedApplicationFeedback.BoolValue)
{
x70Panel.ExtenderButtonToolbarReservedSigs.ShowButtonToolbar();
x70Panel.ExtenderButtonToolbarReservedSigs.Button2On();
}
else
{
x70Panel.ExtenderButtonToolbarReservedSigs.HideButtonToolbar();
x70Panel.ExtenderButtonToolbarReservedSigs.Button2Off();
}
}
}
public override bool CustomActivate()
{
var appMessenger = new ITswAppControlMessenger($"appControlMessenger-{Key}", $"/device/{Key}", this);
@@ -323,6 +350,12 @@ namespace PepperDash.Essentials.Touchpanel
Panel.StringInput[2].StringValue = QrCodeUrlFeedback.StringValue;
Panel.StringInput[3].StringValue = McServerUrlFeedback.StringValue;
Panel.StringInput[4].StringValue = UserCodeFeedback.StringValue;
this.LogInformation("Updating button feedbacks from Panel online status change");
UpdatePanelHardButtons();
};
}

View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project>
<EssentialsVersion>$(Version)</EssentialsVersion>
</Project>