X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=keysets%2Fpanasonic.cpp;h=1618777cb03c11be8087f077d62215ca3251a731;hb=d121f70c1034a2052e2d7e2d0c7bc3fe86dec54b;hp=c1cf149819a8fa665359607c0839d81a44320443;hpb=4fc66aff685d685254554253b3b53b8d63ad73bd;p=pierogi

diff --git a/keysets/panasonic.cpp b/keysets/panasonic.cpp
index c1cf149..1618777 100644
--- a/keysets/panasonic.cpp
+++ b/keysets/panasonic.cpp
@@ -1,38 +1,6 @@
 #include "panasonic.h"
-#include "necprotocol.h"
-
-PanasonicAmp::PanasonicAmp(
-  QObject *guiObject,
-  unsigned int index)
-  : PIRKeysetMetaData(
-      "Amp Keyset",
-      Panasonic_Make,
-      index)
-{
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    400, 400,
-    400, 1200,
-    76000, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(4000, 1600);
-  np->setTrailerPulse(400);
-
-  np->setPreData(0x80080A86, 32);
-
-//  np->setMinimumRepetitions(4);
-
-  np->setCarrierFrequency(36000);
-
-  addKey("POWER", Power_Key, 0xFDBB, 16);
-  addKey("VOL+", VolumeUp_Key, 0x0D4B, 16);
-  addKey("VOL-", VolumeDown_Key, 0x4DCB, 16);
-  addKey("SLEEP", Sleep_Key, 0x3D7B, 16);
-  addKey("DISPLAY", Info_Key, 0xF17B, 16);
-}
+#include "protocols/necprotocol.h"
+#include "protocols/kaseikyoprotocol.h"
 
 
 PanasonicCarAudio::PanasonicCarAudio(
@@ -43,28 +11,19 @@ PanasonicCarAudio::PanasonicCarAudio(
       Panasonic_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    665, 465,
-    665, 1595,
-    108609, true);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(9148, 4424);
-  np->setTrailerPulse(667);
-
-  np->setPreData(0x8156, 16);
-
-  addKey("Power", Power_Key, 0x48B7, 16);
-  addKey("PRG", Unmapped_Key, 0x38C7, 16);
-  addKey("Mode", Unmapped_Key, 0x58A7, 16);
-  addKey("ATT", Unmapped_Key, 0x28D7, 16);
-  addKey("Vol_Up", VolumeUp_Key, 0xB847, 16);
-  addKey("Vol_Down", VolumeDown_Key, 0x9867, 16);
-  addKey("Tune/Track_Up", ChannelUp_Key, 0xF807, 16);
-  addKey("Tune/Track_Down", ChannelDown_Key, 0x7887, 16);
+  threadableProtocol = new NECProtocol(guiObject, index, true, false);
+
+//  setPreData(0x8156, 16);
+  setPreData(0x6A81, 16);
+
+  addKey("Power", Power_Key, 0x12, 8);
+  addKey("ATT", Unmapped_Key, 0x14, 8);
+  addKey("Vol_Down", VolumeDown_Key, 0x19, 8);
+  addKey("Mode", SoundMode_Key, 0x1A, 8);
+  addKey("PRG", Program_Key, 0x1C, 8);
+  addKey("Vol_Up", VolumeUp_Key, 0x1D, 8);
+  addKey("Tune/Track_Down", ChannelDown_Key, 0x1E, 8);
+  addKey("Tune/Track_Up", ChannelUp_Key, 0x1F, 8);
 }
 
 
@@ -76,59 +35,48 @@ PanasonicSat1::PanasonicSat1(
       Panasonic_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    500, 400,
-    500, 1212,
-    74500, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(3565, 1700);
-  np->setTrailerPulse(500);
-
-  np->setPreData(0x40040140, 32);
-
-  addKey("POWER", Power_Key, 0xBDFC, 16);
-  addKey("CH+", ChannelUp_Key, 0xEDAC, 16);
-//  addKey("CH+", ChannelUp_Key, 0x2D6C, 16);
-  addKey("CH-", ChannelDown_Key, 0x6D2C, 16);
-//  addKey("CH-", ChannelDown_Key, 0xADEC, 16);
-  addKey("R_TUNE", Unmapped_Key, 0x8BCA, 16);
-  addKey("GUIDE", Guide_Key, 0xA3E2, 16);
-  addKey("MENU", Menu_Key, 0x2362, 16);
-  addKey("EXIT", Exit_Key, 0x6322, 16);
-  addKey("LEFT", Left_Key, 0xB3F2, 16);
-  addKey("RIGHT", Right_Key, 0x7332, 16);
-  addKey("UP", Up_Key, 0x5312, 16);
-  addKey("DOWN", Down_Key, 0xD392, 16);
-  addKey("FAV", Unmapped_Key, 0x0B4A, 16);
-  addKey("INFO", Info_Key, 0x9DDC, 16);
-  addKey("1", One_Key, 0x0544, 16);
-  addKey("2", Two_Key, 0x85C4, 16);
-  addKey("3", Three_Key, 0x4504, 16);
-  addKey("4", Four_Key, 0xC584, 16);
-  addKey("5", Five_Key, 0x2564, 16);
-  addKey("6", Six_Key, 0xA5E4, 16);
-  addKey("7", Seven_Key, 0x6524, 16);
-  addKey("8", Eight_Key, 0xE5A4, 16);
-  addKey("9", Nine_Key, 0x1554, 16);
-  addKey("0", Zero_Key, 0x95D4, 16);
-  addKey("LOGO_TUNE", Unmapped_Key, 0xABEA, 16);
-  addKey("ALT_AUD", Unmapped_Key, 0x1D5C, 16);
-  addKey("TV/DSS", Input_Key, 0x3D7C, 16);
-  addKey("REC", Record_Key, 0x4302, 16);
-  addKey("ACTION", Select_Key, 0xC382, 16);
-  addKey("PROG", Unmapped_Key, 0x5110, 16);
-  addKey("TXT", Unmapped_Key, 0x7B3A, 16);
-  addKey("STTL", Unmapped_Key, 0xFBBA, 16);
-  addKey("GUIDE", Guide_Key, 0xCB8A, 16);
-//  addKey("EXIT", Unmapped_Key, 0xF3B2, 16);
-  addKey("RED", Red_Key, 0x3776, 16);
-  addKey("GREEN", Green_Key, 0xB7F6, 16);
-  addKey("YELLOW", Yellow_Key, 0xF7B6, 16);
-  addKey("BLUE", Blue_Key, 0x7736, 16);
+  threadableProtocol = new KaseikyoProtocol(guiObject, index);
+
+//  setPreData(0x40040140, 32);
+  setPreData(0x2002, 16);
+
+  addKaseikyoKey("PROG", Program_Key, 0x028, 0x8A);
+  addKaseikyoKey("1", One_Key, 0x028, 0xA0);
+  addKaseikyoKey("2", Two_Key, 0x028, 0xA1);
+  addKaseikyoKey("3", Three_Key, 0x028, 0xA2);
+  addKaseikyoKey("4", Four_Key, 0x028, 0xA3);
+  addKaseikyoKey("5", Five_Key, 0x028, 0xA4);
+  addKaseikyoKey("6", Six_Key, 0x028, 0xA5);
+  addKaseikyoKey("7", Seven_Key, 0x028, 0xA6);
+  addKaseikyoKey("8", Eight_Key, 0x028, 0xA7);
+  addKaseikyoKey("9", Nine_Key, 0x028, 0xA8);
+  addKaseikyoKey("0", Zero_Key, 0x028, 0xA9);
+  addKaseikyoKey("CH-", ChannelDown_Key, 0x028, 0xB6);
+  addKaseikyoKey("CH+", ChannelUp_Key, 0x028, 0xB7);
+  addKaseikyoKey("ALT_AUD", Audio_Key, 0x028, 0xB8);
+  addKaseikyoKey("INFO", Info_Key, 0x028, 0xB9);
+  addKaseikyoKey("TV/DSS", Input_Key, 0x028, 0xBC);
+  addKaseikyoKey("POWER", Power_Key, 0x028, 0xBD);
+  addKaseikyoKey("REC", Record_Key, 0x028, 0xC2);
+  addKaseikyoKey("ACTION", Select_Key, 0x028, 0xC3);
+  addKaseikyoKey("MENU", Menu_Key, 0x028, 0xC4);
+  addKaseikyoKey("GUIDE", Guide_Key, 0x028, 0xC5);
+  addKaseikyoKey("EXIT", Exit_Key, 0x028, 0xC6);
+  addKaseikyoKey("UP", Up_Key, 0x028, 0xCA);
+  addKaseikyoKey("DOWN", Down_Key, 0x028, 0xCB);
+  addKaseikyoKey("LEFT", Left_Key, 0x028, 0xCD);
+  addKaseikyoKey("RIGHT", Right_Key, 0x028, 0xCE);
+  addKaseikyoKey("FAV", Favorites_Key, 0x028, 0xD0);
+  addKaseikyoKey("R_TUNE", PrevChannel_Key, 0x028, 0xD1);
+  addKaseikyoKey("GUIDE", Guide_Key, 0x028, 0xD3);
+  addKaseikyoKey("LOGO_TUNE", Unmapped_Key, 0x028, 0xD5);
+  addKaseikyoKey("TXT", Teletext_Key, 0x028, 0xDE);
+  addKaseikyoKey("STTL", Unmapped_Key, 0x028, 0xDF);
+
+  addKaseikyoKey("RED", Red_Key, 0x028, 0xEC);
+  addKaseikyoKey("GREEN", Green_Key, 0x028, 0xED);
+  addKaseikyoKey("BLUE", Blue_Key, 0x028, 0xEE);
+  addKaseikyoKey("YELLOW", Yellow_Key, 0x028, 0xEF);
 }
 
 
