mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 20:54:55 +00:00
Updated to allow for middle shade button to have label driven from config.
This commit is contained in:
@@ -23,11 +23,11 @@ namespace PepperDash.Essentials.Core.Shades
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Requirements for a device that implements basic Open/Close/Stop shade control
|
/// Requirements for a device that implements basic Open/Close/Stop shade control (Uses 3 relays)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IShadesOpenCloseStop : IShadesOpenClose
|
public interface IShadesOpenCloseStop : IShadesOpenClose
|
||||||
{
|
{
|
||||||
void Stop();
|
void StopOrPreset();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ namespace PepperDash.Essentials.Core.Shades
|
|||||||
#region iShadesOpenClose Members
|
#region iShadesOpenClose Members
|
||||||
|
|
||||||
public abstract void Open();
|
public abstract void Open();
|
||||||
|
public abstract void StopOrPreset();
|
||||||
public abstract void Close();
|
public abstract void Close();
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -19,11 +19,13 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
|
|||||||
RelayControlledShadeConfigProperties Config;
|
RelayControlledShadeConfigProperties Config;
|
||||||
|
|
||||||
ISwitchedOutput OpenRelay;
|
ISwitchedOutput OpenRelay;
|
||||||
ISwitchedOutput StopRelay;
|
ISwitchedOutput StopOrPresetRelay;
|
||||||
ISwitchedOutput CloseRelay;
|
ISwitchedOutput CloseRelay;
|
||||||
|
|
||||||
int RelayPulseTime;
|
int RelayPulseTime;
|
||||||
|
|
||||||
|
public string StopOrPresetButtonLabel { get; set; }
|
||||||
|
|
||||||
public RelayControlledShade(string key, string name, RelayControlledShadeConfigProperties config)
|
public RelayControlledShade(string key, string name, RelayControlledShadeConfigProperties config)
|
||||||
: base(key, name)
|
: base(key, name)
|
||||||
{
|
{
|
||||||
@@ -31,13 +33,15 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
|
|||||||
|
|
||||||
RelayPulseTime = Config.RelayPulseTime;
|
RelayPulseTime = Config.RelayPulseTime;
|
||||||
|
|
||||||
|
StopOrPresetButtonLabel = Config.StopOrPresetLabel;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool CustomActivate()
|
public override bool CustomActivate()
|
||||||
{
|
{
|
||||||
//Create ISwitchedOutput objects based on props
|
//Create ISwitchedOutput objects based on props
|
||||||
OpenRelay = GetSwitchedOutputFromDevice(Config.Relays.Open);
|
OpenRelay = GetSwitchedOutputFromDevice(Config.Relays.Open);
|
||||||
StopRelay = GetSwitchedOutputFromDevice(Config.Relays.Stop);
|
StopOrPresetRelay = GetSwitchedOutputFromDevice(Config.Relays.StopOrPreset);
|
||||||
CloseRelay = GetSwitchedOutputFromDevice(Config.Relays.Close);
|
CloseRelay = GetSwitchedOutputFromDevice(Config.Relays.Close);
|
||||||
|
|
||||||
|
|
||||||
@@ -47,29 +51,28 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
|
|||||||
public override void Open()
|
public override void Open()
|
||||||
{
|
{
|
||||||
Debug.Console(1, this, "Opening Shade: '{0}'", this.Name);
|
Debug.Console(1, this, "Opening Shade: '{0}'", this.Name);
|
||||||
StopRelay.Off();
|
|
||||||
CloseRelay.Off();
|
|
||||||
|
|
||||||
OpenRelay.On();
|
PulseOutput(OpenRelay, RelayPulseTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Stop()
|
public override void StopOrPreset()
|
||||||
{
|
{
|
||||||
Debug.Console(1, this, "Stopping Shade: '{0}'", this.Name);
|
Debug.Console(1, this, "Stopping or recalling preset on Shade: '{0}'", this.Name);
|
||||||
OpenRelay.Off();
|
|
||||||
CloseRelay.Off();
|
|
||||||
|
|
||||||
StopRelay.On();
|
PulseOutput(StopOrPresetRelay, RelayPulseTime);
|
||||||
CTimer stopTimer = new CTimer(new CTimerCallbackFunction((o) => StopRelay.Off()), RelayPulseTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Close()
|
public override void Close()
|
||||||
{
|
{
|
||||||
Debug.Console(1, this, "Closing Shade: '{0}'", this.Name);
|
Debug.Console(1, this, "Closing Shade: '{0}'", this.Name);
|
||||||
OpenRelay.Off();
|
|
||||||
StopRelay.Off();
|
|
||||||
|
|
||||||
CloseRelay.On();
|
PulseOutput(CloseRelay, RelayPulseTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PulseOutput(ISwitchedOutput output, int pulseTime)
|
||||||
|
{
|
||||||
|
output.On();
|
||||||
|
CTimer pulseTimer = new CTimer(new CTimerCallbackFunction((o) => output.Off()), pulseTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -98,11 +101,12 @@ namespace PepperDash.Essentials.Devices.Common.Environment.Somfy
|
|||||||
{
|
{
|
||||||
public int RelayPulseTime { get; set; }
|
public int RelayPulseTime { get; set; }
|
||||||
public ShadeRelaysConfig Relays { get; set; }
|
public ShadeRelaysConfig Relays { get; set; }
|
||||||
|
public string StopOrPresetLabel { get; set; }
|
||||||
|
|
||||||
public class ShadeRelaysConfig
|
public class ShadeRelaysConfig
|
||||||
{
|
{
|
||||||
public IOPortConfig Open { get; set; }
|
public IOPortConfig Open { get; set; }
|
||||||
public IOPortConfig Stop { get; set; }
|
public IOPortConfig StopOrPreset { get; set; }
|
||||||
public IOPortConfig Close { get; set; }
|
public IOPortConfig Close { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ using PepperDash.Core;
|
|||||||
using PepperDash.Essentials.Core;
|
using PepperDash.Essentials.Core;
|
||||||
using PepperDash.Essentials.Core.Config;
|
using PepperDash.Essentials.Core.Config;
|
||||||
using PepperDash.Essentials.Core.Shades;
|
using PepperDash.Essentials.Core.Shades;
|
||||||
|
using PepperDash.Essentials.Devices.Common.Environment.Somfy;
|
||||||
|
|
||||||
namespace PepperDash.Essentials
|
namespace PepperDash.Essentials
|
||||||
{
|
{
|
||||||
@@ -88,7 +89,7 @@ namespace PepperDash.Essentials
|
|||||||
{
|
{
|
||||||
if(DeviceType == eShadeDeviceType.OpenClose)
|
if(DeviceType == eShadeDeviceType.OpenClose)
|
||||||
{
|
{
|
||||||
TriList.SetSigFalseAction(ButtonPressJoinBase + 1, ShadeDevice.Open);
|
TriList.SetSigTrueAction(ButtonPressJoinBase + 1, ShadeDevice.Open);
|
||||||
|
|
||||||
TriList.SetSigFalseAction(ButtonPressJoinBase + 2, ShadeDevice.Close);
|
TriList.SetSigFalseAction(ButtonPressJoinBase + 2, ShadeDevice.Close);
|
||||||
}
|
}
|
||||||
@@ -96,7 +97,10 @@ namespace PepperDash.Essentials
|
|||||||
{
|
{
|
||||||
TriList.SetSigFalseAction(ButtonPressJoinBase + 1, ShadeDevice.Open);
|
TriList.SetSigFalseAction(ButtonPressJoinBase + 1, ShadeDevice.Open);
|
||||||
|
|
||||||
TriList.SetSigFalseAction(ButtonPressJoinBase + 2, (ShadeDevice as IShadesOpenCloseStop).Stop);
|
TriList.SetSigFalseAction(ButtonPressJoinBase + 2, (ShadeDevice as IShadesOpenCloseStop).StopOrPreset);
|
||||||
|
|
||||||
|
if(ShadeDevice is RelayControlledShade)
|
||||||
|
TriList.SetString(StringJoinBase + 2, (ShadeDevice as RelayControlledShade).StopOrPresetButtonLabel);
|
||||||
|
|
||||||
TriList.SetSigFalseAction(ButtonPressJoinBase + 3, ShadeDevice.Close);
|
TriList.SetSigFalseAction(ButtonPressJoinBase + 3, ShadeDevice.Close);
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user