diff --git a/iOS/Assets.xcassets/add.imageset/Contents.json b/iOS/Assets.xcassets/add.imageset/Contents.json deleted file mode 100644 index 5dc2292..0000000 --- a/iOS/Assets.xcassets/add.imageset/Contents.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "images": [ - { - "idiom": "universal" - }, - { - "filename": "add.png", - "scale": "1x", - "idiom": "universal" - }, - { - "filename": "add@2x.png", - "scale": "2x", - "idiom": "universal" - }, - { - "scale": "3x", - "idiom": "universal" - }, - { - "idiom": "iphone" - }, - { - "scale": "1x", - "idiom": "iphone" - }, - { - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "scale": "2x", - "idiom": "iphone" - }, - { - "scale": "3x", - "idiom": "iphone" - }, - { - "idiom": "ipad" - }, - { - "scale": "1x", - "idiom": "ipad" - }, - { - "scale": "2x", - "idiom": "ipad" - }, - { - "idiom": "watch" - }, - { - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "scale": "2x", - "idiom": "watch" - }, - { - "idiom": "mac" - }, - { - "scale": "1x", - "idiom": "mac" - }, - { - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/iOS/Assets.xcassets/add.imageset/add.png b/iOS/Assets.xcassets/add.imageset/add.png deleted file mode 100644 index 0737b9d..0000000 Binary files a/iOS/Assets.xcassets/add.imageset/add.png and /dev/null differ diff --git a/iOS/Assets.xcassets/add.imageset/add@2x.png b/iOS/Assets.xcassets/add.imageset/add@2x.png deleted file mode 100644 index 0ed404c..0000000 Binary files a/iOS/Assets.xcassets/add.imageset/add@2x.png and /dev/null differ diff --git a/qController.Standard/.DS_Store b/qController.Standard/.DS_Store index ff126f0..8cc3233 100644 Binary files a/qController.Standard/.DS_Store and b/qController.Standard/.DS_Store differ diff --git a/qController.Standard/Classes/Communication/IPHelper.cs b/qController.Standard/Classes/Communication/IPHelper.cs new file mode 100644 index 0000000..dd1dea2 --- /dev/null +++ b/qController.Standard/Classes/Communication/IPHelper.cs @@ -0,0 +1,18 @@ +using System; +using System.Net; + +namespace qController +{ + public class IPHelper + { + public IPHelper() + { + } + + public static bool IsValidAddress(string ipString){ + if ((ipString.Split('.').Length - 1) != 3) return false; + IPAddress address; + return IPAddress.TryParse(ipString, out address); + } + } +} diff --git a/qController.Standard/Classes/Communication/QParser.cs b/qController.Standard/Classes/Communication/QParser.cs index 865c33c..c0c2f3c 100644 --- a/qController.Standard/Classes/Communication/QParser.cs +++ b/qController.Standard/Classes/Communication/QParser.cs @@ -72,6 +72,8 @@ namespace qController ParseWorkspaceInfo(msg); else if (msg.Address.Contains("playbackPosition")) ParsePositionUpdateInfo(msg); + else if (msg.Address.Contains("thump")) + Console.WriteLine("Heartbeat Received"); else { Console.WriteLine("Unknown message type"); diff --git a/qController.Standard/Classes/Communication/QUpdater.cs b/qController.Standard/Classes/Communication/QUpdater.cs index 1aba32d..0cb79cd 100644 --- a/qController.Standard/Classes/Communication/QUpdater.cs +++ b/qController.Standard/Classes/Communication/QUpdater.cs @@ -23,21 +23,15 @@ namespace qController public void UpdateLoop() { active = true; - Device.StartTimer(TimeSpan.FromSeconds(0.01), () => { - UpdateSelected(); - UpdateLevels(); + Device.StartTimer(TimeSpan.FromSeconds(5.0), () => { + SendThump(); return active; }); } - public void UpdateSelected() + public void SendThump() { - string valuesForKeys = "[\"displayName\",\"number\",\"type\",\"isBroken\",\"isLoaded\",\"isPaused\",\"isRunning\",\"preWait\",\"duration\",\"postWait\",\"translationX\",\"translationY\",\"opacity\",\"scaleX\",\"scaleY\",\"uniqueID\",\"flagged\",\"listName\",\"colorName\",\"name\",\"armed\"]"; - //qController.qClient.sendAndReceiveStringArgs("/cue/selected/valuesForKeys", valuesForKeys); - } - public void UpdateLevels() - { - //qController.qClient.sendAndReceiveString("/cue/selected/levels"); + qController.qClient.sendStringUDP("/thump"); } public void Kill(){ diff --git a/qController.Standard/Pages/MasterPageItem.cs b/qController.Standard/Classes/Settings/MenuPageitem.cs similarity index 84% rename from qController.Standard/Pages/MasterPageItem.cs rename to qController.Standard/Classes/Settings/MenuPageitem.cs index 5a0e07e..15246a5 100644 --- a/qController.Standard/Pages/MasterPageItem.cs +++ b/qController.Standard/Classes/Settings/MenuPageitem.cs @@ -2,7 +2,7 @@ namespace qController { - public class MasterPageItem + public class MenuPageItem { public string Title { get; set; } public string Icon { get; set; } diff --git a/qController.Standard/Pages/MenuPage.xaml.cs b/qController.Standard/Pages/MenuPage.xaml.cs index 9d1a6f1..12a7fa7 100644 --- a/qController.Standard/Pages/MenuPage.xaml.cs +++ b/qController.Standard/Pages/MenuPage.xaml.cs @@ -9,26 +9,26 @@ namespace qController { public ListView listView; - public ObservableCollection items; + public ObservableCollection items; public MenuPage() { Title = "Menu"; InitializeComponent(); - items = new ObservableCollection(); + items = new ObservableCollection(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Scan Network", Icon = "\uE800", Command = "scan" }); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Add Manually", Icon = "\uE801", Command = "add" }); - /*items.Add(new MasterPageItem + /*items.Add(new MenuPageItem { Title = "Open Link", Icon = "\uF0C9", @@ -73,7 +73,7 @@ namespace qController public void ChangeToWorkspace(QWorkSpace workspace) { items.Clear(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Disconnect", Icon = "\uE803", @@ -81,7 +81,7 @@ namespace qController }); foreach (var cueList in workspace.data) { - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = cueList.listName, Icon = "", @@ -101,7 +101,7 @@ namespace qController cueTitle = "\t" + cue.listName; } - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = cueTitle, Icon = cueIcon, @@ -115,13 +115,13 @@ namespace qController public void ChangeToHome() { items.Clear(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Scan Network", Icon = "\uE800", Command = "scan" }); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Add Manually", Icon = "\uE801", diff --git a/qController.Standard/Pages/RootPage.xaml.cs b/qController.Standard/Pages/RootPage.xaml.cs index 405ac3e..b716a08 100644 --- a/qController.Standard/Pages/RootPage.xaml.cs +++ b/qController.Standard/Pages/RootPage.xaml.cs @@ -39,7 +39,7 @@ namespace qController void OnItemSelected(object sender, SelectedItemChangedEventArgs e) { - var item = e.SelectedItem as MasterPageItem; + var item = e.SelectedItem as MenuPageItem; if (item != null) { MenuPage.listView.SelectedItem = null;