Skip to content

Add movement timing and command banking to ScreenLiftController #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5 commits merged into from
Dec 31, 2025
Merged

Add movement timing and command banking to ScreenLiftController #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d6aaa2
Initial plan
Copilot Dec 27, 2025
7ea1efb
Add raise/lower movement time configuration and banked command support
Copilot Dec 27, 2025
bd11c82
Split movement time into separate raise/lower times and remove timing…
Copilot Dec 27, 2025
ae0b2fe
Refactor timer disposal and improve code readability
Copilot Dec 27, 2025
a7ff2e8
fix: move isInUpPosition to momvement complete method, remove conditi…
erikdred Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 119 additions & 3 deletions src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@

namespace PepperDash.Essentials.Devices.Common.Shades
{
/// <summary>
/// Enumeration for requested state
/// </summary>
enum RequestedState
{
None,
Raise,
Lower
}

/// <summary>
/// Controls a single shade using three relays
/// </summary>
Expand All @@ -25,6 +35,11 @@ public class ScreenLiftController : EssentialsDevice, IProjectorScreenLiftContro
ISwitchedOutput LowerRelay;
ISwitchedOutput LatchedRelay;

private bool _isMoving;
private RequestedState _requestedState;
private RequestedState _currentMovement;
private CTimer _movementTimer;

/// <summary>
/// Gets or sets the InUpPosition
/// </summary>
Expand Down Expand Up @@ -163,22 +178,45 @@ public void Raise()
{
if (RaiseRelay == null && LatchedRelay == null) return;

Debug.LogMessage(LogEventLevel.Debug, this, $"Raising {Type}");
Debug.LogMessage(LogEventLevel.Debug, this, $"Raise called for {Type}");

// If device is moving, bank the command
if (_isMoving)
{
Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Raise command");
_requestedState = RequestedState.Raise;
return;
}

Debug.LogMessage(LogEventLevel.Debug, this, $"Raising {Type}");

switch (Mode)
{
case eScreenLiftControlMode.momentary:
{
PulseOutput(RaiseRelay, RaiseRelayConfig.PulseTimeInMs);

// Set moving flag and start timer if movement time is configured
if (RaiseRelayConfig.MoveTimeInMs > 0)
{
_isMoving = true;
_currentMovement = RequestedState.Raise;
DisposeMovementTimer();
_movementTimer = new CTimer(OnMovementComplete, RaiseRelayConfig.MoveTimeInMs);
}
else
{
InUpPosition = true;
}
break;
}
case eScreenLiftControlMode.latched:
{
LatchedRelay.Off();
InUpPosition = true;
break;
}
}
InUpPosition = true;
}

/// <summary>
Expand All @@ -188,22 +226,100 @@ public void Lower()
{
if (LowerRelay == null && LatchedRelay == null) return;

Debug.LogMessage(LogEventLevel.Debug, this, $"Lower called for {Type}");

// If device is moving, bank the command
if (_isMoving)
{
Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Lower command");
_requestedState = RequestedState.Lower;
return;
}

Debug.LogMessage(LogEventLevel.Debug, this, $"Lowering {Type}");

switch (Mode)
{
case eScreenLiftControlMode.momentary:
{
PulseOutput(LowerRelay, LowerRelayConfig.PulseTimeInMs);

// Set moving flag and start timer if movement time is configured
if (LowerRelayConfig.MoveTimeInMs > 0)
{
_isMoving = true;
_currentMovement = RequestedState.Lower;
DisposeMovementTimer();
_movementTimer = new CTimer(OnMovementComplete, LowerRelayConfig.MoveTimeInMs);
}
else
{
InUpPosition = false;
}
break;
}
case eScreenLiftControlMode.latched:
{
LatchedRelay.On();
InUpPosition = false;
break;
}
}
InUpPosition = false;
}

/// <summary>
/// Disposes the current movement timer if it exists
/// </summary>
private void DisposeMovementTimer()
{
if (_movementTimer != null)
{
_movementTimer.Stop();
_movementTimer.Dispose();
_movementTimer = null;
}
}

/// <summary>
/// Called when movement timer completes
/// </summary>
private void OnMovementComplete(object o)
{
Debug.LogMessage(LogEventLevel.Debug, this, $"Movement complete");

// Update position based on completed movement
if (_currentMovement == RequestedState.Raise)
{
InUpPosition = true;
}
else if (_currentMovement == RequestedState.Lower)
{
InUpPosition = false;
}

_isMoving = false;
_currentMovement = RequestedState.None;

// Execute banked command if one exists
if (_requestedState != RequestedState.None)
{
Debug.LogMessage(LogEventLevel.Debug, this, $"Executing banked command: {_requestedState}");

var commandToExecute = _requestedState;
_requestedState = RequestedState.None;

// Check if current state matches what the banked command would do and execute if different
switch (commandToExecute)
{
case RequestedState.Raise:
Raise();
break;

case RequestedState.Lower:
Lower();
break;
}
}
}

void PulseOutput(ISwitchedOutput output, int pulseTime)
Expand Down
6 changes: 6 additions & 0 deletions src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftRelaysConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@ public class ScreenLiftRelaysConfig
/// </summary>
[JsonProperty("pulseTimeInMs")]
public int PulseTimeInMs { get; set; }

/// <summary>
/// Gets or sets the MoveTimeInMs - time in milliseconds for the movement to complete
/// </summary>
[JsonProperty("moveTimeInMs")]
public int MoveTimeInMs { get; set; }
}
}