From: <be...@us...> - 2009-10-28 11:49:52
|
Revision: 3136 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3136&view=rev Author: belcom Date: 2009-10-28 11:49:24 +0000 (Wed, 28 Oct 2009) Log Message: ----------- - Improved iMON Front Panel support, added some buttons, code corrections. - Added XML description for detect() in Custom HID Receiver.cs because while debugging the "Warning as Error" was annoying. :) - Introduced a "retry loop" if command send to iMON fails. - Sometimes (XP?) devicePath gets reported as "\??\HID..." and will be corrected to "\\?\HID..." Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Front Panel.xml trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Front Panel.xml =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Front Panel.xml 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/Abstract Remote Maps/iMon USB/Imon Front Panel.xml 2009-10-28 11:49:24 UTC (rev 3136) @@ -8,6 +8,7 @@ <RemoteTable RawCode="3015" AbstractButton="Start" /> <RemoteTable RawCode="3023" AbstractButton="Back" /> <RemoteTable RawCode="3045" AbstractButton="Info" /> + <RemoteTable RawCode="3044" AbstractButton="Home" /> <RemoteTable RawCode="3043" AbstractButton="Power" /> <RemoteTable RawCode="3002" AbstractButton="Play" /> <RemoteTable RawCode="3004" AbstractButton="Stop" /> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server/IR Server.csproj 2009-10-28 11:49:24 UTC (rev 3136) @@ -2,7 +2,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> + <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{46F1DB42-F082-4200-B939-6E4B72A8117C}</ProjectGuid> <OutputType>WinExe</OutputType> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs 2009-10-28 11:49:24 UTC (rev 3136) @@ -235,6 +235,9 @@ #endregion + /// <summary> + /// Detect Custom HID Devices. + /// </summary> public override DetectionResult Detect() { if (Environment.UserInteractive) Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.cs 2009-10-28 11:49:24 UTC (rev 3136) @@ -1285,6 +1285,15 @@ rDevice.usUsage = details.Usage; rDevice.usUsagePage = details.UsagePage; RemoteDeviceName = details.ID; + + // on very rare systems RemoteDeviceName is reported wrong, no idea why. Lets change it! + if (RemoteDeviceName.StartsWith(@"\??\")) + { + DebugWriteLine("FindDevices_HID(): Changing to right RemoteDeviceName..."); + DebugWriteLine("FindDevices_HID(): reported RemoteDeviceName: \"{0}\"", RemoteDeviceName); + RemoteDeviceName = @"\\?\" + RemoteDeviceName.Substring(4); + DebugWriteLine("FindDevices_HID(): corrected RemoteDeviceName: \"{0}\"", RemoteDeviceName); + } } // check for keyboard device - MI_00&Col02# if (details.ID.Contains(HIDKeyboardSuffix)) @@ -1572,9 +1581,9 @@ } else if (newArray[8] == 0xEE) // Front panel buttons/volume knob { - if (newArray[4] != 0x00) + if (newArray[5] != 0x00) { - uint keyCode = IMON_PANEL_BUTTON + newArray[4]; + uint keyCode = IMON_PANEL_BUTTON + newArray[5]; RemoteEvent(keyCode, _remoteToggle != newArray[4]); } _remoteToggle = newArray[4]; Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/Imon USB Receivers.csproj 2009-10-28 11:49:24 UTC (rev 3136) @@ -2,7 +2,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> + <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{EC37743A-64B2-472A-9EB6-CB052AD2B35C}</ProjectGuid> <OutputType>Library</OutputType> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs 2009-10-28 10:38:24 UTC (rev 3135) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Plugins/Imon USB Receivers/TestApplication.cs 2009-10-28 11:49:24 UTC (rev 3136) @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Windows.Forms; namespace IRServer.Plugin { @@ -196,7 +197,7 @@ DeviceType DevType; - iMonUSBReceivers device = new iMonUSBReceiver(); + iMonUSBReceivers device = new iMonUSBReceivers(); try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |