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

resolves ecs-797/770/755 Updates Interface extension classes and SourceDeviceMapDictionary to us consistent names

Browse Source
This commit is contained in:
Neil Dorin
2018-07-19 11:16:09 -06:00
parent c2e82e9cb9
commit 4e45103080
10 changed files with 1354 additions and 1343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PepperDashEssentials/Room/Cotija/CotijaSystemController.cs
View File

@@ -276,7 +276,6 @@ namespace PepperDash.Essentials
confObject.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name; confObject.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name;
var version = Assembly.GetExecutingAssembly().GetName().Version; var version = Assembly.GetExecutingAssembly().GetName().Version;
confObject.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build); confObject.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
confObject.Info.RuntimeInfo.OsVersion = Crestron.SimplSharp.CrestronEnvironment.OSVersion.Firmware;
string postBody = JsonConvert.SerializeObject(confObject); string postBody = JsonConvert.SerializeObject(confObject);
SystemUuid = confObject.SystemUuid; SystemUuid = confObject.SystemUuid;

12
PepperDashEssentials/Room/Cotija/DeviceTypeInterfaces/IChannelExtensions.cs
View File

@@ -14,9 +14,9 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.AddAction(prefix + "chanup", new PressAndHoldAction(dev.ChannelUp)); controller.AddAction(prefix + "chanUp", new PressAndHoldAction(dev.ChannelUp));
controller.AddAction(prefix + "chandown", new PressAndHoldAction(dev.ChannelDown)); controller.AddAction(prefix + "chanDown", new PressAndHoldAction(dev.ChannelDown));
controller.AddAction(prefix + "lastchan", new PressAndHoldAction(dev.LastChannel)); controller.AddAction(prefix + "lastChan", new PressAndHoldAction(dev.LastChannel));
controller.AddAction(prefix + "guide", new PressAndHoldAction(dev.Guide)); controller.AddAction(prefix + "guide", new PressAndHoldAction(dev.Guide));
controller.AddAction(prefix + "info", new PressAndHoldAction(dev.Info)); controller.AddAction(prefix + "info", new PressAndHoldAction(dev.Info));
controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit)); controller.AddAction(prefix + "exit", new PressAndHoldAction(dev.Exit));
@@ -26,9 +26,9 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.RemoveAction(prefix + "chanup"); controller.RemoveAction(prefix + "chanUp");
controller.RemoveAction(prefix + "chandown"); controller.RemoveAction(prefix + "chanDown");
controller.RemoveAction(prefix + "lastchan"); controller.RemoveAction(prefix + "lastChan");
controller.RemoveAction(prefix + "guide"); controller.RemoveAction(prefix + "guide");
controller.RemoveAction(prefix + "info"); controller.RemoveAction(prefix + "info");
controller.RemoveAction(prefix + "exit"); controller.RemoveAction(prefix + "exit");

8
PepperDashEssentials/Room/Cotija/DeviceTypeInterfaces/INumericExtensions.cs
View File

@@ -24,8 +24,8 @@ namespace PepperDash.Essentials.Room.Cotija
controller.AddAction(prefix + "num7", new PressAndHoldAction(dev.Digit0)); controller.AddAction(prefix + "num7", new PressAndHoldAction(dev.Digit0));
controller.AddAction(prefix + "num8", new PressAndHoldAction(dev.Digit0)); controller.AddAction(prefix + "num8", new PressAndHoldAction(dev.Digit0));
controller.AddAction(prefix + "num9", new PressAndHoldAction(dev.Digit0)); controller.AddAction(prefix + "num9", new PressAndHoldAction(dev.Digit0));
controller.AddAction(prefix + "dash", new PressAndHoldAction(dev.KeypadAccessoryButton1)); controller.AddAction(prefix + "numDash", new PressAndHoldAction(dev.KeypadAccessoryButton1));
controller.AddAction(prefix + "enter", new PressAndHoldAction(dev.KeypadAccessoryButton2)); controller.AddAction(prefix + "numEnter", new PressAndHoldAction(dev.KeypadAccessoryButton2));
// Deal with the Accessory functions on the numpad later // Deal with the Accessory functions on the numpad later
} }
@@ -43,8 +43,8 @@ namespace PepperDash.Essentials.Room.Cotija
controller.RemoveAction(prefix + "num7"); controller.RemoveAction(prefix + "num7");
controller.RemoveAction(prefix + "num8"); controller.RemoveAction(prefix + "num8");
controller.RemoveAction(prefix + "num9"); controller.RemoveAction(prefix + "num9");
controller.RemoveAction(prefix + "dash"); controller.RemoveAction(prefix + "numDash");
controller.RemoveAction(prefix + "enter"); controller.RemoveAction(prefix + "numEnter");
} }
} }
} }

