From: John Pietrzak Date: Mon, 20 Feb 2012 20:12:47 +0000 (-0500) Subject: Website Update X-Git-Url: http://vcs.maemo.org/git/?p=pierogi;a=commitdiff_plain;h=c8969a3c4c211d088bbc098887d2c45499da2e1d Website Update This is just a small bit of cleanup for the Pierogi website. --- diff --git a/keysets/logitech.cpp b/keysets/logitech.cpp index 6f20278..e03f25b 100644 --- a/keysets/logitech.cpp +++ b/keysets/logitech.cpp @@ -32,8 +32,11 @@ void LogitechSpeakers::populateProtocol( addKey("test", Unmapped_Key, 0x05, 8); addKey("center-", CenterVolumeDown_Key, 0x06, 8); addKey("direct", PCInput_Key, 0x0A, 8); + addKey("direct", One_Key, 0x0A, 8); addKey("optical", OpticalInput_Key, 0x0B, 8); + addKey("optical", Two_Key, 0x0B, 8); addKey("coax", DigitalCoaxInput_Key, 0x0C, 8); + addKey("coax", Three_Key, 0x0C, 8); addKey("vol-", VolumeDown_Key, 0x0E, 8); addKey("power", Power_Key, 0x10, 8); addKey("mute", Mute_Key, 0x16, 8); diff --git a/keysets/sony.cpp b/keysets/sony.cpp index 0e90091..7255c8f 100644 --- a/keysets/sony.cpp +++ b/keysets/sony.cpp @@ -542,6 +542,7 @@ SonyDVD1::SonyDVD1( Sony_Make, index) { + addControlledDevice(Sony_Make, "DVP-CX985V", DVD_Device); } diff --git a/pierogi.pro.user b/pierogi.pro.user index c3b5939..bb677ef 100644 --- a/pierogi.pro.user +++ b/pierogi.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -79,7 +79,7 @@ dpkg-buildpackage -sa -S -uc -us /Users/john/QtSDK/Maemo/4.6.2/bin/mad false - /Users/john/Develop/n900/pierogi-0.6.7 + /Users/john/Develop/n900/pierogi-0.6.8 Custom Process Step ProjectExplorer.ProcessStep @@ -198,6 +198,7 @@ /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_0_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_5_2_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_6_armel.deb + /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_8_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_2_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_4_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_0_armel.deb @@ -228,6 +229,7 @@ 192.168.0.15 192.168.0.15 192.168.0.15 + 192.168.0.15 @@ -252,6 +254,7 @@ + 2012-01-19T22:18:07 @@ -270,6 +273,7 @@ 2012-02-11T18:03:15 2012-02-08T20:29:28 2012-02-16T22:03:28 + 2012-02-19T19:25:47 2012-02-13T22:02:56 2012-02-14T21:42:07 2012-01-17T00:03:13 diff --git a/pirkeysetmanager.cpp b/pirkeysetmanager.cpp index 48b0899..d0c95ec 100644 --- a/pirkeysetmanager.cpp +++ b/pirkeysetmanager.cpp @@ -19,6 +19,7 @@ #include "keysets/ei.h" #include "keysets/elgato.h" #include "keysets/emerson.h" +#include "keysets/epson.h" #include "keysets/fortec.h" #include "keysets/goldstar.h" #include "keysets/grundig.h" @@ -28,6 +29,7 @@ #include "keysets/homecast.h" #include "keysets/hp.h" #include "keysets/huawei.h" +#include "keysets/humax.h" #include "keysets/jvc.h" #include "keysets/kenwood.h" #include "keysets/lg.h" @@ -179,6 +181,9 @@ PIRKeysetManager::PIRKeysetManager() setupKeyset(new EmersonTV1(counter++)); setupKeyset(new EmersonDVD1(counter++)); + setupKeyset(new EpsonProjector1(counter++)); + setupKeyset(new EpsonProjector2(counter++)); + setupKeyset(new FortecReceiver1(counter++)); setupKeyset(new FortecReceiver2(counter++)); @@ -229,6 +234,10 @@ PIRKeysetManager::PIRKeysetManager() setupKeyset(new HuaweiSTB1(counter++)); setupKeyset(new HuaweiSTB2(counter++)); + setupKeyset(new HumaxReceiver1(counter++)); + setupKeyset(new HumaxReceiver2(counter++)); + setupKeyset(new HumaxReceiver3(counter++)); + setupKeyset(new JVCSat1(counter++)); setupKeyset(new JVCSat2(counter++)); setupKeyset(new JVCVCR1(counter++)); diff --git a/pirmakenames.cpp b/pirmakenames.cpp index 7dfcc20..5496b67 100644 --- a/pirmakenames.cpp +++ b/pirmakenames.cpp @@ -20,6 +20,7 @@ PIRMakeMgr::PIRMakeMgr() makes[Ei_Make] = "Ei"; makes[Elgato_Make] = "Elgato"; makes[Emerson_Make] = "Emerson"; + makes[Epson_Make] = "Epson"; makes[Fortec_Make] = "Fortec Star"; makes[GoldStar_Make] = "GoldStar"; makes[Grundig_Make] = "Grundig"; @@ -29,6 +30,7 @@ PIRMakeMgr::PIRMakeMgr() makes[Homecast_Make] = "Homecast"; makes[HP_Make] = "HP"; makes[Huawei_Make] = "Huawei"; + makes[Humax_Make] = "Humax"; makes[JVC_Make] = "JVC"; makes[Kenwood_Make] = "Kenwood"; makes[LG_Make] = "LG"; diff --git a/pirmakenames.h b/pirmakenames.h index 260675b..917e67c 100644 --- a/pirmakenames.h +++ b/pirmakenames.h @@ -21,6 +21,7 @@ enum PIRMakeName{ Ei_Make, Elgato_Make, Emerson_Make, + Epson_Make, Fortec_Make, GoldStar_Make, Grundig_Make, @@ -30,6 +31,7 @@ enum PIRMakeName{ Homecast_Make, HP_Make, Huawei_Make, + Humax_Make, JVC_Make, Kenwood_Make, LG_Make, diff --git a/protocols/kaseikyoprotocol.cpp b/protocols/kaseikyoprotocol.cpp index 44169aa..1fe73bb 100644 --- a/protocols/kaseikyoprotocol.cpp +++ b/protocols/kaseikyoprotocol.cpp @@ -112,9 +112,9 @@ int KaseikyoProtocol::generateStandardCommand( // manufacturer ID codes) and a second half (containing address and command // data). The first half is 16 bits long plus a 4 bit checksum, and the // second half is 24 bits long plus a 4 bit checksum. Of that second half, - // the first 12 bits are probably the device, and the last 12 bits are split + // the first 12 bits are probably the address, and the last 12 bits are split // into 8 bits of command followed by 4 bits that turn out to be the last - // four bits of the command xored with the middle 4 bits of the device. + // four bits of the command xored with the middle 4 bits of the address. // (At least for Panasonic.) Very strange. // For now, I'm going with this game plan: // -- The "preData" will contain the 16 bits of manufacturer data as a diff --git a/www/index.html b/www/index.html index 8e2e066..8c08233 100644 --- a/www/index.html +++ b/www/index.html @@ -21,15 +21,29 @@ home page, I'll just place a copy of the app's internal documentation below. If you have any questions or comments, please post a note on the Pierogi forum boards or send a message to -jpietrzak8@gmail.com. -Thank you for your understanding. +jpietrzak8@gmail.com. Also, a thread +has been set up on +talk.maemo.org, +containing a great deal of information.

+

A note on licensing and such

-Also, some kind folks have asked about donations. Let me state up front that -this is a free, open-source program; do with it as you will! But yes, if you -wish to send some small donation my way, I will gladly accept it. (All -received funds will be put toward the purchase of a second N900.) +I have placed Pierogi under the GNU General Public License, version 2.0 or +later. (Here is a +link to the terms of +that license.) In short, this places certain restrictions on how you can use +the source code for this program (which you can find +here; +if that link is not working for you, please send me a note). The program +itself is free for use, in whatever manner you wish to use it. +

+ +

+However, some kind folks have asked about donations, and I've decided I will +go ahead and set up a Paypal donation site. Any funds received will be put +towards the purchase of a second N900 I can devote fully towards development +work. Thank you for your support!