Fixed installation and nasty exit bug

Finally, got debian source package built, and after some pulling of hair,
both installation and uninstallation via extras-devel seem to be working.
Also fixed a nasty shutdown bug where the worker thread failed to exit.
(Need to test this extensively to be certain it doesn't happen again.)
Added a "sort by device type" button to keyset selection window, though
there isn't any device type data available yet...  And, added keysets for
Raite, Sagem, and Yamaha.

diff --git a/doc/about.html b/doc/about.html
index 8d874fb..441bad4 100644 (file)
--- a/doc/about.html
+++ b/doc/about.html
@@ -6,13 +6,22 @@
 <h2 align="center">A Universal Infrared Remote Control</h2>
 
 <p align="center">
-Version 0.1 (Beta)
+Version 0.1
 </p>
 
 <p>
 Note: while this app is in a fairly usable state, the keysets are still
 incomplete and mostly untested.  Many brands of device are not yet supported,
-and those which have keysets may only work in a limited manner.
+and those which have keysets may only work in a limited manner.  Please do
+post on the
+<a href="https://garage.maemo.org/forum/forum.php?forum_id=7316">Pierogi Forum Board</a>
+if you find bugs to fix, have suggestions on future enhancements, or have
+particular devices or brands you would like to see added to the list of
+keysets.  Thank you!
+</p>
+
+<p>
+For more information, please visit the <a href="http://pierogi.garage.maemo.org">Pierogi website</a>.
 </p>
 
 <p>Copyright (C) 2012 by John Pietrzak.

diff --git a/doc/documentation.html b/doc/documentation.html
index a1d2d34..b23e657 100644 (file)
--- a/doc/documentation.html
+++ b/doc/documentation.html
@@ -113,12 +113,12 @@ Pierogi to use one by simply selecting that keyset from the list.</p>
 <h3>Select Keyset Window</h3>
 
 <p>The Select Keyset window presents a list of all the keysets currently
-available in Pierogi.  As this list is fairly long, a button has been added
-at the top of the window that allows you to choose the make (or brand) of
-the device you are trying to control; once a make has been selected, all
-keysets not associated with that make will be hidden.  To use a keyset,
-simply select it from the list, and close the window (by pressing the
-return arrow at the top right of the screen).</p>
+available in Pierogi.  As this list is fairly long, buttons have been added
+at the top of the window that allows you to choose the make and/or type of
+device you are trying to control; all keysets not associated with the chosen
+make or type will be hidden.  To use a keyset, simply select it from the list,
+and then close the window (by pressing the return arrow at the top right of
+the screen).</p>
 
 <h2>Design Rationale</h2>
 
@@ -309,6 +309,10 @@ to the theory and practice behind consumer IR devices
 
 <li>Link to (what appears to be) source code for the N900's
 <a href="http://svn.jacekowski.org/host_mode/trunk/drivers/input/lirc/lirc_rx51.c">/dev/lirc0 device driver</a>.
+
+<li>A surprisingly decent description of how to use the
+<a href="http://www.yamahapab.com/assets/downloads/codes/Custom_Install_HB.pdf">Yamaha Remote Control</a>.
+
 <ul>
 
 </body>

diff --git a/keysets/lg.cpp b/keysets/lg.cpp
index e809eab..e7495fc 100644 (file)
--- a/keysets/lg.cpp
+++ b/keysets/lg.cpp
@@ -14,8 +14,8 @@ LGTV1::LGTV1(
   NECProtocol *np = new NECProtocol(
     guiObject,
     index,
-    600, 533,
-    600, 1652,
+    600, 500,
+    600, 1600,
     107753, true);
 
   threadableProtocol = np;
@@ -273,7 +273,7 @@ LGDisc1::LGDisc1(
 
   np->setPreData(0x3434, 16);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("power", Power_Key, 0x7887, 16);
   addKey("open-close", Eject_Key, 0x59A6, 16);

diff --git a/keysets/mitsubishi.cpp b/keysets/mitsubishi.cpp
index 22dcf81..f3a38e5 100644 (file)
--- a/keysets/mitsubishi.cpp
+++ b/keysets/mitsubishi.cpp
@@ -22,7 +22,7 @@ MitsubishiTV1::MitsubishiTV1(
 
   np->setPreData(0xE2, 8);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("POWER", Power_Key, 0x40, 8);
   addKey("0", Zero_Key, 0x90, 8);
@@ -126,7 +126,7 @@ MitsubishiVCR1::MitsubishiVCR1(
 
   np->setPreData(0xEA, 8);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("POWER", Power_Key, 0x40, 8);
   addKey("CH-", ChannelDown_Key, 0x48, 8);

diff --git a/keysets/nokia.cpp b/keysets/nokia.cpp
index b6bc20d..92d1735 100644 (file)
--- a/keysets/nokia.cpp
+++ b/keysets/nokia.cpp
@@ -20,7 +20,7 @@ NokiaGenericVCR::NokiaGenericVCR(
 
   np->setTrailerPulse(272);
 
-  np->setMinimumRepetitions(3);
+//  np->setMinimumRepetitions(3);
 
   np->setPreData(0x6, 3);
 

diff --git a/keysets/panasonic.cpp b/keysets/panasonic.cpp
index 6fc8d83..c1cf149 100644 (file)
--- a/keysets/panasonic.cpp
+++ b/keysets/panasonic.cpp
@@ -23,7 +23,7 @@ PanasonicAmp::PanasonicAmp(
 
   np->setPreData(0x80080A86, 32);
 
-  np->setMinimumRepetitions(4);
+//  np->setMinimumRepetitions(4);
 
   np->setCarrierFrequency(36000);
 
@@ -568,7 +568,7 @@ PanasonicAudio::PanasonicAudio(
 
   np->setPreData(0x40040543, 32);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("power", Power_Key, 0xFDBB, 16);
   addKey("tape", Unmapped_Key, 0x3573, 16);
@@ -581,10 +581,10 @@ PanasonicAudio::PanasonicAudio(
   addKey("7", Seven_Key, 0x692F, 16);
   addKey("8", Eight_Key, 0xE9AF, 16);
   addKey("9", Nine_Key, 0x195F, 16);
-  addKey("+10", Unmapped_Key, 0xF9BF, 16);
+  addKey("+10", DoubleDigit_Key, 0xF9BF, 16);
   addKey("10/0", Zero_Key, 0x99DF, 16);
   addKey("cancel", Clear_Key, 0xB1F7, 16);
-  addKey("program", Unmapped_Key, 0xD197, 16);
+  addKey("program", Program_Key, 0xD197, 16);
   addKey("tuner-band", Unmapped_Key, 0x1D5B, 16);
   addKey("tuning-", ChannelDown_Key, 0x5711, 16);
   addKey("tuning+", ChannelUp_Key, 0x97D1, 16);

diff --git a/keysets/raite.cpp b/keysets/raite.cpp
new file mode 100644 (file)
index 0000000..3e50bf8
--- /dev/null
+++ b/keysets/raite.cpp
@@ -0,0 +1,70 @@
+#include "raite.h"
+#include "necprotocol.h"
+
+RaiteDVD1::RaiteDVD1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "DVD Keyset 1",
+      Raite_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    107823, true);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x04FB, 16);
+
+  addKey("mute", Mute_Key, 0xC03F, 16);
+  addKey("1", One_Key, 0xC837, 16);
+  addKey("2", Two_Key, 0x08F7, 16);
+  addKey("3", Three_Key, 0x8877, 16);
+  addKey("4", Four_Key, 0xF00F, 16);
+  addKey("5", Five_Key, 0x30CF, 16);
+  addKey("6", Six_Key, 0xB04F, 16);
+  addKey("7", Seven_Key, 0xD02F, 16);
+  addKey("8", Eight_Key, 0x10EF, 16);
+  addKey("9", Nine_Key, 0x906F, 16);
+  addKey("0", Zero_Key, 0x926D, 16);
+  addKey("+10", DoubleDigit_Key, 0xB24D, 16);
+  addKey("stop", Stop_Key, 0x8A75, 16);
+  addKey("+v", VolumeUp_Key, 0xAA55, 16); // might be wrong
+  addKey("-v", VolumeDown_Key, 0xA857, 16); // also might be wrong
+  addKey("a-b", Unmapped_Key, 0xE817, 16);
+  addKey("1/all", Unmapped_Key, 0x28D7, 16);
+  addKey("rew", Rewind_Key, 0xD827, 16);
+  addKey("ff", FastForward_Key, 0x18E7, 16);
+  addKey("back", Previous_Key, 0x9867, 16);
+  addKey("forward", Next_Key, 0x9A65, 16);
+  addKey("slow", Unmapped_Key, 0xF807, 16);
+  addKey("pause", Pause_Key, 0xBA45, 16);
+  addKey("play", Play_Key, 0x3AC5, 16);
+  addKey("up", Up_Key, 0x22DD, 16);
+  addKey("down", Down_Key, 0xB847, 16);
+  addKey("right", Right_Key, 0x12ED, 16);
+  addKey("left", Left_Key, 0x38C7, 16);
+  addKey("menu", DiscMenu_Key, 0x609F, 16); // "Menu/Return"
+  addKey("zoom", Unmapped_Key, 0x7887, 16);
+  addKey("setup", Menu_Key, 0x40BF, 16);
+  addKey("title", DiscTitle_Key, 0x02FD, 16);
+  addKey("resume", Unmapped_Key, 0x50AF, 16);
+  addKey("sub-title", Captions_Key, 0x48B7, 16);
+  addKey("t/c_search", Unmapped_Key, 0x0AF5, 16);
+  addKey("angle", Unmapped_Key, 0x2AD5, 16);
+  addKey("language", Language_Key, 0x6897, 16);
+  addKey("power", Power_Key, 0x708F, 16);
+  addKey("pbc", Unmapped_Key, 0x32CD, 16);
+  addKey("display", Info_Key, 0x1AE5, 16);
+  addKey("open/close", Eject_Key, 0x58A7, 16);
+  addKey("program", Program_Key, 0x827D, 16);
+  addKey("vocal-assist", Unmapped_Key, 0x807F, 16);
+}

diff --git a/keysets/raite.h b/keysets/raite.h
new file mode 100644 (file)
index 0000000..e9f433f
--- /dev/null
+++ b/keysets/raite.h
@@ -0,0 +1,16 @@
+#ifndef RAITE_H
+#define RAITE_H
+
+#include "pirkeysetmetadata.h"
+
+#include <QObject>
+
+class RaiteDVD1: public PIRKeysetMetaData
+{
+public:
+  RaiteDVD1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+#endif // RAITE_H

diff --git a/keysets/sagem.cpp b/keysets/sagem.cpp
new file mode 100644 (file)
index 0000000..1ffe6e1
--- /dev/null
+++ b/keysets/sagem.cpp
@@ -0,0 +1,89 @@
+#include "sagem.h"
+#include "necprotocol.h"
+
+SagemTVBox1::SagemTVBox1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "DVB-T/Cable Box Keyset 1",
+      Sagem_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    108000, true);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+//  np->setMinimumRepetitions(1);
+
+  np->setPreData(0xE17A, 16);
+
+  addKey("Power", Power_Key, 0x48B7, 16);
+  addKey("P+", ChannelUp_Key, 0x08F7, 16);
+  addKey("P-", ChannelDown_Key, 0x58A7, 16);
+  addKey("Vol+", VolumeUp_Key, 0xB04F, 16);
+  addKey("Vol-", VolumeDown_Key, 0x708F, 16);
+  addKey("Red_A", Red_Key, 0x6897, 16);
+  addKey("Green_B", Green_Key, 0xE817, 16);
+  addKey("Yellow_C", Yellow_Key, 0x18E7, 16);
+  addKey("Blue_D", Blue_Key, 0x9867, 16);
+  addKey("Up", Up_Key, 0xD02F, 16);
+  addKey("Right", Right_Key, 0x38C7, 16);
+  addKey("Down", Down_Key, 0x30CF, 16);
+  addKey("Left", Left_Key, 0xD827, 16);
+  addKey("OK", Select_Key, 0xA857, 16);
+  addKey("INFO", Info_Key, 0x7887, 16); // "Menu"
+  addKey("MENU", Menu_Key, 0x8877, 16);
+  addKey("Head", Unmapped_Key, 0xC837, 16); // "FREEZE", "satdtt"
+  addKey("Q", Unmapped_Key, 0x8877, 16);
+  addKey("LeftArr", Unmapped_Key, 0x14AB, 16);
+  addKey("RightArr", Unmapped_Key, 0x649B, 16); // "LIST", "hd"
+  addKey("EPG", Guide_Key, 0xA45B, 16); // "Navigator"
+  addKey("INPUT", Input_Key, 0x24DB, 16); // "i"
+  addKey("Tone", SoundMode_Key, 0x847B, 16); // "SOUND"
+  addKey("Text", Unmapped_Key, 0xB847, 16); // "TELETEXT"
+  addKey("SUBTITLE", Captions_Key, 0xF807, 16); // "swap"
+  addKey("Interface", Language_Key, 0x04FB, 16); // "AUDIO"
+  addKey("Mute", Mute_Key, 0xF00F, 16);
+  addKey("1", One_Key, 0x807F, 16);
+  addKey("2", Two_Key, 0x40BF, 16);
+  addKey("3", Three_Key, 0xC03F, 16);
+  addKey("4", Four_Key, 0x20DF, 16);
+  addKey("5", Five_Key, 0xA05F, 16);
+  addKey("6", Six_Key, 0x609F, 16);
+  addKey("7", Seven_Key, 0xE01F, 16);
+  addKey("8", Eight_Key, 0x10EF, 16);
+  addKey("9", Nine_Key, 0x906F, 16);
+  addKey("0", Zero_Key, 0x00FF, 16);
+  addKey("EXIT", Exit_Key, 0x50AF, 16); // "Key"
+  addKey("BACK", PrevChannel_Key, 0x28D7, 16); // "R"
+}
+
+
+SagemTVBox1a::SagemTVBox1a(
+  QObject *guiObject,
+  unsigned int index)
+  : SagemTVBox1(guiObject, index)
+{
+  setKeysetName("DVB-T/Cable Box Keyset 1a");
+
+  addKey("epg", Guide_Key, 0x8877, 16);
+  addKey("menu", Menu_Key, 0x9867, 16);
+  addKey("v-", VolumeDown_Key, 0x6897, 16);
+  addKey("v+", VolumeUp_Key, 0xB847, 16);
+  addKey("mute", Mute_Key, 0xE817, 16);
+  addKey("p+", ChannelUp_Key, 0xA45B, 16);
+  addKey("p-", ChannelDown_Key, 0x18E7, 16);
+  addKey("note", Unmapped_Key, 0x847B, 16);
+  addKey("teletext6", Unmapped_Key, 0x04FB, 16);
+  addKey("tria2", Unmapped_Key, 0xF00F, 16);
+  addKey("ext", Unmapped_Key, 0x24DB, 16);
+}

diff --git a/keysets/sagem.h b/keysets/sagem.h
new file mode 100644 (file)
index 0000000..a7d3af0
--- /dev/null
+++ b/keysets/sagem.h
@@ -0,0 +1,23 @@
+#ifndef SAGEM_H
+#define SAGEM_H
+
+#include "pirkeysetmetadata.h"
+#include <QObject>
+
+class SagemTVBox1: public PIRKeysetMetaData
+{
+public:
+  SagemTVBox1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class SagemTVBox1a: public SagemTVBox1
+{
+public:
+  SagemTVBox1a(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+#endif // SAGEM_H

diff --git a/keysets/samsung.cpp b/keysets/samsung.cpp
index 30789a6..5400d72 100644 (file)
--- a/keysets/samsung.cpp
+++ b/keysets/samsung.cpp
@@ -680,7 +680,7 @@ SamsungAC1::SamsungAC1(
 
   np->setPreData(0x804, 12);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("TIMER", Unmapped_Key, 0xA4, 8);
   addKey("SLEEP", Sleep_Key, 0xE4, 8);

diff --git a/keysets/sony.cpp b/keysets/sony.cpp
index bb87e21..55bb700 100644 (file)
--- a/keysets/sony.cpp
+++ b/keysets/sony.cpp
@@ -23,7 +23,7 @@ SonyTV1::SonyTV1(
 
   np->setHeaderPair(2400, 600);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   //np->setCarrierFrequency(40000);
   //np->setDutyCycle(33);
@@ -310,7 +310,7 @@ SonyAmp1::SonyAmp1(
 
   np->setPostData(0xC, 6);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   addKey("VIDEO1", Unmapped_Key, 0x22, 7);
   addKey("VIDEO2", Unmapped_Key, 0x3C, 7);
@@ -366,7 +366,7 @@ SonyAmp2::SonyAmp2(
 
   np->setHeaderPair(2400, 600);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   addKey("power_on", Unmapped_Key, 0x741, 12);
   addKey("power", Power_Key, 0xA81, 12);
@@ -606,7 +606,7 @@ SonyCD3::SonyCD3(
 
   np->setPostData(0x08, 5);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   addKey("|<<", Previous_Key, 0x03, 6);
   addKey(">>|", Next_Key, 0x23, 6);
@@ -659,7 +659,7 @@ SonyDAT1::SonyDAT1(
 
   np->setPostData(0x07, 5);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   np->setCarrierFrequency(40000);
 
@@ -710,7 +710,7 @@ SonyDVD1::SonyDVD1(
 
   np->setHeaderPair(2400, 600);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
 //  np->setCarrierFrequency(40000);
 
@@ -860,7 +860,7 @@ SonyVCR1::SonyVCR1(
   np->setHeaderPair(2499, 517);
   np->setTrailerPulse(703);
 
-  np->setMinimumRepetitions(2);
+//  np->setMinimumRepetitions(2);
 
   addKey("pwon", Power_Key, 0x54D, 11);
   addKey("1", One_Key, 0x00D, 11);
@@ -937,7 +937,7 @@ SonyReceiver1::SonyReceiver1(
 
   np->setHeaderPair(2486, 498);
 
-  np->setMinimumRepetitions(1);
+//  np->setMinimumRepetitions(1);
 
   addKey("SLEEP", Sleep_Key, 0x030C, 15);
   addKey("POWER", Power_Key, 0x540C, 15);

diff --git a/keysets/westinghouse.cpp b/keysets/westinghouse.cpp
index 5957138..a90080e 100644 (file)
--- a/keysets/westinghouse.cpp
+++ b/keysets/westinghouse.cpp
@@ -75,7 +75,7 @@ WestinghouseTV2::WestinghouseTV2(
 
   np->setHeaderPair(2400, 500);
 
-  np->setMinimumRepetitions(3);
+//  np->setMinimumRepetitions(3);
 
   addKey("Power", Power_Key, 0xA90, 12);
   addKey("PIP", PIP_Key, 0xDB0, 12);

diff --git a/keysets/yamaha.cpp b/keysets/yamaha.cpp
new file mode 100644 (file)
index 0000000..2837354
--- /dev/null
+++ b/keysets/yamaha.cpp
@@ -0,0 +1,699 @@
+#include "yamaha.h"
+#include "necprotocol.h"
+
+
+YamahaDVD1::YamahaDVD1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "DVD Keyset 1",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    107782, true);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+
+//  np->setMinimumRepetitions(3);
+
+  np->setPreData(0x3EC1, 16);
+
+  addKey("title", DiscTitle_Key, 0x8D72, 16);
+  addKey("menu", DiscMenu_Key, 0x4DB2, 16);
+  addKey("up", Up_Key, 0x2DD2, 16);
+  addKey("down", Down_Key, 0xCD32, 16);
+  addKey("left", Left_Key, 0xAD52, 16);
+  addKey("right", Right_Key, 0x6D92, 16);
+  addKey("enter", Select_Key, 0x1DE2, 16);
+  addKey("return", Exit_Key, 0xED12, 16);
+  addKey("display", Info_Key, 0x659A, 16);
+  addKey("record", Record_Key, 0xD12E, 16);
+  addKey("stop", Stop_Key, 0xA15E, 16);
+  addKey("pause", Pause_Key, 0xC13E, 16);
+  addKey("play", Play_Key, 0x41BE, 16);
+  addKey("rewind", Rewind_Key, 0x619E, 16);
+  addKey("fast_forward", FastForward_Key, 0xE11E, 16);
+  addKey("previous", Previous_Key, 0x9D62, 16);
+  addKey("next", Next_Key, 0x5DA2, 16);
+  addKey("1", One_Key, 0x29D6, 16);
+  addKey("2", Two_Key, 0xA956, 16);
+  addKey("3", Three_Key, 0x6996, 16);
+  addKey("4", Four_Key, 0xE916, 16);
+  addKey("5", Five_Key, 0x19E6, 16);
+  addKey("6", Six_Key, 0x9966, 16);
+  addKey("7", Seven_Key, 0x59A6, 16);
+  addKey("8", Eight_Key, 0xD926, 16);
+  addKey("9", Nine_Key, 0x39C6, 16);
+  addKey("0", Zero_Key, 0xC936, 16);
+  addKey("+10", DoubleDigit_Key, 0xB946, 16);
+  addKey("ent", Enter_Key, 0x7986, 16);
+  addKey("power_av", Power_Key, 0x01FE, 16); // might be wrong
+}
+
+
+YamahaDVD1a::YamahaDVD1a(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaDVD1(guiObject, index)
+{
+  setKeysetName("DVD/LD Keyset 1a");
+
+  addKey("LD_PLAY", Play_Key, 0xA05F, 16);
+  addKey("LD_PAUSE/STOP", Pause_Key, 0x20DF, 16);
+  addKey("LD_STOP", Stop_Key, 0xDA25, 16);
+  addKey("LD_SCH_FWD", FastForward_Key, 0xE01F, 16);
+  addKey("LD_SCH_REV", Rewind_Key, 0x609F, 16);
+  addKey("LD_CH_+", ChannelUp_Key, 0xC03F, 16);
+  addKey("LD_CH_-", ChannelDown_Key, 0x40BF, 16);
+  addKey("LD_STILL_FWD", StepForward_Key, 0xD02F, 16);
+  addKey("LD_STILL_REV", StepBack_Key, 0x50AF, 16);
+  addKey("DISPLAY", Info_Key, 0xC837, 16);
+  addKey("SOUND", Unmapped_Key, 0x48B7, 16);
+}
+
+
+YamahaAudio1::YamahaAudio1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Device Keyset 1",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    107823, true);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x9E61, 16);
+
+  addKey("SYNCHRO", Unmapped_Key, 0x1AE5, 16); // "DIRECT_OUT"
+  addKey("DIMMER", Unmapped_Key, 0x7887, 16); // "MODE"
+  addKey("TIME", Info_Key, 0x50AF, 16); // "TIME_DISPLAY"
+  addKey("OPEN", Eject_Key, 0x807F, 16);
+  addKey("SPACE", Unmapped_Key, 0xF00F, 16);
+  addKey("PEAK", Unmapped_Key, 0xBA45, 16);
+  addKey("TAPE", Unmapped_Key, 0xEA15, 16);
+  addKey("CLEAR", Clear_Key, 0xB04F, 16); // "CANCEL"
+  addKey("PROG", Program_Key, 0x30CF, 16);
+  addKey("1", One_Key, 0x8877, 16);
+  addKey("2", Two_Key, 0x48B7, 16);
+  addKey("3", Three_Key, 0xC837, 16);
+  addKey("4", Four_Key, 0x28D7, 16);
+  addKey("5", Five_Key, 0xA857, 16);
+  addKey("6", Six_Key, 0x6897, 16);
+  addKey("7", Seven_Key, 0xE817, 16);
+  addKey("8", Eight_Key, 0x18E7, 16);
+  addKey("9", Nine_Key, 0x9867, 16);
+  addKey("0", Zero_Key, 0x08F7, 16);
+  addKey("10", Unmapped_Key, 0x02FD, 16);
+  addKey("11", Unmapped_Key, 0x827D, 16);
+  addKey("12", Unmapped_Key, 0x42BD, 16);
+  addKey("13", Unmapped_Key, 0xC23D, 16);
+  addKey("14", Unmapped_Key, 0x22DD, 16);
+  addKey("15", Unmapped_Key, 0xA25D, 16);
+  addKey("16", Unmapped_Key, 0x629D, 16);
+  addKey("17", Unmapped_Key, 0xE21D, 16);
+  addKey("18", Unmapped_Key, 0x12ED, 16);
+  addKey("19", Unmapped_Key, 0x926D, 16);
+  addKey("20", Unmapped_Key, 0x52AD, 16);
+  addKey("21", Unmapped_Key, 0xD22D, 16);
+  addKey("22", Unmapped_Key, 0x32CD, 16);
+  addKey("23", Unmapped_Key, 0xB24D, 16);
+  addKey("24", Unmapped_Key, 0x728D, 16);
+  addKey("PLUS10", DoubleDigit_Key, 0x58A7, 16);
+  addKey("INDEX", Unmapped_Key, 0xD02F, 16);
+  addKey("REPEAT", Unmapped_Key, 0x10EF, 16); // "REPEAT_S/F/OFF", "S/F"
+  addKey("RANDOM", Unmapped_Key, 0xD827, 16); // "AUTO"
+  addKey("SEARCH_BACK", Rewind_Key, 0xA05F, 16);
+  addKey("SEARCH_FWD", FastForward_Key, 0x609F, 16);
+  addKey("OUTPUT_MINUS", VolumeDown_Key, 0x38C7, 16);
+  addKey("OUTPUT_PLUS", VolumeUp_Key, 0xB847, 16);
+  addKey("SKIP_BACK", Previous_Key, 0x20DF, 16); // "-", "PREV"
+  addKey("SKIP_FWD", Next_Key, 0xE01F, 16); // "+", "NEXT"
+  addKey("STOP", Stop_Key, 0x6A95, 16);
+  addKey("PAUSE", Pause_Key, 0xAA55, 16);
+  addKey("PLAY", Play_Key, 0x40BF, 16);
+  addKey("DEL", Unmapped_Key, 0x708F, 16);
+  addKey("REPEAT_A-B", Unmapped_Key, 0x906F, 16);
+  addKey("DISC_SKIP_FORWARD", Unmapped_Key, 0xF20D, 16);
+  addKey("DISC_SKIP_REVERSE", Unmapped_Key, 0x0AF5, 16);
+  addKey("MODE", Unmapped_Key, 0x00FF, 16);
+  addKey("DISC_SCAN", Unmapped_Key, 0xCA35, 16);
+}
+
+
+YamahaAudio1a::YamahaAudio1a(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaAudio1(guiObject, index)
+{
+  setKeysetName("Audio Keyset 1a");
+
+  addKey("PAUSE/STOP", Stop_Key, 0xC03F, 16);
+  addKey("PAUSE/STOP", Pause_Key, 0xC03F, 16);
+}
+
+
+YamahaAudio2::YamahaAudio2(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 2",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    107500, true);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+//  np->setMinimumRepetitions(1);
+
+  np->setPreData(0x5EA1, 16);
+
+  addKey("Power", Power_Key, 0xF807, 16); // "STANDBY"
+  addKey("mute", Mute_Key, 0x38C7, 16); // "-20DB"
+  addKey("vol+", VolumeUp_Key, 0x58A7, 16);
+  addKey("vol-", VolumeDown_Key, 0xD827, 16);
+  addKey("cd", Unmapped_Key, 0xA857, 16);
+  addKey("tuner", Unmapped_Key, 0x6897, 16);
+  addKey("tapemonitor", Unmapped_Key, 0x18E7, 16); // "Tape/MD_Monitor", "DAT"
+  addKey("dvdld", Unmapped_Key, 0xE817, 16); // "d-tv/cbl", "AUX"
+  addKey("tvdbs", Unmapped_Key, 0x2AD5, 16); // "SAT/D-TV" "d-tv/cbl alt"
+  addKey("vcr", Unmapped_Key, 0xF00F, 16);
+  addKey("phono", Unmapped_Key, 0x28D7, 16);
+  addKey("vaux", Unmapped_Key, 0xAA55, 16); // "GO_CDV1"
+  addKey("extdecoder", Unmapped_Key, 0xE11E, 16); // "ExternalDecoder", "6chIN"
+  addKey("ch-", ChannelDown_Key, 0x8877, 16);
+  addKey("ch+", ChannelUp_Key, 0x08F7, 16);
+  addKey("abcde", Unmapped_Key, 0x48B7, 16); // "A/B/C/D/E" "tuner-toggle"
+  addKey("sleep", Sleep_Key, 0xEA15, 16);
+  addKey("display", Info_Key, 0x43BC, 16); // "onscreen"
+  addKey("on", Unmapped_Key, 0xB847, 16); // Map this to "Power_Key"?
+  addKey("off", Unmapped_Key, 0x7887, 16); // and this?
+  addKey("test", Unmapped_Key, 0xA15E, 16); // "DSP_TEST"
+  addKey("effect", Unmapped_Key, 0x6A95, 16);
+  addKey("up", Up_Key, 0x19E6, 16);
+  addKey("down", Down_Key, 0x9966, 16);
+  addKey("left", Left_Key, 0xCA35, 16); // "DSP-", "DELAY_TIME-"
+  addKey("right", Right_Key, 0x4AB5, 16);  // "DSP+", "DELAY_TIME+"
+  addKey("level", Unmapped_Key, 0x619E, 16); // "Time/Level"
+  addKey("setmenu", Unmapped_Key, 0x39C6, 16);
+  addKey("setmenu-", Unmapped_Key, 0xB946, 16);
+  addKey("effect-", Unmapped_Key, 0x9A65, 16); // "DSP_Prg-"
+  addKey("effect+", Unmapped_Key, 0x1AE5, 16); // "DSP_Prg+"
+  addKey("dolbydts", Surround_Key, 0x11EE, 16); // "PRO_LOGIC_SURROUND"
+  addKey("movietheater1", Unmapped_Key, 0x916E, 16); // "PRO_LOGIC_ENHANCED"
+  addKey("movietheater2", Unmapped_Key, 0x51AE, 16); // "CNCT_VIDEO"
+  addKey("monomovie", Unmapped_Key, 0xD12E, 16);
+  addKey("tvsports", Unmapped_Key, 0x31CE, 16); // "ROCK"
+  addKey("disco", Unmapped_Key, 0xB14E, 16); // "HALL"
+  addKey("rock", Unmapped_Key, 0x718E, 16);
+  addKey("jazzclub", Unmapped_Key, 0xF10E, 16);
+  addKey("church", Unmapped_Key, 0x09F6, 16);
+  addKey("hall", Unmapped_Key, 0x8976, 16);
+  addKey("DiscSkip", Unmapped_Key, 0xF20D, 16); // "CD_DISC"
+  addKey("TapeRec", Record_Key, 0x20DF, 16); // "TAPE_RECPAUSE"
+  addKey("TapeDeckA/B", Unmapped_Key, 0x609F, 16);
+  addKey("TapeRewind", Unmapped_Key, 0x807F, 16);
+  addKey("TapeForward", Unmapped_Key, 0x40BF, 16);
+  addKey("TapePlay", Unmapped_Key, 0x00FF, 16);
+  addKey("TapeStop", Unmapped_Key, 0xC03F, 16);
+  addKey("TapeDirA", Unmapped_Key, 0xE01F, 16);
+  addKey("TapeDirB", Unmapped_Key, 0x02FD, 16);
+  addKey("CDSkipBack", Replay_Key, 0xD02F, 16);
+  addKey("CDSkipForward", Advance_Key, 0x50AF, 16);
+  addKey("CDPlay", Play_Key, 0x10EF, 16);
+  addKey("CDPause/Stop", Pause_Key, 0x906F, 16);
+  addKey("CDPause/Stop", Stop_Key, 0x906F, 16);
+  addKey("CDRewind", Rewind_Key, 0xB04F, 16);
+  addKey("CDForward", FastForward_Key, 0x30CF, 16);
+  addKey("TAPE2", Unmapped_Key, 0x9867, 16);
+  addKey("CENTRE_MODE", Unmapped_Key, 0x21DE, 16);
+  addKey("FRONT_EFFECT_LEVEL_+", Unmapped_Key, 0x01FE, 16);
+  addKey("FRONT_EFFECT_LEVEL_-", Unmapped_Key, 0x817E, 16);
+  addKey("CENTRE_LEVEL_+", Unmapped_Key, 0x41BE, 16);
+  addKey("CENTRE_LEVEL_-", Unmapped_Key, 0xC13E, 16);
+  addKey("REAR_LEVEL_+", Unmapped_Key, 0x7A85, 16);
+  addKey("REAR_LEVEL_-", Unmapped_Key, 0xFA05, 16);
+  addKey("PHONO_PLAY/CUT", Unmapped_Key, 0x708F, 16);
+  addKey("TAPE_REC_MUTE", Unmapped_Key, 0xA05F, 16);
+  addKey("EQ_PRESET_SKIP", Unmapped_Key, 0xDA25, 16);
+  addKey("EQ_ON/FLAT", Unmapped_Key, 0x5AA5, 16);
+  addKey("GO_VCR2", Unmapped_Key, 0xC837, 16);
+}
+
+
+YamahaAudio2a::YamahaAudio2a(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaAudio2(guiObject, index)
+{
+  setKeysetName("Audio Keyset 2a");
+
+  addKey("Dolby/DTS", Unmapped_Key, 0x09F6, 16);
+  addKey("6.1/5.1", Unmapped_Key, 0xE916, 16);
+  addKey("Night", Unmapped_Key, 0xA956, 16);
+  addKey("Stereo", Unmapped_Key, 0x6A95, 16);
+}
+
+
+YamahaAudio2b::YamahaAudio2b(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaAudio2(guiObject, index)
+{
+  setKeysetName("Audio Keyset 2b");
+
+  addKey("SOURCE_DIRECT", Unmapped_Key, 0x6A95, 16);
+}
+
+
+YamahaAudio2c::YamahaAudio2c(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaAudio2(guiObject, index)
+{
+  setKeysetName("Audio Keyset 2c");
+
+  addKey("1", One_Key, 0x11EE, 16);
+  addKey("2", Two_Key, 0x916E, 16);
+  addKey("3", Three_Key, 0x51AE, 16);
+  addKey("4", Four_Key, 0xD12E, 16);
+  addKey("5", Five_Key, 0x31CE, 16);
+  addKey("6", Six_Key, 0xB14E, 16);
+  addKey("7", Seven_Key, 0x718E, 16);
+  addKey("8", Eight_Key, 0xF10E, 16);
+  addKey("9", Nine_Key, 0x09F6, 16);
+  addKey("0", Zero_Key, 0x8976, 16);
+  addKey("set+", Unmapped_Key, 0x7986, 16);
+  addKey("set-", Unmapped_Key, 0xF906, 16);
+  addKey("set^", Unmapped_Key, 0xB946, 16);
+  addKey("setv", Unmapped_Key, 0x39C6, 16);
+  addKey("parameter^", Unmapped_Key, 0xA35C, 16);
+  addKey("parameterv", Unmapped_Key, 0x23DC, 16);
+  addKey("parameter-", Unmapped_Key, 0xE31C, 16);
+  addKey("parameter+", Unmapped_Key, 0x639C, 16);
+}
+
+
+YamahaAudio2d::YamahaAudio2d(
+  QObject *guiObject,
+  unsigned int index)
+  : YamahaAudio2(guiObject, index)
+{
+  setKeysetName("Audio Keyset 2d");
+
+  addKey("LOUDNESS_-", Unmapped_Key, 0x7887, 16);
+  addKey("LOUDNESS_+", Unmapped_Key, 0xB847, 16);
+}
+
+
+YamahaAudio3::YamahaAudio3(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 3",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    38500, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0xFE01, 16);
+
+  addKey("PLAY", Play_Key, 0x00FF, 16);
+  addKey("STOP", Stop_Key, 0xC03F, 16);
+  addKey("RECORD/PAUSE", Record_Key, 0x20DF, 16);
+  addKey("FAST_FORWARD", FastForward_Key, 0x40BF, 16);
+  addKey("REWIND", Rewind_Key, 0x807F, 16);
+  addKey("RECORD_MUTE", Unmapped_Key, 0xA05F, 16);
+  addKey("INTRO_SCAN_FORWARD", Unmapped_Key, 0x7887, 16);
+  addKey("INTRO_SCAN_REVERSE", Unmapped_Key, 0xF807, 16);
+  addKey("SEARCH_FORWARD", Advance_Key, 0x50AF, 16);
+  addKey("SEARCH_REVERSE", Replay_Key, 0xD02F, 16);
+  addKey("DIRECTION_<>", Unmapped_Key, 0xE01F, 16); // "DIR_A"
+  addKey("DIR_B", Unmapped_Key, 0x10EF, 16);
+  addKey("DECK_A/B", Unmapped_Key, 0x609F, 16);
+  addKey("MONITOR", Unmapped_Key, 0xF00F, 16);
+  addKey("DUBBING", Unmapped_Key, 0x906F, 16);
+  addKey("COUNTER_RESET", Reset_Key, 0xB04F, 16);
+  addKey("COUNTER_REMAIN", Unmapped_Key, 0xB847, 16);
+  addKey("COUNTER_MEMORY", Unmapped_Key, 0x708F, 16);
+  addKey("COUNTER_TAPE", Unmapped_Key, 0x30CF, 16);
+  addKey("1", One_Key, 0x8877, 16);
+  addKey("2", Two_Key, 0x48B7, 16);
+  addKey("3", Three_Key, 0xC837, 16);
+  addKey("4", Four_Key, 0x28D7, 16);
+  addKey("5", Five_Key, 0xA857, 16);
+  addKey("6", Six_Key, 0x6897, 16);
+  addKey("7", Seven_Key, 0xE817, 16);
+  addKey("8", Eight_Key, 0x18E7, 16);
+  addKey("9", Nine_Key, 0x9867, 16);
+  addKey("0", Zero_Key, 0x08F7, 16);
+  addKey("CLEAR", Clear_Key, 0xD827, 16);
+  addKey("PROG", Program_Key, 0x58A7, 16);
+  addKey("RUN", Unmapped_Key, 0x38C7, 16);
+}
+
+
+YamahaAudio4::YamahaAudio4(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 4",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    50000, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x857A, 16);
+
+  addKey("CD_PLAY", Play_Key, 0xF708, 16);
+  addKey("CD_PAUSE/STOP", Pause_Key, 0xF609, 16);
+  addKey("CD_PAUSE/STOP", Stop_Key, 0xF609, 16);
+  addKey("CD_SEARCH_>", FastForward_Key, 0xF30C, 16); // Might be wrong
+  addKey("CD_SEARCH_<", Rewind_Key, 0xF20D, 16); // And this
+  addKey("CD_TRACK_+", Next_Key, 0xF50A, 16);
+  addKey("CD_TRACK_-", Previous_Key, 0xF40B, 16);
+  addKey("CD_DISK", Unmapped_Key, 0xB04F, 16);
+  addKey("TAPE_PLAY", Unmapped_Key, 0xFF00, 16);
+  addKey("TAPE_STOP", Unmapped_Key, 0xFC03, 16);
+  addKey("TAPE_SEARCH_>", Unmapped_Key, 0xFD02, 16);
+  addKey("TAPE_SEARCH_<", Unmapped_Key, 0xFE01, 16);
+  addKey("TAPE_DIR_A", Unmapped_Key, 0xF807, 16);
+  addKey("TAPE_DIR_B", Unmapped_Key, 0xBF40, 16);
+  addKey("TAPE_REC/PAUSE", Unmapped_Key, 0xFB04, 16);
+  addKey("TAPE_REC/MUTE", Unmapped_Key, 0xFA05, 16);
+  addKey("TAPE_A/B", Unmapped_Key, 0xF906, 16);
+  addKey("AMP_AUX", Unmapped_Key, 0xE817, 16);
+  addKey("AMP_TAPE1", Unmapped_Key, 0xE718, 16);
+  addKey("AMP_TAPE2", Unmapped_Key, 0xE619, 16);
+  addKey("AMP_TUNER", Unmapped_Key, 0xE916, 16);
+  addKey("AMP_CD", Unmapped_Key, 0xEA15, 16);
+  addKey("AMP_PHONO", Unmapped_Key, 0xEB14, 16);
+  addKey("AMP_SLEEP", Sleep_Key, 0xA857, 16);
+  addKey("AMP_POWER", Power_Key, 0xE01F, 16);
+  addKey("VOL_UP", VolumeUp_Key, 0xE51A, 16);
+  addKey("VOL_DOWN", VolumeDown_Key, 0xE41B, 16);
+  addKey("TUNER_PRESET_+", ChannelUp_Key, 0xEF10, 16);
+  addKey("TUNER_PRESET_-", ChannelDown_Key, 0xEE11, 16);
+  addKey("TUNER_ABCDE", Unmapped_Key, 0xED12, 16);
+  addKey("EQ_PRESET_SKIP", Unmapped_Key, 0xA45B, 16);
+  addKey("EQ_ON/FLAT", Unmapped_Key, 0xA55A, 16);
+  addKey("PHONO_PLAY/CUT", Unmapped_Key, 0xF10E, 16);
+}
+
+
+YamahaAudio5::YamahaAudio5(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 5",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    40000, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+
+  np->setPreData(0xA25D, 16);
+
+  addKey("Power", Power_Key, 0x48B7, 16);
+  addKey("Rewind", Rewind_Key, 0x9867, 16);
+  addKey("Forward", FastForward_Key, 0xC837, 16);
+  addKey("SkipBack", Replay_Key, 0xC43B, 16);
+  addKey("SkipForward", Advance_Key, 0x24DB, 16);
+  addKey("Pause", Pause_Key, 0x00FF, 16);
+  addKey("Stop", Stop_Key, 0x28D7, 16);
+  addKey("Play", Play_Key, 0xA857, 16);
+  addKey("Title", DiscTitle_Key, 0x7B84, 16);
+  addKey("Menu", DiscMenu_Key, 0x21DE, 16);
+  addKey("Up", Up_Key, 0x01FE, 16);
+  addKey("Down", Down_Key, 0x817E, 16);
+  addKey("Left", Left_Key, 0x8A75, 16);
+  addKey("Right", Right_Key, 0xB24D, 16);
+  addKey("Select", Select_Key, 0x847B, 16);
+  addKey("Clear", Clear_Key, 0xF708, 16);
+  addKey("Return", Exit_Key, 0x44BB, 16);
+  addKey("Display", Info_Key, 0x6897, 16);
+  addKey("Index", Unmapped_Key, 0x649B, 16);
+  addKey("+10", DoubleDigit_Key, 0xA45B, 16);
+  addKey("0", Zero_Key, 0x50AF, 16);
+  addKey("1", One_Key, 0x807F, 16);
+  addKey("2", Two_Key, 0x40BF, 16);
+  addKey("3", Three_Key, 0xC03F, 16);
+  addKey("4", Four_Key, 0x20DF, 16);
+  addKey("5", Five_Key, 0xA05F, 16);
+  addKey("6", Six_Key, 0x609F, 16);
+  addKey("7", Seven_Key, 0xE01F, 16);
+  addKey("8", Eight_Key, 0x10EF, 16);
+  addKey("9", Nine_Key, 0x906F, 16);
+}
+
+
+YamahaAudio6::YamahaAudio6(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 6",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    40000, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x8B74, 16);
+
+  addKey("A/B/C/D/E", Unmapped_Key, 0xB04F, 16);
+  addKey("1", One_Key, 0x708F, 16);
+  addKey("2", Two_Key, 0xF00F, 16);
+  addKey("3", Three_Key, 0x08F7, 16);
+  addKey("4", Four_Key, 0x8877, 16);
+  addKey("5", Five_Key, 0x48B7, 16);
+  addKey("6", Six_Key, 0xC837, 16);
+  addKey("7", Seven_Key, 0x28D7, 16);
+  addKey("8", Eight_Key, 0xA857, 16);
+}
+
+
+YamahaAudio7::YamahaAudio7(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Audio Keyset 7",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    40000, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x1EE1, 16);
+
+  addKey("1", One_Key, 0x8877, 16);
+  addKey("2", Two_Key, 0x48B7, 16);
+  addKey("3", Three_Key, 0xC837, 16);
+  addKey("4", Four_Key, 0x28D7, 16);
+  addKey("5", Five_Key, 0xA857, 16);
+  addKey("6", Six_Key, 0x6897, 16);
+  addKey("7", Seven_Key, 0xE817, 16);
+  addKey("8", Eight_Key, 0x18E7, 16);
+  addKey("9", Nine_Key, 0x9867, 16);
+  addKey("0", Zero_Key, 0x08F7, 16);
+  addKey("time", Unmapped_Key, 0x50AF, 16);
+  addKey("prog", Program_Key, 0xD02F, 16);
+  addKey("tape", Unmapped_Key, 0x10EF, 16);
+  addKey("edit", Unmapped_Key, 0x906F, 16);
+  addKey("+10", DoubleDigit_Key, 0x58A7, 16);
+  addKey("mode", Unmapped_Key, 0xBA45, 16);
+  addKey("repeat", Unmapped_Key, 0x30CF, 16);
+  addKey("random", Unmapped_Key, 0xE01F, 16);
+  addKey("open", Eject_Key, 0x00FF, 16);
+  addKey("tuner", Unmapped_Key, 0xD22D, 16);
+  addKey("disc_skip", Unmapped_Key, 0xB04F, 16);
+  addKey("cd_last", Previous_Key, 0x20DF, 16);
+  addKey("cd_next", Next_Key, 0xC03F, 16);
+  addKey("cd_stop", Stop_Key, 0x807F, 16);
+  addKey("cd_play", Play_Key, 0x40BF, 16);
+  addKey("location", Unmapped_Key, 0xDA25, 16);
+  addKey("up_arrow", Up_Key, 0xAA55, 16);
+  addKey("tape_play_back", Unmapped_Key, 0xC23D, 16);
+  addKey("tape_stop", Unmapped_Key, 0x827D, 16);
+  addKey("tape_play_forward", Unmapped_Key, 0x42BD, 16);
+  addKey("left_arrow", Left_Key, 0xEA15, 16);
+  addKey("music", Unmapped_Key, 0x5AA5, 16);
+  addKey("right_arrow", Right_Key, 0x1AE5, 16);
+  addKey("tape_back", Unmapped_Key, 0xA25D, 16);
+  addKey("tape_forward", Unmapped_Key, 0x22DD, 16);
+  addKey("user", Unmapped_Key, 0x3AC5, 16);
+  addKey("down_arrow", Down_Key, 0x6A95, 16);
+  addKey("flat", Unmapped_Key, 0x9A65, 16);
+  addKey("rec", Record_Key, 0x629D, 16);
+  addKey("tape1/2", Unmapped_Key, 0xE21D, 16);
+  addKey("sleep", Sleep_Key, 0xF20D, 16);
+  addKey("-", Unmapped_Key, 0xF807, 16);
+  addKey("power", Power_Key, 0xF00F, 16);
+  addKey("+", Unmapped_Key, 0x7887, 16);
+  addKey("input", Input_Key, 0x7A85, 16);
+}
+
+
+YamahaTV1::YamahaTV1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "TV Keyset 1",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    41609, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0x20DF, 16);
+
+  addKey("1", One_Key, 0x8877, 16);
+  addKey("2", Two_Key, 0x48B7, 16);
+  addKey("3", Three_Key, 0xC837, 16);
+  addKey("4", Four_Key, 0x28D7, 16);
+  addKey("5", Five_Key, 0xA857, 16);
+  addKey("6", Six_Key, 0x6897, 16);
+  addKey("7", Seven_Key, 0xE817, 16);
+  addKey("8", Eight_Key, 0x18E7, 16);
+  addKey("9", Nine_Key, 0x9867, 16);
+  addKey("0", Zero_Key, 0x08F7, 16);
+  addKey("ch+", ChannelUp_Key, 0x00FF, 16);
+  addKey("ch-", ChannelDown_Key, 0x807F, 16);
+  addKey("vol+", VolumeUp_Key, 0x40BF, 16);
+  addKey("vol-", VolumeDown_Key, 0xC03F, 16);
+  addKey("mute", Mute_Key, 0x906F, 16);
+  addKey("goback", PrevChannel_Key, 0x58A7, 16);
+}
+
+
+YamahaKaraoke1::YamahaKaraoke1(
+  QObject *guiObject,
+  unsigned int index)
+  : PIRKeysetMetaData(
+      "Karaoke Keyset 1",
+      Yamaha_Make,
+      index)
+{
+  NECProtocol *np = new NECProtocol(
+    guiObject,
+    index,
+    600, 500,
+    600, 1600,
+    40000, false);
+
+  threadableProtocol = np;
+
+  np->setHeaderPair(9000, 4500);
+  np->setTrailerPulse(600);
+  np->setRepeatPair(9000, 2250);
+
+  np->setPreData(0xDE21, 16);
+
+  addKey("POWER", Power_Key, 0x01FE, 16);
+  addKey("VOL+", VolumeUp_Key, 0x41BE, 16);
+  addKey("VOL-", VolumeDown_Key, 0xC13E, 16);
+  addKey("VCR", Unmapped_Key, 0x718E, 16);
+  addKey("TAPE", Unmapped_Key, 0xF10E, 16);
+  addKey("CD/CDG", Unmapped_Key, 0xB14E, 16);
+  addKey("LD", Unmapped_Key, 0x31CE, 16);
+  addKey("AUX1", Unmapped_Key, 0x8976, 16);
+  addKey("AUX2", Unmapped_Key, 0x09F6, 16);
+  addKey("VOCAL_AID", Unmapped_Key, 0x9B64, 16);
+  addKey("ONE_TOUCH_KAR.", Unmapped_Key, 0x5BA4, 16);
+  addKey("MPX/STEREO", Unmapped_Key, 0x1BE4, 16);
+  addKey("BALLAD", Unmapped_Key, 0x9966, 16);
+  addKey("POPS", Unmapped_Key, 0x59A6, 16);
+  addKey("JAZZ", Unmapped_Key, 0xD926, 16);
+  addKey("ROCK", Unmapped_Key, 0x39C6, 16);
+  addKey("B_SYMBOL", Unmapped_Key, 0x6996, 16);
+  addKey("SQUARE_SYMBOL", Unmapped_Key, 0xE916, 16);
+  addKey("HASH", Unmapped_Key, 0x19E6, 16);
+}

diff --git a/keysets/yamaha.h b/keysets/yamaha.h
new file mode 100644 (file)
index 0000000..3ce4c5a
--- /dev/null
+++ b/keysets/yamaha.h
@@ -0,0 +1,136 @@
+#ifndef YAMAHA_H
+#define YAMAHA_H
+
+#include "pirkeysetmetadata.h"
+
+#include <QObject>
+
+class YamahaDVD1: public PIRKeysetMetaData
+{
+public:
+  YamahaDVD1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaDVD1a: public YamahaDVD1
+{
+public:
+  YamahaDVD1a(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio1: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio1a: public YamahaAudio1
+{
+public:
+  YamahaAudio1a(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio2: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio2(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio2a: public YamahaAudio2
+{
+public:
+  YamahaAudio2a(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio2b: public YamahaAudio2
+{
+public:
+  YamahaAudio2b(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio2c: public YamahaAudio2
+{
+public:
+  YamahaAudio2c(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio2d: public YamahaAudio2
+{
+public:
+  YamahaAudio2d(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio3: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio3(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio4: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio4(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio5: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio5(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio6: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio6(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaAudio7: public PIRKeysetMetaData
+{
+public:
+  YamahaAudio7(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaTV1: public PIRKeysetMetaData
+{
+public:
+  YamahaTV1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+class YamahaKaraoke1: public PIRKeysetMetaData
+{
+public:
+  YamahaKaraoke1(
+    QObject *guiObject,
+    unsigned int index);
+};
+
+#endif // YAMAHA_H

diff --git a/main.cpp b/main.cpp
index 49156ef..b87355a 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -9,5 +9,13 @@ int main(int argc, char *argv[])
   mainWindow.setOrientation(MainWindow::ScreenOrientationLockLandscape);
   mainWindow.showExpanded();
 
+  // A connection to perform any final cleanup work:
+  app.connect(
+    &app,
+    SIGNAL(aboutToQuit()),
+    &mainWindow,
+    SLOT(finalCleanup()),
+    Qt::DirectConnection);
+
   return app.exec();
 }

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ec56cf0..6632b47 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1004,6 +1004,15 @@ void MainWindow::keysetSelectionChanged(
 }
 
 
+void MainWindow::finalCleanup()
+{
+  // Perform any necessary cleanup work here.
+
+  // Make certain that the thread stops repeating:
+  stopRepeating();
+}
+
+
 void MainWindow::on_addKeysetButton_clicked()
 {
   // Is the current keylist already a favorite?

diff --git a/mainwindow.h b/mainwindow.h
index fbea821..9a12419 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -293,6 +293,8 @@ private slots:
   void keysetSelectionChanged(
     QListWidgetItem *item);
 
+  void finalCleanup();
+
 private:
   void enableButtons();
 

diff --git a/pierogi.pro b/pierogi.pro
index d550b3a..618640e 100644 (file)
--- a/pierogi.pro
+++ b/pierogi.pro
@@ -7,7 +7,7 @@ sudoers_stuff.source = pierogi.sudoers
 sudoers_stuff.target = ../../etc/sudoers.d
 loadModule.source = loadRX51Module unloadRX51Module
 loadModule.target = bin
-DEPLOYMENTFOLDERS = loadModule
+DEPLOYMENTFOLDERS = sudoers_stuff loadModule
 
 #symbian:TARGET.UID3 = 0xE0C0A793
 
@@ -58,7 +58,10 @@ SOURCES += main.cpp mainwindow.cpp \
     keysets/jvc.cpp \
     pirselectkeysetform.cpp \
     pirrx51hardware.cpp \
-    pirdevicetypenames.cpp
+    pirdevicetypenames.cpp \
+    keysets/raite.cpp \
+    keysets/sagem.cpp \
+    keysets/yamaha.cpp
 HEADERS += mainwindow.h \
     pirkeynames.h \
     necprotocol.h \
@@ -91,7 +94,10 @@ HEADERS += mainwindow.h \
     keysets/jvc.h \
     pirselectkeysetform.h \
     pirrx51hardware.h \
-    pirdevicetypenames.h
+    pirdevicetypenames.h \
+    keysets/raite.h \
+    keysets/sagem.h \
+    keysets/yamaha.h
 FORMS += mainwindow.ui \
     pirdocumentationform.ui \
     piraboutform.ui \
@@ -157,7 +163,8 @@ OTHER_FILES += \
     www/MiscTab.png \
     www/PierogiIcon.png \
     www/SelectKeysetWindow.png \
-    www/UtilityTab.png
+    www/UtilityTab.png \
+    qtc_packaging/debian_fremantle/postrm
 
 RESOURCES += \
     PierogiResources.qrc

diff --git a/pierogi.pro.user b/pierogi.pro.user
index 0d7facf..6c8c1bd 100644 (file)
--- a/pierogi.pro.user
+++ b/pierogi.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.0, 2012-01-15T09:43:31. -->
+<!-- Written by Qt Creator 2.4.0, 2012-01-18T19:43:06. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -75,7 +75,16 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+      <value type="QString" key="ProjectExplorer.ProcessStep.Arguments">dpkg-buildpackage -sa -S -uc -us</value>
+      <value type="QString" key="ProjectExplorer.ProcessStep.Command">/Users/john/QtSDK/Maemo/4.6.2/bin/mad</value>
+      <value type="bool" key="ProjectExplorer.ProcessStep.Enabled">false</value>
+      <value type="QString" key="ProjectExplorer.ProcessStep.WorkingDirectory">/Users/john/Develop/n900/pierogi-0.1.4</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Process Step</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.ProcessStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
@@ -173,6 +182,10 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoMountAndInstallDeployStep</value>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
+       <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_4_armel.deb</value>
+       <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_3_armel.deb</value>
+       <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_2_armel.deb</value>
+       <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_1_armel.deb</value>
        <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_0_1_armel.deb</value>
        <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_0_armel.deb</value>
        <value type="QString">/Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_0_1_armel.deb</value>
@@ -180,16 +193,28 @@
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
        <value type="QString">192.168.0.15</value>
        <value type="QString">192.168.0.15</value>
+       <value type="QString">192.168.0.15</value>
+       <value type="QString">192.168.0.15</value>
+       <value type="QString">192.168.0.15</value>
+       <value type="QString">192.168.0.15</value>
        <value type="QString">localhost</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
        <value type="QString"></value>
        <value type="QString"></value>
        <value type="QString"></value>
+       <value type="QString"></value>
+       <value type="QString"></value>
+       <value type="QString"></value>
+       <value type="QString"></value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
+       <value type="QDateTime">2012-01-18T19:12:52</value>
+       <value type="QDateTime">2012-01-17T13:21:05</value>
+       <value type="QDateTime">2012-01-17T12:19:28</value>
+       <value type="QDateTime">2012-01-17T00:15:23</value>
        <value type="QDateTime">2012-01-14T13:11:32</value>
-       <value type="QDateTime">2012-01-15T09:06:16</value>
+       <value type="QDateTime">2012-01-17T00:03:13</value>
        <value type="QDateTime">2012-01-01T15:35:35</value>
       </valuelist>
      </valuemap>
@@ -251,7 +276,7 @@
        <value type="QDateTime">2012-01-05T12:18:12</value>
        <value type="QDateTime">2012-01-05T14:48:09</value>
        <value type="QDateTime">2012-01-05T14:54:41</value>
-       <value type="QDateTime">2012-01-05T14:54:41</value>
+       <value type="QDateTime">2012-01-18T19:30:32</value>
        <value type="QDateTime">2012-01-05T14:54:41</value>
        <value type="QDateTime">2012-01-05T12:05:38</value>
       </valuelist>

diff --git a/piraboutform.ui b/piraboutform.ui
index 2d3d6a6..238f73b 100644 (file)
--- a/piraboutform.ui
+++ b/piraboutform.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>About Pierogi</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="margin">

diff --git a/pirkeysetmanager.cpp b/pirkeysetmanager.cpp
index c8416a8..270a002 100644 (file)
--- a/pirkeysetmanager.cpp
+++ b/pirkeysetmanager.cpp
@@ -9,13 +9,16 @@
 #include "keysets/mitsubishi.h"
 #include "keysets/nokia.h"
 #include "keysets/panasonic.h"
+#include "keysets/raite.h"
 #include "keysets/rca.h"
+#include "keysets/sagem.h"
 #include "keysets/samsung.h"
 #include "keysets/sanyo.h"
 #include "keysets/sharp.h"
 #include "keysets/sony.h"
 #include "keysets/toshiba.h"
 #include "keysets/westinghouse.h"
+#include "keysets/yamaha.h"
 #include "keysets/zenith.h"
 //#include "protocol.h"
 #include "pirmakenames.h"
@@ -126,6 +129,8 @@ PIRKeysetManager::PIRKeysetManager(
   populateKeyset(new PanasonicDVD1a(guiObject, counter++));
   populateKeyset(new PanasonicAudio(guiObject, counter++));
 
+  populateKeyset(new RaiteDVD1(guiObject, counter++));
+
   populateKeyset(new RCATV1(guiObject, counter++));
   populateKeyset(new RCATV1a(guiObject, counter++));
   populateKeyset(new RCATV2(guiObject, counter++));
@@ -139,6 +144,9 @@ PIRKeysetManager::PIRKeysetManager(
   populateKeyset(new RCASat1(guiObject, counter++));
   populateKeyset(new RCASat2(guiObject, counter++));
 
+  populateKeyset(new SagemTVBox1(guiObject, counter++));
+  populateKeyset(new SagemTVBox1a(guiObject, counter++));
+
   populateKeyset(new SamsungTV1(guiObject, counter++));
   populateKeyset(new SamsungTV1a(guiObject, counter++));
   populateKeyset(new SamsungTV1b(guiObject, counter++));
@@ -209,6 +217,23 @@ PIRKeysetManager::PIRKeysetManager(
   populateKeyset(new WestinghouseTV1(guiObject, counter++));
   populateKeyset(new WestinghouseTV2(guiObject, counter++));
 
+  populateKeyset(new YamahaDVD1(guiObject, counter++));
+  populateKeyset(new YamahaDVD1a(guiObject, counter++));
+  populateKeyset(new YamahaAudio1(guiObject, counter++));
+  populateKeyset(new YamahaAudio1a(guiObject, counter++));
+  populateKeyset(new YamahaAudio2(guiObject, counter++));
+  populateKeyset(new YamahaAudio2a(guiObject, counter++));
+  populateKeyset(new YamahaAudio2b(guiObject, counter++));
+  populateKeyset(new YamahaAudio2c(guiObject, counter++));
+  populateKeyset(new YamahaAudio2d(guiObject, counter++));
+  populateKeyset(new YamahaAudio3(guiObject, counter++));
+  populateKeyset(new YamahaAudio4(guiObject, counter++));
+  populateKeyset(new YamahaAudio5(guiObject, counter++));
+  populateKeyset(new YamahaAudio6(guiObject, counter++));
+  populateKeyset(new YamahaAudio7(guiObject, counter++));
+  populateKeyset(new YamahaTV1(guiObject, counter++));
+  populateKeyset(new YamahaKaraoke1(guiObject, counter++));
+
   populateKeyset(new ZenithC32V37(guiObject, counter++));
 
   // Start the thread running:

diff --git a/pirmakenames.cpp b/pirmakenames.cpp
index ec94091..cae6aa2 100644 (file)
--- a/pirmakenames.cpp
+++ b/pirmakenames.cpp
@@ -13,13 +13,16 @@ PIRMakeMgr::PIRMakeMgr()
   makes[Nokia_Make] = "Nokia";
   makes[Philips_Make] = "Philips";
   makes[Panasonic_Make] = "Panasonic";
+  makes[Raite_Make] = "Raite";
   makes[RCA_Make] = "RCA";
+  makes[Sagem_Make] = "Sagem";
   makes[Samsung_Make] = "Samsung";
   makes[Sanyo_Make] = "Sanyo";
   makes[Sharp_Make] = "Sharp";
   makes[Sony_Make] = "Sony";
   makes[Toshiba_Make] = "Toshiba";
   makes[Westinghouse_Make] = "Westinghouse";
+  makes[Yamaha_Make] = "Yamaha";
   makes[Zenith_Make] = "Zenith";
 }
 

diff --git a/pirmakenames.h b/pirmakenames.h
index 5fc5c44..814a544 100644 (file)
--- a/pirmakenames.h
+++ b/pirmakenames.h
@@ -17,13 +17,16 @@ enum PIRMakeName{
   Nokia_Make,
   Panasonic_Make,
   Philips_Make,
+  Raite_Make,
   RCA_Make,
+  Sagem_Make,
   Samsung_Make,
   Sanyo_Make,
   Sharp_Make,
   Sony_Make,
   Toshiba_Make,
   Westinghouse_Make,
+  Yamaha_Make,
   Zenith_Make
 };
 

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 9be09a3..7c827fa 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,3 +1,23 @@
+pierogi (0.1.4) unstable; urgency=low
+  * I think uninstall is working now.  So, Initial Release time!
+
+ -- John Pietrzak <jpietrzak8@gmail.com>  Wed, 18 Jan 2012 14:40:54 -0500
+
+pierogi (0.1.3) unstable; urgency=low
+  * Found bug in uninstall, hope third patch is the charm!
+
+ -- John Pietrzak <jpietrzak8@gmail.com>  Tue, 17 Jan 2012 13:04:10 -0500
+
+pierogi (0.1.2) unstable; urgency=low
+  * Install is working fine, still can't get uninstall to work.
+
+ -- John Pietrzak <jpietrzak8@gmail.com>  Tue, 17 Jan 2012 12:11:47 -0500
+
+pierogi (0.1.1) unstable; urgency=low
+  * Still trying to create initial release
+
+ -- John Pietrzak <jpietrzak8@gmail.com>  Tue, 17 Jan 2012 00:11:46 -0500
+
 pierogi (0.1.0) unstable; urgency=low
 
   * Initial Release.

diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control
index 928b58c..e6d9022 100644 (file)
--- a/qtc_packaging/debian_fremantle/control
+++ b/qtc_packaging/debian_fremantle/control
@@ -1,15 +1,15 @@
 Source: pierogi
-Section: user/hidden
+Section: user/utilities
 Priority: optional
 Maintainer: John Pietrzak <jpietrzak8@gmail.com>
 Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
+Homepage: http://pierogi.garage.maemo.org
 
 Package: pierogi
-Architecture: any
+Architecture: armel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Universal Infrared Remote Control for N900
  Pierogi is a Universal Infrared Remote Control app for the Nokia N900.  It is independent from the LIRC server, and stores all configuration info internally.
 XB-Maemo-Display-Name: pierogi
-XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAADZ1JREFUaIHtmXuspWdVxn/P+77fZe99bnNm2s70IuUiEFBECCFeIsY/MP6DJGZGxQtpVIqIQENAjYbJEDVKUkFBpZCWtsogM1AMEBJFgYK2XIVyLaX0Ap3OmTlzzplz9tl7f5f3fZd/7ClpudcANdrnv/3ly/c9z9prPWut94OH8TAexv89/PP1L//yDde+5BCAGXqo+Xw7uK+/cPzoy5/Yje99VJztXP/2q694kYT9bxbxAAHvfvfr9vvYvaodn6Hf3aj6ydZrACTsoaH3nSGYp4mEXfea5x7NzfhX6+EQcjaLvcnXDl/drHL5D3/l+Vd+8KEm/PUIMI/wDUdfeijP2p/vLNGOt5AzfFE79Q3K7U9Yt3MDsO8h5vsNcMeOHfQAzc745Rb71XI4Yrh8HkVZK7UT6+PEcj/NpGbv8ateduWb3nS4fqhJ3x9fK863vv5y68ZbxHZqxkxFOaSoFvBFiXDgh+ZkyimREp/+5Rde9WMAx44d9IcOHU8PqYC3vfmPHh9i84XYTEldbznuqp+eJaeeevkA5WgVF0rIZlhUjpGmib/1xc0L//HIkSPdsWMH/cGDx7KkH3ixO4Bm+8zTdjdP0OxumWEqR6tWr1xi1eKFRjJiTJZTAgkpmC8KitJf/bh9a2/9h9e++GcPHTqeJNnhw4e/wZa/39CxY1cMiq68Nu1uHepmu+SuAe+NnLDUUywekHxhoSykHE0gkDmykCfFSBfdFPlrkh8c/bXn/8XNP0gBLk7Kn4t9/4sKBdVwiXppL/XiqobL52uwfECWM5ajcorkFMESkGUysGwhOAoXh966FxZx5x3Xv/oFT/9BCgipHz+h2zlTKUVz3suHAsxwvkC+xuQRwhAWEwoO5wA5jAwI571Jhlm+oCp521v/5vL3psxbnvOSq977fRdQD1ZrOZ/zbOLkA/JgaZ7zOXWk5GS+NCnLVQtAJufOXGJesbkHS5ITcqL0Yb8RfqPIXHb89S8iJbs1JnvPqQ99/E9eevzDs++1AB194xV3utQ8InczkSLyDl94wGEKdE3EaR51+WDOOXlnkBIgZBk5YSmSzcwXlQzDkMkFWcpkHN1u/1+pice62fSffvvPjt59H4FjBw/6g8ePZ/E/G1d03Wt/Z43Z1vk5RlnsyLFBDnNliSuWcOWSyNlEli9K80GSYY4syzJhcsFjOWMmM3O44IVzZrnHyYQ8OYmcjdSnu2ITf3+yvfGJy//8HSfvI3L48GF35MiR/GAFhHq0+J4wqJ9rGZ1LCrrpTFjELNNON3FhIB9qyFE5GjKTuRIvJDlyjiAPzsllR04JUpzPWb7AeY8sm1eH93ZpOSjeNVi5kLf9/e/RTZuP5ZQ/kpq7PwlcBzyopqg3v/Elt4fUPCrnJMsJSx3tzhZmCV8OyeaRE04eX9bmnOQAIZx3zH+lc0VthgUkSQ5yTHgfcGU5b5nJDJJybEDzIcBwWHakaHTT/qjF5n2TWfrg7/7pW770XQl445XP/TLN1iNzc1ZyAecLnC8A4cslsitwGOQOISSH8wHvHU4eyDjnyBgYOO/A8nxCtPk17ytcGRAewHJsZGY2N4ReIPMhyKwk9QlIn2rH8dj47Nm7puPGQlmdslANJtvtHX/8hhtufYCAo9cdeb5rt14XnLxZT+57unZKzpHUt8ToCfUI5wLkhHMCi8gSzrn5HG4Oh2HMrUlO4DQPhAzyOcsSoGChHs1XDMv0fW9OCIGlHiyZpIQvg5mwnOhnO+ScUFgktU3TTuPnpzv93774r995Tei7yczHlhh7y6lR30xodk6D9fhqBVcskboZeA9WGB45HzAgpQjOkDnmLJyZJchZ5ExOCecDkiNbj6VsokfOkAsgj2WweU6SU8YsyTkX+vYslswwKcUxxXAVX1Ym+hrHU3xhV195xbM/G2KfTjfbG2q31yDbPLIhUA6XKeol2i6S09wcvDNZgqwS7wrMObCIpQabs5CXB4QZWJx3b+cL5BxmKFs0uikmkObNMptBnJuvmRH7lthFcj9Tji0pTVC5gCsl+dKCkkJZsBSn7xLA373yN48sLpWvMJXmgtSON+hmm1icUowuJBPIKRE8yIFs7lZeATPDLM+jimGpQYBhYA75MK+HDCJjyawYDCUnsESKvTlnyqk/98cZljKx2yV1U2K/w75HPgUo6ZoZZpFQ1FjCZpu3KQCEsHAbLtJPd4ixpZttmZQpB3twwanvekNeKWLyWfNO1SpZZw5kGeQMhDlXgUyWoyl3SrGZ17IqdK5m+r4zH5wwkc2RY0dO2fp+iiWUcyL1LVK2erSkvosWygHVwqpm25vWzmY4ORQW5ivlZNbc0XenyO1EMSYbLe9XOVwCYLZ7EksSKsmqceYQSTlnyCYzAQllwyTMgfNCOGUVGFkQyWmKrDIUMDrl5OaLkjSvBbJyH0mxJ8WeODtLubBEuXQx3gX13QzFnnp5H/Sd2tnUZpOIDh8+HI4cORLf8JeX2/K+EZaN7dMnbLazToozVi54tGKSNbsbSilZCNV8vAbJOfM+K8fp3GzsawuNsmXzCspkkwwRyBbJ1kFOkE0oIFeYk5RytL4bY91UqZuyZ/8lGM5ScqpXLjLn5ut7bDvDQz+Z6MSnPnddgA8A0M6ae2a78eLYTm2y9RV8UTNaPgDy9LPTxHaKhSExRZwlLCVcOUCuoKyXwSI5GZybUFNmfo+KeW1YRirxKkl5PBeTGsx6dG6uzX2HUgdE6uWLkCuIXctsukNRDynLinI4Ija76qZnabv4Wn/jjXcbwE/+yMUX9M3mT3eTkxosnq/R6kWqBouanr2HfnJaPlTELCwjsinHGeQk4fChgnNNUALnpXmzdshJEpL3Eh7JIXk5N1/eum5Kjo2sb0WaqR6NGC2vomoFX4woBkPlGJW7TiZnoSjU7u4w2TzDK9782csfcOL2yuf9wnNWDqxeO6h7P5ucdf10k8V9l1IOV0ntmO3NEya3qK6ZYRJeGSc719Dm7lmUSzgniUxKDTLDLBFjBBfMuYBzXudaMs14y1K/q7L0lKXwg71Ui/uxLtG2rfmq1sKe80ygfrrLxsk72V7bXNu598QvXfm+rZvD/QWsf+Uxb6+WTv16u3vPM/tmbIPhinwxotldp9tdY3nvI9S3Pd1si5w9ZjoX0Q4p40A5ZaQC7z0pp7l1kiFmMo2yYd7dNwcZRgvWUY72s7ByHn3bkxIU9ZBKXl3X0O6eFSaL3YSd9c20fXrysle/f+umvxLy9xfw0ds/mp56yf4TC3uKyxZXDqRqcb9m45Nqdu6lKGp8uWLN+E6Fopr7cteRc/pa48pm1re7pL5TjolsEGM/9/ZsREtmKZK6qfp2l9hOWFjZQ1VWCvUSg+Xzcb4gp0xRj5CcOe/VNWObTU4z3trUma+On/fqf73juvs4P0AAwH9+7s67nvbYxz+pHNZPJJ2VVNjC3sdKYcTumVs1XHkEg4X99JO7WNp7EQsrq7TTbYqyJqdOlrNSSvT9jL5riLEnpZacE957OWUWls/X0soKRWHUixdSLSzLklA5wpdDiiLQtB0+lJgZ63d/QZsnNr66ccf42a/59zvfwf3Os75BAMBofXZTNeyfVNbloxb3XUJsp7TTdVWjA4RqmW66gfcDqtE+UjvGVwMGw2VyN2awsBeswQePSPhQUA8XCAGKeoWi8BT1oorBEt4PyG5IKCpBpm/nE6/lSI5YN9tlcvaENk6sfXjrRHPZ6/7jxE3nyNu3FXD7eLyz8/mTH7jo0kuevrin/KF2cjJbajTccyntZFft7jqDlQNgiW6yTrWwH+eM1J+1evE8HDMNRudRBKOoagajFYRBGFhVluCDnK9wzpPNE8pK3nvaJlpRlnKhoG+nebq95sYb66x97NSPX3XL5u3fjOs3FQCwDjs3ffbuax63nBd8teen6uUD8py11G7KVXvMLKjZOWXCqVrYQzs5A75EeHLqVA7OMzmnUC9bNVyl76cUYUgINc10jAu1vPf07RhXeIVqgHdYH6Ntrq3p7k/f8rmTXzzz4le9886Dn9jopt+K57cUcB8+fOv6e390/+pd3Wz25KKKe6rRXgvlovpmy1K7o3J0AUJ0s21COZJkin1HqFcVuzGuqBSqWtZPVQ4WVJQ1ze6mcAHvPRYbYjJQyWRr3W2dXNP2qZNfOnHL+rOu+fSZD30nft9RAMBHbrv3losnO//m6sELFGr5oiS3G3Ll0OrF80jtjlLfUY32GtZiuVeoFq1vx0KleV+QugnOVxT1iNxPkSvw5QCsVex7TXd3dOpLt2+MT61fO17b+oNrPrP9he+G24P5dCTAngCrT3j8nmfuv/SCq5f2Lg/r0YDRSkW1uJdQLpBna/hqgWKwQjs+gQslRbVAPzkNKvDliHY6JkaY7rRsnjzxL83Z3U9ON5sPXf2Jtffc/13fawEcPIg/fnx+avCsH159+uJS+eR6UD55sFxftriyWvki5MGS12BpP6EY0DebhGpITol+toFU03eJ8ebp23KbPzMdtzef+fI917/ltt0zX//87xYP+uPdwYPztLvfi6pnPWbh0QvV4KlF7Z7kav8zVT1ackVYTl236svRRLnr+q691St8SoX7+Ob6mfd/5ZMb45tgfN9zDz/jGeHIjTfGB8vnYTyM/+/4b+QG09epa/BQAAAAAElFTkSuQmCC
+XB-Maemo-Icon-26: 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

diff --git a/qtc_packaging/debian_fremantle/postrm b/qtc_packaging/debian_fremantle/postrm
new file mode 100644 (file)
index 0000000..3653f7a
--- /dev/null
+++ b/qtc_packaging/debian_fremantle/postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rm -f /etc/sudoers.d/pierogi.sudoers
+
+update-sudoers
+
+exit 0

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index 23e8a61..38f3e94 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -27,7 +27,8 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       # $(MAKE) # Uncomment this line for use without Qt Creator
+       #qmake
+       #$(MAKE) # Uncomment this line for use without Qt Creator
        #docbook-to-man debian/pierogi.sgml > pierogi.1
 
        touch $@

diff --git a/www/SelectKeysetWindow.png b/www/SelectKeysetWindow.png
index c6c16d0..e7434b0 100755 (executable)
Binary files a/www/SelectKeysetWindow.png and b/www/SelectKeysetWindow.png differ

diff --git a/www/index.html b/www/index.html
index bf12f87..353a99c 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -151,10 +151,10 @@ Pierogi to use one by simply selecting that keyset from the list.</p>
 <img src="SelectKeysetWindow.png">
 
 <p>The Select Keyset window presents a list of all the keysets currently
-available in Pierogi.  As this list is fairly long, a button has been added
-at the top of the window that allows you to choose the make (or brand) of
-the device you are trying to control; once a make has been selected, all
-keysets not associated with that make will be hidden.  To use a keyset,
+available in Pierogi.  As this list is fairly long, buttons have been added
+at the top of the window to choose the make and/or type of device for
+the product you are trying to control; all keysets not associated with
+the chosen values will be hidden.  To use a keyset,
 simply select it from the list, and close the window (by pressing the
 return arrow at the top right of the screen).</p>
 
@@ -347,6 +347,10 @@ to the theory and practice behind consumer IR devices
 
 <li>Link to (what appears to be) source code for the N900's
 <a href="http://svn.jacekowski.org/host_mode/trunk/drivers/input/lirc/lirc_rx51.c">/dev/lirc0 device driver</a>.
+
+<li>A surprisingly decent description of how to use the
+<a href="http://www.yamahapab.com/assets/downloads/codes/Custom_Install_HB.pdf">Yamaha Remote Control</a>.
+
 <ul>
 
 </body>