12
PepperDashEssentials/Room/Cotija/DeviceTypeInterfaces/IPowerExtensions.cs
View File

@@ -14,18 +14,18 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.AddAction(prefix + "poweron", new Action(dev.PowerOn)); controller.AddAction(prefix + "powerOn", new Action(dev.PowerOn));
controller.AddAction(prefix + "poweroff", new Action(dev.PowerOff)); controller.AddAction(prefix + "powerOff", new Action(dev.PowerOff));
controller.AddAction(prefix + "powertoggle", new Action(dev.PowerToggle)); controller.AddAction(prefix + "powerToggle", new Action(dev.PowerToggle));
} }
public static void UnlinkActions(this IPower dev, CotijaSystemController controller) public static void UnlinkActions(this IPower dev, CotijaSystemController controller)
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.RemoveAction(prefix + "poweron"); controller.RemoveAction(prefix + "powerOn");
controller.RemoveAction(prefix + "poweroff"); controller.RemoveAction(prefix + "powerOff");
controller.RemoveAction(prefix + "powertoggle"); controller.RemoveAction(prefix + "powerToggle");
} }
} }

4
PepperDashEssentials/Room/Cotija/DeviceTypeInterfaces/ISetTopBoxControlsExtensions.cs
View File

@@ -14,7 +14,7 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.AddAction(prefix + "dvrlist", new PressAndHoldAction(dev.DvrList)); controller.AddAction(prefix + "dvrList", new PressAndHoldAction(dev.DvrList));
controller.AddAction(prefix + "replay", new PressAndHoldAction(dev.Replay)); controller.AddAction(prefix + "replay", new PressAndHoldAction(dev.Replay));
} }
@@ -22,7 +22,7 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key); var prefix = string.Format(@"/device/{0}/", (dev as IKeyed).Key);
controller.RemoveAction(prefix + "dvrlist"); controller.RemoveAction(prefix + "dvrList");
controller.RemoveAction(prefix + "replay"); controller.RemoveAction(prefix + "replay");
} }
} }

8
PepperDashEssentials/Room/Cotija/DeviceTypeInterfaces/ITransportExtensions.cs
View File

