Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Core.Fusion
/// <summary>
/// Represents a EssentialsHuddleSpaceFusionSystemControllerBase
/// </summary>
public class IEssentialsRoomFusionController : EssentialsDevice, IOccupancyStatusProvider, IFusionHelpRequest
public class IEssentialsRoomFusionController : EssentialsDevice, IOccupancyStatusProvider, IFusionHelpRequest, IHasFeedback
{
private IEssentialsRoomFusionControllerPropertiesConfig _config;

Expand Down Expand Up @@ -240,6 +240,19 @@ private void ConstructorHelper(IEssentialsRoom room, uint ipId, string joinMapKe

this.LogDebug("Occupancy setup complete");

HelpRequestResponseFeedback = new StringFeedback("HelpRequestResponse", () => FusionRoom.Help.OutputSig.StringValue);

HelpRequestSentFeedback = new BoolFeedback("HelpRequestSent", () => _helpRequestSent);
HelpRequestStatusFeedback = new StringFeedback("HelpRequestStatus", () => _helpRequestStatus.ToString());

Feedbacks.Add(HelpRequestResponseFeedback);
Feedbacks.Add(HelpRequestSentFeedback);
Feedbacks.Add(HelpRequestStatusFeedback);
if (RoomOccupancyRemoteStringFeedback != null)
Feedbacks.Add(RoomOccupancyRemoteStringFeedback);
if (RoomIsOccupiedFeedback != null)
Feedbacks.Add(RoomIsOccupiedFeedback);

}
catch (Exception e)
{
Expand Down Expand Up @@ -303,10 +316,6 @@ public override void Initialize()

FusionRVI.GenerateFileForAllFusionDevices();

HelpRequestResponseFeedback = new StringFeedback("HelpRequestResponse", () => FusionRoom.Help.OutputSig.StringValue);

HelpRequestSentFeedback = new BoolFeedback("HelpRequestSent", () => _helpRequestSent);
HelpRequestStatusFeedback = new StringFeedback("HelpRequestStatus", () => _helpRequestStatus.ToString());
}

/// <summary>
Expand Down Expand Up @@ -339,6 +348,11 @@ protected Func<bool> RoomIsOccupiedFeedbackFunc

#endregion


/// <inheritdoc />
public FeedbackCollection<Feedback> Feedbacks { get; private set; } = new FeedbackCollection<Feedback>();


/// <summary>
/// ScheduleChange event
/// </summary>
Expand Down Expand Up @@ -1772,7 +1786,7 @@ protected void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventA
{
if (args.EventId == FusionEventIds.HelpMessageReceivedEventId)
{
this.LogInformation( "Help message received from Fusion for room '{0}'",
this.LogInformation("Help message received from Fusion for room '{0}'",
Room.Name);

this.LogDebug("Help message content: {0}", FusionRoom.Help.OutputSig.StringValue);
Expand Down Expand Up @@ -1818,12 +1832,12 @@ protected void FusionRoom_FusionStateChange(FusionBase device, FusionStateEventA
_helpRequestStatus = eFusionHelpResponse.None;
}

if(_helpRequestStatus == eFusionHelpResponse.None)
if (_helpRequestStatus == eFusionHelpResponse.None)
{
_helpRequestSent = false;
HelpRequestSentFeedback.FireUpdate();
}

HelpRequestStatusFeedback.FireUpdate();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using PepperDash.Core;
using PepperDash.Core.Logging;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using Serilog.Events;
Expand Down Expand Up @@ -73,7 +74,7 @@ public SourceListItem CurrentSourceInfo
/// <inheritdoc />
public void ExecuteSwitch(object inputSelector)
{
throw new System.NotImplementedException();
this.LogDebug("GenericSink Executing Switch to: {inputSelector}", inputSelector);
}
}

Expand Down
Loading