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

Updates as per request from Heath

Browse Source
This commit is contained in:
Neil Dorin
2018-07-19 17:04:23 -06:00
parent f09ccda33c
commit 9ad2fef94a
3 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs
View File

@@ -240,9 +240,9 @@ namespace PepperDash.Essentials.Room.Cotija
Parent.AddAction(@"/room/room1/defaultsource", new Action(() => Parent.AddAction(@"/room/room1/defaultsource", new Action(() =>
EISC.PulseBool(BoolJoin.ActivitySharePress))); EISC.PulseBool(BoolJoin.ActivitySharePress)));
Parent.AddAction(@"/room/room1/masterVolumeLevel", new Action<ushort>(u => Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u =>
EISC.SetUshort(UshortJoin.MasterVolumeLevel, u))); EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
Parent.AddAction(@"/room/room1/masterVolumeMuteToggle", new Action(() => Parent.AddAction(@"/room/room1/volumes/master/muteToggle", new Action(() =>
EISC.PulseBool(BoolJoin.MasterVolumeIsMuted))); EISC.PulseBool(BoolJoin.MasterVolumeIsMuted)));
Parent.AddAction(@"/room/room1/shutdownStart", new Action(() => Parent.AddAction(@"/room/room1/shutdownStart", new Action(() =>
@@ -286,16 +286,29 @@ namespace PepperDash.Essentials.Room.Cotija
// Volume things // Volume things
EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u => EISC.SetUShortSigAction(UshortJoin.MasterVolumeLevel, u =>
PostStatusMessage(new PostStatusMessage(new
{ {
masterVolumeLevel = u volumes = new
})); {
master = new
{
level = u
}
}
}));
EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b => EISC.SetBoolSigAction(BoolJoin.MasterVolumeIsMuted, b =>
PostStatusMessage(new PostStatusMessage(new
{ {
masterVolumeMuteState = b volumes = new
})); {
master = new
{
muted = b
}
}
}));
// shutdown things // shutdown things
EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() => EISC.SetSigTrueAction(BoolJoin.ShutdownCancel, new Action(() =>
@@ -379,12 +392,12 @@ namespace PepperDash.Essentials.Room.Cotija
// volume control names // volume control names
var volCount = EISC.UShortOutput[701].UShortValue; var volCount = EISC.UShortOutput[701].UShortValue;
// use Volumes object or? //// use Volumes object or?
rmProps.VolumeSliderNames = new List<string>(); //rmProps.VolumeSliderNames = new List<string>();
for(uint i = 701; i <= 700 + volCount; i++) //for(uint i = 701; i <= 700 + volCount; i++)
{ //{
rmProps.VolumeSliderNames.Add(EISC.StringInput[i].StringValue); // rmProps.VolumeSliderNames.Add(EISC.StringInput[i].StringValue);
} //}
// There should be cotija devices in here, I think... // There should be cotija devices in here, I think...
if(co.Devices == null) if(co.Devices == null)
@@ -454,13 +467,24 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
if (ConfigIsLoaded) if (ConfigIsLoaded)
{ {
PostStatusMessage(new PostStatusMessage(new
{ {
isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue, isOn = EISC.BooleanOutput[BoolJoin.RoomIsOn].BoolValue,
selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue, selectedSourceKey = EISC.StringOutput[StringJoin.SelectedSourceKey].StringValue,
masterVolumeLevel = EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue, volumes = new
masterVolumeMuteState = EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue {
}); master = new
{
level = EISC.UShortOutput[UshortJoin.MasterVolumeLevel].UShortValue,
muted = EISC.BooleanOutput[BoolJoin.MasterVolumeIsMuted].BoolValue,
label = EISC.StringInput[701].StringValue,
hasMute = true,
muteIcon = "something.png"
},
count = 1
}
});
} }
else else
{ {

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.

BIN
Release Package/PepperDashEssentials.dll
View File

Binary file not shown.