@@ -17,8 +17,8 @@ namespace PepperDash.Essentials.Room.Cotija
controller.AddAction(prefix + "play", new PressAndHoldAction(dev.Play)); controller.AddAction(prefix + "play", new PressAndHoldAction(dev.Play));
controller.AddAction(prefix + "pause", new PressAndHoldAction(dev.Pause)); controller.AddAction(prefix + "pause", new PressAndHoldAction(dev.Pause));
controller.AddAction(prefix + "stop", new PressAndHoldAction(dev.Stop)); controller.AddAction(prefix + "stop", new PressAndHoldAction(dev.Stop));
controller.AddAction(prefix + "prevtrack", new PressAndHoldAction(dev.ChapPlus)); controller.AddAction(prefix + "prevTrack", new PressAndHoldAction(dev.ChapPlus));
controller.AddAction(prefix + "nexttrack", new PressAndHoldAction(dev.ChapMinus)); controller.AddAction(prefix + "nextTrack", new PressAndHoldAction(dev.ChapMinus));
controller.AddAction(prefix + "rewind", new PressAndHoldAction(dev.Rewind)); controller.AddAction(prefix + "rewind", new PressAndHoldAction(dev.Rewind));
controller.AddAction(prefix + "ffwd", new PressAndHoldAction(dev.FFwd)); controller.AddAction(prefix + "ffwd", new PressAndHoldAction(dev.FFwd));
controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record)); controller.AddAction(prefix + "record", new PressAndHoldAction(dev.Record));
@@ -31,8 +31,8 @@ namespace PepperDash.Essentials.Room.Cotija
controller.RemoveAction(prefix + "play"); controller.RemoveAction(prefix + "play");
controller.RemoveAction(prefix + "pause"); controller.RemoveAction(prefix + "pause");
controller.RemoveAction(prefix + "stop"); controller.RemoveAction(prefix + "stop");
controller.RemoveAction(prefix + "prevtrack"); controller.RemoveAction(prefix + "prevTrack");
controller.RemoveAction(prefix + "nexttrack"); controller.RemoveAction(prefix + "nextTrack");
controller.RemoveAction(prefix + "rewind"); controller.RemoveAction(prefix + "rewind");
controller.RemoveAction(prefix + "ffwd"); controller.RemoveAction(prefix + "ffwd");
controller.RemoveAction(prefix + "record"); controller.RemoveAction(prefix + "record");

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Crestron.SimplSharp; using Crestron.SimplSharp;
using Crestron.SimplSharp.Reflection;
using Crestron.SimplSharpPro.EthernetCommunication; using Crestron.SimplSharpPro.EthernetCommunication;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -328,6 +329,11 @@ namespace PepperDash.Essentials.Room.Cotija
var co = ConfigReader.ConfigObject; var co = ConfigReader.ConfigObject;
co.Info.RuntimeInfo.AppName = Assembly.GetExecutingAssembly().GetName().Name;
var version = Assembly.GetExecutingAssembly().GetName().Version;
co.Info.RuntimeInfo.AssemblyVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
//Room //Room
if (co.Rooms == null) if (co.Rooms == null)
co.Rooms = new List<EssentialsRoomConfig>(); co.Rooms = new List<EssentialsRoomConfig>();

52
PepperDashEssentials/Room/Cotija/RoomBridges/SourceDeviceMapDictionary.cs
View File

@@ -42,23 +42,23 @@ namespace PepperDash.Essentials.Room.Cotija
{"preset23", 123}, {"preset23", 123},
{"preset24", 124}, {"preset24", 124},
{"key0", 130}, {"num0", 130},
{"key1", 131}, {"num1", 131},
{"key2", 132}, {"num2", 132},
{"key3", 133}, {"num3", 133},
{"key4", 134}, {"num4", 134},
{"key5", 135}, {"num5", 135},
{"key6", 136}, {"num6", 136},
{"key7", 137}, {"num7", 137},
{"key8", 138}, {"num8", 138},
{"key9", 139}, {"num9", 139},
{"keyDash", 140}, {"numDash", 140},
{"keyEnter", 141}, {"numEnter", 141},
{"channelUp", 142}, {"chanUp", 142},
{"channelDown", 143}, {"chanDown", 143},
{"channelLast", 144}, {"lastChan", 144},
{"exit", 145}, {"exit", 145},
{"power", 146}, {"powerToggle", 146},
{"red", 147}, {"red", 147},
{"green", 148}, {"green", 148},
{"yellow", 149}, {"yellow", 149},
@@ -71,21 +71,27 @@ namespace PepperDash.Essentials.Room.Cotija
{"closedCaption", 156}, {"closedCaption", 156},
{"stop", 157}, {"stop", 157},
{"pause", 158}, {"pause", 158},
{"cursorUp", 159}, {"up", 159},
{"cursorDown", 160}, {"down", 160},
{"cursorLeft", 161}, {"left", 161},
{"cursorRight", 162}, {"right", 162},
{"settings", 163}, {"settings", 163},
{"info", 164}, {"info", 164},
{"return", 165}, {"return", 165},
{"guide", 166}, {"guide", 166},
{"reboot", 167}, {"reboot", 167},
{"dvrList", 168},
{"replay", 169},
{"play", 170}, {"play", 170},
{"cursorOk", 171}, {"select", 171},
{"record", 172}, {"record", 172},
{"menu", 173}, {"menu", 173},
{"topMenu", 174} {"topMenu", 174},
{"prevTrack", 175},
{"nextTrack", 176},
{"powerOn", 177},
{"powerOff", 178}
}; };

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.

BIN
Release Package/PepperDashEssentials.dll
View File

Binary file not shown.