Gui updated, many keyset changes

[pierogi] / keysets / westinghouse.cpp

diff --git a/keysets/westinghouse.cpp b/keysets/westinghouse.cpp
index eecfbd2..9a2c02a 100644 (file)
--- a/keysets/westinghouse.cpp
+++ b/keysets/westinghouse.cpp
@@ -1,5 +1,6 @@
 #include "westinghouse.h"
-#include "necprotocol.h"
+#include "protocols/necprotocol.h"
+#include "protocols/sircprotocol.h"
 
 WestinghouseTV1::WestinghouseTV1(
   QObject *guiObject,
@@ -9,7 +10,7 @@ WestinghouseTV1::WestinghouseTV1(
       Westinghouse_Make,
       index)
 {
-  threadableProtocol = new NECProtocol(guiObject, index, Standard_NEC);
+  threadableProtocol = new NECProtocol(guiObject, index, false, false);
 
 //  setPreData(0x807F, 16);
   setPreData(0x01, 8);
@@ -21,7 +22,7 @@ WestinghouseTV1::WestinghouseTV1(
   addKey("DVI", Unmapped_Key, 0x06, 8);
   addKey("ASPECT_RATIO", AspectRatio_Key, 0x07, 8);
   addKey("KEY_BACK", PrevChannel_Key, 0x08, 8);
-  addKey("VGA", Unmapped_Key, 0x09, 8);
+  addKey("VGA", PCInput_Key, 0x09, 8);
   addKey("YPbPr", Unmapped_Key, 0x0A, 8);
   addKey("AV", Unmapped_Key, 0x0B, 8);
   addKey("S-Video", Unmapped_Key, 0x0C, 8);
@@ -55,63 +56,53 @@ WestinghouseTV2::WestinghouseTV2(
       Westinghouse_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    600, 500,
-    1200, 500,
-    45000, true,
-    LIRC_NEC);
+  addControlledDevice(Westinghouse_Make, "LVM-42W2", TV_Device);
 
-  threadableProtocol = np;
+  threadableProtocol = new SIRCProtocol(guiObject, index);
 
-  np->setHeaderPair(2400, 500);
-
-//  np->setMinimumRepetitions(3);
-
-  addKey("Power", Power_Key, 0xA90, 12);
-  addKey("PIP", PIP_Key, 0xDB0, 12);
-  addKey("PIPSwap", PIPSwap_Key, 0xFB0, 12);
-  addKey("Mute", Mute_Key, 0x290, 12);
-  addKey("Sleep", Sleep_Key, 0x6D0, 12);
-  addKey("CC", Captions_Key, 0x310, 12);
-  addKey("Backlight", Unmapped_Key, 0x190, 12);
-  addKey("A", Unmapped_Key, 0x570, 12);
-  addKey("B", Unmapped_Key, 0xD70, 12);
-  addKey("C", Unmapped_Key, 0x370, 12);
-  addKey("1", One_Key, 0x010, 12);
-  addKey("2", Two_Key, 0x810, 12);
-  addKey("3", Three_Key, 0x410, 12);
-  addKey("4", Four_Key, 0xC10, 12);
-  addKey("5", Five_Key, 0x210, 12);
-  addKey("6", Six_Key, 0xA10, 12);
-  addKey("7", Seven_Key, 0x610, 12);
-  addKey("8", Eight_Key, 0xE10, 12);
-  addKey("9", Nine_Key, 0x110, 12);
-  addKey("0", Zero_Key, 0x910, 12);
-  addKey(".", Unmapped_Key, 0x510, 12);
-  addKey("EnterNumPad", Enter_Key, 0xD10, 12);
-  addKey("Input", Input_Key, 0xA50, 12);
-  addKey("Zoom", Zoom_Key, 0x390, 12);
-  addKey("Vol+", VolumeUp_Key, 0x490, 12);
-  addKey("Vol-", VolumeDown_Key, 0xC90, 12);
-  addKey("Ch+", ChannelUp_Key, 0x090, 12);
-  addKey("Ch-", ChannelDown_Key, 0x890, 12);
-  addKey("Menu", Menu_Key, 0x070, 12);
-  addKey("Info", Info_Key, 0x5D0, 12);
-  addKey("Up", Up_Key, 0x2F0, 12);
-  addKey("Down", Down_Key, 0xAF0, 12);
-  addKey("Left", Left_Key, 0x2D0, 12);
-  addKey("Right", Right_Key, 0xCD0, 12);
-  addKey("EnterNavigation", Select_Key, 0xA70, 12);
-  addKey("Retry", Unmapped_Key, 0xDD0, 12);
-  addKey("EPG", Guide_Key, 0x710, 12);
-  addKey("YPbPr1", Unmapped_Key, 0x130, 12);
-  addKey("YPbPr2", Unmapped_Key, 0x930, 12);
-  addKey("PC", Unmapped_Key, 0xC30, 12);
-  addKey("Video", Unmapped_Key, 0x030, 12);
-  addKey("HDMI", Unmapped_Key, 0x430, 12);
-  addKey("SVideo", Unmapped_Key, 0xB30, 12);
-  addKey("TV", Unmapped_Key, 0x250, 12);
-  addKey("DVI", Unmapped_Key, 0x230, 12);
+  addSIRC12Key("1", One_Key, 0x01, 0x00);
+  addSIRC12Key("2", Two_Key, 0x01, 0x01);
+  addSIRC12Key("3", Three_Key, 0x01, 0x02);
+  addSIRC12Key("4", Four_Key, 0x01, 0x03);
+  addSIRC12Key("5", Five_Key, 0x01, 0x04);
+  addSIRC12Key("6", Six_Key, 0x01, 0x05);
+  addSIRC12Key("7", Seven_Key, 0x01, 0x06);
+  addSIRC12Key("8", Eight_Key, 0x01, 0x07);
+  addSIRC12Key("9", Nine_Key, 0x01, 0x08);
+  addSIRC12Key("0", Zero_Key, 0x01, 0x09);
+  addSIRC12Key(".", Unmapped_Key, 0x01, 0x0A);
+  addSIRC12Key("EnterNumPad", Enter_Key, 0x01, 0x0B);
+  addSIRC12Key("CC", Captions_Key, 0x01, 0x0C);
+  addSIRC12Key("EPG", Guide_Key, 0x01, 0x0E);
+  addSIRC12Key("Ch+", ChannelUp_Key, 0x01, 0x10);
+  addSIRC12Key("Ch-", ChannelDown_Key, 0x01, 0x11);
+  addSIRC12Key("Vol+", VolumeUp_Key, 0x01, 0x12);
+  addSIRC12Key("Vol-", VolumeDown_Key, 0x01, 0x13);
+  addSIRC12Key("Mute", Mute_Key, 0x01, 0x14);
+  addSIRC12Key("Power", Power_Key, 0x01, 0x15);
+  addSIRC12Key("Backlight", Unmapped_Key, 0x01, 0x18);
+  addSIRC12Key("Zoom", Zoom_Key, 0x01, 0x1C);
+  addSIRC12Key("TV", Unmapped_Key, 0x01, 0x24);
+  addSIRC12Key("Input", Input_Key, 0x01, 0x25);
+  addSIRC12Key("Right", Right_Key, 0x01, 0x33);
+  addSIRC12Key("Left", Left_Key, 0x01, 0x34);
+  addSIRC12Key("Sleep", Sleep_Key, 0x01, 0x36);
+  addSIRC12Key("Retry", Unmapped_Key, 0x01, 0x3B);
+  addSIRC12Key("Info", Info_Key, 0x01, 0x3A);
+  addSIRC12Key("Video", Unmapped_Key, 0x01, 0x40);
+  addSIRC12Key("HDMI", HDMIInput_Key, 0x01, 0x42);
+  addSIRC12Key("PC", PCInput_Key, 0x01, 0x43);
+  addSIRC12Key("DVI", Unmapped_Key, 0x01, 0x44);
+  addSIRC12Key("YPbPr1", Unmapped_Key, 0x01, 0x48);
+  addSIRC12Key("YPbPr2", Unmapped_Key, 0x01, 0x49);
+  addSIRC12Key("SVideo", Unmapped_Key, 0x01, 0x4D);
+  addSIRC12Key("PIP", PIP_Key, 0x01, 0x5B);
+  addSIRC12Key("PIPSwap", PIPSwap_Key, 0x01, 0x5F);
+  addSIRC12Key("Menu", Menu_Key, 0x01, 0x60);
+  addSIRC12Key("EnterNavigation", Select_Key, 0x01, 0x65);
+  addSIRC12Key("A", Unmapped_Key, 0x01, 0x6A);
+  addSIRC12Key("B", Unmapped_Key, 0x01, 0x6B);
+  addSIRC12Key("C", Unmapped_Key, 0x01, 0x6C);
+  addSIRC12Key("Up", Up_Key, 0x01, 0x74);
+  addSIRC12Key("Down", Down_Key, 0x01, 0x75);
 }