Improved to "half-way usable" (version 0.5)

[pierogi] / keysets / rca.cpp

diff --git a/keysets/rca.cpp b/keysets/rca.cpp
index 364b205..9be27dd 100644 (file)
--- a/keysets/rca.cpp
+++ b/keysets/rca.cpp
@@ -14,17 +14,18 @@ RCATV1::RCATV1(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0xF, 4);
-
 //  np->setMinimumRepetitions(1);
 
+  setPreData(0xF, 4);
+
   addKey("vol-left", VolumeDown_Key, 0x2E0D1, 20);
   addKey("vol-right", VolumeUp_Key, 0x2F0D0, 20);
   addKey("mute", Mute_Key, 0x3F0C0, 20);
@@ -82,7 +83,7 @@ RCATV1a::RCATV1a(
 {
   setKeysetName("TV Keyset 1a");
 
-  addKey("repeat", Unmapped_Key, 0x050FA, 20):
+  addKey("repeat", Repeat_Key, 0x050FA, 20);
   addKey("pip", PIP_Key, 0x1B0E4, 20);
   addKey("swap", PIPSwap_Key, 0xC303C, 20);
   addKey("aspect", AspectRatio_Key, 0x9006F, 20);
@@ -102,16 +103,17 @@ RCATV2::RCATV2(
     index,
     500, 1000,
     500, 2000,
-    12390, false);
+    12390, false,
+    LIRC_NEC);
 
   threadableProtocol = np;
   np->setHeaderPair(17355, 3978);
   np->setTrailerPulse(897);
 
-  np->setPreData(0xF, 4);
+  setPreData(0xF, 4);
 
-  addKey("off", Unmapped_Key, 0x3B0C4, 20);
-  addKey("on", Unmapped_Key, 0x3A0C5, 20);
+  addKey("off", PowerOff_Key, 0x3B0C4, 20);
+  addKey("on", PowerOn_Key, 0x3A0C5, 20);
   addKey("display", Info_Key, 0x3C0C3, 20);
   addKey("reset", Reset_Key, 0x120ED, 20);
   addKey("pc", PrevChannel_Key, 0x270D8, 20);
@@ -150,14 +152,15 @@ RCAAux1::RCAAux1(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0x4, 4);
+  setPreData(0x4, 4);
 
   addKey("aux1_power", Power_Key, 0x2ABD5, 20);
   addKey("skip", Advance_Key, 0x53BAC, 20);
@@ -177,7 +180,7 @@ RCAAux1::RCAAux1(
   addKey("aux-clear", Exit_Key, 0x06BF9, 20);
   addKey("aux-1", One_Key, 0x31BCE, 20);
   addKey("aux-2", Two_Key, 0x32BCD, 20);
-  addKey("aux-3", Three_key, 0x33BCC, 20);
+  addKey("aux-3", Three_Key, 0x33BCC, 20);
   addKey("aux-4", Four_Key, 0x34BCB, 20);
   addKey("aux-5", Five_Key, 0x35BCA, 20);
   addKey("aux-6", Six_Key, 0x36BC9, 20);
@@ -212,14 +215,15 @@ RCAAux2::RCAAux2(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0xC, 4);
+  setPreData(0xC, 4);
 
   addKey("aux-on-off", Power_Key, 0x3B3C4, 20);
   addKey("aux-mute", Mute_Key, 0x3F3C0, 20);
@@ -242,7 +246,7 @@ RCAAux2::RCAAux2(
   addKey("aux-ok", Select_Key, 0xF430B, 20);
   addKey("aux-1", One_Key, 0x313CE, 20);
   addKey("aux-2", Two_Key, 0x323CD, 20);
-  addKey("aux-3", Three_key, 0x333CC, 20);
+  addKey("aux-3", Three_Key, 0x333CC, 20);
   addKey("aux-4", Four_Key, 0x343CB, 20);
   addKey("aux-5", Five_Key, 0x353CA, 20);
   addKey("aux-6", Six_Key, 0x363C9, 20);
@@ -290,17 +294,18 @@ RCAVCR1::RCAVCR1(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0xE, 4);
-
 //  np->setMinimumRepetitions(1);
 
+  setPreData(0xE, 4);
+
   addKey("vcr1-on-off", Power_Key, 0x2A1D5, 20);
   addKey("vcr1-who", Unmapped_Key, 0x6119E, 20);
   addKey("vcr1-ch+", ChannelUp_Key, 0x2D1D2, 20);
@@ -356,14 +361,15 @@ RCAVCR2::RCAVCR2(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0xD, 4);
+  setPreData(0xD, 4);
 
   addKey("vcr2-on-off", Power_Key, 0x2A2D5, 20);
   addKey("vcr2-who", Unmapped_Key, 0x6129E, 20);
@@ -416,14 +422,15 @@ RCADVD1::RCADVD1(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0x5, 4);
+  setPreData(0x5, 4);
 
   addKey("dvd-on-off", Power_Key, 0x2AAD5, 20);
   addKey("dvd-who", Unmapped_Key, 0x61A9E, 20);
@@ -460,9 +467,9 @@ RCADVD1::RCADVD1(
   addKey("dvd-stop", Stop_Key, 0x1FAE0, 20);
   addKey("dvd-pause", Pause_Key, 0x19AE6, 20);
   addKey("skip", Advance_Key, 0x53AAC, 20);
-  addKey("dvd_again", Unmapped_Key, 0xBAA45, 20);
+  addKey("dvd_again", Replay_Key, 0xBAA45, 20);
   addKey("dvd_open_close", Eject_Key, 0x40ABF, 20);
-  addKey("dvd_zoom", Unmapped_Key, 0x90A6F, 20);
+  addKey("dvd_zoom", Zoom_Key, 0x90A6F, 20);
   addKey("dvd_preset", Unmapped_Key, 0x12AED, 20);
   addKey("dvd", Unmapped_Key, 0x3AAC5, 20);
 }
@@ -493,14 +500,15 @@ RCASat1::RCASat1(
     index,
     500, 1000,
     500, 2000,
-    64500, true);
+    64500, true,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(4000, 4000);
   np->setTrailerPulse(500);
 
-  np->setPreData(0x7, 4);
+  setPreData(0x7, 4);
 
   addKey("on-off", Power_Key, 0x2A8D5, 20);
   addKey("who", Unmapped_Key, 0x6189E, 20); // "cc", "-"
@@ -549,7 +557,7 @@ RCASat2::RCASat2(
   QObject *guiObject,
   unsigned int index)
   : PIRKeysetMetaData(
-      "Satellite(Dish Network) Keyset 2",
+      "Satellite (Dish Network) Keyset 2",
       RCA_Make,
       index)
 {
@@ -558,22 +566,24 @@ RCASat2::RCASat2(
     index,
     440, 2780,
     440, 1645,
-    6115, false);
+    6115, false,
+    LIRC_NEC);
 
   threadableProtocol = np;
 
   np->setHeaderPair(525, 6045);
   np->setTrailerPulse(450);
 
-  np->setPostData(0x000, 10);
-
-  np->setMinimumRepetitions(6);
+//  np->setMinimumRepetitions(6);
+  np->setFullHeadlessRepeat(true);
 
   np->setCarrierFrequency(56000);
   np->setDutyCycle(32);
 
+  setPostData(0x000, 10);
+
   addKey("info", Info_Key, 0x0, 6);
-  addKey("power_on", Unmapped_Key, 0x1, 6);
+  addKey("power_on", PowerOn_Key, 0x1, 6);
   addKey("power", Power_Key, 0x2, 6);
   addKey("1", One_Key, 0x4, 6);
   addKey("2", Two_Key, 0x5, 6);
@@ -602,7 +612,7 @@ RCASat2::RCASat2(
   addKey("sys_info", Info_Key, 0x36, 6);
   addKey("asterisk", Unmapped_Key, 0x37, 6);
   addKey("pound", Unmapped_Key, 0x38, 6);
-  addKey("power_off", Unmapped_Key, 0x39, 6);
+  addKey("power_off", PowerOff_Key, 0x39, 6);
   addKey("sat", Unmapped_Key, 0x41, 6);
   addKey("dish_home", Unmapped_Key, 0x52, 6);
   addKey("sys_info2", Unmapped_Key, 0x54, 6);