@@ -138,9 +86,10 @@ PanasonicSat1a::PanasonicSat1a(
   : PanasonicSat1(guiObject, index)
 {
   setKeysetName("Satellite Keyset 1a");
-  addKey("EXIT", Exit_Key, 0xF3B2, 16);
-  addKey("CH+", ChannelUp_Key, 0x4D0C, 16);
-  addKey("CH-", ChannelDown_Key, 0xCD8C, 16);
+
+  addKaseikyoKey("EXIT", Exit_Key, 0x028, 0xCF);
+  addKaseikyoKey("CH+", ChannelUp_Key, 0x028, 0xB2);
+  addKaseikyoKey("CH-", ChannelDown_Key, 0x028, 0xB3);
 }
 
 
@@ -152,95 +101,114 @@ PanasonicTV1::PanasonicTV1(
       Panasonic_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    500, 400,
-    500, 1250,
-    75000, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(3500, 1700);
-  np->setTrailerPulse(500);
-
-  np->setPreData(0x400401, 24);
-
-//  np->setMinRepeat(1);
-
-  addKey("POWER", Power_Key, 0x00BCBD, 24);
-  addKey("MUTE", Mute_Key, 0x004C4D, 24);
-  addKey("PICTURE", Unmapped_Key, 0x006061, 24);
-  addKey("SOUND", Unmapped_Key, 0x00E0E1, 24);
-  addKey("ACTION", Enter_Key, 0x004A4B, 24);
-  addKey("ACTION", Select_Key, 0x004A4B, 24);
-  addKey("UP", Up_Key, 0x005253, 24);
-  addKey("DOWN", Down_Key, 0x00D2D3, 24);
-  addKey("RIGHT", Right_Key, 0x00F2F3, 24);
-  addKey("LEFT", Left_Key, 0x007273, 24);
-  addKey("PROG_UP", ChannelUp_Key, 0x002C2D, 24);
-  addKey("PROG_DOWN", ChannelDown_Key, 0x00ACAD, 24);
-  addKey("VOLUME_UP", VolumeUp_Key, 0x000405, 24);
-  addKey("VOLUME_DOWN", VolumeDown_Key, 0x008485, 24);
-  addKey("RECALL", PrevChannel_Key, 0x009C9D, 24);
-  addKey("TV/AV", Input_Key, 0x00A0A1, 24);
-  addKey("RED", Red_Key, 0x000E0F, 24);
-  addKey("GREEN", Green_Key, 0x008E8F, 24);
-  addKey("YELLOW", Yellow_Key, 0x004E4F, 24);
-  addKey("BLUE", Blue_Key, 0x00CECF, 24);
-  addKey("1", One_Key, 0x000809, 24);
-  addKey("2", Two_Key, 0x008889, 24);
-  addKey("3", Three_Key, 0x004849, 24);
-  addKey("4", Four_Key, 0x00C8C9, 24);
-  addKey("5", Five_Key, 0x002829, 24);
-  addKey("6", Six_Key, 0x00A8A9, 24);
-  addKey("7", Seven_Key, 0x006869, 24);
-  addKey("8", Eight_Key, 0x00E8E9, 24);
-  addKey("9", Nine_Key, 0x001819, 24);
-  addKey("0", Zero_Key, 0x009899, 24);
-  addKey("C", Clear_Key, 0x005C5D, 24);
-  addKey("-/--", DoubleDigit_Key, 0x00DCDD, 24); // Might also be Dash_Key
-  addKey("SURROUND", Surround_Key, 0x008C8D, 24);
-  addKey("MULTIWINDOW", Unmapped_Key, 0x006766, 24);
-  addKey("N", Unmapped_Key, 0x003031, 24);
-  addKey("STR", Unmapped_Key, 0x00ABAA, 24);
-  addKey("TIMER", Unmapped_Key, 0x00F0F1, 24);
-  addKey("HELP", Unmapped_Key, 0x003534, 24);
-  addKey("R-TUNE", Unmapped_Key, 0x00ECED, 24);
-  addKey("GAME", Unmapped_Key, 0x00DDDC, 24);
-  addKey("S", Unmapped_Key, 0x007071, 24);
-  addKey("S_MENU", Unmapped_Key, 0x008A8B, 24);
-  addKey("P_MENU", Unmapped_Key, 0x000A0B, 24);
-  addKey("SAP", Unmapped_Key, 0x00CCCD, 24);
-  addKey("FM/TV", Unmapped_Key, 0x007776, 24);
-  addKey("Exit", Unmapped_Key, 0x00CBCA, 24);
-  addKey("Return", Unmapped_Key, 0x002B2A, 24);
-  addKey("MOOD_LIGHT", Unmapped_Key, 0x008584, 24);
-
-  addKey("ASPECT", Unmapped_Key, 0x207B5A, 24);
-
-  addKey("PROG", Unmapped_Key, 0x405110, 24);
-  addKey("MENU", Unmapped_Key, 0x402362, 24);
-  addKey("EXIT", Exit_Key, 0x406322, 24);
-  addKey("GUIDE", Guide_Key, 0x40A3E2, 24);
-  addKey("TV", Unmapped_Key, 0x400C4D, 24);
-
-  addKey("TV/TEXT", Unmapped_Key, 0x80C041, 24);
-  addKey("FP", Unmapped_Key, 0x80A021, 24);
-  addKey("INDEX", Unmapped_Key, 0x801091, 24);
-  addKey("HOLD", Unmapped_Key, 0x809011, 24);
-  addKey("TIMETEXT", Unmapped_Key, 0x80D051, 24);
-  addKey("REVEAL", Unmapped_Key, 0x8038B9, 24);
-  addKey("FTB", Unmapped_Key, 0x8030B1, 24);
-  addKey("Display_Cancel", Unmapped_Key, 0x8020A1, 24);
-  addKey("List/F.Text", Unmapped_Key, 0x80B839, 24);
-
-  addKey("DIRECTREC", Record_Key, 0x909100, 24);
-  addKey("Link", Unmapped_Key, 0x908D1C, 24);
-  addKey("Option", Unmapped_Key, 0x90E574, 24);
-  addKey("SDCard", Unmapped_Key, 0x90D544, 24);
-  addKey("Guide", Unmapped_Key, 0x90E170, 24);
-  addKey("prog-", Unmapped_Key, 0x900B9A, 24);
+  threadableProtocol = new KaseikyoProtocol(guiObject, index);
+
+//  setPreData(0x400401, 24);
+  setPreData(0x2002, 16);
+
+  addKaseikyoKey("TV/AV", Input_Key, 0x008, 0x05);
+  addKaseikyoKey("PICTURE", PictureMode_Key, 0x008, 0x06);
+  addKaseikyoKey("SOUND", SoundMode_Key, 0x008, 0x07);
+  addKaseikyoKey("N", Unmapped_Key, 0x008, 0x0C);
+  addKaseikyoKey("S", Unmapped_Key, 0x008, 0x0E);
+  addKaseikyoKey("TIMER", Sleep_Key, 0x008, 0x0F); // "Sleep"
+  addKaseikyoKey("1", One_Key, 0x008, 0x10);
+  addKaseikyoKey("2", Two_Key, 0x008, 0x11);
+  addKaseikyoKey("3", Three_Key, 0x008, 0x12);
+  addKaseikyoKey("4", Four_Key, 0x008, 0x13);
+  addKaseikyoKey("5", Five_Key, 0x008, 0x14);
+  addKaseikyoKey("6", Six_Key, 0x008, 0x15);
+  addKaseikyoKey("7", Seven_Key, 0x008, 0x16);
+  addKaseikyoKey("8", Eight_Key, 0x008, 0x17);
+  addKaseikyoKey("9", Nine_Key, 0x008, 0x18);
+  addKaseikyoKey("0", Zero_Key, 0x008, 0x19);
+  addKaseikyoKey("VOLUME_UP", VolumeUp_Key, 0x008, 0x20);
+  addKaseikyoKey("VOLUME_DOWN", VolumeDown_Key, 0x008, 0x21);
+  addKaseikyoKey("Bass Up", BassUp_Key, 0x008, 0x22);
+  addKaseikyoKey("Bass Down", BassDown_Key, 0x008, 23);
+  addKaseikyoKey("Treble Up", TrebleUp_Key, 0x008, 0x24);
+  addKaseikyoKey("Treble Down", TrebleDown_Key, 0x008, 0x25);
+  addKaseikyoKey("Balance Left", BalanceLeft_Key, 0x008, 0x26);
+  addKaseikyoKey("Balance Right", BalanceRight_Key, 0x008, 0x27);
+  addKaseikyoKey("SURROUND", Surround_Key, 0x008, 0x31);
+  addKaseikyoKey("MUTE", Mute_Key, 0x008, 0x32);
+  addKaseikyoKey("SAP", Audio_Key, 0x008, 0x33); // "Stereo/Mono/Bilingual"
+  addKaseikyoKey("PROG_UP", ChannelUp_Key, 0x008, 0x34);
+  addKaseikyoKey("PROG_DOWN", ChannelDown_Key, 0x008, 0x35);
+  addKaseikyoKey("R-TUNE", Unmapped_Key, 0x008, 0x37);
+  addKaseikyoKey("RECALL", PrevChannel_Key, 0x008, 0x39);
+  addKaseikyoKey("C", Clear_Key, 0x008, 0x3A);
+  addKaseikyoKey("-/--", DoubleDigit_Key, 0x008, 0x3B); // Also Dash_Key?
+  addKaseikyoKey("POWER", Power_Key, 0x008, 0x3D);
+  addKaseikyoKey("On", PowerOn_Key, 0x008, 0x3E);
+  addKaseikyoKey("Off", PowerOff_Key, 0x008, 0x3F);
+  addKaseikyoKey("Color Up", ColorUp_Key, 0x008, 0x40);
+  addKaseikyoKey("Color Down", ColorDown_Key, 0x008, 0x41);
+  addKaseikyoKey("Contrast Up", ContrastUp_Key, 0x008, 0x42);
+  addKaseikyoKey("Contrast Down", ContrastDown_Key, 0x008, 0x43);
+  addKaseikyoKey("Brightness Up", BrightnessUp_Key, 0x008, 0x44);
+  addKaseikyoKey("Brightness Down", BrightnessDown_Key, 0x008, 0x45);
+  addKaseikyoKey("select", Select_Key, 0x008, 0x49); // "OK"
+  addKaseikyoKey("UP", Up_Key, 0x008, 0x4A);
+  addKaseikyoKey("DOWN", Down_Key, 0x008, 0x4B);
+  addKaseikyoKey("LEFT", Left_Key, 0x008, 0x4E);
+  addKaseikyoKey("RIGHT", Right_Key, 0x008, 0x4F);
+  addKaseikyoKey("P_MENU", Unmapped_Key, 0x008, 0x50);
+  addKaseikyoKey("S_MENU", Unmapped_Key, 0x008, 0x51);
+//  addKaseikyoKey("ACTION", Enter_Key, 0x008, 0x52); // Might be wrong
+  addKaseikyoKey("setup", Menu_Key, 0x008, 0x52); // "ACTION"
+  addKaseikyoKey("pip swap", PIPSwap_Key, 0x008, 0x5E);
+  addKaseikyoKey("pip move", PIPMove_Key, 0x008, 0x67);
+  addKaseikyoKey("RED", Red_Key, 0x008, 0x70);
+  addKaseikyoKey("GREEN", Green_Key, 0x008, 0x71);
+  addKaseikyoKey("YELLOW", Yellow_Key, 0x008, 0x72);
+  addKaseikyoKey("BLUE", Blue_Key, 0x008, 0x73);
+  addKaseikyoKey("MOOD_LIGHT", Unmapped_Key, 0x008, 0xA1);
+  addKaseikyoKey("HELP", Unmapped_Key, 0x008, 0xAC);
+  addKaseikyoKey("GAME", Unmapped_Key, 0x008, 0xBB);
+  addKaseikyoKey("Exit", Unmapped_Key, 0x008, 0xD3);
+  addKaseikyoKey("Return", Unmapped_Key, 0x008, 0xD4); // "R"
+  addKaseikyoKey("STR", Unmapped_Key, 0x008,0xD5);
+  addKaseikyoKey("MULTIWINDOW", Unmapped_Key, 0x008, 0xE6); // "multi pip"
+  addKaseikyoKey("FM/TV", Unmapped_Key, 0x008, 0xEE);
+  addKaseikyoKey("System reset", Unmapped_Key, 0x008, 0xFF);
+
+  addKaseikyoKey("Mix", TeletextAndTV_Key, 0x018, 0x01);
+  addKaseikyoKey("TV/TEXT", Teletext_Key, 0x018, 0x03);
+  addKaseikyoKey("Display_Cancel", Unmapped_Key, 0x018, 0x04);
+  addKaseikyoKey("FP (Favorite Page)", Unmapped_Key, 0x018, 0x05);
+  addKaseikyoKey("INDEX", TeletextIndex_Key, 0x018, 0x08);
+  addKaseikyoKey("HOLD", TeletextHold_Key, 0x018, 0x09);
+  addKaseikyoKey("List Store", TeletextStore_Key, 0x018, 0x0A);
+  addKaseikyoKey("TIMETEXT", TeletextTime_Key, 0x018, 0x0B);
+  addKaseikyoKey("FTB (Full/Top/Bottom)", TeletextSize_Key, 0x018, 0x0C);
+  addKaseikyoKey("REVEAL", TeletextReveal_Key, 0x018, 0x1C);
+  addKaseikyoKey("List/F.Text", Unmapped_Key, 0x018, 0x1D);
+  addKaseikyoKey("Text Reset", Unmapped_Key, 0x018, 0x1E);
+
+  addKaseikyoKey("TV", Unmapped_Key, 0x028, 0x30);
+  addKaseikyoKey("PROG", Program_Key, 0x028, 0x8A);
+  addKaseikyoKey("MENU", Menu_Key, 0x028, 0xC4);
+  addKaseikyoKey("GUIDE", Guide_Key, 0x028, 0xC5);
+  addKaseikyoKey("EXIT", Exit_Key, 0x028, 0xC6);
+
+  addKaseikyoKey("ASPECT", AspectRatio_Key, 0x048, 0xDE);
+  addKaseikyoKey("picture position/size", PIPSize_Key, 0x048, 0xE5);
+
+  addKaseikyoKey("Guide", Unmapped_Key, 0x098, 0x87);
+  addKaseikyoKey("DIRECTREC", Record_Key, 0x098, 0x89);
+  addKaseikyoKey("Exit", Unmapped_Key, 0x098, 0x9A);
+  addKaseikyoKey("Option", Unmapped_Key, 0x098, 0xA7);
+  addKaseikyoKey("SDCard", Unmapped_Key, 0x098, 0xAB);
+  addKaseikyoKey("Favorite", Unmapped_Key, 0x098, 0xAE);
+  addKaseikyoKey("Link", Unmapped_Key, 0x098, 0xB1);
+  addKaseikyoKey("prog-", Unmapped_Key, 0x098, 0xD0);
+
+  // Some media keys, possibly a combo DVD-TV?
+//  addKaseikyoKey("STOP", Stop_Key, 0x00B, 0x00);
+//  addKaseikyoKey("PLAY", Play_Key, 0x00B, 0x0A);
+//  addKaseikyoKey("FORWARD", FastForward_Key, 0x00B, 0x4A);
+//  addKaseikyoKey("REWIND", Rewind_Key, 0x00B, 0x49);
 }
 
 
@@ -251,8 +219,8 @@ PanasonicTV1a::PanasonicTV1a(
 {
   setKeysetName("TV Keyset 1a");
   // Overwrite some of the keys:
-  addKey("OK", Select_Key, 0x009293, 24);
-  addKey("MENU", Menu_Key, 0x006061, 24);
+  addKaseikyoKey("OK", Select_Key, 0x008, 0x49);
+  addKaseikyoKey("MENU", Menu_Key, 0x008, 0x06);
 }
 
 
@@ -265,13 +233,16 @@ PanasonicTV1b::PanasonicTV1b(
 
   addControlledDevice(Panasonic_Make, "Viera TX-32LZD80", TV_Device);
   addControlledDevice(Panasonic_Make, "Viera 42PZ700U", TV_Device);
+  addControlledDevice(Panasonic_Make, "Viera 42PZ8ES", TV_Device);
+  addControlledDevice(Panasonic_Make, "Quintrix TX-25MK1C", TV_Device);
+
+  addKaseikyoKey("Info", Info_Key, 0x008, 0x39); // "OSD"
+  addKaseikyoKey("OK", Select_Key, 0x008, 0x49);
+  addKaseikyoKey("Menu", Menu_Key, 0x008, 0x52);
+//  addKaseikyoKey("Exit", Exit_Key, 0x008, 0xD3);
 
-  addKey("Menu", Menu_Key, 0x004A4B, 24);
-  addKey("OK", Select_Key, 0x009293, 24);
-  addKey("Guide", Guide_Key, 0x90E170, 24);
-//  addKey("Exit", Exit_Key, 0x00CBCA, 24);
-  addKey("Info", Info_Key, 0x009C9D, 24);
-  addKey("Exit", Exit_Key, 0x9059C8, 24);
+  addKaseikyoKey("Guide", Guide_Key, 0x098, 0x87);
+  addKaseikyoKey("Exit", Exit_Key, 0x098, 0x9A);
 }
 
 
@@ -283,108 +254,99 @@ PanasonicVCR1::PanasonicVCR1(
       Panasonic_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    550, 330,
-    550, 1200,
-    75000, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(3600, 1650);
-  np->setTrailerPulse(550);
-
-  np->setPreData(0x400409, 24);
-
-  addKey("POWER", Power_Key, 0x00BCB5, 24);
-  addKey("PROGRAMME^", ChannelUp_Key, 0x002C25, 24);
-  addKey("PROGRAMMEv", ChannelDown_Key, 0x00ACA5, 24);
-  addKey("REC", Record_Key, 0x001019, 24);
-  addKey("PAUSE", Pause_Key, 0x006069, 24);
-  addKey("PLAY", Play_Key, 0x005059, 24);
-  addKey("STOP", Stop_Key, 0x000009, 24);
-  addKey("FORWARD", FastForward_Key, 0x00C0C9, 24);
-  addKey("REWIND", Rewind_Key, 0x004049, 24);
-  addKey("INFO", Info_Key, 0x009C95, 24);
-  addKey("1", One_Key, 0x000801, 24);
-  addKey("2", Two_Key, 0x008881, 24);
-  addKey("3", Three_Key, 0x004841, 24);
-  addKey("4", Four_Key, 0x00C8C1, 24);
-  addKey("5", Five_Key, 0x002821, 24);
-  addKey("6", Six_Key, 0x00A8A1, 24);
-  addKey("7", Seven_Key, 0x006861, 24);
-  addKey("8", Eight_Key, 0x00E8E1, 24);
-  addKey("9", Nine_Key, 0x001811, 24);
-  addKey("0", Zero_Key, 0x009891, 24);
-  addKey("100", PlusOneHundred_Key, 0x00A7AE, 24);
-  addKey("TV-SAT", Input_Key, 0x006C65, 24);
-  addKey("TRACKING_MINUS", Unmapped_Key, 0x004D44, 24);
-  addKey("TRACKING_PLUS", Unmapped_Key, 0x008D84, 24);
-  addKey("TRACKING_AUTO", Unmapped_Key, 0x000D04, 24);
-  addKey("STILL", StepForward_Key, 0x003039, 24);  // also "ADV"
-  addKey("INDEXL", Unmapped_Key, 0x00929B, 24);
-  addKey("INDEXR", Unmapped_Key, 0x00525B, 24);
-  addKey("AV", Unmapped_Key, 0x00030A, 24);
-  addKey("-/--", DoubleDigit_Key, 0x00DCD5, 24);
-  addKey("REPLAY", Replay_Key, 0x00EFE6, 24);
-  addKey("DIRECT_TV_REC", Unmapped_Key, 0x00434A, 24);
-  addKey("TIMERREC", Timer_Key, 0x002D24, 24);
-  addKey("COUNTER_RESET", Unmapped_Key, 0x002A23, 24);
-  addKey("AUDIO", Unmapped_Key, 0x00CCC5, 24);
-  addKey("SLOW", Unmapped_Key, 0x00F0F9, 24);
-  addKey("INDEX", Unmapped_Key, 0x00020B, 24);
-  addKey("+", Unmapped_Key, 0x007178, 24);
-  addKey("-", Unmapped_Key, 0x00F1F8, 24);
-  addKey("mem_rep", Unmapped_Key, 0x00CAC3, 24);
-  addKey("time_search", Unmapped_Key, 0x00222B, 24);
-  addKey("monitor", Unmapped_Key, 0x008980, 24);
-  addKey("repeat", Unmapped_Key, 0x000F06, 24);
-  addKey("memory", Unmapped_Key, 0x008F86, 24);
-  addKey("sleep", Sleep_Key, 0x004F46, 24);
-  addKey("rew2", Unmapped_Key, 0x00CFC6, 24);
-  addKey("cm-zero", Unmapped_Key, 0x001F16, 24);
-  addKey("CLOCK/COUNTER", Unmapped_Key, 0x006A63, 24);
-  addKey("TAPE_REMAIN", Unmapped_Key, 0x00AAA3, 24);
-  addKey("mesecam", Unmapped_Key, 0x00939A, 24);
-  addKey("zerostop", Unmapped_Key, 0x00AFA6, 24);
-  addKey("sap/hi-fi", Unmapped_Key, 0x00676E, 24);
-
-  addKey("DISPLAY", Unmapped_Key, 0x80FA73, 24);
-  addKey("SEARCH", Unmapped_Key, 0x80B930, 24);
-  addKey("SPEED", VHSSpeed_Key, 0x8050D9, 24);
-  addKey("SHOWVIEW", Unmapped_Key, 0x80BA33, 24);
-  addKey("MENU", Menu_Key, 0x806AE3, 24);
-  addKey("OK", Select_Key, 0x801A93, 24);
-  addKey("EXIT", Exit_Key, 0x8066EF, 24);
-  addKey("CHECK+", Unmapped_Key, 0x800980, 24);
-  addKey("CHECK-", Unmapped_Key, 0x808900, 24);
-  addKey("DATE+", Unmapped_Key, 0x8049C0, 24);
-  addKey("DATE-", Unmapped_Key, 0x80C940, 24);
-  addKey("ON+", Unmapped_Key, 0x8029A0, 24);
-  addKey("ON-", Unmapped_Key, 0x80A920, 24);
-  addKey("OFF+", Unmapped_Key, 0x8069E0, 24);
-  addKey("OFF-", Unmapped_Key, 0x80E960, 24);
-  addKey("PROG/CHECK", Program_Key, 0x808009, 24);
-  addKey("CANCEL", Clear_Key, 0x809019, 24);
-  addKey("TAPE", Unmapped_Key, 0x80078E, 24);
-  addKey("ADD/DELETE", Unmapped_Key, 0x808C05, 24);
-  addKey("RADIO_TUNE", Unmapped_Key, 0x801C95, 24);
-  addKey("VPS/PDC", Unmapped_Key, 0x8060E9, 24);
-  addKey("OffTimer", Unmapped_Key, 0x801099, 24);
-  addKey("rotate", Unmapped_Key, 0x8040C9, 24);
-  addKey("rotatedown", Unmapped_Key, 0x80C049, 24);
-  addKey("set", Unmapped_Key, 0x8020A9, 24);
-  addKey("clear", Unmapped_Key, 0x80A029, 24);
-
-  addKey("TV/TEXT", Unmapped_Key, 0xA0EA43, 24);
-  addKey("STILL_ALBUM", Unmapped_Key, 0xA0C46D, 24);
-  addKey("ExtLink", Unmapped_Key, 0xA0DA73, 24);
-  addKey("I-Timer", Unmapped_Key, 0xA0FC55, 24);
-  addKey("PROG_PLAY", Unmapped_Key, 0xA05CF5, 24);
+  threadableProtocol = new KaseikyoProtocol(guiObject, index);
+
+//  setPreData(0x400409, 24);
+  setPreData(0x2002, 16);
+
+  addKaseikyoKey("STOP", Stop_Key, 0x009, 0x00);
+  addKaseikyoKey("REWIND", Rewind_Key, 0x009, 0x02);
+  addKaseikyoKey("FORWARD", FastForward_Key, 0x009, 0x03);
+  addKaseikyoKey("PAUSE", Pause_Key, 0x009, 0x06);
+  addKaseikyoKey("REC", Record_Key, 0x009, 0x08);
+  addKaseikyoKey("PLAY", Play_Key, 0x009, 0x0A);
+  addKaseikyoKey("STILL", StepForward_Key, 0x009, 0x0C);  // also "ADV"
+  addKaseikyoKey("SLOW", Slow_Key, 0x009, 0x0F);
+  addKaseikyoKey("1", One_Key, 0x009, 0x10);
+  addKaseikyoKey("2", Two_Key, 0x009, 0x11);
+  addKaseikyoKey("3", Three_Key, 0x009, 0x12);
+  addKaseikyoKey("4", Four_Key, 0x009, 0x13);
+  addKaseikyoKey("5", Five_Key, 0x009, 0x14);
+  addKaseikyoKey("6", Six_Key, 0x009, 0x15);
+  addKaseikyoKey("7", Seven_Key, 0x009, 0x16);
+  addKaseikyoKey("8", Eight_Key, 0x009, 0x17);
+  addKaseikyoKey("9", Nine_Key, 0x009, 0x18);
+  addKaseikyoKey("0", Zero_Key, 0x009, 0x19);
+  addKaseikyoKey("AUDIO", Audio_Key, 0x009, 0x33);
+  addKaseikyoKey("PROGRAMME^", ChannelUp_Key, 0x009, 0x34);
+  addKaseikyoKey("PROGRAMMEv", ChannelDown_Key, 0x009, 0x35);
+  addKaseikyoKey("TV-SAT", Input_Key, 0x009, 0x36);
+  addKaseikyoKey("INFO", Info_Key, 0x009, 0x39);
+  addKaseikyoKey("-/--", DoubleDigit_Key, 0x009, 0x3B);
+  addKaseikyoKey("POWER", Power_Key, 0x009, 0x3D);
+  addKaseikyoKey("INDEX", Unmapped_Key, 0x009, 0x40);
+  addKaseikyoKey("time_search", Unmapped_Key, 0x009, 0x44);
+  addKaseikyoKey("INDEXL", Unmapped_Key, 0x009, 0x49);
+  addKaseikyoKey("INDEXR", Unmapped_Key, 0x009, 0x4A);
+  addKaseikyoKey("mem_rep", Unmapped_Key, 0x009, 0x53);
+  addKaseikyoKey("COUNTER_RESET", Unmapped_Key, 0x009, 0x54);
+  addKaseikyoKey("TAPE_REMAIN", Unmapped_Key, 0x009, 0x55);
+  addKaseikyoKey("CLOCK/COUNTER", Clock_Key, 0x009, 0x56);
+  addKaseikyoKey("+", Unmapped_Key, 0x009, 0x8E);
+  addKaseikyoKey("-", Unmapped_Key, 0x009, 0x8F);
+  addKaseikyoKey("monitor", Unmapped_Key, 0x009, 0x91);
+  addKaseikyoKey("TRACKING_AUTO", AutoTracking_Key, 0x009, 0xB0);
+  addKaseikyoKey("TRACKING_PLUS", TrackingPlus_Key, 0x009, 0xB1);
+  addKaseikyoKey("TRACKING_MINUS", TrackingMinus_Key, 0x009, 0xB2);
+  addKaseikyoKey("TIMERREC", Timer_Key, 0x009, 0xB4);
+  addKaseikyoKey("AV", Unmapped_Key, 0x009, 0xC0);
+  addKaseikyoKey("DIRECT_TV_REC", Unmapped_Key, 0x009, 0xC2);
+  addKaseikyoKey("mesecam", Unmapped_Key, 0x009, 0xC9);
+  addKaseikyoKey("100", PlusOneHundred_Key, 0x009, 0xE5);
+  addKaseikyoKey("sap/hi-fi", Unmapped_Key, 0x009, 0xE6);
+  addKaseikyoKey("repeat", Repeat_Key, 0x009, 0xF0);
+  addKaseikyoKey("memory", Program_Key, 0x009, 0xF1);
+  addKaseikyoKey("sleep", Sleep_Key, 0x009, 0xF2);
+  addKaseikyoKey("rew2", Unmapped_Key, 0x009, 0xF3);
+  addKaseikyoKey("zerostop", Unmapped_Key, 0x009, 0xF5);
+  addKaseikyoKey("REPLAY", Replay_Key, 0x009, 0xF7);
+  addKaseikyoKey("cm-zero", Unmapped_Key, 0x009, 0xF8);
+
+  addKaseikyoKey("PROG/CHECK", Program_Key, 0x019, 0x01);
+  addKaseikyoKey("rotate", Unmapped_Key, 0x019, 0x02);
+  addKaseikyoKey("rotatedown", Unmapped_Key, 0x019, 0x03);
+  addKaseikyoKey("set", Unmapped_Key, 0x019, 0x04);
+  addKaseikyoKey("clear", Unmapped_Key, 0x019, 0x05);
+  addKaseikyoKey("VPS/PDC", Unmapped_Key, 0x019, 0x06);
+  addKaseikyoKey("OffTimer", Sleep_Key, 0x019, 0x08);
+  addKaseikyoKey("CANCEL", Clear_Key, 0x019, 0x09);
+  addKaseikyoKey("SPEED", VHSSpeed_Key, 0x019, 0x0A);
+  addKaseikyoKey("ADD/DELETE", Unmapped_Key, 0x019, 0x31);
+  addKaseikyoKey("RADIO_TUNE", Unmapped_Key, 0x019, 0x38);
+  addKaseikyoKey("MENU", Menu_Key, 0x019, 0x56);
+  addKaseikyoKey("OK", Select_Key, 0x019, 0x58);
+  addKaseikyoKey("SHOWVIEW", Unmapped_Key, 0x019, 0x5D);
+  addKaseikyoKey("DISPLAY", Unmapped_Key, 0x019, 0x5F);
+  addKaseikyoKey("EXIT", Exit_Key, 0x019, 0x66);
+  addKaseikyoKey("CHECK+", Unmapped_Key, 0x019, 0x90);
+  addKaseikyoKey("CHECK-", Unmapped_Key, 0x019, 0x91);
+  addKaseikyoKey("DATE+", Unmapped_Key, 0x019, 0x92);
+  addKaseikyoKey("DATE-", Unmapped_Key, 0x019, 0x93);
+  addKaseikyoKey("ON+", Unmapped_Key, 0x019, 0x94);
+  addKaseikyoKey("ON-", Unmapped_Key, 0x019, 0x95);
+  addKaseikyoKey("OFF+", Unmapped_Key, 0x019, 0x96);
+  addKaseikyoKey("OFF-", Unmapped_Key, 0x019, 0x97);
+  addKaseikyoKey("SEARCH", Unmapped_Key, 0x019, 0x9D);
+  addKaseikyoKey("TAPE", Unmapped_Key, 0x019, 0xE0);
+
+  addKaseikyoKey("STILL_ALBUM", Unmapped_Key, 0x059, 0x23);
+  addKaseikyoKey("PROG_PLAY", Unmapped_Key, 0x059, 0x3A);
+  addKaseikyoKey("I-Timer", Unmapped_Key, 0x059, 0x3F);
+  addKaseikyoKey("TV/TEXT", Unmapped_Key, 0x059, 0x57);
+  addKaseikyoKey("ExtLink", Unmapped_Key, 0x059, 0x5B);
 
 // These are fishy:
-//  addKey("RESET_STORE", Unmapped_Key, 0x801A93, 24);
+//  addKaseikyoKey("RESET_STORE", Unmapped_Key, 0x019, 0x58);
 }
 
 
@@ -395,9 +357,9 @@ PanasonicVCR1a::PanasonicVCR1a(
 {
   setKeysetName("VCR Keyset 1a");
 
-  addKey("DISPLAY", Info_Key, 0x80FA73, 24);
-  addKey("AV", Input_Key, 0x00030A, 24);
-  addKey("OSD", Info_Key, 0x00EAE3, 24);
+  addKaseikyoKey("OSD", Info_Key, 0x009, 0x57);
+  addKaseikyoKey("AV", Input_Key, 0x009, 0xC0);
+  addKaseikyoKey("DISPLAY", Info_Key, 0x019, 0x5F);
 }
 
 
@@ -408,9 +370,9 @@ PanasonicVCR1b::PanasonicVCR1b(
 {
   setKeysetName("VCR Keyset 1b");
 
-  addKey("clear", Clear_Key, 0x8050D9, 24);
-  addKey("prog", Program_Key, 0x00FFF6, 24);
-  addKey("repeat", Unmapped_Key, 0x009F96, 24);
+  addKaseikyoKey("repeat", Repeat_Key, 0x009, 0xF9);
+  addKaseikyoKey("prog", Program_Key, 0x009, 0xFF);
+  addKaseikyoKey("clear", Clear_Key, 0x019, 0x0A);
 }
 
 
@@ -421,10 +383,10 @@ PanasonicVCR1c::PanasonicVCR1c(
 {
   setKeysetName("VCR Keyset 1c");
 
-  addKey("rotate", Up_Key, 0x8040C9, 24);
-  addKey("rotatedown", Down_Key, 0x80C049, 24);
-  addKey("set", Select_Key, 0x8020A9, 24);
-  addKey("clear", Exit_Key, 0x80A029, 24);
+  addKaseikyoKey("rotate", Up_Key, 0x019, 0x02);
+  addKaseikyoKey("rotatedown", Down_Key, 0x019, 0x03);
+  addKaseikyoKey("set", Select_Key, 0x019, 0x04);
+  addKaseikyoKey("clear", Exit_Key, 0x019, 0x05);
 }
 
 
@@ -436,97 +398,84 @@ PanasonicDVD1::PanasonicDVD1(
       Panasonic_Make,
       index)
 {
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    500, 400,
-    500, 1200,
-    75000, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(3500, 1650);
-  np->setTrailerPulse(500);
-
-  np->setPreData(0x40040D00, 32);
-
-  addKey("POWER", Power_Key, 0xBCB1, 16);
-  addKey("PLAY", Play_Key, 0x505D, 16);
-  addKey("REW", Rewind_Key, 0x202D, 16);
-  addKey("FF", FastForward_Key, 0xA0AD, 16);
-  addKey("STOP", Stop_Key, 0x000D, 16);
-  addKey("PAUSE", Pause_Key, 0x606D, 16);
-  addKey("PREV", Previous_Key, 0x929F, 16);
-  addKey("NEXT", Next_Key, 0x525F, 16);
-  addKey("UP", Up_Key, 0xA1AC, 16);
-  addKey("LEFT", Left_Key, 0xE1EC, 16);
-  addKey("RIGHT", Right_Key, 0x111C, 16);
-  addKey("DOWN", Down_Key, 0x616C, 16);
-  addKey("ACTION", Select_Key, 0x414C, 16);
-  addKey("RETURN", Exit_Key, 0x818C, 16);
-  addKey("MENU", Menu_Key, 0x010C, 16);
-  addKey("INFO", Info_Key, 0x4944, 16);
-  addKey("1", One_Key, 0x0805, 16);
-  addKey("2", Two_Key, 0x8885, 16);
-  addKey("3", Three_Key, 0x4845, 16);
-  addKey("4", Four_Key, 0xC8C5, 16);
-  addKey("5", Five_Key, 0x2825, 16);
-  addKey("6", Six_Key, 0xA8A5, 16);
-  addKey("7", Seven_Key, 0x6865, 16);
-  addKey("8", Eight_Key, 0xE8E5, 16);
-  addKey("9", Nine_Key, 0x1815, 16);
-  addKey("0", Zero_Key, 0x9895, 16);
-  addKey("CANCEL", Clear_Key, 0xC1CC, 16);
-  addKey("+10", DoubleDigit_Key, 0x919C, 16);
-  addKey("inputselect", Input_Key, 0x919C, 16);
-//  addKey("R-TUNE", Unmapped_Key, 0xD9D4, 16);
-  addKey("TOP_MENU", Unmapped_Key, 0xD9D4, 16);
-  addKey("OPEN/CLOSE", Eject_Key, 0x808D, 16);
-//  addKey("TV-SAT", Input_Key, 0x808D, 16);
-  addKey("CH_DOWN", ChannelDown_Key, 0xE0ED, 16);
-  addKey("CH_UP", ChannelUp_Key, 0xF0FD, 16);
-  addKey("SLEEP", Sleep_Key, 0xD7DA, 16);
-  addKey("SUBTITLE", Captions_Key, 0x8984, 16);
-  addKey("AUDIO", Unmapped_Key, 0xCCC1, 16);
-  addKey("ANGLE", Unmapped_Key, 0x0904, 16);
-  addKey("QUICK_REPLAY", Replay_Key, 0xD1DC, 16);
-  addKey("PROGRAM", Program_Key, 0x515C, 16);
-  addKey("RANDOM", Unmapped_Key, 0xB2BF, 16);
-  addKey("REPEAT", Unmapped_Key, 0x313C, 16);
-  addKey("A-B_REPEAT", Unmapped_Key, 0x121F, 16);
-  addKey("A.SRD", Unmapped_Key, 0x7974, 16);
-  addKey("BASS", Unmapped_Key, 0x2B26, 16);
-  addKey("CINEMA", Unmapped_Key, 0x030E, 16);
-  addKey("D.ENH", Unmapped_Key, 0xABA6, 16);
-  addKey("ZOOM", Unmapped_Key, 0x838E, 16);
-  addKey("POSITION_MEMORY", Unmapped_Key, 0x626F, 16);
-  addKey("ONETOUCH_MEMORY", Unmapped_Key, 0x6B66, 16);
-  addKey("GROUP", Unmapped_Key, 0x070A, 16);
-  addKey("PLAY_MODE", Unmapped_Key, 0xB1BC, 16);
-  addKey("SETUP", Unmapped_Key, 0x2924, 16);
-  addKey("CINEMA", Unmapped_Key, 0x030E, 16);
-  addKey("VOLUMEUP", VolumeUp_Key, 0xC6CB, 16);
-  addKey("VOLUMEDOWN", VolumeDown_Key, 0x262B, 16);
-  addKey("showview", Unmapped_Key, 0xFEF3, 16);
-  addKey("manualskip", Unmapped_Key, 0x323F, 16);
-  addKey("functions", Unmapped_Key, 0xEAE7, 16);
-  addKey("progcheck", Unmapped_Key, 0x3E33, 16);
-  addKey("status", Unmapped_Key, 0xFAF7, 16);
-  addKey("timeslip", Unmapped_Key, 0xD2DF, 16);
-  addKey("rec", Record_Key, 0x101D, 16);
-  addKey("recmode", Unmapped_Key, 0x8A87, 16);
-  addKey("extlink", Unmapped_Key, 0xC4C9, 16);
-  addKey("timer", Unmapped_Key, 0x1E13, 16);
-  addKey("createchapter", Unmapped_Key, 0x1A17, 16);
-  addKey("erase", Unmapped_Key, 0x222F, 16);
-  addKey("frec", Unmapped_Key, 0xE3EE, 16);
-  addKey("DISC", Unmapped_Key, 0xEDE0, 16);
-  addKey("SEQUENTIAL", Unmapped_Key, 0xFDF0, 16);
-  addKey("FL_SELECT", Unmapped_Key, 0x6D60, 16);
-  addKey("i", Unmapped_Key, 0x666B, 16);
-//  addKey("EXIT", Unmapped_Key, 0x808A07, 24);
-//  addKey("RED", Unmapped_Key, 0x80820F, 24);
-//  addKey("GREEN", Unmapped_Key, 0x8042CF, 24);
+  threadableProtocol = new KaseikyoProtocol(guiObject, index);
+
+//  setPreData(0x40040D00, 32);
+  setPreData(0x2002, 16);
+
+  addKaseikyoKey("STOP", Stop_Key, 0x00B, 0x00);
+  addKaseikyoKey("OPEN/CLOSE", Eject_Key, 0x00B, 0x01);
+//  addKaseikyoKey("TV-SAT", Input_Key, 0x00B, 0x01);
+  addKaseikyoKey("REW", Rewind_Key, 0x00B, 0x04);
+  addKaseikyoKey("FF", FastForward_Key, 0x00B, 0x05);
+  addKaseikyoKey("PAUSE", Pause_Key, 0x00B, 0x06);
+  addKaseikyoKey("CH_DOWN", ChannelDown_Key, 0x00B, 0x07);
+  addKaseikyoKey("rec", Record_Key, 0x00B, 0x08);
+  addKaseikyoKey("PLAY", Play_Key, 0x00B, 0x0A);
+  addKaseikyoKey("CH_UP", ChannelUp_Key, 0x00B, 0x0F);
+  addKaseikyoKey("1", One_Key, 0x00B, 0x10);
+  addKaseikyoKey("2", Two_Key, 0x00B, 0x11);
+  addKaseikyoKey("3", Three_Key, 0x00B, 0x12);
+  addKaseikyoKey("4", Four_Key, 0x00B, 0x13);
+  addKaseikyoKey("5", Five_Key, 0x00B, 0x14);
+  addKaseikyoKey("6", Six_Key, 0x00B, 0x15);
+  addKaseikyoKey("7", Seven_Key, 0x00B, 0x16);
+  addKaseikyoKey("8", Eight_Key, 0x00B, 0x17);
+  addKaseikyoKey("9", Nine_Key, 0x00B, 0x18);
+  addKaseikyoKey("0", Zero_Key, 0x00B, 0x19);
+  addKaseikyoKey("extlink", Unmapped_Key, 0x00B, 0x23);
+  addKaseikyoKey("AUDIO", Audio_Key, 0x00B, 0x33);
+  addKaseikyoKey("POWER", Power_Key, 0x00B, 0x3D);
+  addKaseikyoKey("erase", Unmapped_Key, 0x00B, 0x44); // "DELETE"
+  addKaseikyoKey("POSITION_MEMORY", Unmapped_Key, 0x00B, 0x46);
+  addKaseikyoKey("A-B_REPEAT", RepeatAB_Key, 0x00B, 0x48);
+  addKaseikyoKey("PREV", Previous_Key, 0x00B, 0x49);
+  addKaseikyoKey("NEXT", Next_Key, 0x00B, 0x04A);
+  addKaseikyoKey("timeslip", Unmapped_Key, 0x00B, 0x4B);
+  addKaseikyoKey("manualskip", Unmapped_Key, 0x00B, 0x4C);
+  addKaseikyoKey("RANDOM", Random_Key, 0x00B, 0x4D);
+  addKaseikyoKey("recmode", Unmapped_Key, 0x00B, 0x51);
+  addKaseikyoKey("functions", Unmapped_Key, 0x00B, 0x57);
+  addKaseikyoKey("createchapter", Unmapped_Key, 0x00B, 0x58);
+  addKaseikyoKey("status", Unmapped_Key, 0x00B, 0x5F);
+  addKaseikyoKey("VOLUMEDOWN", VolumeDown_Key, 0x00B, 0x62);
+  addKaseikyoKey("VOLUMEUP", VolumeUp_Key, 0x00B, 0x63);
+  addKaseikyoKey("i", Unmapped_Key, 0x00B, 0x66);
+  addKaseikyoKey("timer", Timer_Key, 0x00B, 0x78);
+  addKaseikyoKey("progcheck", Unmapped_Key, 0x00B, 0x7C);
+  addKaseikyoKey("showview", Unmapped_Key, 0x00B, 0x7F);
+  addKaseikyoKey("MENU", Menu_Key, 0x00B, 0x80);
+  addKaseikyoKey("RETURN", Exit_Key, 0x00B, 0x81);
+  addKaseikyoKey("ACTION", Select_Key, 0x00B, 0x82);
+  addKaseikyoKey("CANCEL", Clear_Key, 0x00B, 0x83);
+  addKaseikyoKey("UP", Up_Key, 0x00B, 0x85);
+  addKaseikyoKey("DOWN", Down_Key, 0x00B, 0x86);
+  addKaseikyoKey("LEFT", Left_Key, 0x00B, 0x87);
+  addKaseikyoKey("RIGHT", Right_Key, 0x00B, 0x88);
+  addKaseikyoKey("+10", DoubleDigit_Key, 0x00B, 0x89);
+//  addKaseikyoKey("inputselect", Input_Key, 0x00B, 0x89); // odd!
+  addKaseikyoKey("PROGRAM", Program_Key, 0x00B, 0x8A);
+  addKaseikyoKey("QUICK_REPLAY", Replay_Key, 0x00B, 0x8B);
+  addKaseikyoKey("REPEAT", Repeat_Key, 0x00B, 0x8C);
+  addKaseikyoKey("PLAY_MODE", Unmapped_Key, 0x00B, 0x8D);
+  addKaseikyoKey("ANGLE", Angle_Key, 0x00B, 0x90);
+  addKaseikyoKey("SUBTITLE", Captions_Key, 0x00B, 0x91);
+  addKaseikyoKey("INFO", Info_Key, 0x00B, 0x92);
+  addKaseikyoKey("SETUP", Unmapped_Key, 0x00B, 0x94);
+//  addKaseikyoKey("R-TUNE", PrevChannel_Key, 0x00B, 0x9B);
+  addKaseikyoKey("TOP_MENU", DiscTitle_Key, 0x00B, 0x9B);
+  addKaseikyoKey("A.SRD", Unmapped_Key, 0x00B, 0x9E);
+  addKaseikyoKey("FL_SELECT", Unmapped_Key, 0x00B, 0xB6);
+  addKaseikyoKey("DISC", Unmapped_Key, 0x00B, 0xB7);
+  addKaseikyoKey("SEQUENTIAL", Unmapped_Key, 0x00B, 0xBF);
+  addKaseikyoKey("CINEMA", Unmapped_Key, 0x00B, 0xC0);
+  addKaseikyoKey("ZOOM", Zoom_Key, 0x00B, 0xC1);
+  addKaseikyoKey("frec", Unmapped_Key, 0x00B, 0xC7);
+  addKaseikyoKey("BASS", EnhancedBass_Key, 0x00B, 0xD4);
+  addKaseikyoKey("D.ENH", Unmapped_Key, 0x00B, 0xD5);
+  addKaseikyoKey("ONETOUCH_MEMORY", Unmapped_Key, 0x00B, 0xD6);
+  addKaseikyoKey("GROUP", Unmapped_Key, 0x00B, 0xE0);
+  addKaseikyoKey("SLEEP", Sleep_Key, 0x00B, 0xEB);
 }
 
 
@@ -537,66 +486,89 @@ PanasonicDVD1a::PanasonicDVD1a(
 {
   setKeysetName("DVD Keyset 1a");
 
-  addKey("channel2up", ChannelUp_Key, 0x2C21, 16);
-  addKey("channel2down", ChannelDown_Key, 0xACA1, 16);
-  addKey("DELETE", Clear_Key, 0x222F, 16);
-  addKey("INPUT_SELECT", Input_Key, 0x0A07, 16);
+  addKaseikyoKey("channel2up", ChannelUp_Key, 0x00B, 0x34);
+  addKaseikyoKey("channel2down", ChannelDown_Key, 0x00B, 0x35);
+  addKaseikyoKey("INPUT_SELECT", Input_Key, 0x00B, 0x50);
 }
 
 
-PanasonicAudio::PanasonicAudio(
+PanasonicAudio1::PanasonicAudio1(
   QObject *guiObject,
   unsigned int index)
   : PIRKeysetMetaData(
-      "Audio System Keyset",
+      "Audio Keyset 1",
       Panasonic_Make,
       index)
 {
   addControlledDevice(Panasonic_Make, "RX-DS25", Audio_Device);
-
-  NECProtocol *np = new NECProtocol(
-    guiObject,
-    index,
-    516, 358,
-    516, 1220,
-    83895, false);
-
-  threadableProtocol = np;
-
-  np->setHeaderPair(3581, 1655);
-  np->setTrailerPulse(524);
-
-  np->setPreData(0x40040543, 32);
-
-//  np->setMinimumRepetitions(1);
-
-  addKey("power", Power_Key, 0xFDBB, 16);
-  addKey("tape", Unmapped_Key, 0x3573, 16);
-  addKey("1", One_Key, 0x094F, 16);
-  addKey("2", Two_Key, 0x89CF, 16);
-  addKey("3", Three_Key, 0x490F, 16);
-  addKey("4", Four_Key, 0xC98F, 16);
-  addKey("5", Five_Key, 0x296F, 16);
-  addKey("6", Six_Key, 0xA9EF, 16);
-  addKey("7", Seven_Key, 0x692F, 16);
-  addKey("8", Eight_Key, 0xE9AF, 16);
-  addKey("9", Nine_Key, 0x195F, 16);
-  addKey("+10", DoubleDigit_Key, 0xF9BF, 16);
-  addKey("10/0", Zero_Key, 0x99DF, 16);
-  addKey("cancel", Clear_Key, 0xB1F7, 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);
-  addKey("fm-mode", Unmapped_Key, 0x2761, 16);
-  addKey("cd", Unmapped_Key, 0x6D2B, 16);
-  addKey("prev", Previous_Key, 0x2167, 16);
-  addKey("next", Next_Key, 0xA1E7, 16);
-  addKey("stop-clear", Stop_Key, 0x0147, 16);
-  addKey("play-pause", Play_Key, 0xE1A7, 16);
-  addKey("play-pause", Pause_Key, 0xE1A7, 16);
-  addKey("repeat", Unmapped_Key, 0x81C7, 16);
-  addKey("xbs", Unmapped_Key, 0x6B2D, 16);
-  addKey("vol-", VolumeDown_Key, 0x8DCB, 16);
-  addKey("vol+", VolumeUp_Key, 0x0D4B, 16);
+  addControlledDevice(Panasonic_Make, "RX-e300", Audio_Device);
+
+  threadableProtocol = new KaseikyoProtocol(guiObject, index);
+
+//  setPreData(0x40040543, 32);
+  setPreData(0x2002, 16);
+
+  addKaseikyoKey("INTRO", Unmapped_Key, 0xC2A, 0x46); // odd
+
+  addKaseikyoKey("stop-clear", Stop_Key, 0xC2A, 0x80);
+  addKaseikyoKey("repeat", Repeat_Key, 0xC2A, 0x81);
+  addKaseikyoKey("random", Random_Key, 0xC2A, 0x82);
+  addKaseikyoKey("eject", Eject_Key, 0xC2A, 0x8E);
+  addKaseikyoKey("prev", Rewind_Key, 0xC2A, 0x84); // "CD_<<"
+  addKaseikyoKey("next", FastForward_Key, 0xC2A, 0x85); // "CD_>>"
+  addKaseikyoKey("CD_PAUSE", Pause_Key, 0xC2A, 0x86);
+  addKaseikyoKey("play-pause", Play_Key, 0xC2A, 0x87);
+  addKaseikyoKey("program", Program_Key, 0xC2A, 0x8B); // "MEMORY"
+  addKaseikyoKey("cancel", Clear_Key, 0xC2A, 0x8D);
+  addKaseikyoKey("display", Info_Key, 0xC2A, 0x8F);
+
+  addKaseikyoKey("1", One_Key, 0xC2A, 0x90);
+  addKaseikyoKey("2", Two_Key, 0xC2A, 0x91);
+  addKaseikyoKey("3", Three_Key, 0xC2A, 0x92);
+  addKaseikyoKey("4", Four_Key, 0xC2A, 0x93);
+  addKaseikyoKey("5", Five_Key, 0xC2A, 0x94);
+  addKaseikyoKey("6", Six_Key, 0xC2A, 0x95);
+  addKaseikyoKey("7", Seven_Key, 0xC2A, 0x96);
+  addKaseikyoKey("8", Eight_Key, 0xC2A, 0x97);
+  addKaseikyoKey("9", Nine_Key, 0xC2A, 0x98);
+  addKaseikyoKey("10/0", Zero_Key, 0xC2A, 0x99);
+  addKaseikyoKey("+10", DoubleDigit_Key, 0xC2A, 0x9F);
+
+  addKaseikyoKey("tape_stop", Unmapped_Key, 0xC2A, 0xA0);
+  addKaseikyoKey("rew", Unmapped_Key, 0xC2A, 0xA2); // "TAPE_<<"
+  addKaseikyoKey("ff", Unmapped_Key, 0xC2A, 0xA3); // "TAPE_>>"
+  addKaseikyoKey("tape_record", Record_Key, 0xC2A, 0xA4);
+  addKaseikyoKey("TAPE_PLAY_REWIND", Unmapped_Key, 0xC2A, 0xA5);
+  addKaseikyoKey("tape_play", Unmapped_Key, 0xC2A, 0xA6); // "TAPE_PLAY_FORWARD"
+  addKaseikyoKey("tape", TapeInput_Key, 0xC2A, 0xAC);
+  addKaseikyoKey("TAPE_DECK", Unmapped_Key, 0xC2A, 0xAD);
+  addKaseikyoKey("rev_mode", Unmapped_Key, 0xC2A, 0xAE); // "TAPE_REV_MODE"
+  addKaseikyoKey("counter_reset", Reset_Key, 0xC2A, 0xAF);
+
+  addKaseikyoKey("vol+", VolumeUp_Key, 0xC2A, 0xB0);
+  addKaseikyoKey("vol-", VolumeDown_Key, 0xC2A, 0xB1);
+  addKaseikyoKey("cd", CDInput_Key, 0xC2A, 0xB6);
+  addKaseikyoKey("tuner-band", TunerBand_Key, 0xC2A, 0xB8);
+  addKaseikyoKey("sleep", Sleep_Key, 0xC2A, 0xBC);
+  addKaseikyoKey("power", Power_Key, 0xC2A, 0xBF);
+
+  addKaseikyoKey("TRACK>>", Unmapped_Key, 0xC2A, 0xD0);
+  addKaseikyoKey("TRACK<<", Unmapped_Key, 0xC2A, 0xD1);
+  addKaseikyoKey("xbs", Unmapped_Key, 0xC2A, 0xD6);
+  addKaseikyoKey("preset_eq", Unmapped_Key, 0xC2A, 0xD9);
+  addKaseikyoKey("virtualizer", Unmapped_Key, 0xC2A, 0xDA); // "S.VIRT"
+
+  addKaseikyoKey("fm-mode", FMMode_Key, 0xC2A, 0xE4); // "st-mono"
+  addKaseikyoKey("TUNER_PRESET_TUNE_UP", NextPreset_Key, 0xC2A, 0xE7);
+  addKaseikyoKey("TUNER_PRESET_TUNE_UP", Next_Key, 0xC2A, 0xE7);
+  addKaseikyoKey("TUNER_PRESET_TUNE_DOWN", PrevPreset_Key, 0xC2A, 0xE8);
+  addKaseikyoKey("TUNER_PRESET_TUNE_DOWN", Previous_Key, 0xC2A, 0xE8);
+  addKaseikyoKey("tuning+", ChannelUp_Key, 0xC2A, 0xE9);
+  addKaseikyoKey("tuning-", ChannelDown_Key, 0xC2A, 0xEA);
+  addKaseikyoKey("AUTOSCAN", Scan_Key, 0xC2A, 0xEC);
+  addKaseikyoKey("bp", Unmapped_Key, 0xC2A, 0xEF); // "TUNER_BP", beat-proof?
+
+  addKaseikyoKey("panelopen", Unmapped_Key, 0xC2A, 0xF4);  // "TOP_PANEL_OPEN"
+  addKaseikyoKey("panelclose", Unmapped_Key, 0xC2A, 0xF5); // "TOP_PANEL_CLOSE"
 }
+