pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat Enhance ScreenLiftController to improve command banking during movement

Browse Source
This commit is contained in:
equinoy
2025-12-27 15:22:09 -06:00
parent ae0b2fe086
commit e2699aced9
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs
View File

@@ -179,10 +179,10 @@ namespace PepperDash.Essentials.Devices.Common.Shades
Debug.LogMessage(LogEventLevel.Debug, this, $"Raise called for {Type}"); Debug.LogMessage(LogEventLevel.Debug, this, $"Raise called for {Type}");
// If device is moving, bank the command // If device is moving, just bank the command - don't interrupt current movement
if (_isMoving) if (_isMoving)
{ {
Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Raise command"); Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Raise command for execution after movement completes");
_requestedState = RequestedState.Raise; _requestedState = RequestedState.Raise;
return; return;
} }
@@ -193,24 +193,31 @@ namespace PepperDash.Essentials.Devices.Common.Shades
{ {
case eScreenLiftControlMode.momentary: case eScreenLiftControlMode.momentary:
{ {
// Ensure lower relay is off to prevent simultaneous relay activation
if (LowerRelay != null) LowerRelay.Off();
PulseOutput(RaiseRelay, RaiseRelayConfig.PulseTimeInMs); PulseOutput(RaiseRelay, RaiseRelayConfig.PulseTimeInMs);
// Set moving flag and start timer if movement time is configured // Always set moving flag to enable command banking, even if no timer is configured
_isMoving = true;
DisposeMovementTimer();
// Start timer if movement time is configured
if (RaiseRelayConfig.RaiseTimeInMs > 0) if (RaiseRelayConfig.RaiseTimeInMs > 0)
{ {
_isMoving = true;
DisposeMovementTimer();
_movementTimer = new CTimer(OnMovementComplete, RaiseRelayConfig.RaiseTimeInMs); _movementTimer = new CTimer(OnMovementComplete, RaiseRelayConfig.RaiseTimeInMs);
} }
InUpPosition = true;
break; break;
} }
case eScreenLiftControlMode.latched: case eScreenLiftControlMode.latched:
{ {
LatchedRelay.Off(); LatchedRelay.Off();
InUpPosition = true;
break; break;
} }
} }
InUpPosition = true;
} }
/// <summary> /// <summary>
@@ -222,10 +229,10 @@ namespace PepperDash.Essentials.Devices.Common.Shades
Debug.LogMessage(LogEventLevel.Debug, this, $"Lower called for {Type}"); Debug.LogMessage(LogEventLevel.Debug, this, $"Lower called for {Type}");
// If device is moving, bank the command // If device is moving, just bank the command - don't interrupt current movement
if (_isMoving) if (_isMoving)
{ {
Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Lower command"); Debug.LogMessage(LogEventLevel.Debug, this, $"Device is moving, banking Lower command for execution after movement completes");
_requestedState = RequestedState.Lower; _requestedState = RequestedState.Lower;
return; return;
} }
@@ -236,24 +243,31 @@ namespace PepperDash.Essentials.Devices.Common.Shades
{ {
case eScreenLiftControlMode.momentary: case eScreenLiftControlMode.momentary:
{ {
// Ensure raise relay is off to prevent simultaneous relay activation
if (RaiseRelay != null) RaiseRelay.Off();
PulseOutput(LowerRelay, LowerRelayConfig.PulseTimeInMs); PulseOutput(LowerRelay, LowerRelayConfig.PulseTimeInMs);
// Set moving flag and start timer if movement time is configured // Always set moving flag to enable command banking, even if no timer is configured
_isMoving = true;
DisposeMovementTimer();
// Start timer if movement time is configured
if (LowerRelayConfig.LowerTimeInMs > 0) if (LowerRelayConfig.LowerTimeInMs > 0)
{ {
_isMoving = true;
DisposeMovementTimer();
_movementTimer = new CTimer(OnMovementComplete, LowerRelayConfig.LowerTimeInMs); _movementTimer = new CTimer(OnMovementComplete, LowerRelayConfig.LowerTimeInMs);
} }
InUpPosition = false;
break; break;
} }
case eScreenLiftControlMode.latched: case eScreenLiftControlMode.latched:
{ {
LatchedRelay.On(); LatchedRelay.On();
InUpPosition = false;
break; break;
} }
} }
InUpPosition = false;
} }
/// <summary> /// <summary>