tux-droid-svn Mailing List for Tux Droid CE (Page 187)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2008-07-25 19:51:02
|
Author: jerome Date: 2008-07-25 21:51:11 +0200 (Fri, 25 Jul 2008) New Revision: 1357 Modified: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml Log: changed message. Modified: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml =================================================================== --- software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml 2008-07-25 19:35:00 UTC (rev 1356) +++ software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml 2008-07-25 19:51:11 UTC (rev 1357) @@ -18,7 +18,7 @@ name="message" description="Message sent when I'm saying hello" type="string" - defaultValue="That's work with python" /> + defaultValue="Hello world in python" /> </parameters> </gadget> </gadgets> \ No newline at end of file |
Author: jerome
Date: 2008-07-25 21:35:00 +0200 (Fri, 25 Jul 2008)
New Revision: 1356
Added:
software_suite_v2/software/gadgets/tuxdroid-java-gadget-HelloWorld/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/branches/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/tags/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/tags/tuxdroid-python-gadget-HelloWorld.tgf
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/pythonHelloWorld.py
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/resources/
software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/resources/HelloWorld.png
Removed:
software_suite_v2/software/gadgets/HelloWorldGadget/
Log:
Modified java hello world project name.
Added python hello world gadget
Copied: software_suite_v2/software/gadgets/tuxdroid-java-gadget-HelloWorld (from rev 1352, software_suite_v2/software/gadgets/HelloWorldGadget)
Added: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/tags/tuxdroid-python-gadget-HelloWorld.tgf
===================================================================
(Binary files differ)
Property changes on: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/tags/tuxdroid-python-gadget-HelloWorld.tgf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml (rev 0)
+++ software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/gadgets.xml 2008-07-25 19:35:00 UTC (rev 1356)
@@ -0,0 +1,24 @@
+<gadgets>
+ <gadget>
+ <interpreter
+ kind="bash">
+ <executable>pythonHelloWorld.py</executable>
+ </interpreter>
+ <description>
+ <name>HelloWorld Python Sample Gadget</name>
+ <description>This gadget throws a simple Hello World notification in python</description>
+ <author>jerome conan</author>
+ <version>1.0</version>
+ <iconFile>resources/HelloWorld.png</iconFile>
+ <executionMode>command</executionMode>
+ <uuid>548f7a9a-567c-423e-a0dd-102ff68a1a99</uuid>
+ </description>
+ <parameters>
+ <parameter
+ name="message"
+ description="Message sent when I'm saying hello"
+ type="string"
+ defaultValue="That's work with python" />
+ </parameters>
+ </gadget>
+</gadgets>
\ No newline at end of file
Added: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/pythonHelloWorld.py
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/pythonHelloWorld.py (rev 0)
+++ software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/pythonHelloWorld.py 2008-07-25 19:35:00 UTC (rev 1356)
@@ -0,0 +1,6 @@
+#importing os to have Environnement variables support.
+import os
+
+#displpay message from xml file (paramaters changes also works.
+
+print("message " + os.environ['tgp_message'])
\ No newline at end of file
Added: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/resources/HelloWorld.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v2/software/gadgets/tuxdroid-python-gadget-HelloWorld/trunk/resources/HelloWorld.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: jaguarondi <c2m...@c2...> - 2008-07-25 14:55:16
|
Author: jaguarondi Date: 2008-07-25 16:55:23 +0200 (Fri, 25 Jul 2008) New Revision: 1355 Modified: firmware/hex_dev/new_rf/tuxaudio.hex Log: * Updated the hex file to have the audio flash. All functionalities should be there now. Modified: firmware/hex_dev/new_rf/tuxaudio.hex =================================================================== --- firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-25 14:54:20 UTC (rev 1354) +++ firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-25 14:55:23 UTC (rev 1355) @@ -1,10 +1,10 @@ -:1000000019C0BAC69EC631C09EC02FC02EC02DC01A +:1000000019C0A8C68CC631C09EC02FC02EC02DC03E :100010002CC02BC02AC029C028C027C026C025C09C :1000200005C123C022C021C020C01FC01EC01DC0EA -:10003000EAC91BC011241FBECFEFD4E0DEBFCDBF85 -:1000400011E0A0E0B1E0EAECF6E102C005900D920B +:10003000E5C91BC011241FBECFEFD4E0DEBFCDBF8A +:1000400011E0A0E0B1E0E0ECF6E102C005900D9215 :10005000A635B107D9F713E0A6E5B1E001C01D92BE -:10006000A632B107E1F74FD12FCBCACFCF93DF93A1 +:10006000A432B107E1F74FD12ACBCACFCF93DF93A8 :10007000CDB7DEB721970FB6F894DEBF0FBECDBF68 :100080008FEA84B987EC85B98FE088B988E087B9B1 :10009000198203C089818F5F898389818233D0F37C @@ -29,345 +29,344 @@ :1001C000238192818481F22FF81BF91781F0E22FAD :1001D000FF27892F99270197E823F9238D919C9177 :1001E0001197E80FF91F30832F5FED012B8380916A -:1001F0007A00806480937A00809108028150809315 -:100200000802882319F481E080930702FF91EF919F +:1001F0007A00806480937A00809106028150809317 +:100200000602882319F481E080930502FF91EF91A3 :10021000DF91CF91BF91AF919F918F914F913F917E :100220002F910F900FBE0F901F9018950FB6CF9380 :10023000C0910001CF5FC0930001C0FF02C08DDFFD :10024000F894CF910FBE1895CF93DF93CDB7DEB75B :1002500024970FB6F894DEBF0FBECDBF80EF898321 :1002600096B189B19F70807D982B9A831E9B02C0A6 -:1002700090629A838A819BE989278A838091CC0244 -:100280008B83882321F480916301882319F081E016 -:100290008C8301C01C82CE01019613D624960FB622 +:1002700090629A838A819BE989278A838091CA0246 +:100280008B83882321F480916101882319F081E018 +:100290008C8301C01C82CE010196FFD524960FB637 :1002A000F894DEBF0FBECDBFDF91CF9108951092BD -:1002B00056017CD1F89480E885B998E098B91BB8CC +:1002B00056018FD1F89480E885B998E098B91BB8B9 :1002C000E4E6F0E0208189EE808390936C0082E088 :1002D0008BBBE8E6F0E080818260808383B7817F1A :1002E000846083BF83B7816083BF7894889583B728 -:1002F0008E7F83BF10926C0020936400B7DE4AD7D4 -:100300003AD74ED10895CEEFD4E0DEBFCDBFAEDEFA -:10031000809107019091080143D080910E01909146 -:100320000F013ED0ABD927D78AE090E090936201CD -:1003300080936101789483E08CBB8DBB789438D630 -:1003400080910702882331F11092070280915601B3 -:10035000823020F081508093560101C075DF90916A -:1003600010019923B9F08AB183608AB9198203C058 -:1003700089818F5F898389818F3FD1F7892F815050 -:1003800080931001882319F48AB1836002C08AB176 -:100390008C7F8AB980915601813081F688DFCECF7B -:1003A000FC01138214820895FC0120E030E0838177 -:1003B0009481891B9281891711F421E030E0C901F1 -:1003C0000895DC01FC01238192818481F22FF81BC6 -:1003D000F91719F481E090E00895E22FFF27892FA3 -:1003E00099270197E823F9238D919C911197E80FA4 -:1003F000F91F60832F5FFD01238380E090E0089563 -:10040000CF93DF93DC01EC012C818B81281719F449 -:1004100082E090E013C0E22FFF27ED018A81992747 -:100420000197E823F9238D919C91E80FF91F8081B2 -:10043000FB0180832F5F2C8380E090E0DF91CF91E0 -:1004400008958EBD0DB407FEFDCF8EB59927089592 -:10045000FF920F931F93182F062FF42E299883E0F5 -:10046000F0DF812FEEDF802FECDF8F2DEADF80E0E1 -:10047000E8DF299A99271F910F91FF900895FF9225 -:100480000F931F93182F062FF42E299889E3D9DF95 -:10049000812FD7DF802FD5DF8F2DD3DF299A1F91B2 -:1004A0000F91FF9008951F93182F299881E0C9DFBD -:1004B000812FC7DF299A1F910895299884E0C1DF11 -:1004C000299A0895299886E0BCDF299A0895CF9348 -:1004D000DF9380E0E8DFC2E1D1E0F4DF4A816981A7 -:1004E0008881CDDF239681E0C333D807B1F7DF9150 -:1004F000CF910895ECDFE6DF299880E6A2DF299A04 -:100500000895299885E09DDF80E09BDF299A99274F -:100510000895EF92FF920F931F93182F062FD7DFA6 -:10052000E02EE11AFF24102F1295107F13C0CADFAE -:10053000299880E286DF802F82958F7082DF812F5D -:1005400080DF80E07EDF299ADCDF80FDFDCF015077 -:100550001051FA948E2D8095F81649F71F910F913E -:10056000FF90EF900895EF92FF920F931F93182F33 -:10057000062FF42EE22EC5DF80FDFDCFA3DF2998E4 -:1005800082E05FDF812F5DDF802F5BDF8F2D59DF02 -:100590008E2D57DF299A1F910F91FF90EF900895AC -:1005A000289A29988BEA4DDF299A0895289A299844 -:1005B00089EB47DF299A08951092CC0210925C01D2 -:1005C00020E040E060E08CEC5FD4289A299A0895FE -:1005D0001F93CF93DF938091D502882309F4F5C050 -:1005E0001091CC0280918A02882309F48DC01123D6 -:1005F00009F48AC080918A02811708F485C081E0DD -:1006000080936A0110926C0180936B0120E090E06E -:10061000312F315002C02F5F9F5F931741F08F3F02 -:1006200011F08E3F09F42F5F8D5FA9F3F5CF892F6D -:10063000880F890F8F5F20936C0180936B019F5F00 -:1006400090936A01299883E0FCDE80E0FADE8091D5 -:100650006C01F7DE80916B01F4DEC4EFD1E080E045 -:10066000F0DE899381E0CA3FD807C9F71230A8F0BD -:100670008091F501805F8093F5018091F501807F85 -:100680008093F5018091F501882329F48091F4018C -:100690008F5F8093F4011092F601299A8091F40102 -:1006A000883090F58091F701883070F58091F401E1 -:1006B000882321F48091F501843030F18091F80194 -:1006C000882321F48091F9018430F0F09091F701B2 -:1006D0008091F4019817C0F09091F7018091F40196 -:1006E0009817B9F49091F8018091F501981760F08E -:1006F0009091F8018091F501981759F49091F901C2 -:100700008091F601891728F010925C011092CC02BA -:1007100068C0809107019091080142DE299883E02A -:1007200090DE8091F4018DDE8091F5018ADE80916A -:10073000F60187DE8AEF87BD1092D50260918A02AA -:1007400020E040E08CECA0D34CC036DF4AC080E013 -:1007500078DE2091FC01992702C0959587952A950E -:10076000E2F7682F80910701909108012ADE8091BD -:10077000F6018F5F8093F6018091F601882391F452 -:100780008091F5018F5F8093F5018091F5018823B9 -:1007900049F48091F4018F5F8093F4018091F4011A -:1007A000883099F29091F4018091F701981769F4DB -:1007B0009091F5018091F801981739F49091F60124 -:1007C0008091F901981709F4C0CF809158018823CE -:1007D00041F48091070190910801E6DD882309F436 -:1007E000B6CFDF91CF911F9108951F938091330170 -:1007F000882321F07FDE109233012EC082DE80FD3F -:100800002BC011E01093330110925A012EEF40E0FB -:1008100060E080E0A8DE20E041E060E080E0A3DE70 -:1008200024E042E060E080E09EDE20E043E060E023 -:1008300080E099DE10928A021092640120E040E08C -:1008400060E08DEC21D360918A0220E04091640148 -:100850008BEC1AD310936E001F91089540918A0279 -:1008600083E0489FA00111244F5F5F4F50936901BF -:1008700040936801652F772780E0EADD8093F401DB -:1008800040916801509169014F5F5F4F509369013A -:1008900040936801652F772780E0DADD8093F501CA -:1008A00040916801509169014F5F5F4F509369011A -:1008B00040936801652F772780E0CADD8093F601B9 -:1008C0008091F4019091F5018295807F92959F70BF -:1008D000890F9927089581E080936B0110926C0134 -:1008E00010926A0140916B0160916C0180E0B0DD73 -:1008F0008F3FB9F080916C0120916B01922F9F5F27 -:1009000021F09F5F11F09F3F09F48F5F80936C018E -:100910002D5F20936B0180916A018F5F80936A0144 -:10092000E1CF80916A01815080936A0199270895EF -:10093000FF920F931F93CF93DF93CDB7DEB721972D -:100940000FB6F894DEBF0FBECDBF8091670188233C -:1009500009F08AC010926E0080918A02882351F4B7 -:100960001092F40184E08093F5011092F601109248 -:100970006D0152C040918A0283E0489FA00111247A -:100980004F5F5F4F5093690140936801652F772750 -:1009900080E05EDD8093F40140916801509169012F -:1009A0004F5F5F4F5093690140936801652F772730 -:1009B00080E04EDD8093F50140916801509169011E -:1009C0004F5F5F4F5093690140936801652F772710 -:1009D00080E03EDD8093F6018091F501805F809399 -:1009E000F5018091F501807F8093F5018091F501FB -:1009F000882329F48091F4018F5F8093F401109291 -:100A0000F6019091F4018091F5019295907F829585 -:100A10008F70980F90936D0180910701909108015C -:100A2000BFDC8091F401883048F085E08093670155 -:100A300020E040E065E08DEC27D205C080916701A1 -:100A40008F5F8093670188E893E1909360018093C2 -:100A50005F0190936201809361012091F5014091C3 -:100A6000F40161E08DEC4FC1813051F5F090F60159 -:100A70000091F5011091F40125DD29988FEAE1DC60 -:100A8000812FDFDC802FDDDC8F2DDBDCBE016F5F93 -:100A90007F4F8091070190910801B2DC882311F407 -:100AA000898101C080E8CDDC299A809167018F5F40 -:100AB0008093670181E08093D5021092660124C182 -:100AC000823009F07EC08091D502882309F052C09F -:100AD00057C0E0910701F091080193818481981734 -:100AE000A9F181E0809366018AE090E09093600133 -:100AF00080935F01909362018093610129988FEA4E -:100B0000A0DCBE016F5F7F4F8091070190910801CB -:100B100077DC898196DC299A8091F6018F5F80933A -:100B2000F6018091F601882371F48091F5018F5FC1 -:100B30008093F5018091F501882329F48091F401D7 -:100B40008F5F8093F401DDDC80FDFDCF80915F013C -:100B500090916001892B09F4B6C08091F40187302F -:100B600049F48091F5018F3F29F48091F6018F3F80 -:100B700009F4A9C080915801882309F4AACFC4C000 -:100B80009CDC80916601882399F04091F40180916A -:100B9000F5014295407F82958F70480F4093640124 -:100BA00080916D01481B20E062E08DEC6DD187C023 -:100BB00020E040E066E08DEC67D185E0809367013E -:100BC000A3C0833091F580916501813011F484E0F8 -:100BD00027C0823039F520E040E064E08DEC54D14C -:100BE00090916D01992371F481E080935A018AE01C -:100BF00090E09093620180936101109267011092DE -:100C00005B0110C06091F4018091F5016295607FF5 -:100C100082958F70680F60936401892F7ADC85E07C -:100C200080936701109265016FC0843009F04EC057 -:100C300020E040E063E08DEC27D180918A028F5F55 -:100C400080938A0240918A0283E0489FA001112488 -:100C50004F5F5F4F50936901409368012091F40109 -:100C6000652F772780E07FDC409168015091690112 -:100C70004F5F5F4F50936901409368012091F501E8 -:100C8000652F772780E06FDC409168015091690102 -:100C90004F5F5F4F50936901409368012091F601C7 -:100CA000652F772780E05FDC9091F4018091F5015A -:100CB0009295907F82958F70980F909364018091A8 -:100CC00067018F5F7BCF1092D5021EC08530E1F4A3 -:100CD00002DE80938A028AE090E090936201809322 -:100CE00061011092670110925B0181E080936E00B8 -:100CF00020E040E060E08DECC7D060918A0220E007 -:100D0000409164018BECC0D021960FB6F894DEBF01 -:100D10000FBECDBFDF91CF911F910F91FF9008952E -:100D2000FC018181843061F4A281B3818C9188239C -:100D300039F080818A3221F4B0936F01A0936E0163 -:100D400008951F920F920FB60F9211248F9381E096 -:100D50008093E201809358018F910F900FBE0F9006 -:100D60001F9018951092E1012A988091AD018EBDD7 -:100D7000E89AE09A289808951F920F920FB60F9262 -:100D800011248F939F93EF93FF932A991CC00DB466 -:100D900007FE19C09091E1018EB5E92FFF27E758B2 -:100DA000FE4F80839F5F9093E101973231F42A9A3E -:100DB000E898289A1092580106C0E92FFF27E355BA -:100DC000FE4F80818EBDFF91EF919F918F910F908B -:100DD0000FBE0F901F901895E0910701F091080148 -:100DE00023819481809172018F5F809372018823A7 -:100DF00001F5291B809171012817B0F4209371012E -:100E0000203520F006C087B5815002C087B58F5FBE -:100E100087BD87B58F3F11F48EEF87BD87B5803FC3 -:100E200040F480EF87BD089520937101293258F76F -:100E3000F0CF0895FF920F931F93CF93DF939C0100 -:100E4000E0914001F091410183819481891B8D31B2 -:100E500018F080E090E012C0FFB6F894E901890133 -:100E60000C5F1F4F69918091400190914101A9DA77 -:100E7000C017D107B9F7FFBE81E090E0DF91CF91B5 -:100E80001F910F91FF900895CF93DF93CDB7DEB7F9 -:100E900024970FB6F894DEBF0FBECDBF89836A8357 -:100EA0004B832C83CE010196C5DF992787FD909552 -:100EB00024960FB6F894DEBF0FBECDBFDF91CF9161 -:100EC0000895FF920F931F93CF93DF93AC01E091AE -:100ED0003901F0913A0123818481281B33278281D3 -:100EE00099270497821793071CF480E090E012C0C2 -:100EF000FFB6F894EA018A010C5F1F4F6991809157 -:100F0000390190913A015DDAC017D107B9F7FFBEF8 -:100F100081E090E0DF91CF911F910F91FF900895B4 -:100F2000CF93DF93CDB7DEB724970FB6F894DEBF2B -:100F30000FBECDBF89836A834B832C83CE0101967C -:100F4000C0DF992787FD909524960FB6F894DEBFF1 -:100F50000FBECDBFDF91CF9108950F931F93CF9315 -:100F6000DF93BC01E0914001F091410193818481C4 -:100F7000981729F401C0789481E090E014C0F894A7 -:100F8000EB018B010C5F1F4FBE01809140019091DE -:100F9000410136DA882379F72196C017D107A1F7E6 -:100FA000789480E090E0DF91CF911F910F910895A8 -:100FB0000F931F93CF93DF938091E201882319F061 -:100FC0001092E201CFDE8091E101873208F487C000 -:100FD0001092E10110917A0190917901809177014D -:100FE0008917C9F090937701912F969580917001A0 -:100FF00082958F70892780FF0EC08BE791E0D0D05B -:10100000882319F48BE791E05CDF8091700190E117 -:10101000892780937001C12FDD27C2FF10C0DCDE5D -:101020000FE711E0F80161918F0180910701909124 -:101030000801C7D9F1E0003A1F0741F0F3CF8091D2 -:1010400078018093AD018F5F8093780120917001CA -:10105000822F869594E0D695C7959A95E1F78C27CF -:1010600080FD1AC0E0914001F0914101838194819B -:10107000891B843088F082E0282720937001CFEA12 -:10108000D1E0BE018091400190914101B9D92196F2 -:1010900081E0C33BD807A9F7E0910E01F0910F0161 -:1010A00083819481891B90917001813188F09460D3 -:1010B00090937001C3EBD1E0BE0180910E0190913D -:1010C0000F019ED92196E1E0C43CDE0721F0F4CF68 -:1010D0009B7F90937001809170018093AE0145D108 -:1010E000019709F443C080914D0190914E010397FF -:1010F00049F180916E0190916F01009761F050D09D -:10110000882329F480916E0190916F0193DE1092F3 -:101110006F0110926E01E0913901F0913A019381D3 -:1011200084819817D1F0C3E7D1E0BE0180913901E5 -:1011300090913A0165D98823C9F42196F1E0C73727 -:10114000DF0799F789E491E01ED110C00ED1019715 -:1011500069F08FE491E0DFD009C0E0914001F091A7 -:10116000410183819481891B8D3180F3DF91CF917F -:101170001F910F910895BFD09AE29093490184E0A6 -:1011800080934A0190934F018093500180E996E04B -:10119000A8D008958091390190913A0101D908951C -:1011A000FC018081882309F468C0833011F468D081 -:1011B00041C08039B1F480915C01882309F05DC0A1 -:1011C00080915B01882309F058C082818093FC01E3 -:1011D00081818093CC0281E080935C018093D50271 -:1011E00029C0823949F48181882319F05F98559884 -:1011F00021C05F9A559A1EC0823561F480915C01CE -:10120000882311F010925C0181E08093D5028093D5 -:101210005B0110C0843521F481E080935A010AC03B -:10122000833559F48181882311F081E001C082E087 -:101230008093650181E090E008958F3FD9F480911B -:10124000E8019181282F21502093E80131818917ED -:1012500028F43093E8011092E70109C0231B809124 -:10126000E701820F8093E70181818093E8018091FB -:10127000E701828380E090E0089581E090E00895A6 -:10128000CF93DF93CDB7DEB72C970FB6F894DEBFC0 -:101290000FBECDBF80EF9DE1DE011196FC010196EE -:1012A000E491ED932DE18C3F9207C1F7CE010196B9 -:1012B000C1DDCE010596BEDDCE010996BBDD609194 -:1012C0008A0220E0409164018BECDEDD2C960FB6A3 -:1012D000F894DEBF0FBECDBFDF91CF91089528985F -:1012E00008959093F0018093EF0108959093F20197 -:1012F0008093F10108951092EA011092E901459A54 -:10130000449A80E68093B90080E28093B80085E833 -:101310008093BC000895FC018091E9019091EA015D -:10132000019719F48FEF90E00895F093EC01E093AA -:10133000EB0181E090E09093EA018093E9019583CD -:1013400084838081880F8F5F8093ED011092EE017E -:1013500085EA8093BC0080E090E00895E091EB0185 -:10136000F091EC018081992708958091E901909195 -:10137000EA0108951092EA011092E901089580911E -:10138000EE0199270895FC018091E9019091EA010D -:10139000019719F48FEF9FEF0895F093EC01E0931C -:1013A000EB0181E090E09093EA018093E90195835D -:1013B00084838081880F8093ED011092EE0185EA8D -:1013C0008093BC0080E090E00895CF93DF93CDB789 -:1013D000DEB721970FB6F894DEBF0FBECDBF1982DE -:1013E00003C089818F5F898389818F3FD1F785EA27 -:1013F0008093BC0021960FB6F894DEBF0FBECDBF20 -:10140000DF91CF9108951F920F920FB60F92112482 -:101410002F933F934F935F936F937F938F939F93FC -:10142000AF93BF93CF93DF93EF93FF938091B90076 -:101430009927887F90708035910509F4A2C0813585 -:10144000910594F58032910509F4DDC08132910552 -:101450009CF48830910509F45CC08930910524F42E -:10146000892B09F4EDC0EFC08031910509F451C01A -:10147000489709F0E8C052C08833910509F46FC05D -:101480008933910544F48832910509F447C0C09727 -:1014900009F0D9C0B8C08034910509F483C08834FC -:1014A000910509F0D0C0AFC08837910509F4B8C0E4 -:1014B00089379105ACF48036910509F4B1C08136C5 -:1014C00091052CF48835910509F0BDC07AC08836A5 -:1014D000910509F4A5C08037910509F0B4C0A0C0FA -:1014E0008039910509F4A2C0813991054CF4803806 -:1014F000910509F49BC08838910509F0A4C09CC0EF -:101500008839910509F498C0803A910509F09BC08B -:101510008FC08091ED018093BB0051C09091EE018E -:10152000E091EB01F091EC018181981770F48091CA -:10153000EE010280F381E02DE80FF11D90818F5FB5 -:101540008093EE019093BB003AC085E98093BC0084 -:1015500082E090E09093EA018093E9010FC08091CE -:10156000BC0085688093BC0085E090E09093EA0120 -:101570008093E901E091EB01F091EC019583848384 -:1015800062C09091EE01E091EB01F091EC010280DC -:10159000F381E02DE90FF11D8091BB0080839F5FF7 -:1015A0009093EE012091EE013327E091EB01F09151 -:1015B000EC0181819927019728173907BCF185E84B -:1015C00040C0A091EB01B091EC019091EE01ED01D2 -:1015D000EA81FB81E90FF11D8091BB0080839F5F51 -:1015E0009093EE0184E090E09093EA018093E9010A -:1015F0009D838C83E091EF01F091F001309719F118 -:10160000CD0109951DC083E090E09093EA0180939D -:10161000E901E091EB01F091EC019583848310C026 -:1016200081E090E09093EA018093E90185EC09C0A4 -:101630001092EA011092E9018091BC00856801C016 -:1016400085E98093BC00FF91EF91DF91CF91BF912D -:10165000AF919F918F917F916F915F914F913F914A -:101660002F910F900FBE0F901F90189581E0E3EF20 -:10167000F1E0A0E0B0E0182E0ED0089581E0E3EF95 -:10168000F1E0A0E0B0E0182E01D0089509D0019259 -:101690001A94E1F7089501900BD01A94E1F7089598 -:1016A000F999FECFB2BDA1BDF89A119600B4089584 -:1016B000F999FECFB2BDA1BD00BC11960FB6F8944A -:0A16C000FA9AF99A0FBE0895FFCFC1 -:1016CA0004010A0280000002018C024000000901A4 -:1016DA0014010000000100000200000300000400E1 -:1016EA000005000006000007000007800007A000B0 -:1016FA0007C00001D6021000003401E602200000F3 -:10170A003B010603200000420100007301000000B3 -:06171A0000E301000000E5 +:1002F0008E7F83BF10926C0020936400B7DE45D7D9 +:1003000035D761D10895CEEFD4E0DEBFCDBFAEDEEC +:10031000809107019091080156D080910E01909133 +:100320000F0151D0A6D9FAD2809388028091880219 +:10033000B8D2809362011AD7789483E08CBB8DBBCE +:10034000789480915801882361F480915B01811138 +:1003500012D380915C0181114ED180915A0181119B +:1003600067D212D680910502882331F110920502DE +:1003700080915601823020F081508093560101C057 +:1003800063DF909110019923B9F08AB183608AB933 +:10039000198203C089818F5F898389818F3FD1F75B +:1003A000892F815080931001882319F48AB18360CA +:1003B00002C08AB18C7F8AB980915601813009F0E0 +:1003C000BFCF75DFBDCFFC01138214820895FC01FD +:1003D00020E030E083819481891B9281891711F498 +:1003E00021E030E0C9010895DC01FC012381928104 +:1003F0008481F22FF81BF91719F481E090E0089539 +:10040000E22FFF27892F99270197E823F9238D9160 +:100410009C911197E80FF91F60832F5FFD012383E3 +:1004200080E090E00895CF93DF93DC01EC012C8114 +:100430008B81281719F482E090E013C0E22FFF2788 +:10044000ED018A8199270197E823F9238D919C91E9 +:10045000E80FF91F8081FB0180832F5F2C8380E0F0 +:1004600090E0DF91CF9108958EBD0DB407FEFDCFD2 +:100470008EB599270895FF920F931F93182F062F7B +:10048000F42E299883E0F0DF812FEEDF802FECDF60 +:100490008F2DEADF80E0E8DF299A99271F910F91DD +:1004A000FF900895FF920F931F93182F062FF42E9D +:1004B000299889E3D9DF812FD7DF802FD5DF8F2DD2 +:1004C000D3DF299A1F910F91FF9008951F93182F42 +:1004D000299881E0C9DF812FC7DF299A1F910895EC +:1004E000299884E0C1DF299A0895299886E0BCDF25 +:1004F000299A0895CF93DF9380E0E8DFC2E1D1E04D +:10050000F4DF4A8169818881CDDF239681E0C3339E +:10051000D807B1F7DF91CF910895ECDFE6DF299896 +:1005200080E6A2DF299A0895299885E09DDF80E082 +:100530009BDF299A99270895EF92FF920F931F93BB +:10054000182F062FD7DFE02EE11AFF24102F129567 +:10055000107F13C0CADF299880E286DF802F829542 +:100560008F7082DF812F80DF80E07EDF299ADCDFE1 +:1005700080FDFDCF01501051FA948E2D8095F81614 +:1005800049F71F910F91FF90EF900895EF92FF921E +:100590000F931F93182F062FF42EE22EC5DF80FD38 +:1005A000FDCFA3DF299882E05FDF812F5DDF802F01 +:1005B0005BDF8F2D59DF8E2D57DF299A1F910F9109 +:1005C000FF90EF900895289A29988BEA4DDF299A99 +:1005D0000895289A299889EB47DF299A089510925F +:1005E000CA0210925C0120E040E060E08CEC38D45C +:1005F000289A299A08950F931F93CF93DF938091A0 +:10060000D302882309F4FCC00091CA0280918802B9 +:10061000882309F48DC0002309F48AC080918802E0 +:10062000801708F485C081E08093680110926A0108 +:100630008093690120E090E0302F315002C02F5F9D +:100640009F5F931741F08F3F11F08E3F09F42F5FAA +:100650008D5FA9F3F5CF892F880F890F8F5F2093C6 +:100660006A01809369019F5F90936801299883E0F4 +:10067000FBDE80E0F9DE80916A01F6DE809169019F +:10068000F3DEC2EFD1E080E0EFDE899381E0C83F86 +:10069000D807C9F70230A8F08091F301805F8093FA +:1006A000F3018091F301807F8093F3018091F30146 +:1006B000882329F48091F2018F5F8093F2011092D8 +:1006C000F401299A8091F201883090F58091F5012A +:1006D000883070F58091F201882321F48091F30134 +:1006E000843030F18091F601882321F48091F70164 +:1006F0008430F0F09091F5018091F2019817C0F0EC +:100700009091F5018091F2019817B9F49091F6015A +:100710008091F301981760F09091F6018091F301B8 +:10072000981759F49091F7018091F401891728F0F6 +:1007300010925C011092CA0276C0809107019091DC +:10074000080141DE299883E08FDE8091F2018CDE82 +:100750008091F30189DE8091F40186DE8AEF87BD06 +:100760001092D3026091880220E040E08CEC78D3B4 +:100770005AC035DF58C080E077DE9091FA01082F2B +:10078000112702C0159507959A95E2F7602F809181 +:1007900007019091080128DE602F80910701909158 +:1007A000080122DE8091F4018F5F8093F401809133 +:1007B000F401882391F48091F3018F5F8093F3011A +:1007C0008091F301882349F48091F2018F5F809337 +:1007D000F2018091F201883061F29091F2018091F2 +:1007E000F501981769F49091F3018091F60198173B +:1007F00039F49091F4018091F701981709F4B9CF79 +:1008000080915801882379F4E0910701F091080163 +:1008100023818481281B33278281992701972817F8 +:1008200039070CF4A8CFDF91CF911F910F91089554 +:100830001F9380913301882321F06FDE10923301E2 +:100840002EC072DE80FD2BC011E010933301109298 +:100850005A012EEF40E060E080E098DE20E041E0C9 +:1008600060E080E093DE24E042E060E080E08EDE45 +:1008700020E043E060E080E089DE10928802109280 +:10088000620120E040E060E08DECEAD260918802F5 +:1008900020E0409162018BECE3D210936E001F9137 +:1008A00008954091880283E0489FA00111244F5F82 +:1008B0005F4F5093670140936601652F772780E073 +:1008C000DADD8093F20140916601509167014F5F3C +:1008D0005F4F5093670140936601652F772780E053 +:1008E000CADD8093F30140916601509167014F5F2B +:1008F0005F4F5093670140936601652F772780E033 +:10090000BADD8093F4018091F2019091F301829518 +:10091000807F92959F70890F9927089581E0809339 +:10092000690110926A011092680140916901609119 +:100930006A0180E0A0DD8F3FB9F080916A012091CB +:100940006901922F9F5F21F09F5F11F09F3F09F493 +:100950008F5F80936A012D5F209369018091680108 +:100960008F5F80936801E1CF80916801815080930F +:10097000680199270895FF920F931F93CF93DF93F8 +:10098000CDB7DEB721970FB6F894DEBF0FBECDBF4F +:1009900080916501882309F086C010926E008091D5 +:1009A0008802882351F41092F20184E08093F301CD +:1009B0001092F40110926B0152C04091880283E0C2 +:1009C000489FA00111244F5F5F4F509367014093F0 +:1009D0006601652F772780E04EDD8093F20140911C +:1009E0006601509167014F5F5F4F509367014093DD +:1009F0006601652F772780E03EDD8093F30140910B +:100A00006601509167014F5F5F4F509367014093BC +:100A10006601652F772780E02EDD8093F4018091B9 +:100A2000F301805F8093F3018091F301807F8093D5 +:100A3000F3018091F301882329F48091F2018F5F03 +:100A40008093F2011092F4019091F2018091F301F0 +:100A50009295907F82958F70980F90936B01809103 +:100A6000070190910801AFDC8091F201883048F0D5 +:100A700085E08093650120E040E065E08DECF0D1F9 +:100A800005C0809165018F5F8093650188E893E1DF +:100A90009093600180935F012091F3014091F201F6 +:100AA00061E08DEC1EC1813051F5F090F4010091B0 +:100AB000F3011091F20119DD29988FEAD5DC812F1D +:100AC000D3DC802FD1DC8F2DCFDCBE016F5F7F4F59 +:100AD0008091070190910801A6DC882311F4898197 +:100AE00001C080E8C1DC299A809165018F5F809305 +:100AF000650181E08093D30210926401F3C08230DB +:100B000009F084C08091D302882309F051C05FC0EE +:100B1000E0910701F091080193818481981709F40D +:100B20004CC081E0809364018AE090E09093600182 +:100B300080935F0129988FEA97DC8E010F5F1F4F2A +:100B4000B80180910701909108016DDC89818CDCEE +:100B5000B801809107019091080165DC299A809184 +:100B6000F4018F5F8093F4018091F401882371F484 +:100B70008091F3018F5F8093F3018091F3018823CB +:100B800029F48091F2018F5F8093F2018091F2014C +:100B9000873059F48091F3018F3F39F48091F4014B +:100BA0008F3F19F41092D30208C0BEDC80FDFDCF48 +:100BB00080915801882309F4ABCF80915F01909117 +:100BC0006001892B09F08EC01092D3028BC088DCA3 +:100BD00080916401882399F04091F2018091F301A2 +:100BE0004295407F82958F70480F409362018091BB +:100BF0006B01481B20E062E08DEC32D155C020E053 +:100C000040E066E08DEC2CD185E051C0833011F4DA +:100C100084E04DC0843009F04DC020E040E063E046 +:100C20008DEC1ED1809188028F5F80938802409165 +:100C3000880283E0489FA00111244F5F5F4F5093CB +:100C40006701409366012091F201652F772780E0CC +:100C50009DDC40916601509167014F5F5F4F50935B +:100C60006701409366012091F301652F772780E0AB +:100C70008DDC40916601509167014F5F5F4F50934B +:100C80006701409366012091F401652F772780E08A +:100C90007DDC9091F2018091F3019295907F829595 +:100CA0008F70980F90936201809165018F5F8093A0 +:100CB000650118C08530B1F431DE8093880210924E +:100CC000650110925B0181E080936E0020E040E0BE +:100CD00060E08DECC5D06091880220E04091620117 +:100CE0008BECBED021960FB6F894DEBF0FBECDBF01 +:100CF000DF91CF911F910F91FF900895FC018181A9 +:100D0000843061F4A281B3818C91882339F0808191 +:100D10008A3221F4B0936D01A0936C0108951F9263 +:100D20000F920FB60F9211248F9381E08093E00110 +:100D3000809358018F910F900FBE0F901F901895C0 +:100D40001092DF0128982A988091AB018EBDE89A15 +:100D5000E09A08951F920F920FB60F9211248F936D +:100D60009F93EF93FF932A991AC00DB407FE17C003 +:100D70009091DF018EB5E92FFF27E958FE4F808360 +:100D80009F5F9093DF01973221F42A9AE898289A7E +:100D900006C0E92FFF27E555FE4F80818EBDFF91EC +:100DA000EF919F918F910F900FBE0F901F9018950C +:100DB000E0910701F09108012381948180917001F5 +:100DC0008F5F80937001882301F5291B80916F014B +:100DD0002817B0F420936F01203520F006C087B5A6 +:100DE000815002C087B58F5F87BD87B58F3F11F4F3 +:100DF0008EEF87BD87B5803F40F480EF87BD0895B3 +:100E000020936F01293258F7F0CF0895FF920F9386 +:100E10001F93CF93DF939C01E0914001F09141013A +:100E200083819481891B8D3118F080E090E012C09D +:100E3000FFB6F894E90189010C5F1F4F6991809119 +:100E4000400190914101D0DAC017D107B9F7FFBE38 +:100E500081E090E0DF91CF911F910F91FF90089575 +:100E6000CF93DF93CDB7DEB724970FB6F894DEBFEC +:100E70000FBECDBF89836A834B832C83CE0101963D +:100E8000C5DF992787FD909524960FB6F894DEBFAD +:100E90000FBECDBFDF91CF910895FF920F931F93A7 +:100EA000CF93DF93AC01E0913901F0913A012381B6 +:100EB0008481281B332782819927049782179307FF +:100EC0001CF480E090E012C0FFB6F894EA018A01B9 +:100ED0000C5F1F4F69918091390190913A0184DA3A +:100EE000C017D107B9F7FFBE81E090E0DF91CF9145 +:100EF0001F910F91FF900895CF93DF93CDB7DEB789 +:100F000024970FB6F894DEBF0FBECDBF89836A83E6 +:100F10004B832C83CE010196C0DF992787FD9095E6 +:100F200024960FB6F894DEBF0FBECDBFDF91CF91F0 +:100F300008950F931F93CF93DF93BC01E09140017D +:100F4000F091410193818481981729F401C078942C +:100F500081E090E014C0F894EB018B010C5F1F4F0F +:100F6000BE0180914001909141015DDA882379F7BB +:100F70002196C017D107A1F7789480E090E0DF9127 +:100F8000CF911F910F9108950F931F93CF93DF93EC +:100F90008091E001882319F01092E001D1DE809168 +:100FA000DF01873208F496C01092DF0110917801BA +:100FB00090917701809175018917C9F0909375011F +:100FC000912F969580916E0182958F70892780FF71 +:100FD0000EC089E791E0DFD0882319F489E791E01A +:100FE0005CDF80916E0190E1892780936E01012F73 +:100FF000112702FF12C080915C01882371F4D8DEB2 +:10100000CDE7D1E069918091070190910801ECD979 +:1010100081E0CE39D80761F0F5CF80915F019091E2 +:101020006001009729F001979093600180935F0120 +:10103000809176018093AB018F5F80937601209140 +:101040006E01822F869594E0169507959A95E1F7A3 +:10105000802780FD1AC0E0914001F0914101838119 +:101060009481891B843088F082E0282720936E01C8 +:10107000CDEAD1E0BE018091400190914101D3D9E8 +:10108000219681E0C13BD807A9F7E0910E01F091CC +:101090000F0183819481891B90916E01813188F0C9 +:1010A000946090936E01C1EBD1E0BE0180910E017E +:1010B00090910F01B8D9219681E0C23CD80721F068 +:1010C000F4CF9B7F90936E0180916E018093AC0171 +:1010D0001092580145D1019709F443C080914D0108 +:1010E00090914E01039749F180916C0190916D01AF +:1010F000009761F050D0882329F480916C01909181 +:101100006D0184DE10926D0110926C01E091390145 +:10111000F0913A01938184819817D1F0C1E7D1E031 +:10112000BE018091390190913A017DD98823C9F49B +:10113000219681E0C537D80799F789E491E01ED15F +:1011400010C00ED1019769F08FE491E0DFD009C0A3 +:10115000E0914001F091410183819481891B8D319F +:1011600080F3DF91CF911F910F910895BFD09AE244 +:101170009093490184E080934A0190934F018093BA +:1011800050018EE796E0A8D00895809139019091A2 +:101190003A0119D90895FC018081882309F468C0B7 +:1011A000833011F468D041C08039B1F480915C0182 +:1011B000882309F05DC080915B01882309F058C045 +:1011C00082818093FA0181818093CA0281E08093B9 +:1011D0005C018093D30229C0823949F4818188233C +:1011E00019F05F98559821C05F9A559A1EC08235B4 +:1011F00061F480915C01882311F010925C0181E020 +:101200008093D30280935B0110C0843521F481E088 +:1012100080935A010AC0833559F48181882311F0E3 +:1012200081E001C082E08093630181E090E0089555 +:101230008F3FD9F48091E6019181282F215020938E +:10124000E6013181891728F43093E6011092E50117 +:1012500009C0231B8091E501820F8093E501818104 +:101260008093E6018091E501828380E090E008951B +:1012700081E090E00895CF93DF93CDB7DEB72C9750 +:101280000FB6F894DEBF0FBECDBF80EF9DE1DE014B +:101290001196FC010196E491ED932DE18C3F9207AC +:1012A000C1F7CE010196B2DDCE010596AFDDCE01CC +:1012B0000996ACDD6091880220E0409162018BECE0 +:1012C000CFDD2C960FB6F894DEBF0FBECDBFDF91F9 +:1012D000CF910895289808959093EE018093ED01A1 +:1012E00008959093F0018093EF0108951092E80122 +:1012F0001092E701459A449A80E68093B90080E213 +:101300008093B80085E88093BC000895FC0180912B +:10131000E7019091E801019719F48FEF90E00895AB +:10132000F093EA01E093E90181E090E09093E80115 +:101330008093E701958384838081880F8F5F8093FA +:10134000EB011092EC0185EA8093BC0080E090E014 +:101350000895E091E901F091EA01808199270895CB +:101360008091E7019091E80108951092E8011092B0 +:10137000E70108958091EC0199270895FC0180917F +:10138000E7019091E801019719F48FEF9FEF08951D +:10139000F093EA01E093E90181E090E09093E801A5 +:1013A0008093E701958384838081880F8093EB018C +:1013B0001092EC0185EA8093BC0080E090E00895F3 +:1013C000CF93DF93CDB7DEB721970FB6F894DEBF8A +:1013D0000FBECDBF198203C089818F5F8983898148 +:1013E0008F3FD1F785EA8093BC0021960FB6F89421 +:1013F000DEBF0FBECDBFDF91CF9108951F920F9238 +:101400000FB60F9211242F933F934F935F936F93D7 +:101410007F938F939F93AF93BF93CF93DF93EF937C +:10142000FF938091B9009927887F9070803591054E +:1014300009F4A2C08135910594F58032910509F433 +:10144000DDC0813291059CF48830910509F45CC0BF +:101450008930910524F4892B09F4EDC0EFC0803167 +:10146000910509F451C0489709F0E8C052C088338B +:10147000910509F46FC08933910544F488329105D0 +:1014800009F447C0C09709F0D9C0B8C080349105AD +:1014900009F483C08834910509F0D0C0AFC0883703 +:1014A000910509F4B8C089379105ACF480369105EF +:1014B00009F4B1C0813691052CF48835910509F005 +:1014C000BDC07AC08836910509F4A5C08037910562 +:1014D00009F0B4C0A0C08039910509F4A2C08139D7 +:1014E00091054CF48038910509F49BC0883891052A +:1014F00009F0A4C09CC08839910509F498C0803ACD +:10150000910509F09BC08FC08091EB018093BB00D7 +:1015100051C09091EC01E091E901F091EA018181E3 +:10152000981770F48091EC010280F381E02DE80FB0 +:10153000F11D90818F5F8093EC019093BB003AC0C6 +:1015400085E98093BC0082E090E09093E80180936D +:10155000E7010FC08091BC0085688093BC0085E0E6 +:1015600090E09093E8018093E701E091E901F09128 +:10157000EA019583848362C09091EC01E091E901D6 +:10158000F091EA010280F381E02DE90FF11D8091D5 +:10159000BB0080839F5F9093EC012091EC01332787 +:1015A000E091E901F091EA018181992701972817DB +:1015B0003907BCF185E840C0A091E901B091EA018A +:1015C0009091EC01ED01EA81FB81E90FF11D809121 +:1015D000BB0080839F5F9093EC0184E090E0909348 +:1015E000E8018093E7019D838C83E091ED01F09108 +:1015F000EE01309719F1CD0109951DC083E090E00F +:101600009093E8018093E701E091E901F091EA010C +:101610009583848310C081E090E09093E8018093EB +:10162000E70185EC09C01092E8011092E701809172 +:10163000BC00856801C085E98093BC00FF91EF91F3 +:10164000DF91CF91BF91AF919F918F917F916F91DA +:101650005F914F913F912F910F900FBE0F901F9070 +:10166000189581E0E1EFF1E0A0E0B0E0182E0ED097 +:10167000089581E0E1EFF1E0A0E0B0E0182E01D0A4 +:10168000089509D001921A94E1F7089501900BD0C2 +:101690001A94E1F70895F999FECFB2BDA1BDF89A69 +:1016A000119600B40895F999FECFB2BDA1BD00BC5A +:1016B00011960FB6F894FA9AF99A0FBE0895FFCFD3 +:1016C0000401080280000002018A024000000901B2 +:1016D00014010000000100000200000300000400EB +:1016E0000005000006000007000007800007A000BA +:1016F00007C00001D4021000003401E40220000001 +:101700003B010403200000420100007101000000C1 +:0617100000E101000000F1 :0C1DF000C8010500C9210501CA0000005F :00000001FF |
|
From: jaguarondi <c2m...@c2...> - 2008-07-25 14:54:28
|
Author: jaguarondi
Date: 2008-07-25 16:54:20 +0200 (Fri, 25 Jul 2008)
New Revision: 1354
Modified:
firmware/tuxaudio/branches/new_rf/communication.c
firmware/tuxaudio/branches/new_rf/flash.c
firmware/tuxaudio/branches/new_rf/hardware.h
firmware/tuxaudio/branches/new_rf/main.c
firmware/tuxaudio/branches/new_rf/varis.c
firmware/tuxaudio/branches/new_rf/varis.h
Log:
* Re-enabled the audio flash (play and program).
Modified: firmware/tuxaudio/branches/new_rf/communication.c
===================================================================
--- firmware/tuxaudio/branches/new_rf/communication.c 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/communication.c 2008-07-25 14:54:20 UTC (rev 1354)
@@ -245,16 +245,24 @@
static uint8_t frame_in_idx, frame_out_idx;
static uint8_t spi_in[52], spi_out[52], spi_idx;
+static bool rf_spi_request;
/* INT1 (PD3) Interrupt on TXE signal. */
ISR(SIG_INTERRUPT1)
{
+ rf_spi_request = true;
+ rf_txe = true;
+}
+
+void start_rf_spi(void)
+{
//PORTB |= 0x80; // XXX DEBUG
//if (spi_idx) // XXX debug
//PORTB |= 0x80; // XXX DEBUG
spi_idx = 0;
- /* Chip select */
- PORTB &= ~_BV(PB2);
+
+ flash_onhold();
+ rf_select();
SPDR = spi_out[spi_idx];
EIMSK |= _BV(INT0);
EIFR |= _BV(INT0);
@@ -279,8 +287,9 @@
{
/* Unselect by waiting here otherwise we would have to use the SPI
* interrupt to do it. */
- PORTB |= _BV(PB2);
+ rf_unselect();
EIMSK &= ~_BV(INT0);
+ flash_enable();
}
else
{
@@ -330,8 +339,14 @@
* when the RF is off. */
/* XXX this doesn't work anymore with the current RF, to check later. */
/*if (!(RF_ONLINE_PIN & RF_ONLINE_MK))*/
- /*FifoClear(rf_cmdout_buf);*/
+ //FifoClear(rf_cmdout_buf);
+ if (rf_spi_request)
+ {
+ rf_spi_request = false;
+ start_rf_spi();
+ }
+
/* Fill and process RF data. */
if (spi_idx >= SPI_SIZE)
{
@@ -360,7 +375,7 @@
}
//else
//PORTB |= 0x80; // XXX DEBUG
- if (config_in & CFG_AUDIO_MK)
+ if (config_in & CFG_AUDIO_MK && !flashPlay)
{
adapt_audio_rate();
@@ -370,7 +385,10 @@
}
}
else
- PORTB ^= 0x80; // XXX DEBUG
+ {
+ if (frame_without_sound)
+ frame_without_sound --;
+ }
/* DEBUG VERSION
* The first part checks a saw wave, the second part can check for
@@ -424,6 +442,7 @@
config_out &= ~CFG_AUDIO_MK;
}
spi_out[SPI_CONFIG_OFFSET] = config_out;
+ rf_txe = false;
}
/* If busy, pass. */
Modified: firmware/tuxaudio/branches/new_rf/flash.c
===================================================================
--- firmware/tuxaudio/branches/new_rf/flash.c 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/flash.c 2008-07-25 14:54:20 UTC (rev 1354)
@@ -116,8 +116,9 @@
uint8_t static programming_state = DETECT_INDEXES;
if (programming_state == DETECT_INDEXES)
{
+ /* Disable audio PWM interrupt */
TIMSK0 = 0x00;
- //numSound = readFlashNumber();
+
if (numSound == 0)
{
/* The flash memory is empty. The first address is 0x000400 */
@@ -156,7 +157,6 @@
programming_state ++;
frame_without_sound = 5000;
- frame_without_sound_timeout = 5000;
queue_rf_cmd_p(STATUS_FLASH_PROG_CMD, IN_PROGRESS, ad[0], ad[1]);
}
@@ -190,28 +190,27 @@
}
else if (programming_state == WAITING_STATE)
{
- if (write_toc == 1)
- {
+ /*if (write_toc == 1)*/
+ /*{*/
programming_state = PROG_TOC;
- }
- else if (write_toc == 2)
- {
- queue_rf_cmd_p(STATUS_FLASH_PROG_CMD, ERASING_LAST_SOUND, 0, 0);
- if (first_block == 0)
- {
- eraseFlag = 1;
- frame_without_sound_timeout = TTS_TIMEOUT;
- programming_state = 0;
- programmingFlash = 0;
- }
- else
- {
- last_block = (ad[0] << 4) + (ad[1] >> 4);
- blockErase(first_block, last_block);
- programming_state = PROG_END;
- }
- }
- write_toc = 0;
+ /*}*/
+ /*else if (write_toc == 2)*/
+ /*{*/
+ /*queue_rf_cmd_p(STATUS_FLASH_PROG_CMD, ERASING_LAST_SOUND, 0, 0);*/
+ /*if (first_block == 0)*/
+ /*{*/
+ /*eraseFlag = 1;*/
+ /*programming_state = 0;*/
+ /*programmingFlash = 0;*/
+ /*}*/
+ /*else*/
+ /*{*/
+ /*last_block = (ad[0] << 4) + (ad[1] >> 4);*/
+ /*blockErase(first_block, last_block);*/
+ /*programming_state = PROG_END;*/
+ /*}*/
+ /*}*/
+ /*write_toc = 0;*/
}
else if (programming_state == PROG_TOC)
{
@@ -229,7 +228,6 @@
else if (programming_state == PROG_END)
{
numSound = readFlashNumber();
- frame_without_sound_timeout = TTS_TIMEOUT;
programming_state = 0;
programmingFlash = 0;
TIMSK0 = 0x01;
@@ -288,14 +286,18 @@
//queue_rf_cmd_p(STATUS_FLASH_PROG_CMD, STANDBY, 0, 0);
enter = 1;
eraseFlag = 0;
+
+ /* Wite the first index. */
program_flash(0x00, 0x00, 0x00, 0xFE);
program_flash(0x00, 0x00, 0x01, 0x00);
program_flash(0x00, 0x00, 0x02, 0x04);
program_flash(0x00, 0x00, 0x03, 0x00);
numSound = 0;
last_block = 0;
+
queue_rf_cmd_p(STATUS_FLASH_PROG_CMD, STANDBY, 0, 0);
queue_rf_cmd_p(SOUND_VAR_CMD, numSound, last_block, 0);
+ /* Re-enable audio PWM interrupt */
TIMSK0 = 0x01;
}
}
@@ -459,11 +461,13 @@
static void playingSound(void)
{
uint8_t sound;
- while (!rf_txe && !FifoFull(PWMFifo))
+ while (!rf_txe && FifoLength(PWMFifo) < (PWMFifo->size-1))
{
sound = spiSend(0x00); // Wait response
sound = sound >> audioLevel;
+ /* Save it twice to have 16kHz */
FifoPut(PWMFifo, sound);
+ FifoPut(PWMFifo, sound);
ad[2]++; // Increment address for next play
if (ad[2] == 0)
@@ -562,12 +566,13 @@
uint8_t data;
sound_stored = 1;
frame_without_sound = STOP_FRAME_NUMBER;
- frame_without_sound_timeout = STOP_FRAME_NUMBER;
flash_select();
spiSend(SEQU_PROGRAM);
FifoGet(PWMFifo, &data);
spiSend(data);
+ /* Drop one byte out of 2 to store in 8kHz */
+ FifoGet(PWMFifo, &data);
flash_unselect();
ad[2] ++;
@@ -577,20 +582,23 @@
if (ad[1] == 0x00)
ad[0]++;
}
+ if (ad[0] == 0x07 && ad[1] == 0xFF && ad[2] == 0xFF)
+ {
+ flash_state = 0;
+ break;
+ }
while (read_status() & BUSY) ;
}
-
- /* Check for the last sound byte */
- if (!(frame_without_sound))
+ else
{
- flash_state = 0;
break;
}
- if (ad[0] == 0x07 && ad[1] == 0xFF && ad[2] == 0xFF)
- {
- flash_state = 0;
- break;
- }
+
}
+ /* Check for the last sound byte */
+ if (!(frame_without_sound))
+ {
+ flash_state = 0;
+ }
}
Modified: firmware/tuxaudio/branches/new_rf/hardware.h
===================================================================
--- firmware/tuxaudio/branches/new_rf/hardware.h 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/hardware.h 2008-07-25 14:54:20 UTC (rev 1354)
@@ -41,7 +41,6 @@
#define RF_RESET_PT PORTB
/** RF reset DDR. */
#define RF_RESET_DDR DDRB
-
/** RF online mask. */
#define RF_ONLINE_MK _BV(PB6)
/** RF online PIN. */
@@ -50,7 +49,18 @@
#define RF_ONLINE_PT PORTB
/** RF online DDR. */
#define RF_ONLINE_DDR DDRB
+/** RF chip select mask. */
+#define RF_CS_MK _BV(PB2)
+/** RF chip select PIN. */
+#define RF_CS_PIN PINB
+/** RF chip select PORT. */
+#define RF_CS_PT PORTB
+/** RF chip select DDR. */
+#define RF_CS_DDR DDRB
+#define rf_select() (PORTB &= ~_BV(PB2))
+#define rf_unselect() (PORTB |= _BV(PB2))
+
/* Flash memory port */
#define FLASH_PORT PORTB
#define FLASH_CS_PIN _BV(PB1)
Modified: firmware/tuxaudio/branches/new_rf/main.c
===================================================================
--- firmware/tuxaudio/branches/new_rf/main.c 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/main.c 2008-07-25 14:54:20 UTC (rev 1354)
@@ -159,10 +159,9 @@
FifoClear(PWMFifo); /* Initialise the PWM fifo */
FifoClear(ADCFifo); /* Initialise the ADC fifo */
config_init(); /* load the configuration defaults from EEPROM */
- /*numSound = readFlashNumber();*/
- /*last_block = readLastBlock(numSound);*/
+ numSound = readFlashNumber();
+ last_block = readLastBlock(numSound);
communication_init(); /* I2C initialization */
- frame_without_sound_timeout = TTS_TIMEOUT;
sei(); /* Init global interrupt */
@@ -201,14 +200,19 @@
//queue_core_cmd(spi_commandRX);
//}
- /*if (programmingFlash) // Restora all the context for flash programming*/
- /*programming();*/
+ if (!rf_txe)
+ {
+ if (programmingFlash) // Restora all the context for flash programming
+ {
+ programming();
+ }
- /*if (flashPlay)*/
- /*playSound();*/
+ if (flashPlay)
+ playSound();
- /*if (eraseFlag)*/
- /*erase();*/
+ if (eraseFlag)
+ erase();
+ }
/* Send commands to I2C, otherwise get new status from tuxcore */
communication_task();
Modified: firmware/tuxaudio/branches/new_rf/varis.c
===================================================================
--- firmware/tuxaudio/branches/new_rf/varis.c 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/varis.c 2008-07-25 14:54:20 UTC (rev 1354)
@@ -38,7 +38,7 @@
volatile unsigned char spi_count;
volatile unsigned char spi_lenght_data;
volatile unsigned char spi_ready = 0;
-volatile unsigned char rf_txe = 0;
+volatile uint8_t rf_txe = 0;
volatile uint8_t spi_commandTX[5];
unsigned char spi_commandRX[5];
unsigned char commandRX = 0;
@@ -72,7 +72,6 @@
volatile unsigned char Fifoinert = 0;
uint16_t frame_without_sound = 0;
-uint16_t frame_without_sound_timeout= 0;
uint8_t sound_played = 0;
uint8_t last_block = 0;
Modified: firmware/tuxaudio/branches/new_rf/varis.h
===================================================================
--- firmware/tuxaudio/branches/new_rf/varis.h 2008-07-25 14:45:47 UTC (rev 1353)
+++ firmware/tuxaudio/branches/new_rf/varis.h 2008-07-25 14:54:20 UTC (rev 1354)
@@ -40,7 +40,7 @@
extern volatile unsigned char spi_count;
extern volatile unsigned char spi_lenght_data;
extern volatile unsigned char spi_ready;
-extern volatile unsigned char rf_txe;
+extern volatile uint8_t rf_txe;
extern uint8_t spi_commandTX[5];
extern unsigned char spi_commandRX[5];
extern unsigned char commandRX;
@@ -82,7 +82,6 @@
extern volatile unsigned char Fifoinert;
extern uint16_t frame_without_sound;
-extern uint16_t frame_without_sound_timeout;
extern uint8_t sound_played;
extern uint8_t last_block;
|
|
From: jerome <c2m...@c2...> - 2008-07-25 14:52:47
|
Author: jerome Date: 2008-07-25 16:45:47 +0200 (Fri, 25 Jul 2008) New Revision: 1353 Added: software_suite_v2/software/tools/tuxdroid-gadgets-tester/ software_suite_v2/software/tools/tuxdroid-gadgets-tester/branches/ software_suite_v2/software/tools/tuxdroid-gadgets-tester/tags/ software_suite_v2/software/tools/tuxdroid-gadgets-tester/trunk/ Log: |
|
From: jerome <c2m...@c2...> - 2008-07-25 14:39:26
|
Author: jerome
Date: 2008-07-25 16:39:18 +0200 (Fri, 25 Jul 2008)
New Revision: 1352
Added:
software_suite_v2/software/gadgets/
software_suite_v2/software/gadgets/HelloWorldGadget/
software_suite_v2/software/gadgets/HelloWorldGadget/branches/
software_suite_v2/software/gadgets/HelloWorldGadget/tags/
software_suite_v2/software/gadgets/HelloWorldGadget/tags/MyHelloWorldGadget.V-0.0.1.tgf
software_suite_v2/software/gadgets/HelloWorldGadget/trunk/
software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.classpath
software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.project
software_suite_v2/software/gadgets/HelloWorldGadget/trunk/src/
software_suite_v2/software/gadgets/HelloWorldGadget/trunk/src/helloWorld.java
Log:
First complete gadget demo, included bidirectionnal parameters (you have to update gadgets framework).
Added: software_suite_v2/software/gadgets/HelloWorldGadget/tags/MyHelloWorldGadget.V-0.0.1.tgf
===================================================================
(Binary files differ)
Property changes on: software_suite_v2/software/gadgets/HelloWorldGadget/tags/MyHelloWorldGadget.V-0.0.1.tgf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.classpath
===================================================================
--- software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.classpath (rev 0)
+++ software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.classpath 2008-07-25 14:39:18 UTC (rev 1352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/tuxdroid-gadget-framework"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.project
===================================================================
--- software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.project (rev 0)
+++ software_suite_v2/software/gadgets/HelloWorldGadget/trunk/.project 2008-07-25 14:39:18 UTC (rev 1352)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>helloWorld</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: software_suite_v2/software/gadgets/HelloWorldGadget/trunk/src/helloWorld.java
===================================================================
--- software_suite_v2/software/gadgets/HelloWorldGadget/trunk/src/helloWorld.java (rev 0)
+++ software_suite_v2/software/gadgets/HelloWorldGadget/trunk/src/helloWorld.java 2008-07-25 14:39:18 UTC (rev 1352)
@@ -0,0 +1,43 @@
+
+import java.io.IOException;
+
+import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
+import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadgetConfiguration;
+
+
+public class helloWorld extends SimpleGadget<helloWorld.HelloWorldConfiguration>{
+
+ //public class that manage a simple configuration.
+ public static class HelloWorldConfiguration extends SimpleGadgetConfiguration{
+
+ //Number of time that hello world will be sent.
+ private int counter = 1; //default value.
+
+ //Allow to set how much time notification will be sent.
+ public void setCounter(int counter){
+ this.counter = counter;
+ }
+
+ //Send actual counter value.
+ public int getCounter(){
+ return this.counter;
+ }
+ }
+
+ //Configuration object.
+
+ @Override
+ public void start() throws Exception { //gadget run part.
+ for(int i=0; i < this.configuration().getCounter(); i++){
+ //Send something to say through gadget framework.
+ throwMessageNotification("Hello world");
+ }
+ System.exit(0);
+ }
+
+ public static void main(String[] args) throws InterruptedException, IOException {
+ //Stand alone behavior.
+ new helloWorld().boot(new HelloWorldConfiguration());
+ }
+
+}
|
|
From: Paul_R <c2m...@c2...> - 2008-07-24 13:58:20
|
Author: Paul_R Date: 2008-07-24 15:58:26 +0200 (Thu, 24 Jul 2008) New Revision: 1351 Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java Log: * Removed unused imports and the jigloo header ... Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java =================================================================== --- software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-24 13:57:14 UTC (rev 1350) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-24 13:58:26 UTC (rev 1351) @@ -27,9 +27,7 @@ import GUI.control.ledsThread; import GUI.control.waitingLoop; import java.util.*; -import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; @@ -53,20 +51,6 @@ import com.tuxisalive.api.TuxAPIConst; - - -/** -* This code was edited or generated using CloudGarden's Jigloo -* SWT/Swing GUI Builder, which is free for non-commercial -* use. If Jigloo is being used commercially (ie, by a corporation, -* company or business for any purpose whatever) then you -* should purchase a license for each developer using Jigloo. -* Please visit www.cloudgarden.com for details. -* Use of Jigloo implies acceptance of these licensing terms. -* A COMMERCIAL LICENSE HAS NOT BEEN PURCHASED FOR -* THIS MACHINE, SO JIGLOO OR THIS CODE CANNOT BE USED -* LEGALLY FOR ANY CORPORATE OR COMMERCIAL PURPOSE. -*/ public class mainWindow extends javax.swing.JFrame { { //Set Look & Feel |
|
From: Paul_R <c2m...@c2...> - 2008-07-24 13:57:08
|
Author: Paul_R
Date: 2008-07-24 15:57:14 +0200 (Thu, 24 Jul 2008)
New Revision: 1350
Added:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/advancedViewPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
Removed:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/
Modified:
software_suite_v2/software/tools/tuxController/trunk/.classpath
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Renamed componants to components (changed the classpath and imports).
* Added a look and feel (Plastic3DLookAndFeel)
* Removed some printf
Modified: software_suite_v2/software/tools/tuxController/trunk/.classpath
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/.classpath 2008-07-24 13:55:20 UTC (rev 1349)
+++ software_suite_v2/software/tools/tuxController/trunk/.classpath 2008-07-24 13:57:14 UTC (rev 1350)
@@ -2,5 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/looks-2.1.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/advancedViewPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/advancedViewPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/advancedViewPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,70 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+import i18n.bundle;
+
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JCheckBox;
+
+import GUI.mainWindow;
+
+/**
+ * Advanced view panel
+ * @author paul
+ *
+ */
+public class advancedViewPanel {
+ private mainWindow win;
+
+ /**
+ * Create the advanced view panel.
+ * @param inst a ainWindow instance.
+ */
+ public advancedViewPanel(mainWindow inst) {
+ win = inst;
+ createAdvancedViewSection();
+ }
+
+ /**
+ * Create the panel with the checkbox.
+ */
+ private void createAdvancedViewSection() {
+ win.chkAdvancedView = new JCheckBox();
+ win.getContentPane().add(win.chkAdvancedView,
+ new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.chkAdvancedView.setText(bundle.getString("chkAdvancedView")); //$NON-NLS-1$
+ win.chkAdvancedView.setMargin(new java.awt.Insets(2, 10, 2, 1));
+
+ win.chkAdvancedView.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkAdvancedViewActionPerformed(evt);
+ }
+ });
+ }
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/advancedViewPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,476 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+import i18n.bundle;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import GUI.JVerticalLabel;
+import GUI.mainWindow;
+
+/**
+ * Create the control panel
+ * @author paul
+ *
+ */
+public class controlPanel {
+
+ private mainWindow win;
+
+ /**
+ * Create the control panel.
+ * @param inst a mainWindow instance.
+ */
+ public controlPanel(mainWindow inst) {
+ win = inst;
+
+ createPanel();
+ dummyPanel();
+
+ createEyesPanel();
+ eyesSeparators();
+ eyesObjects();
+
+ createMouthPanel();
+ mouthSeparators();
+ mouthObjects();
+
+ createFlippersPanel();
+ flippersSeparators();
+ flippersObjects();
+
+ createSpinPanel();
+ spinSeparators();
+ spinObjects();
+ }
+
+ /**
+ * Create the main panel.
+ */
+ private void createPanel() {
+ win.panMainCtl = new JPanel();
+ win.getContentPane().add(win.panMainCtl,
+ new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panMainCtl.setLayout(null);
+
+ win.panCtl = new JPanel();
+ win.panMainCtl.add(win.panCtl);
+ win.panCtl.setBounds(0, 0, 360, 390);
+ java.awt.Dimension panDim = new java.awt.Dimension(360, 390);
+ GridBagLayout panControlLayout = new GridBagLayout();
+ win.panCtl.setLayout(panControlLayout);
+ win.panCtl.setMaximumSize(panDim);
+ win.panCtl.setMinimumSize(panDim);
+ panControlLayout.rowWeights = new double[] {0.1, 0.1, 0.1, 0.1, 0.0};
+ panControlLayout.rowHeights = new int[] {10, 79, 62, 142, 97};
+ panControlLayout.columnWeights = new double[] {0.0};
+ panControlLayout.columnWidths = new int[] {360};
+ }
+
+ /**
+ * Create a dummy panel, only used for the alignment.
+ */
+ private void dummyPanel() {
+ win.panDummyCtl = new JPanel();
+ win.panCtl.add(win.panDummyCtl,
+ new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panDummyCtl.setLayout(null);
+
+ dummySeparators();
+ }
+
+ /**
+ * Create the dummy separators.
+ */
+ private void dummySeparators() {
+ win.sepDummy1 = new JSeparator();
+ win.panDummyCtl.add(win.sepDummy1);
+ win.sepDummy1.setBounds(2, 4, 2, 6);
+ win.sepDummy1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepDummy2 = new JSeparator();
+ win.panDummyCtl.add(win.sepDummy2);
+ win.sepDummy2.setBounds(18, 4, 2, 6);
+ win.sepDummy2.setOrientation(SwingConstants.VERTICAL);
+ }
+
+ /**
+ * Create the eyes control panel.
+ */
+ private void createEyesPanel() {
+ win.panEyesCtl = new JPanel();
+ win.panCtl.add(win.panEyesCtl,
+ new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panEyesCtl.setLayout(null);
+ }
+
+ /**
+ * Create the eyes panel separators and label.
+ */
+ private void eyesSeparators() {
+ win.sepEyes1 = new JSeparator();
+ win.panEyesCtl.add(win.sepEyes1);
+ win.sepEyes1.setBounds(2, 0, 2, 75);
+ win.sepEyes1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepEyes2 = new JSeparator();
+ win.panEyesCtl.add(win.sepEyes2);
+ win.sepEyes2.setBounds(18, 0, 2, 75);
+ win.sepEyes2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblEyes = new JVerticalLabel(bundle.getString("lblEyes"), 52); //$NON-NLS-1$
+ win.panEyesCtl.add(win.lblEyes);
+ win.lblEyes.setBounds(2, 0, 16, 79);
+ }
+
+ /**
+ * Create the eyes objects
+ */
+ private void eyesObjects() {
+ win.btnEyesRun = new JButton();
+ win.panEyesCtl.add(win.btnEyesRun);
+ win.btnEyesRun.setBounds(25, 27, 25, 25);
+ win.btnEyesRun.setContentAreaFilled(false);
+ win.btnEyesRun.setBorderPainted(false);
+ win.btnEyesRun.setIcon(win.iconRun);
+ win.btnEyesRun.setFocusable(false);
+ win.btnEyesRun.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnEyesRunMouseClicked(evt);
+ }
+ });
+
+ win.spinEyes = new JSpinner();
+ win.panEyesCtl.add(win.spinEyes);
+ win.spinEyes.setModel(win.spinEyesCountModel);
+ win.spinEyes.setBounds(59, 27, 60, 25);
+ win.spinEyes.setValue(1);
+
+ win.radEyesCount = new JRadioButton();
+ win.radEyesDuring = new JRadioButton();
+ win.panEyesCtl.add(win.radEyesCount);
+ win.panEyesCtl.add(win.radEyesDuring);
+ win.radEyesCount.setSelected(true);
+ win.radEyesCount.setText(bundle.getString("radEyesCount")); //$NON-NLS-1$
+ win.radEyesDuring.setText(bundle.getString("radEyesDuring")); //$NON-NLS-1$
+ win.getRadEyes().add(win.radEyesCount);
+ win.getRadEyes().add(win.radEyesDuring);
+ win.radEyesCount.setBounds(125, 20, 65, 20);
+ win.radEyesDuring.setBounds(125, 37, 65, 20);
+ win.radEyesCount.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.radEyesCountStateChanged(evt);
+ }
+ });
+ }
+
+ /**
+ * Create the mouth panel.
+ */
+ private void createMouthPanel() {
+ win.panMouthCtl = new JPanel();
+ win.panCtl.add(win.panMouthCtl,
+ new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panMouthCtl.setLayout(null);
+ }
+
+ /**
+ * Create the mouth panel separators and label.
+ */
+ private void mouthSeparators() {
+ win.sepMouth1 = new JSeparator();
+ win.panMouthCtl.add(win.sepMouth1);
+ win.sepMouth1.setBounds(2, 2, 2, 58);
+ win.sepMouth1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepMouth2 = new JSeparator();
+ win.panMouthCtl.add(win.sepMouth2);
+ win.sepMouth2.setBounds(18, 2, 2, 58);
+ win.sepMouth2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblMouth = new JVerticalLabel(bundle.getString("lblMouth"), 48); //$NON-NLS-1$
+ win.panMouthCtl.add(win.lblMouth);
+ win.lblMouth.setBounds(2, 0, 16, 62);
+ }
+
+ /**
+ * Create the mouth panel objects.
+ */
+ private void mouthObjects() {
+ win.btnMouthRun = new JButton();
+ win.panMouthCtl.add(win.btnMouthRun);
+ win.btnMouthRun.setBounds(25, 19, 25, 25);
+ win.btnMouthRun.setContentAreaFilled(false);
+ win.btnMouthRun.setBorderPainted(false);
+ win.btnMouthRun.setIcon(win.iconRun);
+ win.btnMouthRun.setFocusable(false);
+ win.btnMouthRun.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnMouthRunMouseClicked(evt);
+ }
+ });
+
+ win.spinMouth = new JSpinner();
+ win.panMouthCtl.add(win.spinMouth);
+ win.spinMouth.setModel(win.spinMouthCountModel);
+ win.spinMouth.setBounds(59, 19, 60, 25);
+ win.spinMouth.setValue(1);
+
+ win.radMouthCount = new JRadioButton();
+ win.radMouthDuring = new JRadioButton();
+ win.panMouthCtl.add(win.radMouthCount);
+ win.panMouthCtl.add(win.radMouthDuring);
+ win.radMouthCount.setText(bundle.getString("radMouthCount")); //$NON-NLS-1$
+ win.radMouthDuring.setText(bundle.getString("radMouthDuring")); //$NON-NLS-1$
+ win.radMouthCount.setSelected(true);
+ win.getRadMouth().add(win.radMouthCount);
+ win.getRadMouth().add(win.radMouthDuring);
+ win.radMouthCount.setBounds(125, 12, 65, 20);
+ win.radMouthDuring.setBounds(125, 29, 65, 20);
+ win.radMouthCount.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.radMouthCountStateChanged(evt);
+ }
+ });
+ }
+
+ /**
+ * Create the flippers panel
+ */
+ private void createFlippersPanel() {
+ win.panFlippersCtl = new JPanel();
+ win.panCtl.add(win.panFlippersCtl,
+ new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panFlippersCtl.setLayout(null);
+ }
+
+ /**
+ * Create the flippers panel separators and label.
+ */
+ private void flippersSeparators() {
+ win.sepFlippers1 = new JSeparator();
+ win.panFlippersCtl.add(win.sepFlippers1);
+ win.sepFlippers1.setBounds(2, 2, 2, 138);
+ win.sepFlippers1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepFlippers2 = new JSeparator();
+ win.panFlippersCtl.add(win.sepFlippers2);
+ win.sepFlippers2.setBounds(18, 2, 2, 138);
+ win.sepFlippers2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblFlippers = new JVerticalLabel(bundle.getString("lblFlippers"), 90); //$NON-NLS-1$
+ win.panFlippersCtl.add(win.lblFlippers);
+ win.lblFlippers.setBounds(2, 0, 16, 142);
+ }
+
+ /**
+ * Create the flippers objects.
+ */
+ private void flippersObjects() {
+ win.btnFlippersRun = new JButton();
+ win.panFlippersCtl.add(win.btnFlippersRun);
+ win.btnFlippersRun.setBounds(25, 59, 25, 25);
+ win.btnFlippersRun.setContentAreaFilled(false);
+ win.btnFlippersRun.setBorderPainted(false);
+ win.btnFlippersRun.setIcon(win.iconRun);
+ win.btnFlippersRun.setFocusable(false);
+ win.btnFlippersRun.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnFlippersRunMouseClicked(evt);
+ }
+ });
+
+ win.spinFlippers = new JSpinner();
+ win.panFlippersCtl.add(win.spinFlippers);
+ win.spinFlippers.setModel(win.spinFlippersCountModel);
+ win.spinFlippers.setBounds(59, 59, 60, 25);
+ win.spinFlippers.setValue(1);
+
+ win.slideFlippers = new JSlider();
+ win.panFlippersCtl.add(win.slideFlippers);
+ win.slideFlippers.setBounds(220, 72, 110, 16);
+ win.slideFlippers.setMinimum(1);
+ win.slideFlippers.setMaximum(5);
+ win.slideFlippers.setValue(5);
+ win.slideFlippers.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.slideFlippersStateChanged(evt);
+ }
+ });
+
+ win.lblFlippersSpeed = new JLabel();
+ win.panFlippersCtl.add(win.lblFlippersSpeed);
+ win.lblFlippersSpeed.setText(bundle.getString("lblFlippersSpeed")); //$NON-NLS-1$
+ win.lblFlippersSpeed.setBounds(220, 54, 110, 16);
+ win.lblFlippersSpeed.setHorizontalAlignment(SwingConstants.CENTER);
+
+ win.radFlippersCount = new JRadioButton();
+ win.radFlippersDuring = new JRadioButton();
+ win.panFlippersCtl.add(win.radFlippersCount);
+ win.panFlippersCtl.add(win.radFlippersDuring);
+ win.radFlippersCount.setText(bundle.getString("radFlippersCount")); //$NON-NLS-1$
+ win.radFlippersDuring.setText(bundle.getString("radFlippersDuring")); //$NON-NLS-1$
+ win.radFlippersCount.setSelected(true);
+ win.getRadFlippers().add(win.radFlippersCount);
+ win.getRadFlippers().add(win.radFlippersDuring);
+ win.radFlippersCount.setBounds(125, 52, 65, 20);
+ win.radFlippersDuring.setBounds(125, 69, 65, 20);
+ win.radFlippersCount.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.radFlippersCountStateChanged(evt);
+ }
+ });
+ }
+
+ /**
+ * Create the spin panel.
+ */
+ private void createSpinPanel() {
+ win.panSpinCtl = new JPanel();
+ win.panCtl.add(win.panSpinCtl,
+ new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panSpinCtl.setLayout(null);
+ }
+
+ /**
+ * Create the spin panel separator and label.
+ */
+ private void spinSeparators() {
+ win.sepSpin1 = new JSeparator();
+ win.panSpinCtl.add(win.sepSpin1);
+ win.sepSpin1.setBounds(2, 2, 2, 93);
+ win.sepSpin1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepSpin2 = new JSeparator();
+ win.panSpinCtl.add(win.sepSpin2);
+ win.sepSpin2.setBounds(18, 2, 2, 93);
+ win.sepSpin2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblSpin = new JVerticalLabel(bundle.getString("lblSpin"), 74); //$NON-NLS-1$
+ win.panSpinCtl.add(win.lblSpin);
+ win.lblSpin.setBounds(2, 0, 16, 97);
+ }
+
+ /**
+ * Create the spin objects.
+ */
+ private void spinObjects() {
+ win.btnSpinRun = new JButton();
+ win.panSpinCtl.add(win.btnSpinRun);
+ win.btnSpinRun.setBounds(25, 29, 25, 25);
+ win.btnSpinRun.setContentAreaFilled(false);
+ win.btnSpinRun.setBorderPainted(false);
+ win.btnSpinRun.setIcon(win.iconRun);
+ win.btnSpinRun.setFocusable(false);
+ win.btnSpinRun.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnSpinRunMouseClicked(evt);
+ }
+ });
+
+ win.spinSpin = new JSpinner();
+ win.panSpinCtl.add(win.spinSpin);
+ win.spinSpin.setModel(win.spinSpinCountModel);
+ win.spinSpin.setBounds(59, 29, 60, 25);
+ win.spinSpin.setValue(1);
+
+ win.radSpinCount = new JRadioButton();
+ win.radSpinDuring = new JRadioButton();
+ win.panSpinCtl.add(win.radSpinCount);
+ win.panSpinCtl.add(win.radSpinDuring);
+ win.radSpinCount.setText(bundle.getString("radSpinCount")); //$NON-NLS-1$
+ win.radSpinDuring.setText(bundle.getString("radSpinDuring")); //$NON-NLS-1$
+ win.radSpinCount.setSelected(true);
+ win.getRadSpin().add(win.radSpinCount);
+ win.getRadSpin().add(win.radSpinDuring);
+ win.radSpinCount.setBounds(125, 22, 65, 20);
+ win.radSpinDuring.setBounds(125, 39, 65, 20);
+ win.radSpinCount.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.radSpinCountStateChanged(evt);
+ }
+ });
+
+ win.slideSpin = new JSlider();
+ win.panSpinCtl.add(win.slideSpin);
+ win.slideSpin.setBounds(220, 43, 110, 16);
+ win.slideSpin.setMinimum(1);
+ win.slideSpin.setMaximum(5);
+ win.slideSpin.setValue(5);
+ win.slideSpin.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.slideSpinStateChanged(evt);
+ }
+ });
+
+ win.lblSpinSpeed = new JLabel();
+ win.panSpinCtl.add(win.lblSpinSpeed);
+ win.lblSpinSpeed.setText(bundle.getString("lblSpinSpeed")); //$NON-NLS-1$
+ win.lblSpinSpeed.setBounds(220, 25, 110, 16);
+ win.lblSpinSpeed.setHorizontalAlignment(SwingConstants.CENTER);
+
+ win.radSpinLeft = new JRadioButton();
+ win.radSpinRight = new JRadioButton();
+ win.panSpinCtl.add(win.radSpinLeft);
+ win.panSpinCtl.add(win.radSpinRight);
+ win.radSpinLeft.setText(bundle.getString("radSpinLeft")); //$NON-NLS-1$
+ win.radSpinRight.setText(bundle.getString("radSpinRight")); //$NON-NLS-1$
+ win.radSpinLeft.setSelected(true);
+ win.getRadDir().add(win.radSpinLeft);
+ win.getRadDir().add(win.radSpinRight);
+ win.radSpinLeft.setBounds(40, 60, 80, 20);
+ win.radSpinRight.setBounds(125, 60, 80, 20);
+ }
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/controlPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,95 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+
+import i18n.bundle;
+
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+
+import GUI.JVerticalLabel;
+import GUI.mainWindow;
+
+public class generalControlPanel {
+
+ private mainWindow win;
+
+ public generalControlPanel(mainWindow inst) {
+ win = inst;
+ createPanel();
+ separators();
+ button();
+ }
+
+ private void createPanel() {
+ win.panGeneralControl = new JPanel();
+ win.getContentPane().add(win.panGeneralControl,
+ new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panGeneralControl.setLayout(null);
+ }
+
+ private void separators() {
+
+ win.sepGeneralControl1 = new JSeparator();
+ win.panGeneralControl.add(win.sepGeneralControl1);
+ win.sepGeneralControl1.setBounds(2, 4, 2, 86);
+ win.sepGeneralControl1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepGeneralControl2 = new JSeparator();
+ win.panGeneralControl.add(win.sepGeneralControl2);
+ win.sepGeneralControl2.setBounds(18, 4, 2, 86);
+ win.sepGeneralControl2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblGeneral = new JVerticalLabel(bundle.getString("lblGeneral"), 67); //$NON-NLS-1$
+ win.panGeneralControl.add(win.lblGeneral);
+ win.lblGeneral.setBounds(2, 0, 16, 90);
+ }
+
+ private void button() {
+ win.btnGeneralStop = new JButton();
+ win.panGeneralControl.add(win.btnGeneralStop);
+ win.btnGeneralStop.setBounds(8, 32, 352, 25);
+ win.btnGeneralStop.setContentAreaFilled(false);
+ win.btnGeneralStop.setBorderPainted(false);
+ win.btnGeneralStop.setIcon(win.iconStop);
+ win.btnGeneralStop.setText(bundle.getString("btnGeneral")); //$NON-NLS-1$
+ win.btnGeneralStop.setHorizontalTextPosition(SwingConstants.RIGHT);
+ win.btnGeneralStop.setHorizontalAlignment(SwingConstants.LEFT);
+ win.btnGeneralStop.setFocusable(false);
+ win.btnGeneralStop.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnGeneralStopMouseClicked(evt);
+ }
+ });
+ }
+
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/generalControlPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,189 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+
+import i18n.bundle;
+
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import GUI.JVerticalLabel;
+import GUI.mainWindow;
+
+/**
+ * LED control panel.
+ * @author paul
+ *
+ */
+public class ledPanel {
+ private mainWindow win;
+
+ /**
+ * Create the LED panel
+ * @param inst a mainWindow instance
+ */
+ public ledPanel(mainWindow inst) {
+ win = inst;
+ createPanel();
+ createSeparators();
+ createButtons();
+ createSpinners();
+ createRadios();
+ createSliders();
+ }
+
+ /**
+ * Create the panel
+ */
+ private void createPanel() {
+ win.panLedsCtl = new JPanel();
+ win.getContentPane().add(win.panLedsCtl,
+ new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panLedsCtl.setLayout(null);
+ }
+
+ /**
+ * Create the buttons
+ */
+ private void createButtons() {
+ win.btnLedsRun = new JButton();
+ win.panLedsCtl.add(win.btnLedsRun);
+ win.btnLedsRun.setBounds(26, 24, 25, 25);
+ win.btnLedsRun.setContentAreaFilled(false);
+ win.btnLedsRun.setBorderPainted(false);
+ win.btnLedsRun.setIcon(win.iconRun);
+ win.btnLedsRun.setFocusable(false);
+ win.btnLedsRun.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnLedsRunMouseClicked(evt);
+ }
+ });
+ }
+
+ /**
+ * Create the separators
+ */
+ private void createSeparators() {
+ win.sepLed1 = new JSeparator();
+ win.panLedsCtl.add(win.sepLed1);
+ win.sepLed1.setBounds(2, 4, 2, 74);
+ win.sepLed1.setOrientation(SwingConstants.VERTICAL);
+
+ win.sepLed2 = new JSeparator();
+ win.panLedsCtl.add(win.sepLed2);
+ win.sepLed2.setBounds(18, 4, 2, 74);
+ win.sepLed2.setOrientation(SwingConstants.VERTICAL);
+
+ win.lblLed = new JVerticalLabel(bundle.getString("lblLeds"), 50); //$NON-NLS-1$
+ win.panLedsCtl.add(win.lblLed);
+ win.lblLed.setBounds(2, 2, 16, 80);
+ }
+
+ /**
+ * Create the spinners
+ */
+ private void createSpinners() {
+ win.spinLeds = new JSpinner();
+ win.panLedsCtl.add(win.spinLeds);
+ win.spinLeds.setModel(win.spinLedsCountModel);
+ win.spinLeds.setBounds(59, 24, 60, 25);
+ win.spinLeds.setValue(1);
+ }
+
+ /**
+ * Create the radio buttons
+ */
+ private void createRadios() {
+ win.radLedsNone = new JRadioButton();
+ win.radLedsFade = new JRadioButton();
+ win.radLedsGradiant = new JRadioButton();
+ win.panLedsCtl.add(win.radLedsNone);
+ win.panLedsCtl.add(win.radLedsFade);
+ win.panLedsCtl.add(win.radLedsGradiant);
+ win.radLedsNone.setSelected(true);
+ win.radLedsNone.setText(bundle.getString("lblLedsEffectNone")); //$NON-NLS-1$
+ win.radLedsFade.setText(bundle.getString("lblLedsEffectFade")); //$NON-NLS-1$
+ win.radLedsGradiant.setText(bundle.getString("lblLedsEffectGradiant")); //$NON-NLS-1$
+
+ win.getRadLeds().add(win.radLedsNone);
+ win.getRadLeds().add(win.radLedsFade);
+ win.getRadLeds().add(win.radLedsGradiant);
+ win.radLedsNone.setBounds(125, 10, 80, 20);
+ win.radLedsFade.setBounds(125, 27, 80, 20);
+ win.radLedsGradiant.setBounds(125, 44, 80, 20);
+ }
+
+ /**
+ * Create the sliders
+ */
+ private void createSliders() {
+ win.slideLedsIntensity = new JSlider();
+ win.panLedsCtl.add(win.slideLedsIntensity);
+ win.slideLedsIntensity.setBounds(220, 20, 110, 16);
+ win.slideLedsIntensity.setMinimum(0);
+ win.slideLedsIntensity.setMaximum(10);
+ win.slideLedsIntensity.setValue(10);
+ win.slideLedsIntensity.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent evt) {
+ win.slideLedsIntensityStateChanged(evt);
+ }
+ });
+
+ win.lblLedsIntensity = new JLabel();
+ win.panLedsCtl.add(win.lblLedsIntensity);
+ win.lblLedsIntensity.setText(bundle.getString("lblLedsIntensity")); //$NON-NLS-1$
+ win.lblLedsIntensity.setBounds(220, 3, 110, 16);
+ win.lblLedsIntensity.setHorizontalAlignment(SwingConstants.CENTER);
+
+ win.slideLedsSpeed = new JSlider();
+ win.panLedsCtl.add(win.slideLedsSpeed);
+ win.slideLedsSpeed.setBounds(220, 53, 110, 16);
+ win.slideLedsSpeed.setMinimum(1);
+ win.slideLedsSpeed.setMaximum(5);
+ win.slideLedsSpeed.setValue(3);
+ win.slideLedsSpeed.setMinorTickSpacing(5);
+ win.slideLedsSpeed.setMajorTickSpacing(5);
+
+ win.lblLedsBlinkSpeed = new JLabel();
+ win.panLedsCtl.add(win.lblLedsBlinkSpeed);
+ win.lblLedsBlinkSpeed.setText(bundle.getString("lblLedsSpeed")); //$NON-NLS-1$
+ win.lblLedsBlinkSpeed.setBounds(220, 35, 110, 16);
+ win.lblLedsBlinkSpeed.setHorizontalAlignment(SwingConstants.CENTER);
+ }
+
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ledPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,158 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+
+import GUI.mainWindow;
+
+public class levelPanel {
+ private mainWindow win;
+
+ public levelPanel(mainWindow inst) {
+ win = inst;
+ createPanel();
+ createLightSection();
+ createBatterySection();
+ createMicroSection();
+ }
+
+ private void createPanel() {
+ win.panLevelAbs = new JPanel();
+ win.getContentPane().add(win.panLevelAbs,
+ new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panLevelAbs.setLayout(null);
+
+ /* Create the panel */
+ win.panLevel = new JPanel();
+ win.panLevelAbs.add(win.panLevel);
+ win.panLevel.setBounds(0, 0, 406, 79);
+ java.awt.Dimension panDim = new java.awt.Dimension(406, 90);
+ GridBagLayout panLevelLayout = new GridBagLayout();
+ win.panLevel.setLayout(panLevelLayout);
+ win.panLevel.setMaximumSize(panDim);
+ win.panLevel.setMinimumSize(panDim);
+ panLevelLayout.rowWeights = new double[] {0.1, 0.1, 0.1};
+ panLevelLayout.rowHeights = new int[] {30, 30, 30};
+ panLevelLayout.columnWeights = new double[] {0.0, 0.0, 0.0};
+ panLevelLayout.columnWidths = new int[] {55, 260, 70};
+ }
+
+ private void createLightSection() {
+ win.dimProg = new java.awt.Dimension(250, 15);
+ win.imgLightLevel = new JLabel();
+ win.imgLightLevel.setIcon(win.iconLight);
+ win.panLevel.add(win.imgLightLevel,
+ new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+
+ win.progLightLevel = new JProgressBar();
+ win.panLevel.add(win.progLightLevel,
+ new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.progLightLevel.setPreferredSize(win.dimProg);
+ win.progLightLevel.setMinimumSize(win.dimProg);
+ win.progLightLevel.setMaximumSize(win.dimProg);
+
+ win.lblLightLevel = new JLabel();
+ win.panLevel.add(win.lblLightLevel,
+ new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.lblLightLevel.setText("0.00 %");
+ win.lblLightLevel.setSize(60, 22);
+ }
+
+ private void createBatterySection() {
+ win.imgBatteryLevel = new JLabel();
+ win.panLevel.add(win.imgBatteryLevel,
+ new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.imgBatteryLevel.setIcon(win.iconBattery);
+
+ win.progBatteryLevel = new JProgressBar();
+ win.panLevel.add(win.progBatteryLevel,
+ new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.progBatteryLevel.setPreferredSize(win.dimProg);
+ win.progBatteryLevel.setMaximum(70);
+ win.progBatteryLevel.setMinimumSize(win.dimProg);
+ win.progBatteryLevel.setMaximumSize(win.dimProg);
+
+ win.lblBatteryLevel = new JLabel();
+ win.panLevel.add(win.lblBatteryLevel,
+ new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.lblBatteryLevel.setText("0.00 V");
+ win.lblBatteryLevel.setSize(60, 22);
+ }
+
+ private void createMicroSection() {
+ win.imgMicroLevel = new JLabel();
+ win.panLevel.add(win.imgMicroLevel,
+ new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.imgMicroLevel.setIcon(win.iconMicro);
+
+ win.progMicroLevel = new JProgressBar();
+ win.panLevel.add(win.progMicroLevel,
+ new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.NONE,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.progMicroLevel.setPreferredSize(win.dimProg);
+ win.progMicroLevel.setMinimumSize(win.dimProg);
+ win.progMicroLevel.setMaximumSize(win.dimProg);
+
+ win.lblMicroLevel = new JLabel();
+ win.panLevel.add(win.lblMicroLevel,
+ new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.lblMicroLevel.setText("0.00 %");
+ win.lblMicroLevel.setSize(60, 22);
+ }
+
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/levelPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,128 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+
+import javax.swing.DefaultComboBoxModel;
+
+import GUI.mainWindow;
+
+public class objects {
+ private mainWindow win;
+
+ public objects(mainWindow inst) {
+ win = inst;
+ createImagesObjects();
+ createSpinnerModels();
+ createComboboxModels();
+ }
+
+ private void createImagesObjects() {
+ /* Spinning images */
+ win.spinLeft = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/spinLeft.png"));
+ win.spinRight = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/spinRight.png"));
+ win.spinOff = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/spinOff.png"));
+ win.spinCharger = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/spinCharging.png"));
+
+ /* Flippers images */
+ win.flippersUp = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/flippersUp.png"));
+ win.flippersDown = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/flippersDown.png"));
+
+ /* Beak images */
+ win.mouthOpen = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/mouthOpened.png"));
+ win.mouthClose = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/mouthClosed.png"));
+
+ /* Right eye */
+ win.eyeRightOn = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/rightEyeOn.png"));
+ win.eyeRightOff = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/rightEyeOff.png"));
+ win.eyeRightClose = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/rightEyeClosed.png"));
+
+ /* Left eye */
+ win.eyeLeftOn = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/leftEyeOn.png"));
+ win.eyeLeftOff = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/leftEyeOff.png"));
+ win.eyeLeftClose = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/leftEyeClosed.png"));
+
+ /* Buttons images */
+ win.iconUp = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconUp.png"));
+ win.iconDown = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconDown.png"));
+ win.iconLeft = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconLeft.png"));
+ win.iconRight = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconRight.png"));
+ win.iconRun = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconRun.png"));
+ win.iconStop = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconStop.png"));
+
+ /* Levels images */
+ win.iconLight = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconLight.png"));
+ win.iconBattery = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconBattery.png"));
+ win.iconMicro = new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/iconMicro.png"));
+ }
+
+ private void createSpinnerModels() {
+ win.spinEyesCountModel =
+ new javax.swing.SpinnerNumberModel(1, 1, 127, 1);
+ win.spinEyesDuringModel =
+ new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05);
+ win.spinMouthCountModel =
+ new javax.swing.SpinnerNumberModel(1, 1, 127, 1);
+ win.spinMouthDuringModel =
+ new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05);
+ win.spinFlippersCountModel =
+ new javax.swing.SpinnerNumberModel(1, 1, 127, 1);
+ win.spinFlippersDuringModel =
+ new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05);
+ win.spinSpinCountModel =
+ new javax.swing.SpinnerNumberModel(1, 1, 127, 1);
+ win.spinSpinDuringModel =
+ new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05);
+ win.spinLedsCountModel =
+ new javax.swing.SpinnerNumberModel(1, 1, 127, 1);
+ win.spinTTSPitchModel =
+ new javax.swing.SpinnerNumberModel(100, 70, 200, 1);
+ }
+
+ private void createComboboxModels() {
+ win.voiceList = new String[] {"No voice"};
+ win.cmbVoicesModel = new DefaultComboBoxModel(win.voiceList);
+ }
+
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/objects.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,191 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+import i18n.bundle;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextArea;
+
+import GUI.mainWindow;
+
+/**
+ * TTS Text entry panel.
+ * @author paul
+ *
+ */
+public class ttsPanel {
+
+ private mainWindow win;
+
+ /**
+ * Create the TTS text entry panel.
+ * @param inst a mainWindow instance.
+ */
+ public ttsPanel(mainWindow inst) {
+ win = inst;
+
+ createTextPanel();
+ createCheckboxPanel();
+ createTextEntryPanel();
+ createButtonsPanel();
+
+ createConfigPanel();
+ createConfigObjects();
+ }
+
+ /**
+ * Create the panel layout.
+ */
+ private void createTextPanel() {
+
+ win.panTTSAbs = new JPanel();
+ win.getContentPane().add(win.panTTSAbs,
+ new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panTTSAbs.setLayout(null);
+
+ win.panTTS = new JPanel();
+ win.panTTSAbs.add(win.panTTS);
+ win.panTTS.setBounds(0, 0, 406, 140);
+ java.awt.Dimension panDim = new java.awt.Dimension(390, 140);
+ GridBagLayout panTTSLayout = new GridBagLayout();
+ win.panTTS.setLayout(panTTSLayout);
+ win.panTTS.setMaximumSize(panDim);
+ win.panTTS.setMinimumSize(panDim);
+ panTTSLayout.rowWeights = new double[] {0.1, 0.1, 0.1};
+ panTTSLayout.rowHeights = new int[] {30, 70, 30};
+ panTTSLayout.columnWeights = new double[] {0.0, 0.0, 0.0};
+ panTTSLayout.columnWidths = new int[] {390};
+
+ }
+
+ /**
+ * Create the enable/disable checkbox.
+ */
+ private void createCheckboxPanel() {
+ win.chkTTS = new JCheckBox();
+ win.panTTS.add(win.chkTTS,
+ new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
+ GridBagConstraints.WEST,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.chkTTS.setText(bundle.getString("chkTTS")); //$NON-NLS-1$
+ win.chkTTS.setOpaque(false);
+ win.chkTTS.setMargin(new java.awt.Insets(2, 10, 2, 1));
+ win.chkTTS.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkTTSActionPerformed(evt);
+ }
+ });
+ }
+
+ /**
+ * Create the text entry.
+ */
+ private void createTextEntryPanel() {
+ win.textTTS = new JTextArea();
+ win.panTTS.add(win.textTTS,
+ new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(4, 4, 4, 20), 0, 0));
+ win.textTTS.setText(bundle.getString("textTTS")); //$NON-NLS-1$
+ win.textTTS.setSize(370, 60);
+ }
+
+ /**
+ * Create the buttons.
+ */
+ private void createButtonsPanel() {
+ win.panTTSButtons = new JPanel();
+ win.panTTS.add(win.panTTSButtons,
+ new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panTTSButtons.setLayout(null);
+
+ win.btnTTSPlay = new JButton();
+ win.panTTSButtons.add(win.btnTTSPlay);
+ win.btnTTSPlay.setText(bundle.getString("btnTTSPlay")); //$NON-NLS-1$
+ win.btnTTSPlay.setBounds(270, 5, 100, 20);
+ win.btnTTSPlay.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnTTSPlayMouseClicked(evt);
+ }
+ });
+
+ win.btnTTSStop = new JButton();
+ win.panTTSButtons.add(win.btnTTSStop);
+ win.btnTTSStop.setText(bundle.getString("btnTTSStop")); //$NON-NLS-1$
+ win.btnTTSStop.setBounds(155, 5, 100, 20);
+ win.btnTTSStop.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnTTSStopMouseClicked(evt);
+ }
+ });
+ }
+
+ private void createConfigPanel() {
+ win.panTTSConfig = new JPanel();
+ win.getContentPane().add(win.panTTSConfig,
+ new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0,
+ GridBagConstraints.CENTER,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+ win.panTTSConfig.setLayout(null);
+ }
+
+ private void createConfigObjects() {
+ win.cmbVoices = new JComboBox();
+ win.panTTSConfig.add(win.cmbVoices);
+ win.cmbVoices.setModel(win.cmbVoicesModel);
+ win.cmbVoices.setBounds(50, 40, 200, 22);
+
+ win.spinTTSPitch = new JSpinner();
+ win.panTTSConfig.add(win.spinTTSPitch);
+ win.spinTTSPitch.setModel(win.spinTTSPitchModel);
+ win.spinTTSPitch.setBounds(50, 70, 60, 25);
+
+ win.spinTTSPitch.setValue(100);
+
+ win.lblTTSPitch = new JLabel();
+ win.panTTSConfig.add(win.lblTTSPitch);
+ win.lblTTSPitch.setText(bundle.getString("lblTTSPitch")); //$NON-NLS-1$
+ win.lblTTSPitch.setBounds(120, 70, 250, 25);
+ }
+
+}
Property changes on: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/ttsPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java (rev 0)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/components/tuxPanel.java 2008-07-24 13:57:14 UTC (rev 1350)
@@ -0,0 +1,284 @@
+/*
+ * TuxController - Gadget for the TuxDroid software suite.
+ * Copyright (C) 2007 C2ME S.A. <tux...@c2...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* $Id$ */
+
+package GUI.components;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import GUI.mainWindow;
+
+public class tuxPanel {
+ private mainWindow win;
+
+ /**
+ * This class is used to create the Tux pael (panel which display the
+ * images of Tux.
+ * @param inst the mainWindow instance.
+ */
+ public tuxPanel(mainWindow inst) {
+ win = inst;
+ createPanel();
+ createEyesSection();
+ createMouthSection();
+ createFlippersSection();
+ createSpinSection();
+
+
+
+ win.chkLeftLed = new JCheckBox();
+ win.panImages.add(win.chkLeftLed);
+ win.chkLeftLed.setBounds(120, 0, 25, 25);
+
+ win.chkLeftLed.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkLeftLedActionPerformed(evt);
+ }
+ });
+
+ win.chkRightLed = new JCheckBox();
+ win.panImages.add(win.chkRightLed);
+ win.chkRightLed.setBounds(90, 0, 25, 25);
+
+ win.chkRightLed.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
+ win.chkRightLedActionPerformed(evt);
+ }
+ });
+
+
+ }
+
+ private void createPanel() {
+ /* Create the image Panel */
+ win.panImages = new JPanel();
+ win.getContentPane().add(win.panImages,
+ new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0,
+ GridBagConstraints.NORTH,
+ GridBagConstraints.BOTH,
+ new Insets(0, 0, 0, 0), 0, 0));
+
+ win.panImages.setLayout(null);
+
+ }
+ /**
+ * Create the eyes section.
+ */
+ private void createEyesSection() {
+ createEyesImage();
+ createEyesButtons();
+ }
+
+ /**
+ * Create the eyes image
+ */
+ private void createEyesImage() {
+ win.imgRightEye = new JLabel();
+ win.panImages.add(win.imgRightEye);
+ win.imgRightEye.setBounds(30, 10, 180, 79);
+ win.imgRightEye.setIcon(win.eyeRightOn);
+
+
+ /* Left eye */
+ win.imgLeftEye = new JLabel();
+ win.panImages.add(win.imgLeftEye);
+ win.imgLeftEye.setBounds(210, 10, 189, 79);
+ win.imgLeftEye.setIcon(win.eyeLeftOn);
+ win.imgLeftEye.setBackground(new java.awt.Color(82,82,82));
+ }
+
+ private void createEyesButtons() {
+ /* Eyes open button */
+ win.btnEyesOpen = new JButton();
+ win.panImages.add(win.btnEyesOpen);
+ win.btnEyesOpen.setBounds(20, 17, 25, 25);
+ win.btnEyesOpen.setContentAreaFilled(false);
+ win.btnEyesOpen.setBorderPainted(false);
+ win.btnEyesOpen.setIcon(win.iconUp);
+ win.btnEyesOpen.setFocusable(false);
+ win.btnEyesOpen.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent evt) {
+ win.btnEyesOpenMouseClicked(evt);
+ }
+ });
+
+ /* Eyes close button */
+ win.btnEyesClose = new JButton();
+ win.panImages.add(win.btnEyesClose);
+ win.btnEyesClose.setBounds(20, 42, 25, 25);
+ win.btnEyesClose.setContentAreaFilled(false);
+ win.btnEyesClose.setBorderPainted(false);
+ win.btnEyesClose.setIcon(win.iconDown);
+ win.btnEyesClose.setFocusable(false);
+ win.btnEyesClose.addMouseListener(new MouseAdapter() {
+ p...
[truncated message content] |
|
From: Paul_R <c2m...@c2...> - 2008-07-24 13:55:16
|
Author: Paul_R Date: 2008-07-24 15:55:20 +0200 (Thu, 24 Jul 2008) New Revision: 1349 Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/JVerticalLabel.java Log: * Fixed an encodage problem. Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/JVerticalLabel.java =================================================================== --- software_suite_v2/software/tools/tuxController/trunk/src/GUI/JVerticalLabel.java 2008-07-23 13:27:57 UTC (rev 1348) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/JVerticalLabel.java 2008-07-24 13:55:20 UTC (rev 1349) @@ -1,6 +1,6 @@ /* This file is part of "TuxDroid Control Center". * Copyright 2008, kysoh - * Author : Jérôme conan + * Author : Jerome conan * eMail : jer...@ky... * Site : http://www.kysoh.com/ * @@ -22,8 +22,11 @@ package GUI; -import javax.swing.*; -import java.awt.*; +import javax.swing.JLabel; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Dimension; public class JVerticalLabel extends JLabel{ /** |
|
From: jerome <c2m...@c2...> - 2008-07-23 13:27:57
|
Author: jerome Date: 2008-07-23 15:27:57 +0200 (Wed, 23 Jul 2008) New Revision: 1348 Added: software_suite_v2/software/control_center/ software_suite_v2/software/control_center/branches/ software_suite_v2/software/control_center/tags/ software_suite_v2/software/control_center/trunk/ Log: Added control center svn directories. |
|
From: jaguarondi <c2m...@c2...> - 2008-07-22 12:21:41
|
Author: jaguarondi Date: 2008-07-22 14:21:47 +0200 (Tue, 22 Jul 2008) New Revision: 1347 Modified: firmware/hex_dev/new_rf/tuxaudio.hex Log: * Removed a debug signal that ket the RF in reset on standard tuxes. Modified: firmware/hex_dev/new_rf/tuxaudio.hex =================================================================== --- firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-22 11:52:21 UTC (rev 1346) +++ firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-22 12:21:47 UTC (rev 1347) @@ -1,10 +1,10 @@ -:1000000019C0B3C69EC631C09EC02FC02EC02DC021 +:1000000019C0BAC69EC631C09EC02FC02EC02DC01A :100010002CC02BC02AC029C028C027C026C025C09C :1000200005C123C022C021C020C01FC01EC01DC0EA -:10003000DAC91BC011241FBECFEFD4E0DEBFCDBF95 -:1000400011E0A0E0B1E0EAEAF6E102C005900D920D +:10003000EAC91BC011241FBECFEFD4E0DEBFCDBF85 +:1000400011E0A0E0B1E0EAECF6E102C005900D920B :10005000A635B107D9F713E0A6E5B1E001C01D92BE -:10006000A532B107E1F74FD11FCBCACFCF93DF93B2 +:10006000A632B107E1F74FD12FCBCACFCF93DF93A1 :10007000CDB7DEB721970FB6F894DEBF0FBECDBF68 :100080008FEA84B987EC85B98FE088B988E087B9B1 :10009000198203C089818F5F898389818233D0F37C @@ -29,28 +29,28 @@ :1001C000238192818481F22FF81BF91781F0E22FAD :1001D000FF27892F99270197E823F9238D919C9177 :1001E0001197E80FF91F30832F5FED012B8380916A -:1001F0007A00806480937A00809107028150809316 -:100200000702882319F481E080930602FF91EF91A1 +:1001F0007A00806480937A00809108028150809315 +:100200000802882319F481E080930702FF91EF919F :10021000DF91CF91BF91AF919F918F914F913F917E :100220002F910F900FBE0F901F9018950FB6CF9380 :10023000C0910001CF5FC0930001C0FF02C08DDFFD :10024000F894CF910FBE1895CF93DF93CDB7DEB75B :1002500024970FB6F894DEBF0FBECDBF80EF898321 :1002600096B189B19F70807D982B9A831E9B02C0A6 -:1002700090629A838A819BE989278A838091CB0245 +:1002700090629A838A819BE989278A838091CC0244 :100280008B83882321F480916301882319F081E016 -:100290008C8301C01C82CE01019609D624960FB62C +:100290008C8301C01C82CE01019613D624960FB622 :1002A000F894DEBF0FBECDBFDF91CF9108951092BD :1002B00056017CD1F89480E885B998E098B91BB8CC :1002C000E4E6F0E0208189EE808390936C0082E088 :1002D0008BBBE8E6F0E080818260808383B7817F1A :1002E000846083BF83B7816083BF7894889583B728 -:1002F0008E7F83BF10926C0020936400B7DE3AD7E4 -:100300002AD74ED10895CEEFD4E0DEBFCDBFAEDE0A +:1002F0008E7F83BF10926C0020936400B7DE4AD7D4 +:100300003AD74ED10895CEEFD4E0DEBFCDBFAEDEFA :10031000809107019091080143D080910E01909146 -:100320000F013ED09BD917D78AE090E090936201ED -:1003300080936101789483E08CBB8DBB78942ED63A -:1003400080910602882331F11092060280915601B5 +:100320000F013ED0ABD927D78AE090E090936201CD +:1003300080936101789483E08CBB8DBB789438D630 +:1003400080910702882331F11092070280915601B3 :10035000823020F081508093560101C075DF90916A :1003600010019923B9F08AB183608AB9198203C058 :1003700089818F5F898389818F3FD1F7892F815050 @@ -89,56 +89,56 @@ :1005800082E05FDF812F5DDF802F5BDF8F2D59DF02 :100590008E2D57DF299A1F910F91FF90EF900895AC :1005A000289A29988BEA4DDF299A0895289A299844 -:1005B00089EB47DF299A08951092CB0210925C01D3 -:1005C00020E040E060E08CEC55D4289A299A089508 -:1005D0001F93CF93DF938091D402882309F4F5C051 -:1005E0001091CB0280918902882309F48DC01123D8 -:1005F00009F48AC080918902811708F485C081E0DE +:1005B00089EB47DF299A08951092CC0210925C01D2 +:1005C00020E040E060E08CEC5FD4289A299A0895FE +:1005D0001F93CF93DF938091D502882309F4F5C050 +:1005E0001091CC0280918A02882309F48DC01123D6 +:1005F00009F48AC080918A02811708F485C081E0DD :1006000080936A0110926C0180936B0120E090E06E :10061000312F315002C02F5F9F5F931741F08F3F02 :1006200011F08E3F09F42F5F8D5FA9F3F5CF892F6D :10063000880F890F8F5F20936C0180936B019F5F00 :1006400090936A01299883E0FCDE80E0FADE8091D5 -:100650006C01F7DE80916B01F4DEC3EFD1E080E046 -:10066000F0DE899381E0C93FD807C9F71230A8F0BE -:100670008091F401805F8093F4018091F401807F88 -:100680008093F4018091F401882329F48091F3018F -:100690008F5F8093F3011092F501299A8091F30105 -:1006A000883090F58091F601883070F58091F301E3 -:1006B000882321F48091F401843030F18091F70196 -:1006C000882321F48091F8018430F0F09091F601B4 -:1006D0008091F3019817C0F09091F6018091F30199 -:1006E0009817B9F49091F7018091F401981760F090 -:1006F0009091F7018091F401981759F49091F801C5 -:100700008091F501891728F010925C011092CB02BC +:100650006C01F7DE80916B01F4DEC4EFD1E080E045 +:10066000F0DE899381E0CA3FD807C9F71230A8F0BD +:100670008091F501805F8093F5018091F501807F85 +:100680008093F5018091F501882329F48091F4018C +:100690008F5F8093F4011092F601299A8091F40102 +:1006A000883090F58091F701883070F58091F401E1 +:1006B000882321F48091F501843030F18091F80194 +:1006C000882321F48091F9018430F0F09091F701B2 +:1006D0008091F4019817C0F09091F7018091F40196 +:1006E0009817B9F49091F8018091F501981760F08E +:1006F0009091F8018091F501981759F49091F901C2 +:100700008091F601891728F010925C011092CC02BA :1007100068C0809107019091080142DE299883E02A -:1007200090DE8091F3018DDE8091F4018ADE80916C -:10073000F50187DE8AEF87BD1092D40260918902AD -:1007400020E040E08CEC96D34CC036DF4AC080E01D -:1007500078DE2091FB01992702C0959587952A950F +:1007200090DE8091F4018DDE8091F5018ADE80916A +:10073000F60187DE8AEF87BD1092D50260918A02AA +:1007400020E040E08CECA0D34CC036DF4AC080E013 +:1007500078DE2091FC01992702C0959587952A950E :10076000E2F7682F80910701909108012ADE8091BD -:10077000F5018F5F8093F5018091F501882391F455 -:100780008091F4018F5F8093F4018091F4018823BC -:1007900049F48091F3018F5F8093F3018091F3011D -:1007A000883099F29091F3018091F601981769F4DD -:1007B0009091F4018091F701981739F49091F50127 -:1007C0008091F801981709F4C0CF809158018823CF +:10077000F6018F5F8093F6018091F601882391F452 +:100780008091F5018F5F8093F5018091F5018823B9 +:1007900049F48091F4018F5F8093F4018091F4011A +:1007A000883099F29091F4018091F701981769F4DB +:1007B0009091F5018091F801981739F49091F60124 +:1007C0008091F901981709F4C0CF809158018823CE :1007D00041F48091070190910801E6DD882309F436 :1007E000B6CFDF91CF911F9108951F938091330170 :1007F000882321F07FDE109233012EC082DE80FD3F :100800002BC011E01093330110925A012EEF40E0FB :1008100060E080E0A8DE20E041E060E080E0A3DE70 :1008200024E042E060E080E09EDE20E043E060E023 -:1008300080E099DE109289021092640120E040E08D -:1008400060E08DEC17D36091890220E04091640153 -:100850008BEC10D310936E001F9108954091890284 +:1008300080E099DE10928A021092640120E040E08C +:1008400060E08DEC21D360918A0220E04091640148 +:100850008BEC1AD310936E001F91089540918A0279 :1008600083E0489FA00111244F5F5F4F50936901BF -:1008700040936801652F772780E0EADD8093F301DC +:1008700040936801652F772780E0EADD8093F401DB :1008800040916801509169014F5F5F4F509369013A -:1008900040936801652F772780E0DADD8093F401CB +:1008900040936801652F772780E0DADD8093F501CA :1008A00040916801509169014F5F5F4F509369011A -:1008B00040936801652F772780E0CADD8093F501BA -:1008C0008091F3019091F4018295807F92959F70C1 +:1008B00040936801652F772780E0CADD8093F601B9 +:1008C0008091F4019091F5018295807F92959F70BF :1008D000890F9927089581E080936B0110926C0134 :1008E00010926A0140916B0160916C0180E0B0DD73 :1008F0008F3FB9F080916C0120916B01922F9F5F27 @@ -147,225 +147,227 @@ :10092000E1CF80916A01815080936A0199270895EF :10093000FF920F931F93CF93DF93CDB7DEB721972D :100940000FB6F894DEBF0FBECDBF8091670188233C -:1009500009F08AC010926E0080918902882351F4B8 -:100960001092F30184E08093F4011092F50110924B -:100970006D0152C04091890283E0489FA00111247B +:1009500009F08AC010926E0080918A02882351F4B7 +:100960001092F40184E08093F5011092F601109248 +:100970006D0152C040918A0283E0489FA00111247A :100980004F5F5F4F5093690140936801652F772750 -:1009900080E05EDD8093F301409168015091690130 +:1009900080E05EDD8093F40140916801509169012F :1009A0004F5F5F4F5093690140936801652F772730 -:1009B00080E04EDD8093F40140916801509169011F +:1009B00080E04EDD8093F50140916801509169011E :1009C0004F5F5F4F5093690140936801652F772710 -:1009D00080E03EDD8093F5018091F401805F80939B -:1009E000F4018091F401807F8093F4018091F401FF -:1009F000882329F48091F3018F5F8093F301109293 -:100A0000F5019091F3018091F4019295907F829588 +:1009D00080E03EDD8093F6018091F501805F809399 +:1009E000F5018091F501807F8093F5018091F501FB +:1009F000882329F48091F4018F5F8093F401109291 +:100A0000F6019091F4018091F5019295907F829585 :100A10008F70980F90936D0180910701909108015C -:100A2000BFDC8091F301883048F085E08093670156 -:100A300020E040E065E08DEC1DD205C080916701AB +:100A2000BFDC8091F401883048F085E08093670155 +:100A300020E040E065E08DEC27D205C080916701A1 :100A40008F5F8093670188E893E1909360018093C2 -:100A50005F0190936201809361012091F4014091C4 -:100A6000F30161E08DEC4FC1813051F5F090F5015B -:100A70000091F4011091F30125DD29988FEAE1DC62 +:100A50005F0190936201809361012091F5014091C3 +:100A6000F40161E08DEC4FC1813051F5F090F60159 +:100A70000091F5011091F40125DD29988FEAE1DC60 :100A8000812FDFDC802FDDDC8F2DDBDCBE016F5F93 :100A90007F4F8091070190910801B2DC882311F407 :100AA000898101C080E8CDDC299A809167018F5F40 -:100AB0008093670181E08093D4021092660124C183 -:100AC000823009F07EC08091D402882309F052C0A0 +:100AB0008093670181E08093D5021092660124C182 +:100AC000823009F07EC08091D502882309F052C09F :100AD00057C0E0910701F091080193818481981734 :100AE000A9F181E0809366018AE090E09093600133 :100AF00080935F01909362018093610129988FEA4E :100B0000A0DCBE016F5F7F4F8091070190910801CB -:100B100077DC898196DC299A8091F5018F5F80933B -:100B2000F5018091F501882371F48091F4018F5FC4 -:100B30008093F4018091F401882329F48091F301DA -:100B40008F5F8093F301DDDC80FDFDCF80915F013D -:100B500090916001892B09F4B6C08091F301873030 -:100B600049F48091F4018F3F29F48091F5018F3F82 +:100B100077DC898196DC299A8091F6018F5F80933A +:100B2000F6018091F601882371F48091F5018F5FC1 +:100B30008093F5018091F501882329F48091F401D7 +:100B40008F5F8093F401DDDC80FDFDCF80915F013C +:100B500090916001892B09F4B6C08091F40187302F +:100B600049F48091F5018F3F29F48091F6018F3F80 :100B700009F4A9C080915801882309F4AACFC4C000 -:100B80009CDC80916601882399F04091F30180916B -:100B9000F4014295407F82958F70480F4093640125 -:100BA00080916D01481B20E062E08DEC63D187C02D -:100BB00020E040E066E08DEC5DD185E08093670148 +:100B80009CDC80916601882399F04091F40180916A +:100B9000F5014295407F82958F70480F4093640124 +:100BA00080916D01481B20E062E08DEC6DD187C023 +:100BB00020E040E066E08DEC67D185E0809367013E :100BC000A3C0833091F580916501813011F484E0F8 -:100BD00027C0823039F520E040E064E08DEC4AD156 +:100BD00027C0823039F520E040E064E08DEC54D14C :100BE00090916D01992371F481E080935A018AE01C :100BF00090E09093620180936101109267011092DE -:100C00005B0110C06091F3018091F4016295607FF7 +:100C00005B0110C06091F4018091F5016295607FF5 :100C100082958F70680F60936401892F7ADC85E07C :100C200080936701109265016FC0843009F04EC057 -:100C300020E040E063E08DEC1DD1809189028F5F60 -:100C4000809389024091890283E0489FA00111248A -:100C50004F5F5F4F50936901409368012091F3010A +:100C300020E040E063E08DEC27D180918A028F5F55 +:100C400080938A0240918A0283E0489FA001112488 +:100C50004F5F5F4F50936901409368012091F40109 :100C6000652F772780E07FDC409168015091690112 -:100C70004F5F5F4F50936901409368012091F401E9 +:100C70004F5F5F4F50936901409368012091F501E8 :100C8000652F772780E06FDC409168015091690102 -:100C90004F5F5F4F50936901409368012091F501C8 -:100CA000652F772780E05FDC9091F3018091F4015C +:100C90004F5F5F4F50936901409368012091F601C7 +:100CA000652F772780E05FDC9091F4018091F5015A :100CB0009295907F82958F70980F909364018091A8 -:100CC00067018F5F7BCF1092D4021EC08530E1F4A4 -:100CD00002DE809389028AE090E090936201809323 +:100CC00067018F5F7BCF1092D5021EC08530E1F4A3 +:100CD00002DE80938A028AE090E090936201809322 :100CE00061011092670110925B0181E080936E00B8 -:100CF00020E040E060E08DECBDD06091890220E012 -:100D0000409164018BECB6D021960FB6F894DEBF0B +:100CF00020E040E060E08DECC7D060918A0220E007 +:100D0000409164018BECC0D021960FB6F894DEBF01 :100D10000FBECDBFDF91CF911F910F91FF9008952E :100D2000FC018181843061F4A281B3818C9188239C :100D300039F080818A3221F4B0936F01A0936E0163 -:100D400008951F920F920FB60F9211248F93109255 -:100D5000E1012A988091AD018EBDE89AE09A8F91C9 -:100D60000F900FBE0F901F9018951F920F920FB605 -:100D70000F9211248F939F93EF93FF932A9919C099 -:100D80000DB407FE16C09091E1018EB5E92FFF2743 -:100D9000E758FE4F80839F5F9093E101973219F4EB -:100DA0002A9AE89806C0E92FFF27E355FE4F808175 -:100DB0008EBDFF91EF919F918F910F900FBE0F907D -:100DC0001F901895E0910701F0910801238194810B -:100DD000809172018F5F80937201882301F5291B36 -:100DE000809171012817B0F420937101203520F013 -:100DF00006C087B5815002C087B58F5F87BD87B5B4 -:100E00008F3F11F48EEF87BD87B5803F40F480EFB0 -:100E100087BD089520937101293258F7F0CF0895C6 -:100E2000FF920F931F93CF93DF939C01E0914001BA -:100E3000F091410183819481891B8D3118F080E00C -:100E400090E012C0FFB6F894E90189010C5F1F4FD2 -:100E500069918091400190914101B3DAC017D107A7 -:100E6000B9F7FFBE81E090E0DF91CF911F910F9124 -:100E7000FF900895CF93DF93CDB7DEB724970FB6D9 -:100E8000F894DEBF0FBECDBF89836A834B832C836A -:100E9000CE010196C5DF992787FD909524960FB660 -:100EA000F894DEBF0FBECDBFDF91CF910895FF92C2 -:100EB0000F931F93CF93DF93AC01E0913901F09131 -:100EC0003A0123818481281B332782819927049743 -:100ED000821793071CF480E090E012C0FFB6F894EC -:100EE000EA018A010C5F1F4F69918091390190914D -:100EF0003A0167DAC017D107B9F7FFBE81E090E089 -:100F0000DF91CF911F910F91FF900895CF93DF93C1 -:100F1000CDB7DEB724970FB6F894DEBF0FBECDBFB6 -:100F200089836A834B832C83CE010196C0DF992786 -:100F300087FD909524960FB6F894DEBF0FBECDBF07 -:100F4000DF91CF9108950F931F93CF93DF93BC014F -:100F5000E0914001F091410193818481981729F437 -:100F600001C0789481E090E014C0F894EB018B010B -:100F70000C5F1F4FBE01809140019091410140DA0A -:100F8000882379F72196C017D107A1F7789480E0DC -:100F900090E0DF91CF911F910F9108950F931F93D0 -:100FA000CF93DF938091E101873208F488C01092DB -:100FB000E10110917A01909179018091770189176F -:100FC000C9F090937701912F969580917001829549 -:100FD0008F70892780FF0EC08BE791E0D1D08823E6 -:100FE00019F48BE791E063DF8091700190E189272C -:100FF00080937001012F112702FF0EC0E3DECFE7BF -:10100000D1E069918091070190910801DAD981E0DE -:10101000C03AD80721F0F5CF85B1805885B98091C5 -:1010200078018093AD018F5F8093780120917001EA -:10103000822F869594E0169507959A95E1F780277B -:1010400080FD1AC0E0914001F091410183819481BB -:10105000891B843088F082E0282720937001CFEA32 -:10106000D1E0BE018091400190914101C9D9219602 -:1010700081E0C33BD807A9F7E0910E01F0910F0181 -:1010800083819481891B90917001813188F09460F3 -:1010900090937001C3EBD1E0BE0180910E0190915D -:1010A0000F01AED9219681E0C43CD80721F0F4CFDE -:1010B0009B7F90937001809170018093AE0145D128 -:1010C000019709F443C080914D0190914E0103971F -:1010D00049F180916E0190916F01009761F050D0BD -:1010E000882329F480916E0190916F0199DE10920E -:1010F0006F0110926E01E0913901F0913A019381F4 -:1011000084819817D1F0C3E7D1E0BE018091390105 -:1011100090913A0175D98823C9F4219681E0C737A7 -:10112000D80799F789E491E01ED110C00ED101973C -:1011300069F08FE491E0DFD009C0E0914001F091C7 -:10114000410183819481891B8D3180F3DF91CF919F -:101150001F910F910895BFD09AE29093490184E0C6 -:1011600080934A0190934F018093500180E996E06B -:10117000A8D008958091390190913A0111D908952C -:10118000FC018081882309F468C0833011F468D0A1 -:1011900041C08039B1F480915C01882309F05DC0C1 -:1011A00080915B01882309F058C082818093FB0104 -:1011B00081818093CB0281E080935C018093D40293 -:1011C00029C0823949F48181882319F05F985598A4 -:1011D00021C05F9A559A1EC0823561F480915C01EE -:1011E000882311F010925C0181E08093D4028093F7 -:1011F0005B0110C0843521F481E080935A010AC05C -:10120000833559F48181882311F081E001C082E0A7 -:101210008093650181E090E008958F3FD9F480913B -:10122000E7019181282F21502093E701318189170F -:1012300028F43093E7011092E60109C0231B809146 -:10124000E601820F8093E60181818093E70180911E -:10125000E601828380E090E0089581E090E00895C7 -:10126000CF93DF93CDB7DEB72C970FB6F894DEBFE0 -:101270000FBECDBF80EF9DE1DE011196FC0101960E -:10128000E491ED932DE18C3F9207C1F7CE010196D9 -:10129000C7DDCE010596C4DDCE010996C1DD6091A2 -:1012A000890220E0409164018BECE4DD2C960FB6BE -:1012B000F894DEBF0FBECDBFDF91CF91089528987F -:1012C00008959093EF018093EE0108959093F101BA -:1012D0008093F00108951092E9011092E801459A77 -:1012E000449A80E68093B90080E28093B80085E854 -:1012F0008093BC000895FC018091E8019091E90180 -:10130000019719F48FEF90E00895F093EB01E093CB -:10131000EA0181E090E09093E9018093E8019583F0 -:1013200084838081880F8F5F8093EC011092ED01A0 -:1013300085EA8093BC0080E090E00895E091EA01A6 -:10134000F091EB018081992708958091E8019091B7 -:10135000E90108951092E9011092E8010895809141 -:10136000ED0199270895FC018091E8019091E90130 -:10137000019719F48FEF9FEF0895F093EB01E0933D -:10138000EA0181E090E09093E9018093E801958380 -:1013900084838081880F8093EC011092ED0185EAAF -:1013A0008093BC0080E090E00895CF93DF93CDB7A9 -:1013B000DEB721970FB6F894DEBF0FBECDBF1982FE -:1013C00003C089818F5F898389818F3FD1F785EA47 -:1013D0008093BC0021960FB6F894DEBF0FBECDBF40 -:1013E000DF91CF9108951F920F920FB60F921124A3 -:1013F0002F933F934F935F936F937F938F939F931D -:10140000AF93BF93CF93DF93EF93FF938091B90096 -:101410009927887F90708035910509F4A2C08135A5 -:10142000910594F58032910509F4DDC08132910572 -:101430009CF48830910509F45CC08930910524F44E -:10144000892B09F4EDC0EFC08031910509F451C03A -:10145000489709F0E8C052C08833910509F46FC07D -:101460008933910544F48832910509F447C0C09747 -:1014700009F0D9C0B8C08034910509F483C088341C -:10148000910509F0D0C0AFC08837910509F4B8C004 -:1014900089379105ACF48036910509F4B1C08136E5 -:1014A00091052CF48835910509F0BDC07AC08836C5 -:1014B000910509F4A5C08037910509F0B4C0A0C01A -:1014C0008039910509F4A2C0813991054CF4803826 -:1014D000910509F49BC08838910509F0A4C09CC00F -:1014E0008839910509F498C0803A910509F09BC0AC -:1014F0008FC08091EC018093BB0051C09091ED01B1 -:10150000E091EA01F091EB018181981770F48091EC -:10151000ED010280F381E02DE80FF11D90818F5FD6 -:101520008093ED019093BB003AC085E98093BC00A5 -:1015300082E090E09093E9018093E8010FC08091F0 -:10154000BC0085688093BC0085E090E09093E90141 -:101550008093E801E091EA01F091EB0195838483A7 -:1015600062C09091ED01E091EA01F091EB010280FF -:10157000F381E02DE90FF11D8091BB0080839F5F17 -:101580009093ED012091ED013327E091EA01F09174 -:10159000EB0181819927019728173907BCF185E86C -:1015A00040C0A091EA01B091EB019091ED01ED01F5 -:1015B000EA81FB81E90FF11D8091BB0080839F5F71 -:1015C0009093ED0184E090E09093E9018093E8012D -:1015D0009D838C83E091EE01F091EF01309719F13A -:1015E000CD0109951DC083E090E09093E9018093BF -:1015F000E801E091EA01F091EB019583848310C04A -:1016000081E090E09093E9018093E80185EC09C0C6 -:101610001092E9011092E8018091BC00856801C038 -:1016200085E98093BC00FF91EF91DF91CF91BF914D -:10163000AF919F918F917F916F915F914F913F916A -:101640002F910F900FBE0F901F90189581E0E2EF41 -:10165000F1E0A0E0B0E0182E0ED0089581E0E2EFB6 -:10166000F1E0A0E0B0E0182E01D0089509D0019279 -:101670001A94E1F7089501900BD01A94E1F70895B8 -:10168000F999FECFB2BDA1BDF89A119600B40895A4 -:10169000F999FECFB2BDA1BD00BC11960FB6F8946A -:0A16A000FA9AF99A0FBE0895FFCFE1 -:1016AA000401090280000002018B024000000901C6 -:1016BA001401000000010000020000030000040001 -:1016CA000005000006000007000007800007A000D0 -:1016DA0007C00001D5021000003401E50220000015 -:1016EA003B010503200000420100007301000000D5 -:0616FA0000E20100000007 +:100D400008951F920F920FB60F9211248F9381E096 +:100D50008093E201809358018F910F900FBE0F9006 +:100D60001F9018951092E1012A988091AD018EBDD7 +:100D7000E89AE09A289808951F920F920FB60F9262 +:100D800011248F939F93EF93FF932A991CC00DB466 +:100D900007FE19C09091E1018EB5E92FFF27E758B2 +:100DA000FE4F80839F5F9093E101973231F42A9A3E +:100DB000E898289A1092580106C0E92FFF27E355BA +:100DC000FE4F80818EBDFF91EF919F918F910F908B +:100DD0000FBE0F901F901895E0910701F091080148 +:100DE00023819481809172018F5F809372018823A7 +:100DF00001F5291B809171012817B0F4209371012E +:100E0000203520F006C087B5815002C087B58F5FBE +:100E100087BD87B58F3F11F48EEF87BD87B5803FC3 +:100E200040F480EF87BD089520937101293258F76F +:100E3000F0CF0895FF920F931F93CF93DF939C0100 +:100E4000E0914001F091410183819481891B8D31B2 +:100E500018F080E090E012C0FFB6F894E901890133 +:100E60000C5F1F4F69918091400190914101A9DA77 +:100E7000C017D107B9F7FFBE81E090E0DF91CF91B5 +:100E80001F910F91FF900895CF93DF93CDB7DEB7F9 +:100E900024970FB6F894DEBF0FBECDBF89836A8357 +:100EA0004B832C83CE010196C5DF992787FD909552 +:100EB00024960FB6F894DEBF0FBECDBFDF91CF9161 +:100EC0000895FF920F931F93CF93DF93AC01E091AE +:100ED0003901F0913A0123818481281B33278281D3 +:100EE00099270497821793071CF480E090E012C0C2 +:100EF000FFB6F894EA018A010C5F1F4F6991809157 +:100F0000390190913A015DDAC017D107B9F7FFBEF8 +:100F100081E090E0DF91CF911F910F91FF900895B4 +:100F2000CF93DF93CDB7DEB724970FB6F894DEBF2B +:100F30000FBECDBF89836A834B832C83CE0101967C +:100F4000C0DF992787FD909524960FB6F894DEBFF1 +:100F50000FBECDBFDF91CF9108950F931F93CF9315 +:100F6000DF93BC01E0914001F091410193818481C4 +:100F7000981729F401C0789481E090E014C0F894A7 +:100F8000EB018B010C5F1F4FBE01809140019091DE +:100F9000410136DA882379F72196C017D107A1F7E6 +:100FA000789480E090E0DF91CF911F910F910895A8 +:100FB0000F931F93CF93DF938091E201882319F061 +:100FC0001092E201CFDE8091E101873208F487C000 +:100FD0001092E10110917A0190917901809177014D +:100FE0008917C9F090937701912F969580917001A0 +:100FF00082958F70892780FF0EC08BE791E0D0D05B +:10100000882319F48BE791E05CDF8091700190E117 +:10101000892780937001C12FDD27C2FF10C0DCDE5D +:101020000FE711E0F80161918F0180910701909124 +:101030000801C7D9F1E0003A1F0741F0F3CF8091D2 +:1010400078018093AD018F5F8093780120917001CA +:10105000822F869594E0D695C7959A95E1F78C27CF +:1010600080FD1AC0E0914001F0914101838194819B +:10107000891B843088F082E0282720937001CFEA12 +:10108000D1E0BE018091400190914101B9D92196F2 +:1010900081E0C33BD807A9F7E0910E01F0910F0161 +:1010A00083819481891B90917001813188F09460D3 +:1010B00090937001C3EBD1E0BE0180910E0190913D +:1010C0000F019ED92196E1E0C43CDE0721F0F4CF68 +:1010D0009B7F90937001809170018093AE0145D108 +:1010E000019709F443C080914D0190914E010397FF +:1010F00049F180916E0190916F01009761F050D09D +:10110000882329F480916E0190916F0193DE1092F3 +:101110006F0110926E01E0913901F0913A019381D3 +:1011200084819817D1F0C3E7D1E0BE0180913901E5 +:1011300090913A0165D98823C9F42196F1E0C73727 +:10114000DF0799F789E491E01ED110C00ED1019715 +:1011500069F08FE491E0DFD009C0E0914001F091A7 +:10116000410183819481891B8D3180F3DF91CF917F +:101170001F910F910895BFD09AE29093490184E0A6 +:1011800080934A0190934F018093500180E996E04B +:10119000A8D008958091390190913A0101D908951C +:1011A000FC018081882309F468C0833011F468D081 +:1011B00041C08039B1F480915C01882309F05DC0A1 +:1011C00080915B01882309F058C082818093FC01E3 +:1011D00081818093CC0281E080935C018093D50271 +:1011E00029C0823949F48181882319F05F98559884 +:1011F00021C05F9A559A1EC0823561F480915C01CE +:10120000882311F010925C0181E08093D5028093D5 +:101210005B0110C0843521F481E080935A010AC03B +:10122000833559F48181882311F081E001C082E087 +:101230008093650181E090E008958F3FD9F480911B +:10124000E8019181282F21502093E80131818917ED +:1012500028F43093E8011092E70109C0231B809124 +:10126000E701820F8093E70181818093E8018091FB +:10127000E701828380E090E0089581E090E00895A6 +:10128000CF93DF93CDB7DEB72C970FB6F894DEBFC0 +:101290000FBECDBF80EF9DE1DE011196FC010196EE +:1012A000E491ED932DE18C3F9207C1F7CE010196B9 +:1012B000C1DDCE010596BEDDCE010996BBDD609194 +:1012C0008A0220E0409164018BECDEDD2C960FB6A3 +:1012D000F894DEBF0FBECDBFDF91CF91089528985F +:1012E00008959093F0018093EF0108959093F20197 +:1012F0008093F10108951092EA011092E901459A54 +:10130000449A80E68093B90080E28093B80085E833 +:101310008093BC000895FC018091E9019091EA015D +:10132000019719F48FEF90E00895F093EC01E093AA +:10133000EB0181E090E09093EA018093E9019583CD +:1013400084838081880F8F5F8093ED011092EE017E +:1013500085EA8093BC0080E090E00895E091EB0185 +:10136000F091EC018081992708958091E901909195 +:10137000EA0108951092EA011092E901089580911E +:10138000EE0199270895FC018091E9019091EA010D +:10139000019719F48FEF9FEF0895F093EC01E0931C +:1013A000EB0181E090E09093EA018093E90195835D +:1013B00084838081880F8093ED011092EE0185EA8D +:1013C0008093BC0080E090E00895CF93DF93CDB789 +:1013D000DEB721970FB6F894DEBF0FBECDBF1982DE +:1013E00003C089818F5F898389818F3FD1F785EA27 +:1013F0008093BC0021960FB6F894DEBF0FBECDBF20 +:10140000DF91CF9108951F920F920FB60F92112482 +:101410002F933F934F935F936F937F938F939F93FC +:10142000AF93BF93CF93DF93EF93FF938091B90076 +:101430009927887F90708035910509F4A2C0813585 +:10144000910594F58032910509F4DDC08132910552 +:101450009CF48830910509F45CC08930910524F42E +:10146000892B09F4EDC0EFC08031910509F451C01A +:10147000489709F0E8C052C08833910509F46FC05D +:101480008933910544F48832910509F447C0C09727 +:1014900009F0D9C0B8C08034910509F483C08834FC +:1014A000910509F0D0C0AFC08837910509F4B8C0E4 +:1014B00089379105ACF48036910509F4B1C08136C5 +:1014C00091052CF48835910509F0BDC07AC08836A5 +:1014D000910509F4A5C08037910509F0B4C0A0C0FA +:1014E0008039910509F4A2C0813991054CF4803806 +:1014F000910509F49BC08838910509F0A4C09CC0EF +:101500008839910509F498C0803A910509F09BC08B +:101510008FC08091ED018093BB0051C09091EE018E +:10152000E091EB01F091EC018181981770F48091CA +:10153000EE010280F381E02DE80FF11D90818F5FB5 +:101540008093EE019093BB003AC085E98093BC0084 +:1015500082E090E09093EA018093E9010FC08091CE +:10156000BC0085688093BC0085E090E09093EA0120 +:101570008093E901E091EB01F091EC019583848384 +:1015800062C09091EE01E091EB01F091EC010280DC +:10159000F381E02DE90FF11D8091BB0080839F5FF7 +:1015A0009093EE012091EE013327E091EB01F09151 +:1015B000EC0181819927019728173907BCF185E84B +:1015C00040C0A091EB01B091EC019091EE01ED01D2 +:1015D000EA81FB81E90FF11D8091BB0080839F5F51 +:1015E0009093EE0184E090E09093EA018093E9010A +:1015F0009D838C83E091EF01F091F001309719F118 +:10160000CD0109951DC083E090E09093EA0180939D +:10161000E901E091EB01F091EC019583848310C026 +:1016200081E090E09093EA018093E90185EC09C0A4 +:101630001092EA011092E9018091BC00856801C016 +:1016400085E98093BC00FF91EF91DF91CF91BF912D +:10165000AF919F918F917F916F915F914F913F914A +:101660002F910F900FBE0F901F90189581E0E3EF20 +:10167000F1E0A0E0B0E0182E0ED0089581E0E3EF95 +:10168000F1E0A0E0B0E0182E01D0089509D0019259 +:101690001A94E1F7089501900BD01A94E1F7089598 +:1016A000F999FECFB2BDA1BDF89A119600B4089584 +:1016B000F999FECFB2BDA1BD00BC11960FB6F8944A +:0A16C000FA9AF99A0FBE0895FFCFC1 +:1016CA0004010A0280000002018C024000000901A4 +:1016DA0014010000000100000200000300000400E1 +:1016EA000005000006000007000007800007A000B0 +:1016FA0007C00001D6021000003401E602200000F3 +:10170A003B010603200000420100007301000000B3 +:06171A0000E301000000E5 :0C1DF000C8010500C9210501CA0000005F :00000001FF |
|
From: jaguarondi <c2m...@c2...> - 2008-07-22 11:52:17
|
Author: jaguarondi Date: 2008-07-22 13:52:21 +0200 (Tue, 22 Jul 2008) New Revision: 1346 Added: firmware/hex_dev/new_rf/fuxusb.hid.hex Log: * Added the hid version of the fuxusb firmware. Added: firmware/hex_dev/new_rf/fuxusb.hid.hex =================================================================== --- firmware/hex_dev/new_rf/fuxusb.hid.hex (rev 0) +++ firmware/hex_dev/new_rf/fuxusb.hid.hex 2008-07-22 11:52:21 UTC (rev 1346) @@ -0,0 +1,533 @@ +:101861001219701210F33009051210A480F5120933 +:031871005D80F0A7 +:0C197000438F01C281D2A3D2AF020EFA55 +:0C197C00C8040401C9000004CA000000F7 +:060EFA00121AA143BC80A6 +:100F00009001AC1204110000271043BC109001ACFA +:100F1000E0FCA3E0FDA3E0FEA3E0FFEC4D4E4F603C +:100F200018EF24FFFFEE34FFFEED34FFFDEC34FF3D +:0C0F3000FC9001AC12040580D453BCEF0F +:100F3C007D80E4FF121A9AE4FF1218ED12180B537D +:080F4C00F1FC43F101D2B322D4 +:1010F300E5BD30E5051219568012E5BD30E4051251 +:101103001A488008E5BD30E003121A3FE5BD30E31D +:101113000E53BDF71215F89000FCE0600214F09036 +:1011230001A4E0600B12192B50062005031219C409 +:0B113300120E2DE5F8600312132522B8 +:04161E004101A400E2 +:100F5400E5CFF0A3E5CFF0A3E5CFF0A3E5CFF022F2 +:100F64009001A1E4F07412A3F09001A674FFF0A321 +:100F74002253CEFB43CE80229001A1E4F0A322535E +:100F8400CEFD53CE7F229001A6E0FBA3E0FAA3E0BE +:100F9400F92253CE7F53CEFB22F053CEFB43CE1027 +:080FA40022E4F5CF43CE102238 +:10180B00E49001AAF0A3F0A3F09001A4F09001CE14 +:06181B00F09001CDF02267 +:100006007D857F01121A9A7F011218ED7D817F028C +:10001600121A9A7F021218ED7D817F03121A9A7FB7 +:10002600031218ED7D877F04121A9A7F041218EDC9 +:0C0036007D837F05121A9A7F050218EDE9 +:061AAF00E4F5C7020B5A2A +:100B5A009001A5E5CFF09001A3E5CFF09001A5E0C3 +:100B6A00546070739001A3E024FEB40A00506690AA +:100B7A000B8775F003A4C58325F0C58373020BDACE +:100B8A00020BDF020BDF020BAF020BA5020BDF0227 +:100B9A000BAA020BB4020BC4020BD512064C806FCF +:100BAA00121711806A1217F380659001A5E070058B +:100BBA00121531805A1218FE80559001A5E0B481B1 +:100BCA0005121A17804912193A8044120E96803F6C +:100BDA00121821803A80329001A5E0546064207096 +:100BEA00289001A3E0247E600F146011146013247E +:100BFA0003701412172F801712174D80121216CF76 +:100C0A00800D1216F08008800053CEFB12190D5386 +:030C1A00CE7F2268 +:1017F3009001ACE5CFF053CEFB43BC011219B89076 +:0718030001ACE04480F5C6D2 +:01180A0022BB +:10153100AFCF120F96EFD39401501B9001A4EFF09F +:10154100B401091215AC1216AC121A211219B812F3 +:09155100000643BC022212190D30 +:01155A00226E +:100E96009001AC120F54120F969001AEE0B40318F5 +:100EA6009001ACE070129001CEF09001CDF07F047D +:100EB6001218ED7F051218ED9001AEE0B4010C900A +:100EC60001ACE0B401057F811218ED9001AEE0B4EB +:100ED600020C9001ACE0B401057F021218ED9001FE +:100EE600AEE0B4050C9001ACE0B401057F03121826 +:040EF600ED0219B838 +:10064C00C20AAFCFAECFEE24FE601E14605424E27B +:10065C00603E14602924216003020767120F647442 +:10066C0000F0A37446F00207719001A17401F074BC +:10067C004B120F6B7401F0A3741EF0020771120F72 +:10068C007C7422120F6C7402F0A37447F002077191 +:10069C00120F7C7409120F6C7401F0A374D5F00264 +:1006AC000771EFB4090040030207679006BEF828F3 +:1006BC0028730206D90206E60206F80207050207AD +:1006CC0017020734020723020745020756120F646C +:1006DC007400F0A37458F0020771120F7C740C12A2 +:1006EC000F6C7400F0A3746AF0020771120F64743B +:1006FC0000F0A37476F0020771120F7C740C120FC9 +:10070C006C7400F0A37488F0020771120F6474000B +:10071C00F0A37494F0804E120F7C741E120F6C7444 +:10072C0000F0A374C8F0803D120F7C7422120F6C81 +:10073C007400F0A374A6F0802C120F7C741A120FA4 +:10074C006C7400F0A374E6F0801B120F7C741E1204 +:10075C000F6C7401F0A37400F0800A53CEFB1219D5 +:10076C000D53CE7F22E5CFE5CF9001ADE5CFF090D4 +:10077C0001ACE5CFF09001A1E0FEA3E0FF9001AC4D +:10078C00E0FCA3E0FDD39FEC9E400CEF541F6002F5 +:10079C008001D3920A80089001A1ECF0A3EDF01235 +:1007AC000F75D39001A2E094209001A1E094004039 +:1007BC000B120F8A7D2012125C40E722120F8A90D6 +:1007CC0001A1A3E0FD12125C5029300A0A120F8A13 +:1007DC00E4FD12125C501CE5CE54427005E5CE309F +:1007EC00E2F5E5CE20E20CE5CE5442600653CE7F16 +:0307FC0053CEFDDC +:0107FF0022D7 +:10125C009001AEEDF01218869001A6EBF0A3EAF027 +:10126C00A3E9F09001AEE0FFC39001A2E09FF090E3 +:10127C0001A1E09400F0E5CE54427005E5CE30E0DB +:10128C00F553CEFEE5CE5442600853CEEF53CEFD5F +:04129C00C322D32274 +:10171100120F759001A4E0F5CF43CE10E5CE30E075 +:0E172100FB53CEFEE5CE544260FA120F832237 +:0A1A1700120F7512190D53CE7F2235 +:10105400E5CFE5CFAFCF120F759001A5E0247F60F7 +:101064000C14600E2402701975CF018014E4F5CFBE +:10107400800FEF547F24A9F582E43401F583E0F571 +:10108400CF120FA5E5CE30E0FBE5CE20E2F653CE3D +:0F109400FEE5CE544260FAE5CE20E2F5120F835E +:0110A300222A +:1011D0009001A5E0700280379001A5E0B401028083 +:1011E0002E9001A5E06402702CE5CF7028E5CFAF0A +:1011F000CFEF247F701975C70143CE20E4F5C79067 +:1012000001AA04120F9DE5CE30E0FB53CEFE22531F +:06121000CEFB12190D22B5 +:100FAC009001A5E0700280479001A5E0B401028099 +:100FBC003E9001A5E06402703CE5CF7038E5CFAF00 +:100FCC00CFEF601F247F702775C70153CEDF7F01E1 +:100FDC001218EDE4F5C79001AA120F9DE5CE30E092 +:100FEC00FB8008120F9EE5CE30E0FB53CEFE225361 +:060FFC00CEFB12190D22CC +:10172F009001AC120F54120F75120FA5E5CE30E0D9 +:0D173F00FB53CEFEE5CE544260FA120F833C +:01174C00227A +:10174D009001AC120F54120F75120FA5E5CE30E0BB +:0D175D00FB53CEFEE5CE544260FA120F831E +:01176A00225C +:1016CF009001AC120F54120F7575CF0A43CE10E56F +:1016DF00CE30E0FB53CEFEE5CE544260FA120F83BC +:0116EF0022D8 +:1016F0009001AC120F54120F7575CF0143CE10E557 +:10170000CE30E0FB53CEFEE5CE544260FA120F839A +:0117100022B6 +:0C1988009001B9120F54120F960219B80A +:0C1994009001BD120F54120F960219B8FA +:0C19A0009001C1120F54120F960219B8EA +:0C19AC009001C5120F54120F960219B8DA +:0F18FE0053CEFBE5CE544260FA53CEFD0219B82B +:0E193A00E5CF9001A0E5CFF053CEFB0219B827 +:10182100120F759001A0E0F5CF1219B8E5CE544220 +:0618310060FA120F832291 +:0F190D0043CE20E5CE30E3FB53CEDF53CEF7229F +:0C19B80043CE10E5CE30E0FB53CEFE2203 +:100046001201100100000020EB0307FF410001022E +:100056000301120309040000000000000000000074 +:10006600000000000C034B00790073006F0068006D +:100076001203540075007800440072006F00690096 +:1000860064000C03310030003000300031001203F0 +:10009600540075007800440072006F006900640027 +:1000A6002203540075007800440072006F00690056 +:1000B60064002D0053007000650061006B00650050 +:1000C60072001E03540075007800440072006F0031 +:1000D600690064002D004D006900630072006F0026 +:1000E6001A03540075007800440072006F0069001E +:1000F60064002D005400540053001E035400750084 +:100106007800440072006F00690064002D00410011 +:100116007500640069006F00090229010601048068 +:10012600320904000000010100080A24010001341C +:10013600000201020C240201010200010000000677 +:100146000C2402020101000100000500092403033A +:100156000101000106092403040103000205090444 +:100166000100000102000609040101010102000666 +:10017600072401030102000B2402010101080140CA +:100186001F00090581010800010000072501000084 +:100196000000090402000001020005090402010131 +:1001A60001020005072401020102000B24020101DD +:1001B600010801803E000905020110000100000748 +:1001C60025010000000009040300020300000009E5 +:1001D60021100100012222000705840340000107C7 +:1001E6000505034000010904040000010100070998 +:1001F600240100011E0001050C2402070101000173 +:100206000000000709240308010300070709040585 +:1002160000000102000709040501010102000707A9 +:100226002401070102000B24020101010801401FFD +:100236000009050301080001000007250100000070 +:10024600000600FF0901A1010903150026FF00951C +:1002560040750881020904150026FF0095407508BF +:030266009102C042 +:06162200C106C107C1056D +:10132500E5F830E00BE4F5C7E5CE30E203121AAF7D +:10133500E5F830E103121948E5F830E20312184CDC +:10134500E5F830E303121837E5F830E403121666C2 +:0C135500E5F830E5061212A012140C227C +:101874009001CEE0600B75C704E5CE20E40343CEAF +:02188400102230 +:0C19C40075C70112178943CE10D205220E +:0E19480075C701E5CE30E00553CEFEC2052284 +:1018370075C70330060B121ADFEF60057F08121712 +:05184700A553CEFD22B7 +:10184C0075C70220060B121ADFEF60057F10121706 +:05185C00A553CEFD22A2 +:10140C0075C7059001CDE0FF700CE5CE30E10753B8 +:10141C00CEFD7401F022EFB4010EE5CE30E6095397 +:10142C00CEBFE49001CDF022E5CE30E60453CEBF22 +:05143C002253CEFD2249 +:1016660075C704E5CE30E01A53CEFE9001CEE014E5 +:10167600F0E0C394005002E4F09001CEE060034332 +:03168600CE102261 +:10168900EF24FFFFEE34FFFEED34FFFDEC34FFFCE9 +:10169900020405E0FCA3E0FDA3E0FEA3E0FFEC4D9E +:0316A9004E4F227F +:1012A00075C705E5CE5442603A121ADFEF1490007C +:1012B000FBF0AFCFE4FE9000FBE0FDEEC39D5010CD +:1012C00074BB2EF582E43400F583E5CFF00E80E6A2 +:1012D000EF600A24FE6009047009020A96D2032214 +:0312E000120D42AA +:0112E30022E8 +:100E2D003007659001CEE0C39402505C75C704E4B1 +:100E3D00F5CF30A303FF80027F018FCF9000FEE03E +:100E4D00F5CFE51060071313543FFF80027F008F2D +:100E5D00CFE4F517E517C3951050091218A98FCFD8 +:100E6D00051780F0851017E517C3943C5007E4F57E +:100E7D00CF051780F2121A219001CEE004F012185E +:080E8D0074E49000FEF0C207BE +:010E9500223A +:1015840075C70475CFF0EF60047F0080027F018F80 +:10159400CFAF058FCFAF038FCF9001B0E0F5CF90E1 +:0815A40001CEE004F00218740E +:100A96009000BBE07001229000BBE0B40120900002 +:100AA600BEE02403600F14600F14600F146003028D +:100AB6000B3DD207220215AC02144102113E9000F2 +:100AC600BBE0B4020DA3E0600614706BD20622C22E +:100AD60006229000BBE06406705D121A2190197C14 +:100AE600120B3E90197D120B3E90197E120B45900B +:100AF600197F120B45901980120B4C901981120B1D +:100B06004C901981E4740193FF12176B90198312AC +:100B16000B53901984120B53901985E493FF121707 +:100B26006B901985E4740193FF12176B901987E493 +:100B360093FF12176BD20722E493FF12176B22E47E +:100B460093FF12176B22E493FF12176B22E493FFB5 +:040B560012176B22E5 +:0A144100E4F5A8F5B175C314C281EB +:10144B009001AC1204110000271043BC109001ACAA +:10145B0012169C60089001AC12168980F053BCEFF9 +:0A146B00D2B375A61E75A6E180FE3F +:10113E00E4F5A8F5B175C314D2B3C2817B067D0167 +:0E114E007F041217C07B017DF47F041217C0CE +:10115C009001AC1204110000271043BC109001AC9C +:10116C0012169C60089001AC12168980F053BCEFEB +:0B117C00121A8475A61E75A6E180FE05 +:091A3F0053BDFE43BC40C28122EC +:0D19560053BCBF53BDFE53BDDF53BDF72290 +:091A480053BDEF12180B021A2124 +:0C162800C181C104C102C1004100FD00ED +:1016420090014FE02406FFE433FE900152E022E4D1 +:10165200900151F0900150F022F582E43401F583BB +:04166200E0F5C522C8 +:0C19D000121651D201D291C202C20422B0 +:1016AC0053AFFE43C31043C30253C3F753C3FB43AF +:1016BC00C32043C340D2B2D2B4D291D288D2A812A2 +:0316CC0016512292 +:03000300021002E6 +:10100200C0E0C083C082C0D075D000C007D2B73064 +:101012009104C2B78031E5C420E704C2B7802890AA +:101022000155E0FF04F074FF2FF582E43400F583EC +:10103200E5C5F0900155E0FFB42704D29180067413 +:10104200262F12165BC2B7D007D0D0D082D083D061 +:02105200E0328A +:10095D00D2B620B404C2008015200012D200C2917C +:10096D00E4900155F0E0242612165BC2B6222091C8 +:10097D0003C2B622900155E0C394275003020A9397 +:10098D00E49001ADF0900155F0900100E09001ADC3 +:10099D00F09000FFE0FF900153E06F605FEFF0908B +:1009AD0000FDE020E4047F0180027F009001ADE0B6 +:1009BD0020E1047E0180027E00EE6F602DE4900147 +:1009CD00ACF09001ACE0FFC39404501774012FF507 +:1009DD0082E43401F583E0FF12176B9001ACE00463 +:1009ED00F080DF9000FDE06410F09001ADE030E2AA +:1009FD000B7B017A0179057D11121361900154E091 +:100A0D00FF04F0900126EFF09001ADE020E4047FAB +:100A1D000180027F009000FDE0FE20E1047D018059 +:100A2D00027D00ED6F7037300334C203EE64029027 +:100A3D0000FDF0E49001ACF09001ACE0FF24BBF5BB +:100A4D0082E43400F583E0FE74282FF582E434014E +:100A5D00F583EEF09001ACE004F0E0B404DA121A84 +:100A6D0093EFC394219000FDE040104404F07B010E +:100A7D007A01792C7D211213D6800354FBF090005E +:060A8D00FDE0900127F0DE +:020A9300C2B6E9 +:010A9500223E +:10046E0030B410C204E4900152F0121652C201C20E +:10047E0091D20220020302064B20040302064BE433 +:10048E009001B3F0C204900151E0FF701790014E3D +:10049E00300304740A80027402F0F5C590015174A1 +:1004AE0001F08051EFB40116900152E0B4110690A4 +:1004BE0001517402F090014EE020E1398034900138 +:1004CE0051E0FF64027027A3E0FEB4150F90014EB9 +:1004DE00E030E302C2039001517403F090014EE04C +:1004EE0030E30974062EF8E6F5C580098004EFB4F2 +:1004FE000303E4F5C5900152E004F0900150E0FFD3 +:10050E007030AEC4BE8003D38001C350F530A30358 +:10051E0002064B90014DE5C5F0E5C590014F30E761 +:10052E00057422F080037411F09001507401F002F2 +:10053E000639EF64017045AFC4BF8003D38001C399 +:10054E0050F530A30302064B90014DE030E112D27C +:10055E0090900152E02497F582E43400F583E5C5CE +:10056E00F090014FE024011216486F7001EE600307 +:10057E000206399001507402F0020639900150E0E3 +:10058E0064026003020639AFC4BF8003D38001C387 +:10059E0050F530A30302064B90014DE0F930E34EC7 +:1005AE0090014FE0FF2405FDE433FC900152E0FB87 +:1005BE007A00D39DEC6480F87480985015C3EB9F3D +:1005CE00FFEA9400FE74B32FF58274013EF583E5C5 +:1005DE00C5F0121642B50716E4B50612900156E59F +:1005EE00C5F0E0FF9000FEE0C39F5002EFF0121640 +:1005FE00426F7001EE7034C202D291D201E930E343 +:10060E003C9001B5E06036E49001B4F09001B4E0A6 +:10061E0024B5F582E43401F583E0FF12176B9001E7 +:10062E00B4E004F0E0C3940440E2229001B3E0048D +:0D063E00F0300409E0C3940550030204925B +:01064B00228C +:0416340041019300DD +:1014750074BB2FF582E43400F583E0FF900194E01E +:10148500FE04F090019AE0FCA3E02EF582E43CF521 +:1014950083EFF09001ACE004F022E49001B0F0FBA2 +:0114A5002224 +:100D42009000BBE0B40105121187803120090E1218 +:100D5200149F7D01FF121584121A6C80209000BB33 +:100D6200E0B4030F121A6C12149F7DFE7F0112155C +:100D720084800A9000BBE0B40203120C1D9001951E +:100D8200E0FF90019CE0FEB5072590019FE0FD90F9 +:100D92000194E0B5051990019EE02DF090019DE0CF +:100DA2003400F0E4900194F090019CF0D20822EE1D +:100DB200C39F400C12149F7D05FF121584121A6CFA +:010DC200220E +:1010A4009000FCE0704830084578AC7C017D017B01 +:1010B400017A0179967E007F061203399001B27499 +:1010C40040F0121505900097E020E0F99000FC74C0 +:1010D40014F0900097E0C413135401FF900193E0BF +:0F10E40004FDF0E49001B0F0FB121584C2082265 +:100C1D0090019CE070779000BCE0900197F0A3E408 +:100C2D00F09000BDE0FF900198E02FF0900197E06B +:100C3D003400F09000FBE0B404028039900197E09D +:100C4D00FEA3E0FFEE547FFC90019DE06C7003A3CA +:100C5D00E06F6024EF64C07003EE641D601A9001B4 +:100C6D0097E0640E7004A3E064C0600C12149F7DC5 +:100C7D0003FF121584121A6C9001AC7403F09001ED +:100C8D00ACE0FFC39423501A12147580F19001AC9F +:100C9D007401F09001ACE0FFC3942150051214755E +:080CAD0080F190019CE004F0CD +:010CB500221C +:101187009000FC74FAF01218981215D29000BCE087 +:1011970025E0900196F09000BDE090019FF090004F +:1011A700BEE0900195F0E490019DF0A3F0900194CA +:1011B700F090019CF0900193F0D209C2A89001B081 +:0911C700F0FB7DFF7F010215849D +:081A6C00C2091215AC0219D0E9 +:10189800121AC6121A8C90019A7400F0A37403F0FD +:0118A800221D +:10150500900097E054BFF09001ACE0900098F09007 +:1015150001ADE0FCA3E0FDEC900001F0A3EDF0903F +:0C15250001B2E02402900096F002191CB4 +:1012160090008AE0FF04F0748B2FF582E43400F529 +:1012260083E595F022E0FF04F074012FF582E434A3 +:1012360000F58322900096E0FF900000E0C39F2215 +:10124600E0FBA3E0FAA3E0F9EA494B22A3E0FAA304 +:06125600E0F5828A83220C +:041AC6007593802272 +:071A8C007593C043B1022273 +:0C19DC00900083EBF0A3EAF0A3E9F022F6 +:0C19E800900087EBF0A3EAF0A3E9F022E6 +:0F191C00900097E04401F0E4900000F0021ACA36 +:041ACA004393202200 +:0B1A0C00439310900097E054FEF0227E +:031AD6008F9522C7 +:041ACE004393042218 +:041AD2005393FB220D +:031AD900AF9522A4 +:031ADC00AF9422A2 +:03004300020800B0 +:10080000C0E0C0F0C083C082C0D075D008AF94EF04 +:10081000120442094C00086508086510086D1808A4 +:100820008D20086D28088D30089738089D40088D68 +:1008300048089A50088A5808AD6008AD6808AD703D +:1008400008AD7808C38008D58808C39008D59808F3 +:10085000DCA00908A80908B0092FB80897C00897B4 +:10086000C80000094F5393DF900098800812123A95 +:10087000500B12122BE0FF121AD602094F121A0C5B +:10088000900097E04440F002094F12121690009732 +:10089000E04402F002094C02094712121690008649 +:1008A000E014FF90008AE0C39F50278022900097B9 +:1008B000E04401F090008AE4F0900097E054FBF0EF +:1008C00002093D12121690008AE0C39408500302F8 +:1008D000093D020942900097E04404F0121A8C90FE +:1008E0000083121246601890008AE0FF7B017A00B4 +:1008F000798BC00A900083121252D00A12046C90B5 +:100900000097E054FEF08047900087121246601A6C +:100910007B017A007901C00A900087121252D00A36 +:100920007F8212046C900096EFF0900000E4F0904B +:10093000000012122BE0F59512123A5005121ACE51 +:10094000800D121AD28008121A8C8003121A0C53CE +:0D09500093F7D0D0D082D083D0F0D0E03229 +:061AB500E4F514F5132214 +:071A9300C3E5139514FF22C7 +:1017A5008F17C3E51395146480600FAF130513EF0E +:0A17B500547F2422F8A6CFD517E8D0 +:0117BF002207 +:0B13D6009001AEEBF0A3EAF0A3E9F0F9 +:1013E100E4FFEFC39D5023AE140514EE547F242275 +:1013F100F8E6FE9001AEE0FBA3E0FAA3E0F98F82EC +:0A140100758300EE1203B70F80D8C8 +:01140B0022BE +:061ABB00E4F516F515220A +:0F192B00C3E5159516D394204003D38001C32242 +:051361009001AEEDF06B +:10136600A3F0C3E51595166440602B9001AFE0FF2E +:101376009001AEE0C39FFFE494008F82F5831203D1 +:1013860078FFAE150515EE543F24A2F8A607900186 +:06139600AFE014F070CC82 +:01139C00222E +:101789007F08E516B5150575CF80800DAE160516CF +:0B179900EE543F24A2F8E6F5CFDFE796 +:0117A4002222 +:02163800C10BE4 +:0A1A2100E4F512F511F510C20B22D6 +:10176B00300B03121A21AE10051074572EF582E4BC +:0E177B003401F583EFF0E510B43C02D20B22EE +:1018A900AF11051174572FF582E43401F583E0FF78 +:0118B900220C +:02163A00C10CE1 +:1018CB00E0FEA3E0FFE4FCFDFB7AFAF9F8D3020398 +:0118DB00EF1D +:1015AC00D291C281E49001ADF0A3F09001AD12187C +:1015BC00CB40109001AEE004F070F09001ADE0046F +:0515CC00F080E8D2816F +:0115D10022F7 +:1015D200C291C281E49001ACF0A3F09001AC121868 +:1015E200CB40109001ADE004F070F09001ACE0044B +:0515F200F080E8D28149 +:0115F70022D1 +:1018BA0020A304D20CD322300C031215ACC20CC3E1 +:0118CA0022FB +:05163C004201CF000097 +:1015F80030090A7D207C017F007E01801520A30A26 +:101608007D207C007F107E0080087D007C047F00A8 +:061618007E031214A6225D +:1014A6009001D0E004F070069001CFE004F09001C6 +:1014B600CFE0FAA3E0FBB50707EAB50603C2B322FD +:1014C600C3EB9DEA9C4009D2B3E49001CFF0A3F0B0 +:0114D60022F3 +:0D19630012035FF5CF740129F9E43AFA226E +:071A9A008FC7AF058FD422B6 +:10139D0030F805E4F5C7802E30F90575C7018026B4 +:1013AD0030FA0575C702801E30FB0575C703801620 +:1013BD0030FC0575C704800E30FD0575C705800628 +:0913CD0030FE0375C706AFC7220C +:031ADF00AFE22251 +:091A5100AFE3EFFEADE2EDFF2270 +:10188600E4F5C7AF051DEF600512196380F543CE79 +:0218960010221E +:0C19F400AF051DEF600512196380F5229D +:1018DC00AF051DEF600AE5CF1203A512196880F061 +:0118EC0022D9 +:091A5A008FC7E4F5CE43CE202233 +:1018ED007401A807088002C333D8FCF5D5E4F5D5FB +:0118FD0022C8 +:071AA10075A41043A302220B +:071AA800121AA143BC8022C9 +:10155B0041746D656C202852290A63353133312D66 +:10156B007573622D6364632D315F305F320A0A003D +:09157B001B631B5B3F32356C0061 +:0B12E4009001C9EBF0A3EAF0A3E9F0D1 +:1012EF009001C9E0FBA3E475F0011203D9A9F0FA4C +:1012FF0012035F9001CCF06013E0B40A057F0D126A +:10130F001A749001CCE0FF121A7480D47F0D121A58 +:06131F00747F0A021A743B +:091A63007BFF7A15797B0212E485 +:100DC3009001D2EDF09001D1EFF070097F0D121A6E +:100DD300747F0A80377F1B121A747F5B121A749018 +:100DE30001D2E0FFD394094003120E219001D212E5 +:100DF3000E137F3B121A749001D1E0FFD394094084 +:100E030003120E219001D1120E137F48121A74227D +:100E1300E075F00A84E5F02430FF121A7422EF75AE +:0A0E2300F00A842430FF121A742232 +:051AC100A298920D2225 +:1017DA00759840538FF7438F0175CBFF75CAF37520 +:0917EA00C834D2CA439812D3227C +:081A74003099FDC2998F9922FF +:071A7C003098FDAF99C298FC +:011A83002240 +:0A1A2B008FC5E5C430E7FB7F012200 +:0A1A350043A22012FFC053A2DF22DB +:0C1A00008F1CAF058F1F121A35AF1D227E +:1017C000A2AF920FC2AF8F1CAF038F1FAF058F1D4B +:0917D000121A35A20F92AF7F013D +:0117D90022ED +:0814D7009001D3EFF0A3EDF04A +:1014DF00A2AF920EC2AFE4FD7F08121A009001D3A3 +:1014EF00E0F45FFFA3E04FF51D751C07121A35A23C +:0514FF000E92AF7F0119 +:0115040022C4 +:081A8400C2AF43A22002F400EE +:03000000020CB639 +:0C0CB600787FE4F6D8FD7581E1020CFDAA +:10026900E709F608DFFA8046E709F208DFFA803E77 +:1002790088828C83E709F0A3DFFA8032E309F60864 +:10028900DFFA8078E309F208DFFA807088828C83CC +:10029900E309F0A3DFFA806489828A83E0A3F60880 +:1002A900DFFA805889828A83E0A3F208DFFA804C5A +:1002B90080D280FA80C680D4806980F28033801031 +:1002C90080A680EA809A80A880DA80E280CA80339A +:1002D90089828A83ECFAE493A3C8C582C8CCC58312 +:1002E900CCF0A3C8C582C8CCC583CCDFE9DEE780E2 +:1002F9000D89828A83E493A3F608DFF9ECFAA9F061 +:10030900EDFB2289828A83ECFAE0A3C8C582C8CCB6 +:10031900C583CCF0A3C8C582C8CCC583CCDFEADECF +:10032900E880DB89828A83E493A3F208DFF980CC31 +:1003390088F0EF60010E4E60C388F0ED2402B4042A +:100349000050B9F582EB2402B4040050AF232345D1 +:0603590082239002B9733B +:10035F00BB010689828A83E0225002E722BBFE029C +:09036F00E32289828A83E49322CF +:10037800BB010CE58229F582E5833AF583E022503A +:1003880006E92582F8E622BBFE06E92582F8E22284 +:0D039800E58229F582E5833AF583E493229E +:1003A500BB010689828A83F0225002F722BBFE0137 +:0203B500F32231 +:1003B700F8BB010DE58229F582E5833AF583E8F07C +:1003C700225006E92582C8F622BBFE05E92582C828 +:0203D700F22210 +:1003D900A3F8E0C5F025F0F0E582158270021583D7 +:0603E900E0C838F0E82234 +:1003EF00EB9FF5F0EA9E42F0E99D42F0EC6480C885 +:0603FF0064809845F02225 +:0C040500ECF0A3EDF0A3EEF0A3EFF0226A +:10041100A8828583F0D083D0821204281204281286 +:100421000428120428E473E493A3C583C5F0C583AB +:10043100C8C582C8F0A3C583C5F0C583C8C582C835 +:010441002298 +:10044200D083D082F8E4937012740193700DA3A349 +:1004520093F8740193F5828883E47374029368605D +:06046200EFA3A3A380DF5D +:060468008A838982E4731F +:100CC200021861E493A3F8E493A34003F68001F2CF +:100CD20008DFF48029E493A3F85407240CC8C33333 +:100CE200C4540F4420C8834004F456800146F6DF02 +:100CF200E4800B010204081020408090161EE47E5E +:100D0200019360BCA3FF543F30E509541FFEE493F6 +:100D1200A360010ECF54C025E060A840B8E493A3BD +:100D2200FAE493A3F8E493A3C8C582C8CAC583CAE8 +:100D3200F0A3C8C582C8CAC583CADFE9DEE780BEA0 +:0116410000A8 +:00000001FF |
|
From: jaguarondi <c2m...@c2...> - 2008-07-22 09:33:17
|
Author: jaguarondi Date: 2008-07-22 11:33:23 +0200 (Tue, 22 Jul 2008) New Revision: 1345 Removed: firmware/hex_dev/WIFI_ID/ Log: * We don't need this anymore. |
|
From: Paul_R <c2m...@c2...> - 2008-07-22 07:54:40
|
Author: Paul_R
Date: 2008-07-22 09:54:50 +0200 (Tue, 22 Jul 2008)
New Revision: 1344
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Bug : spinning images.
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java 2008-07-22 07:42:18 UTC (rev 1343)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/controlTux.java 2008-07-22 07:54:50 UTC (rev 1344)
@@ -89,8 +89,10 @@
"onMouthEvent");
tux.event.handler.register(TuxAPIConst.ST_NAME_FLIPPERS_POSITION, this,
"onFlippersEvent");
- tux.event.handler.register(TuxAPIConst.ST_NAME_SPINNING_DIRECTION, this,
- "onSpinEvent");
+ tux.event.handler.register(TuxAPIConst.ST_NAME_SPIN_RIGHT_MOTOR_ON, this,
+ "onSpinRightEvent", "True", null);
+ tux.event.handler.register(TuxAPIConst.ST_NAME_SPIN_LEFT_MOTOR_ON, this,
+ "onSpinLeftEvent", "True", null);
tux.event.handler.register("light_level", this,
"onLightLevelEvent");
tux.event.handler.register("battery_level", this,
@@ -536,15 +538,22 @@
}
/**
- * Event function : Spinning events.
+ * Event function : Right spin events.
* @param Current spinning state.
* @param The time of the last state.
*/
- public void onSpinEvent(String value, Double delay) {
- if (value == null)
- return;
- win.refreshSpinning(value);
+ public void onSpinRightEvent(String value, Double delay) {
+ win.refreshSpinning(TuxAPIConst.SSV_RIGHT);
}
+
+ /**
+ * Event function : Left spin events.
+ * @param Current spinning state.
+ * @param The time of the last state.
+ */
+ public void onSpinLeftEvent(String value, Double delay) {
+ win.refreshSpinning(TuxAPIConst.SSV_LEFT);
+ }
/**
* Event function : Spinning counter events.
@@ -553,7 +562,10 @@
*/
public void onSpinCounter(String value, Double delay) {
if (value.equals("0"))
+ {
+ win.refreshSpinning(TuxAPIConst.SSV_OFF);
win.resetSpinRunButton();
+ }
}
/**
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-22 07:42:18 UTC (rev 1343)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-22 07:54:50 UTC (rev 1344)
@@ -697,11 +697,12 @@
*/
public void refreshSpinning(String state)
{
+ System.out.println(state);
if (state.equalsIgnoreCase(TuxAPIConst.SSV_LEFT))
imgSpin.setIcon(spinLeft);
else if (state.equalsIgnoreCase(TuxAPIConst.SSV_RIGHT))
imgSpin.setIcon(spinRight);
- else if (state.equalsIgnoreCase("NONE")) //$NON-NLS-1$
+ else if (state.equalsIgnoreCase(TuxAPIConst.SSV_OFF)) //$NON-NLS-1$
imgSpin.setIcon(spinOff);
else if (state.equalsIgnoreCase("PLUGGED")) //$NON-NLS-1$
{
|
|
From: jaguarondi <c2m...@c2...> - 2008-07-22 07:42:16
|
Author: jaguarondi Date: 2008-07-22 09:42:18 +0200 (Tue, 22 Jul 2008) New Revision: 1343 Modified: firmware/hex_dev/new_rf/fuxrf.hex firmware/hex_dev/new_rf/fuxusb.hex firmware/hex_dev/new_rf/tuxaudio.hex firmware/hex_dev/new_rf/tuxcore.hex firmware/hex_dev/new_rf/tuxrf.hex Log: * Updated the hex files of the development firmware of the 16kHz and new RF. Modified: firmware/hex_dev/new_rf/fuxrf.hex =================================================================== --- firmware/hex_dev/new_rf/fuxrf.hex 2008-07-18 13:49:38 UTC (rev 1342) +++ firmware/hex_dev/new_rf/fuxrf.hex 2008-07-22 07:42:18 UTC (rev 1343) @@ -1,117 +1,118 @@ :1000000021C03BC03AC039C038C037C036C035C047 -:1000100034C033C032C050C230C02FC02EC02DC03B -:100020002CC034C3EEC1A2C1D8C127C026C025C090 -:1000300024C023C0E1C29EC25FC27AC297C2A2C2DC -:10004000BAC2C9C211241FBECFEFD2E0DEBFCDBFFE -:1000500011E0A0E0B1E0ECE1F7E002C005900D9204 -:10006000A430B107D9F711E0A4E0B1E001C01D92BE -:10007000A93DB107E1F702D050C3C2CFCFEFD2E024 -:10008000DEBFCDBF1A9901C040C709D020D0F8D239 -:1000900084B1886284B93B9A7894F2D0FFCF80E231 -:1000A00085B983E184B988E388B987E087B980E4BA -:1000B0008BB986EA8AB985E08093C4001092C000AB -:1000C0001092C1001092C20010926F0008959AE53C -:1000D00090939A0180919A0180939901809199015E -:1000E0008093980190939D0180919D0180939C0144 -:1000F00080919C0180939B0180EF80939F01809170 -:100100009F0180939E0184E080930A0196E590937D -:100110000B012FEF20930C0190930D01809154015E -:100120008093A0019093A1012093A2019093A30139 -:1001300094E39093A40185E58093A5018093A601A3 -:100140008093A7018093A8018093A9018093AA01BD -:100150008093AB018093AC018093AD018093AE019D -:100160008093AF018093B0018093B1018093B2017D -:100170008093B3018093B4018093B5018093B6015D -:100180008093B7018093B8018093B9018093BA013D -:100190008093BB018093BC018093BD018093BE011D -:1001A0008093BF018093C0018093C1018093C201FD -:1001B0008093C3018093C4018093C5018093C601DD -:1001C0008093C7018093C8018093C9018093CA01BD -:1001D0008093CB018093CC018093CD018093CE019D -:1001E0008093CF018093D0018093D1018093D2017D -:1001F0008093D3018093D4018093D5018093D6015D -:100200009093D701089520E009C090E0000000001D -:10021000000000009F5F9031C9F72F5F2817A9F7F2 -:1002200008959091A40120E0E3EAF1E0DF011B973B -:1002300003C08081280F9150119631969230C8F7F3 -:100240002195FD01238708951F937FD05D9A80E05B -:1002500000008F5F8F3FE1F720E010E006C0822FA3 -:10026000992787709070892B19F4110F48991160A4 -:100270002F5F2134A0F372D0812F99271F91089509 -:100280008091970180648093970168D00DD010927F -:10029000C0001092C1001092C20080E290E09093E2 -:1002A0008900809388000895109285001092840040 -:1002B0001092800082E08093810080936F0086BB63 -:1002C0000895109285001092840010928000109280 -:1002D000820082E086BB10926F0083E080938100F1 -:1002E0000895299A59985C98419860FF04C0282F76 -:1002F000255E8FE711C020E090EA5C9897FF02C06E -:10030000599A01C059985C9A2F5F293011F0990FC2 -:10031000F4CF282F245E84E35C989927982F8827B0 -:100320002068820F911D20E05C9897FF02C0599AC7 -:1003300001C059985C9A2F5F203119F0880F991FDE -:10034000F3CF5C985998419A0895299A5A9A419AFC -:100350005D9828985C985998549A08955D982898C3 -:1003600029985A9841985C98599808951F920F922D -:100370000FB60F9211242F938F939F93EF93FF93B8 -:100380002091D801273009F42998E22FFF27809186 -:10039000A40199270B96E817F90759F4E856FE4F80 -:1003A00080819FE089278093C60088E48093C10004 -:1003B00007C0E856FE4F80819FE089278093C600E2 -:1003C0002F5F2093D801FF91EF919F918F912F91F3 -:1003D0000F900FBE0F901F9018951F920F920FB69F -:1003E0000F9211241092C0001092C1001092C2000E -:1003F0005A9828984198299A0F900FBE0F901F90F5 -:1004000018951F920F920FB60F9211242F938F936E -:100410009F93EF93FF93209195019091C6008FE0F9 -:100420009827243049F580911101E0910001F09165 -:100430000101E80FF11D90838F5F8093110180917E -:1004400011018F738093110180919601890F809320 -:10045000960190911101E0910001F09101018081DC -:100460009817F1F41092C0001092C1001092C200CF -:100470005A985D982FEF14C0E22FFF27E65FFE4FDA -:100480008081981711F020E00BC02F5F243041F4D9 -:1004900080918400909185009093100180930F01CA -:1004A00020939501FF91EF919F918F912F910F9044 -:1004B0000FBE0F901F9018951F920F920FB60F92BC -:1004C00011242F933F934F935F936F937F938F9359 -:1004D0009F93AF93BF93EF93FF93809104018F5F3E -:1004E000877080930401E82FFF27E830F10508F0BA -:1004F000B6C0E65EFF4F099484E08093540180917A -:10050000540161E0EEDE80E48093C00088E08093D7 -:10051000C100809188009091890085599E4F9093E9 -:10052000890080938800809154018093A00197C036 -:100530008091880090918900805F9A4F9093890004 -:10054000809388001092D80186E48093C200289A94 -:1005500088E28093C10085E58093C6008093C60041 -:1005600078945FDECAD08093090179C080919701A9 -:100570008111B3D0EADE80918800909189008B5B75 -:100580009F4F69C084E08093540110921101109232 -:100590009501109296018091540160E0A2DE809155 -:1005A0008800909189008C5E9E4F90938900809383 -:1005B0008800549854C08091880090918900895A8D -:1005C0009F4F90938900809388005D9A8091540199 -:1005D00080930A0144C0109296011092C00080E9F5 -:1005E0008093C10086E48093C2008091880090913E -:1005F00089008C599B4F2FC01092C0001092C100EF -:100600001092C200809195018F3FF9F4809196017C -:100610008823D9F480910001909101012091020179 -:100620003091030130930101209300019093030165 -:10063000809302018091970187FF07C080910F018D -:10064000909110018C5D9B4F06C080918800909125 -:10065000890084559F4F9093890080938800FF9173 -:10066000EF91BF91AF919F918F917F916F915F912A -:100670004F913F912F910F900FBE0F901F901895A3 -:1006800080EC8CBD5F984298409808951F920F921D -:100690000FB60F9211248F939F93EF93FF93909136 -:1006A0000701E5EAF1E0E90FF11D8EB58083409A7C -:1006B0009F5F90930701E0910501F0910601E90F1A -:1006C000F11D80818EBD4098FF91EF919F918F9198 -:1006D0000F900FBE0F901F90189510920701E09198 -:1006E0000201F09103013196F0930601E0930501B8 -:1006F000319781818EBD429A089542988091070179 -:100700008F3319F481E090E00895803418F08FEF72 -:0C0710009FEF089580E090E00895FFCF77 -:04071C00130155016F -:0C0EF000C8030600C9F00403CA0000009B +:1000100034C033C032C0D5C130C02FC02EC02DC0B7 +:100020002CC0DDC288C142C173C127C026C025C013 +:1000300024C023C0E2C1E4C128C245C24EC267C287 +:1000400076C286C211241FBECFEFD2E0DEBFCDBF85 +:1000500011E0A0E0B1E0E4E2F7E002C005900D920B +:10006000A430B107D9F712E0A4E0B1E001C01D92BD +:10007000A530B107E1F702D054C3C2CFCFEFD2E031 +:10008000DEBFCDBF1A9901C040C706D029D0A1D28A +:100090003B9A78948DD0FFCF80E285B983E184B913 +:1000A00088E388B987E087B980E48BB986EA8AB9A2 +:1000B00085E08093C4001092C0001092C10010929D +:1000C000C20010926F00A0E0B0E023D3802D9927EA +:1000D00080930D01883018F084E080930D0108951D +:1000E0009AE59093B0018091B0018093AF01809127 +:1000F000AF018093AE019093B3018091B3018093DF +:10010000B2018091B2018093B10180EF8093B5017B +:100110008091B5018093B40110920E0196E5909301 +:100120000F012FEF20931001909311018091610135 +:100130008093B6019093B7012093B8019093B901D1 +:10014000089520E009C090E00000000000000000D9 +:100150009F5F9031C9F72F5F2817A9F7089590E0A6 +:10016000EAEBF1E08191980F82E0E230F807D1F7F5 +:1001700091959093020208951F937FD05D9A80E03D +:1001800000008F5F8F3FE1F720E010E006C0822F74 +:10019000992787709070892B19F4110F4899116075 +:1001A0002F5F2134A0F37AD0812F99271F910895D2 +:1001B00075D063D00DD01092C0001092C100109283 +:1001C000C20080E290E090938900809388000895B7 +:1001D00010928500109284001092800082E080933B +:1001E000810080936F0086BB089510928500109265 +:1001F0008400109280001092820082E086BB1092F0 +:100200006F0083E0809381000895382F299A5998D0 +:100210005C98419860FF07C080910D01880F81674D +:10022000232F255E11C020E090EA5C9897FF02C062 +:10023000599A01C059985C9A2F5F293011F0990F93 +:10024000F4CF232F245E84E35C989927982F882786 +:100250002068820F911D20E05C9897FF02C0599A98 +:1002600001C059985C9A2F5F203119F0880F991FAF +:10027000F3CF5C985998419A0895299A5A9A419ACD +:100280005D9828985C985998549A0895299A419AAB +:100290005D9828985C985998549A08955D98289884 +:1002A00029985A9841985C98599808951F920F92EE +:1002B0000FB60F9211242F938F939F93EF93FF9379 +:1002C00020910302273011F429980CC0243551F4F1 +:1002D000809102029FE089278093C60088E4809382 +:1002E000C10009C0E22FFF27E255FE4F80819FE049 +:1002F00089278093C6002F5F20930302FF91EF911F +:100300009F918F912F910F900FBE0F901F90189576 +:100310001F920F920FB60F9211241092C0001092EC +:10032000C1001092C20028984198299A0F900FBEE0 +:100330000F901F9018951F920F920FB60F921124D5 +:100340002F938F939F93EF93FF939091AB01209105 +:10035000C6008FE028279430F1F480911501E091D8 +:100360000001F0910101E80FF11D20838F5F809360 +:1003700015018091AD01820F8093AD01809115012F +:10038000893499F41092C0001092C1001092C200FA +:100390005D989FEF0AC0E92FFF27E25FFE4F808143 +:1003A000281711F090E001C09F5F9093AB01FF917F +:1003B000EF919F918F912F910F900FBE0F901F90F3 +:1003C00018951F920F920FB60F9211242F933F93FF +:1003D0004F935F936F937F938F939F93AF93BF934D +:1003E000EF93FF9380910401E82FFF27E830F10598 +:1003F00008F0D8C0E65EFF4F099481E080930401C5 +:100400001092C0001092C1001092C2003FDF809194 +:10041000AB018F3FD9F48091AD018823A1F42091E5 +:1004200000013091010180910201909103019093AC +:1004300001018093000130930301209302018BB1ED +:1004400098E089278BB98091AD0101C08AE0809343 +:10045000AC01109261018091610161E0D6DE80E41F +:100460008093C00088E08093C100809188009091C3 +:10047000890084589E4F90938900809388008091D2 +:1004800061018093B60135D18DC080918800909133 +:1004900089008C5B9A4F909389008093880010921A +:1004A000030286E48093C200289A88E28093C10008 +:1004B00085E58093C6008093C600789450DE83E083 +:1004C000809304016FC0809188009091890090937F +:1004D000890080938800C2D065C0D8DEBFD010925A +:1004E0006101109215011092AB011092AD01809143 +:1004F000610160E08ADE80918800909189008B5DC7 +:100500009E4F909389008093880054984BC08091AF +:10051000880090918900895A9F4F90938900809319 +:1005200088005D9A8091610180930E013BC010921A +:10053000AD011092C00080E98093C10086E48093F1 +:10054000C20080918800909189008C5B9A4F24C0F2 +:100550001092C0001092C1001092C20097DE8091EC +:10056000AB018F3FA1F48091AD01882381F42091EC +:10057000000130910101809102019091030190935B +:1005800001018093000130930301209302018091C7 +:100590008800909189004796909389008093880005 +:1005A00010920401809104018F5F87708093040191 +:1005B000FF91EF91BF91AF919F918F917F916F913B +:1005C0005F914F913F912F910F900FBE0F901F9011 +:1005D000189580EC8CBD5F984298409808951F92C2 +:1005E0000F920FB60F9211248F939F93EF93FF9367 +:1005F00080910A01E82FFF27E654FE4F9EB59083B5 +:10060000409A8F5F80930A0190910B019F5F9093B6 +:100610000B019150863071F48091BA0180FF03C0C4 +:1006200087E280930A0180910402882319F49E5D79 +:1006300090930B0180910B01E0910801F091090169 +:10064000E80FF11D80818EBD4098FF91EF919F9141 +:100650008F910F900FBE0F901F90189510920A0166 +:1006600010920B01E0910201F0910301F093090156 +:10067000E09308018091AC01882339F4818188706E +:1006800080930701109206010EC080910601882315 +:1006900039F010920701DF011196218124700FC0FB +:1006A00081E080930601DF0111969181292F24704A +:1006B00080910701882319F09460918303C08C9185 +:1006C0008B7F8C93209307018091AC01882329F4C0 +:1006D000808181708093040208C090E080910402C0 +:1006E000882309F491E09093040280818EBD429AA0 +:1006F0000895429880910501882329F08091BB01DB +:1007000088608093BB018091BB0184708093050158 +:100710000895F999FECFB2BDA1BDF89A119600B423 +:040720000895FFCF6A +:040724001701620156 +:0C0EF000C8030600C9360503CA00000054 :00000001FF Modified: firmware/hex_dev/new_rf/fuxusb.hex =================================================================== --- firmware/hex_dev/new_rf/fuxusb.hex 2008-07-18 13:49:38 UTC (rev 1342) +++ firmware/hex_dev/new_rf/fuxusb.hex 2008-07-22 07:42:18 UTC (rev 1343) @@ -1,503 +1,526 @@ -:101614001217E6120006300905120F8280F5121621 -:08162400DC50F012026980EBBA -:0C17E600438F01C281D2A3D2AF020E2AB1 -:0C17F200C8040401C9000004CA00000083 -:060E2A0012190D43BC800B -:100E300090011E1205E10000271043BC1090011E16 -:100E4000E0FCA3E0FDA3E0FEA3E0FFEC4D4E4F600D -:100E500018EF24FFFFEE34FFFEED34FFFDEC34FF0E -:0C0E6000FC90011E1205D580D453BCEF9D -:100E6C007D80E4FF121906E4FF12174612165C533C -:080E7C00F1FC43F101D2B322A5 -:10000600E5BD30E5051217CC8012E5BD30E40512DA -:1000160018BB8008E5BD30E0031218B2E5BD30E339 -:100026000E53BDF712147B9000FCE0600214F01230 -:0D00360013B1120D5DE5F860031211742284 -:0415A80041010E00EF -:100E8400E5CFF0A3E5CFF0A3E5CFF0A3E5CFF022C3 -:100E940090010BE4F07412A3F090011074FFF0A31E -:100EA4002253CEFB43CE802290010BE4F0A32253C5 -:100EB400CEFD53CE7F22900110E0FBA3E0FAA3E025 -:100EC400F92253CE7F53CEFB22F053CEFB43CE10F8 -:080ED40022E4F5CF43CE102209 -:10165C00E4900114F0A3F0A3F090010EF090013A85 -:06166C00F0900139F022AC -:1011B3007D857F011219067F011217467D817F020B -:1011C3001219067F021217467D817F031219067FCB -:1011D300031217467D877F041219067F04121746F0 -:0C11E3007D837F051219067F0502174668 -:06191B00E4F5C7020A1307 -:100A130090010FE5CFF090010DE5CFF090010FE0CD -:100A23005460707390010DE024FEB40A0050669088 -:100A33000A4075F003A4C58325F0C58373020A93A6 -:100A4300020A98020A98020A68020A5E020A9802D7 -:100A53000A63020A6D020A7D020A8E12063E806F45 -:100A630012154E806A12162C806590010FE07005F6 -:100A73001213DC805A121757805590010FE0B4818E -:100A83000512188080491217A28044120DC6803FB8 -:100A9300121672803A803290010FE0546064207025 -:100AA3002890010DE0247E600F146011146013245C -:100AB30003701412156C801712158A801212150C0C -:100AC300800D12152D8008800053CEFB121766533C -:030AD300CE7F22B1 -:10162C0090011EE5CFF053CEFB43BC0112182E9057 -:07163C00011EE04480F5C629 -:011643002284 -:1013DC00AFCF120EC6EFD39401501B90010EEFF05D -:1013EC00B4010912142F1214A112189412182E12EF -:0913FC0011B343BC022212176672 -:0114050022C4 -:100DC60090011E120E84120EC6900120E0B4031884 -:100DD60090011EE0701290013AF0900139F07F0404 -:100DE6001217467F05121746900120E0B4010C90B9 -:100DF600011EE0B401057F81121746900120E0B480 -:100E0600020C90011EE0B401057F02121746900104 -:100E160020E0B4050C90011EE0B401057F03121713 -:040E26004602182E3A -:10063E00C20AAFCFAECFEE24FE601E14605424E289 -:10064E00603E14602924216003020759120E94742F -:10065E0000F0A37446F002076390010B7401F0746E -:10066E004B120E9B7401F0A3741EF0020763120E60 -:10067E00AC7422120E9C7402F0A37447F00207634E -:10068E00120EAC7409120E9C7401F0A374D5F00214 -:10069E000763EFB4090040030207599006B0F8282B -:1006AE0028730206CB0206D80206EA0206F70207F4 -:1006BE0009020726020715020737020748120E9491 -:1006CE007400F0A37458F0020763120EAC740C128F -:1006DE000E9C7400F0A3746AF0020763120E9474F9 -:1006EE0000F0A37476F0020763120EAC740C120EB7 -:1006FE009C7400F0A37488F0020763120E947400C9 -:10070E00F0A37494F0804E120EAC741E120E9C74F4 -:10071E0000F0A374C8F0803D120EAC7422120E9C31 -:10072E007400F0A374A6F0802C120EAC741A120E84 -:10073E009C7400F0A374E6F0801B120EAC741E12B3 -:10074E000E9C7401F0A37400F0800A53CEFB1217B6 -:10075E006653CE7F22E5CFE5CF90011FE5CFF09017 -:10076E00011EE5CFF090010BE0FEA3E0FF90011E0D -:10077E00E0FCA3E0FDD39FEC9E400CEF541F600203 -:10078E008001D3920A800890010BECF0A3EDF012D9 -:10079E000EA5D390010CE0942090010BE094004044 -:1007AE000B120EBA7D201210EF40E722120EBA90F5 -:1007BE00010BA3E0FD1210EF5029300A0A120EBAF7 -:1007CE00E4FD1210EF501CE5CE54427005E5CE301C -:1007DE00E2F5E5CE20E20CE5CE5442600653CE7F24 -:0307EE0053CEFDEA -:0107F10022E5 -:1010EF00900120EDF0121701900110EBF0A3EAF040 -:1010FF00A3E9F0900120E0FFC390010CE09FF09076 -:10110F00010BE09400F0E5CE54427005E5CE30E0DF -:10111F00F553CEFEE5CE5442600853CEEF53CEFDCD -:04112F00C322D322E2 -:10154E00120EA590010EE0F5CF43CE10E5CE30E0A1 -:0E155E00FB53CEFEE5CE544260FA120EB322CD -:0A188000120EA512176653CE7F2248 -:100F3200E5CFE5CFAFCF120EA590010FE0247F6081 -:100F42000C14600E2402701975CF018014E4F5CFE1 -:100F5200800FEF547F2413F582E43401F583E0F52A -:100F6200CF120ED5E5CE30E0FBE5CE20E2F653CE31 -:0F0F7200FEE5CE544260FAE5CE20E2F5120EB352 -:010F8100224D -:1010630090010FE07002803790010FE0B40102801D -:101073002E90010FE06402702CE5CF7028E5CFAF0E -:10108300CFEF247F701975C70143CE20E4F5C790D5 -:10109300011404120ECDE5CE30E0FB53CEFE2253F5 -:0610A300CEFB12176622CD -:100EDC0090010FE07002804790010FE0B401028096 -:100EEC003E90010FE06402703CE5CF7038E5CFAF67 -:100EFC00CFEF601F247F702775C70153CEDF7F01B2 -:100F0C00121746E4F5C7900114120ECDE5CE30E071 -:100F1C00FB8008120ECEE5CE30E0FB53CEFE225302 -:060F2C00CEFB1217662245 -:10156C0090011E120E84120EA5120ED5E5CE30E09F -:0D157C00FB53CEFEE5CE544260FA120EB3D2 -:01158900223F -:10158A0090011E120E84120EA5120ED5E5CE30E081 -:0D159A00FB53CEFEE5CE544260FA120EB3B4 -:0115A7002221 -:10150C0090011E120E84120EA575CF0A43CE10E563 -:10151C00CE30E0FB53CEFEE5CE544260FA120EB351 -:01152C00229C -:10152D0090011E120E84120EA575CF0143CE10E54B -:10153D00CE30E0FB53CEFEE5CE544260FA120EB330 -:01154D00227B -:0C17FE00900125120E84120EC602182E57 -:0C180A00900129120E84120EC602182E46 -:0C18160090012D120E84120EC602182E36 -:0C182200900131120E84120EC602182E26 -:0F17570053CEFBE5CE544260FA53CEFD02182E5E -:0E17A200E5CF90010AE5CFF053CEFB02182EE2 -:10167200120EA590010AE0F5CF12182EE5CE5442C3 -:0616820060FA120EB32213 -:0F17660043CE20E5CE30E3FB53CEDF53CEF72248 -:0C182E0043CE10E5CE30E0FB53CEFE228E -:100046001201100100000020EB0307FF410001022E -:100056000301120309040000000000000000000074 -:10006600000000000C034B00790073006F0068006D -:100076001203540075007800440072006F00690096 -:1000860064000C03310030003000300031001203F0 -:10009600540075007800440072006F006900640027 -:1000A6002203540075007800440072006F00690056 -:1000B60064002D0053007000650061006B00650050 -:1000C60072001E03540075007800440072006F0031 -:1000D600690064002D004D006900630072006F0026 -:1000E6001A03540075007800440072006F0069001E -:1000F60064002D005400540053001E035400750084 -:100106007800440072006F00690064002D00410011 -:100116007500640069006F00090229010601048068 -:10012600320904000000010100080A24010001341C -:10013600000201020C240201010200010000000677 -:100146000C2402020101000100000500092403033A -:100156000101000106092403040103000205090444 -:100166000100000102000609040101010102000666 -:10017600072401030102000B2402010101080140CA -:100186001F00090581010800010000072501000084 -:100196000000090402000001020005090402010131 -:1001A60001020005072401020102000B24020101DD -:1001B600010801401F0009050201080001000007AF -:1001C60025010000000009040300020300000009E5 -:1001D60021100100012222000705840340000107C7 -:1001E6000505034000010904040000010100070998 -:1001F600240100011E0001050C2402070101000173 -:100206000000000709240308010300070709040585 -:1002160000000102000709040501010102000707A9 -:100226002401070102000B24020101010801401FFD -:100236000009050301080001000007250100000070 -:10024600000600FF0901A1010903150026FF00951C -:1002560040750881020904150026FF0095407508BF -:030266009102C042 -:0615AC00C106C107C105E4 -:10117400E5F830E00BE4F5C7E5CE30E20312191BC5 -:10118400E5F830E1031217B0E5F830E20312169DDA -:10119400E5F830E303121688E5F830E4031214C6C8 -:0F11A400E5F830E509300006120C7C1212282203 -:1016EF0090013AE0600B75C704E5CE20E40343CECA -:0216FF001022B7 -:0E13B10090010EE06024121793501F20051CBF -:1013BF0075C70190011E7408F01216C78FCF9001E8 -:0C13CF001EE014F0E070F243CE10D205D6 -:0113DB0022EF -:0E17B00075C701E5CE30E00553CEFEC205221E -:1016880075C70330060B12194EEF60057F08121557 -:05169800C653CEFD2247 -:10169D0075C70220060B12194EEF60057F08121553 -:0516AD00C653CEFD2232 -:1012280075C705900139E0FF700CE5CE30E1075332 -:10123800CEFD7401F022EFB4010EE5CE30E609537D -:10124800CEBFE4900139F022E5CE30E60453CEBF9C -:051258002253CEFD222F -:1014C60075C704E5CE30E01A53CEFE90013AE0141B -:1014D600F0E0C394005002E4F090013AE060034368 -:0314E600CE102203 -:1014E900EF24FFFFEE34FFFEED34FFFDEC34FFFC8B -:1014F9000205D5E0FCA3E0FDA3E0FEA3E0FFEC4D6F -:031509004E4F2220 -:100C7C0075C705E5CE5442606D12194EEF14900005 -:100C8C00FBF0AFCFE490011EF09000FBE0FE900172 -:100C9C001EE0FDC39E501574BB2DF582E43400F5A7 -:100CAC0083E5CFF090011EE004F080DDEF600A24B4 -:100CBC00FE603004703002094FC200D203E4900190 -:100CCC001EF090011EE0FF24BBF582E43400F58396 -:100CDC00E0FE74182FF8A60690011EE004F0E0B4B4 -:060CEC0004E022120BFBE4 -:010CF20022DF -:100D5D0030076590013AE0C39402505C75C704E416 -:100D6D00F5CF30A303FF80027F018FCF900116E0F6 -:100D7D00F5CFE51060071313543FFF80027F008FFE -:100D8D00CFE4F517E517C3951050091218758FCFDD -:100D9D00051780F0851017E517C3943C5007E4F54F -:100DAD00CF051780F212189490013AE004F0121654 -:080DBD00EFE4900116F0C207FB -:010DC500220B -:1012910075C70475CFF0EF60047F0080027F018F76 -:1012A100CFAF058FCFAF038FCF900123E0F5CFE410 -:1012B100FFE4F5CF0FEFB43BF890013AE004F00200 -:0212C10016EF26 -:10094F009000BBE07001229000BBE0B4012090004A -:10095F00BEE02403600F14600F14600F14600302D5 -:10096F0009F6D2072202142F02125D020FD1900056 -:10097F00BBE0B4020DA3E0600614706BD20622C276 -:10098F0006229000BBE06406705D1218949017F277 -:10099F001209F79017F31209F79017F41209FE9046 -:1009AF0017F51209FE9017F6120A059017F7120A9B -:1009BF00059017F7E4740193FF1216449017F9127C -:1009CF000A0C9017FA120A0C9017FBE493FF1216F9 -:1009DF00449017FBE4740193FF1216449017FDE443 -:1009EF0093FF121644D20722E493FF12164422E417 -:1009FF0093FF12164422E493FF12164422E493FF4E -:040A0F001216442255 -:0A125D00E4F5A8F5B175C314C281D1 -:1012670090011F1205E10000271043BC1090011FD9 -:101277001214FC600890011F1214E980F053BCEFB0 -:0A128700D2B375A61E75A6E180FE25 -:100FD100E4F5A8F5B175C314D2B3C2817B067D01D6 -:0E0FE1007F041215E17B017DF47F041215E1FF -:100FEF0090011F1205E10000271043BC1090011F54 -:100FFF001214FC600890011F1214E980F053BCEF2B -:0B100F001218F775A61E75A6E180FE02 -:0918B20053BDFE43BC40C281227B -:0D17CC0053BCBF53BDFE53BDDF53BDF7221C -:0918BB0053BDEF12165C021894F3 -:0615B200C181C104C10269 -:0A188A00E490011BF090011AF02217 -:0E17BE0012188AD201D291C202C204D20022B5 -:1014A10053AFFE43C31043C30253C3F753C3FB43BC -:1014B100C32043C340D2B2D2B4D291D288D2A812AF -:0514C100188AD2002290 -:030003000219429D -:03194200D204329A -:1002690030B410C204E490011CF012188BC201C210 -:1002790091D202200203020487200403020487E4C6 -:1002890090011EF0C20490011BE0702C12178450DB -:100299000E900118300304740A80127402800E3023 -:1002A900030790011874088004E4900118F0F5C55B -:1002B90090011B7401F0805790011BE0B40119A350 -:1002C900E0B4110690011B7402F0900118E030E1CE -:1002D9003B1216B28FC5803790011BE0FF64027094 -:1002E90027A3E0FEB4150F900118E030E302C20322 -:1002F90090011B7403F0900118E030E30974062E95 -:10030900F8E6F5C580098004EFB40303E4F5C59068 -:10031900011CE004F090011AE0FF7030AEC4BE8009 -:1003290003D38001C350F530A3030204879001175A -:10033900E5C5F0E5C590011930E7057422F08003A1 -:100349007411F090011A7401F0020475EF640170E0 -:100359004AAFC4BF8003D38001C350F530A3030261 -:100369000487900117E030E112D29090011CE0243B -:1003790097F582E43400F583E5C5F0900119E0248E -:1003890001FFE433FE90011CE06F7001EE6003028F -:10039900047590011A7402F002047590011AE06460 -:1003A900026003020475AFC4BF8003D38001C35048 -:1003B900F530A303020487900117E0F930E3579061 -:1003C9000119E0FF2405FDE433FC90011CE0FB7AF0 -:1003D90000D39DEC6480F87480985015C3EB9FFF9F -:1003E900EA9400FE741E2FF58274013EF583E5C57B -:1003F900F0900119E02406FFE433FE90011CE0B5FA -:100409000714E4B50610A3E5C5F0E0FF900116E076 -:10041900C39F5002EFF0900119E0FF2406FDE43379 -:10042900FC90011CE06D7001EC7041D200C202D257 -:1004390091D201E9548260031212C3900117E0308E -:10044900E33C900120E06036E490011FF090011F29 -:10045900E02420F582E43401F583E0FF121644908C -:10046900011FE004F0E0C3940440E22290011EE081 -:0E04790004F0300409E0C39405500302028D24 -:010487002252 -:0415B8004100FD00F1 -:1012F50074BB2FF582E43400F583E0FF9000FEE037 -:10130500FE04F0900104E0FCA3E02EF582E43CF538 -:1013150083EFF090011FE004F022E4900123F0FB3D -:0113250022A5 -:100BFB009000BBE0B4010512101A803120090E12CF -:100C0B00131F7D01FF1212911218DF80209000BB81 -:100C1B00E0B4030F1218DF12131F7DFE7F011212B7 -:100C2B0091800A9000BBE0B40203120AD69000FF39 -:100C3B00E0FF900106E0FEB50725900109E0FD906D -:100C4B0000FEE0B50519900108E02DF0900107E0DA -:100C5B003400F0E49000FEF0900106F0D20822EE92 -:100C6B00C39F400C12131F7D05FF1212911218DF48 -:010C7B002256 -:100F82009000FCE07048300845781E7C017D017BB2 -:100F9200017A0179007E007F0612055890012474BF -:100FA20040F0121385900097E020E0F99000FC7465 -:100FB20014F0900097E0C413135401FF9000FDE079 -:0F0FC20004FDF0E4900123F0FB121291C208220B -:100AD600900106E070779000BCE0900101F0A3E47D -:100AE600F09000BDE0FF900102E02FF0900101E0E0 -:100AF6003400F09000FBE0B404028039900101E07C -:100B0600FEA3E0FFEE547FFC900107E06C7003A3A8 -:100B1600E06F6024EF64C07003EE641D601A9001FC -:100B260001E0640E7004A3E064C0600C12131F7D24 -:100B360003FF1212911218DF90011F7403F0900147 -:100B46001FE0FFC39423501A1212F580F190011F83 -:100B56007401F090011FE0FFC3942150051212F5B5 -:080B660080F1900106E004F0AB -:010B6E002264 -:10101A009000FC74FAF01217131214559000BCE0F9 -:10102A0025E0900100F09000BDE0900109F09000E9 -:10103A00BEE09000FFF0E4900107F0A3F09000FEFC -:10104A00F0900106F09000FDF0D209C2A8900123A9 -:09105A00F0FB7DFF7F0102129101 -:0818DF00C20912142F0217BE0A -:101713001219321218FF9001047400F0A37403F03D -:0117230022A3 -:10138500900097E054BFF090011EE0900098F09017 -:10139500011FE0FCA3E0FDEC900001F0A3EDF0904F -:0C13A5000124E02402900096F00217756D -:1010A90090008AE0FF04F0748B2FF582E43400F598 -:1010B90083E595F022E0FF04F074012FF582E43412 -:1010C90000F58322900096E0FF900000E0C39F2284 -:1010D900E0FBA3E0FAA3E0F9EA494B22A3E0FAA373 -:0610E900E0F5828A83227B -:041932007593802207 -:0718FF007593C043B1022202 -:0C183A00900083EBF0A3EAF0A3E9F02299 -:0C184600900087EBF0A3EAF0A3E9F02289 -:0F177500900097E04401F0E4900000F002193674 -:041936004393202295 -:0B186A00439310900097E054FEF02222 -:031945008F952259 -:04193A0043930422AD -:04193E005393FB22A2 -:03194800AF952236 -:03194B00AF942234 -:030043000207F2BF -:1007F200C0E0C0F0C083C082C0D075D008AF94EF13 -:10080200120612093E00085708085710085F180818 -:100812007F20085F28087F30088938088F40087FCA -:1008220048088C50087C58089F60089F68089F7091 -:10083200089F7808B58008C78808B59008C7980847 -:10084200CEA008FAA808FAB00921B80889C0088918 -:10085200C8000009415393DF90009880081210CD20 -:10086200500B1210BEE0FF12194502094112186A1C -:10087200900097E04440F00209411210A9900097BD -:10088200E04402F002093E0209391210A9900086E2 -:10089200E014FF90008AE0C39F50278022900097C7 -:1008A200E04401F090008AE4F0900097E054FBF0FD -:1008B20002092F1210A990008AE0C3940850030283 -:1008C200092F020934900097E04404F01218FF90B7 -:1008D20000831210D9601890008AE0FF7B017A0031 -:1008E200798BC00A9000831210E5D00A12063C9060 -:1008F2000097E054FEF080479000871210D9601AEA -:100902007B017A007901C00A9000871210E5D00AB3 -:100912007F8212063C900096EFF0900000E4F09087 -:1009220000001210BEE0F5951210CD500512193AD2 -:10093200800D12193E80081218FF800312186A53A4 -:0D09420093F7D0D0D082D083D0F0D0E03237 -:06192100E4F514F51322A9 -:0F178400C3E5139514D394204003D38001C322EF -:1015C6008F17C3E51395146440600FAF130513EF2F -:0A15D600543F2422F8A6CFD517E8F1 -:0115E00022E8 -:1016B200E514B513037F8022AF140514EF543F24C1 -:0516C20022F8E6FF2202 -:06192700E4F516F515229F -:0F179300C3E5159516D394204003D38001C322DC -:1012C3008F17C3E515951664406026E517FDEFC338 -:1012D3009DFDE49400FC74992DF58274003CF58324 -:1012E300E0FEAD150515ED543F2462F8A606D517AB -:0112F300D129 -:0112F40022D7 -:1016C700E516B515037F8022AF160516EF543F24A4 -:0516D70062F8E6FF22AD -:0215BC00C10B61 -:0A189400E4F512F511F510C20B2265 -:10164400300B03121894AE10051074A22EF8A607DE -:08165400E510B43C02D20B22A8 -:0B187500AF11051174A22FF8E6FF224E -:0215BE00C10C5E -:10172400E0FEA3E0FFE4FCFDFB7AFAF9F8D302053E -:01173400BFF5 -:10142F00D291C281E4900120F0A3F0900120121715 -:10143F00244010900121E004F070F0900120E004AE -:05144F00F080E8D281ED -:011454002275 -:10145500C291C281E490011FF0A3F090011F121701 -:10146500244010900120E004F070F090011FE0048A -:05147500F080E8D281C7 -:01147A00224F -:1016DC0020A304D20CD322300C0312142FD200C23C -:0216EC000CC32D -:0116EE0022D9 -:0515C00042013B0000A8 -:10147B0030090A7D207C017F007E01801520A30AA4 -:10148B007D207C007F107E0080087D007C047F0027 -:06149B007E03121326225D -:1013260090013CE004F0700690013BE004F090016F -:101336003BE0FAA3E0FBB50707EAB50603C2B32212 -:10134600C3EB9DEA9C4009D2B3E490013BF0A3F0C5 -:011356002274 -:0D17D90012057EF5CF740129F9E43AFA22D9 -:071906008FC7AF058FD4224B -:1011EF0030F805E4F5C7802E30F90575C701802664 -:1011FF0030FA0575C702801E30FB0575C7038016D0 -:10120F0030FC0575C704800E30FD0575C7058006D7 -:09121F0030FE0375C706AFC722BB -:03194E00AFE222E3 -:0918C400AFE3EFFEADE2EDFF22FF -:10170100E4F5C7AF051DEF60051217D980F543CE8B -:021711001022A4 -:0C185200AF051DEF60051217D980F522CC -:10173500AF051DEF600AE5CF1205971217DE80F0A1 -:011745002281 -:0918CD008FC7E4F5CE43CE2022C2 -:101746007401A807088002C333D8FCF5D5E4F5D5A3 -:011756002270 -:07190D0075A41043A30222A0 -:0719140012190D43BC8022F3 -:1014060041746D656C202852290A63353133312DBC -:101416007573622D6364632D315F305F320A0A0093 -:091426001B631B5B3F32356C00B7 -:0B113300900135EBF0A3EAF0A3E9F017 -:10113E00900135E0FBA3E475F0011205A9A9F0FAC0 -:10114E0012057E900138F06013E0B40A057F0D128F -:10115E0018E7900138E0FF1218E780D47F0D1218BF -:06116E00E77F0A0218E70A -:0918D6007BFF7A1479260211331C -:100CF30090013EEDF090013DEFF070097F0D121869 -:100D0300E77F0A80377F1B1218E77F5B1218E79093 -:100D1300013EE0FFD394094003120D5190013E12AE -:100D23000D437F3B1218E790013DE0FFD394094048 -:100D330003120D5190013D120D437F481218E72213 -:100D4300E075F00A84E5F02430FF1218E722EF750E -:0A0D5300F00A842430FF1218E72292 -:05192D00A298920D22BA -:1015FB00759840538FF7438F0175CBFF75CAF37501 -:09160B00C834D2CA439812D3225C -:0818E7003099FDC2998F99228E -:0718EF003098FDAF99C2988B -:0118F60022CF -:0A189E008FC5E5C430E7FB7F01228F -:0A18A80043A22012FFC053A2DF226A -:0C185E008F1CAF058F1F1218A8AF1D22B1 -:1015E100A2AF920FC2AF8F1CAF038F1FAF058F1D2C -:0915F1001218A8A20F92AF7F01AD -:0115FA0022CE -:0813570090013FEFF0A3EDF05F -:10135F00A2AF920EC2AFE4FD7F0812185E90013F5C -:10136F00E0F45FFFA3E04FF51D751C071218A8A24C -:05137F000E92AF7F019A -:011384002246 -:0818F700C2AF43A22002F4007D -:03000000020B6F81 -:0C0B6F00787FE4F6D8FD7581DD020BB63E -:10048800E709F608DFFA8046E709F208DFFA803E56 -:1004980088828C83E709F0A3DFFA8032E309F60843 -:1004A800DFFA8078E309F208DFFA807088828C83AB -:1004B800E309F0A3DFFA806489828A83E0A3F6085F -:1004C800DFFA805889828A83E0A3F208DFFA804C39 -:1004D80080D280FA80C680D4806980F28033801010 -:1004E80080A680EA809A80A880DA80E280CA803379 -:1004F80089828A83ECFAE493A3C8C582C8CCC583F1 -:10050800CCF0A3C8C582C8CCC583CCDFE9DEE780C0 -:100518000D89828A83E493A3F608DFF9ECFAA9F03F -:10052800EDFB2289828A83ECFAE0A3C8C582C8CC95 -:10053800C583CCF0A3C8C582C8CCC583CCDFEADEAE -:10054800E880DB89828A83E493A3F208DFF980CC10 -:1005580088F0EF60010E4E60C388F0ED2402B40409 -:100568000050B9F582EB2402B4040050AF232345B0 -:0605780082239004D873F9 -:10057E00BB010689828A83E0225002E722BBFE027B -:09058E00E32289828A83E49322AE -:10059700BB010689828A83F0225002F722BBFE0143 -:0205A700F3223D -:1005A900A3F8E0C5F025F0F0E58215827002158305 -:0605B900E0C838F0E82262 -:1005BF00EB9FF5F0EA9E42F0E99D42F0EC6480C8B3 -:0605CF0064809845F02253 -:0C05D500ECF0A3EDF0A3EEF0A3EFF02299 -:1005E100A8828583F0D083D0821205F81205F81213 -:1005F10005F81205F8E473E493A3C583C5F0C58338 -:10060100C8C582C8F0A3C583C5F0C583C8C582C863 -:0106110022C6 -:10061200D083D082F8E4937012740193700DA3A377 -:1006220093F8740193F5828883E47374029368608B -:06063200EFA3A3A380DF8B -:060638008A838982E4734D -:100B7B00021614E493A3F8E493A34003F68001F266 -:100B8B0008DFF48029E493A3F85407240CC8C3337B -:100B9B00C4540F4420C8834004F456800146F6DF4A -:100BAB00E4800B01020408102040809015A8E47E1D -:100BBB00019360BCA3FF543F30E509541FFEE4933F -:100BCB00A360010ECF54C025E060A840B8E493A306 -:100BDB00FAE493A3F8E493A3C8C582C8CAC583CA31 -:100BEB00F0A3C8C582C8CAC583CADFE9DEE780BEE9 -:0115C5000025 +:1018000012190F12109D30090512104E80F51209A1 +:031810000780F05E +:0C190F00438F01C281D2A3D2AF020EA40C +:0C191B00C8040401C9000004CA00000058 +:060EA400121A4043BC805D +:100EAA009001AC1201EE0000271043BC109001AC77 +:100EBA00E0FCA3E0FDA3E0FEA3E0FFEC4D4E4F6093 +:100ECA0018EF24FFFFEE34FFFEED34FFFDEC34FF94 +:0C0EDA00FC9001AC1201E280D453BCEF8C +:100EE6007D80E4FF121A39E4FF12188C1217AA53F8 +:080EF600F1FC43F101D2B3222B +:10109D00E5BD30E5051218F58012E5BD30E4051209 +:1010AD0019E78008E5BD30E0031219DEE5BD30E338 +:1010BD000E53BDF71215979000FCE0600214F090EE +:1010CD0001A4E0600B1218CA500620050312196323 +:0B10DD00120DD7E5F860031212C422C8 +:0415BD004101A40044 +:100EFE00E5CFF0A3E5CFF0A3E5CFF0A3E5CFF02249 +:100F0E009001A1E4F07412A3F09001A674FFF0A377 +:100F1E002253CEFB43CE802253CEFD53CE7F229062 +:100F2E0001A6E0FBA3E0FAA3E0F92253CE7F53CE55 +:100F3E00FB229001A1E4F0A322F053CEFB43CE108E +:080F4E0022E4F5CF43CE10228E +:1017AA00E49001AAF0A3F0A3F09001A4F09001CE76 +:0617BA00F09001CDF022C9 +:100006007D857F01121A397F0112188C7D817F024E +:10001600121A397F0212188C7D817F03121A397FDA +:100026000312188C7D877F04121A397F0412188CEC +:0C0036007D837F05121A397F0502188CAB +:061A4E00E4F5C7020B04E1 +:100B04009001A5E5CFF09001A3E5CFF09001A5E019 +:100B1400546070739001A3E024FEB40A0050669000 +:100B24000B3175F003A4C58325F0C58373020B84D0 +:100B3400020B89020B89020B59020B4F020B89022B +:100B44000B54020B5E020B6E020B7F120621806FA8 +:100B54001216B0806A12179280659001A5E07005A4 +:100B64001214D0805A12189D80559001A5E0B481CA +:100B7400051219B680491218D98044120E40803FDC +:100B84001217C0803A80329001A5E054606420704E +:100B9400289001A3E0247E600F14601114601324D4 +:100BA4000370141216CE80171216EC801212166EF1 +:100BB400800D12168F8008800053CEFB1218AC53A0 +:030BC400CE7F22BF +:101792009001ACE5CFF053CEFB43BC011219579038 +:0717A20001ACE04480F5C634 +:0117A900221D +:1014D000AFCF120F39EFD39401501B9001A4EFF05E +:1014E000B4010912154B12164B1219C012195712DA +:0914F000000643BC02221218ACF4 +:0114F90022D0 +:100E40009001AC120EFE120F399001AEE0B40318FF +:100E50009001ACE070129001CEF09001CDF07F04D3 +:100E600012188C7F0512188C9001AEE0B4010C9022 +:100E700001ACE0B401057F8112188C9001AEE0B4A2 +:100E8000020C9001ACE0B401057F0212188C9001B5 +:100E9000AEE0B4050C9001ACE0B401057F0312187C +:040EA0008C02195750 +:10062100C20AAFCFAECFEE24FE60171460292402B8 +:100631006003020711120F0E7402F0A3744BF00253 +:10064100071B9001A17401F07420120F157403F0BF +:10065100A37423F002071BEFB40900400302071142 +:10066100900668F82828730206830206900206A203 +:100671000206AF0206C10206DE0206CD0206EF0245 +:100681000700120F0E7402F0A3745DF002071B1233 +:100691000F40740C120F167402F0A3746FF002076E +:1006A1001B120F0E7402F0A3747BF002071B120FD2 +:1006B10040740C120F167402F0A3748DF002071B24 +:1006C100120F0E7402F0A37499F0804E120F407451 +:1006D1001E120F167402F0A374CDF0803D120F406C +:1006E1007422120F167402F0A374ABF0802C120F57 +:1006F10040741A120F167402F0A374EBF0801B12EF +:100701000F40741E120F167403F0A37405F0800AD3 +:1007110053CEFB1218AC53CE7F22E5CFE5CF90012B +:10072100ADE5CFF09001ACE5CFF09001A1E0FEA3E3 +:10073100E0FF9001ACE0FCA3E0FDD39FEC9E400CF8 +:10074100EF541F60028001D3920A80089001A1EC4E +:10075100F0A3EDF0120F1FD39001A2E094209001BD +:10076100A1E09400400B120F2D7D201211BD40E736 +:1007710022120F2D9001A1A3E0FD1211BD502930CD +:100781000A0A120F2DE4FD1211BD501CE5CE544290 +:100791007005E5CE30E2F5E5CE20E20CE5CE54421F +:0807A100600653CE7F53CEFD2C +:0107A900222D +:1011BD009001AEEDF01218259001A6EBF0A3EAF028 +:1011CD00A3E9F09001AEE0FFC39001A2E09FF09083 +:1011DD0001A1E09400F0E5CE54427005E5CE30E07B +:1011ED00F553CEFEE5CE5442600853CEEF53CEFDFF +:0411FD00C322D32214 +:1016B000120F1F9001A4E0F5CF43CE10E5CE30E02D +:0E16C000FB53CEFEE5CE544260FA120F2622F6 +:0A19B600120F1F1218AC53CE7F224F +:100FFE00E5CFE5CFAFCF120F1F9001A5E0247F60A4 +:10100E000C14600E2402701975CF018014E4F5CF14 +:10101E00800FEF547F24A9F582E43401F583E0F5C7 +:10102E00CF120F4FE5CE30E0FBE5CE20E2F653CEE9 +:0F103E00FEE5CE544260FAE5CE20E2F5120F2611 +:01104D002280 +:101131009001A5E0700280379001A5E0B401028022 +:101141002E9001A5E06402702CE5CF7028E5CFAFA9 +:10115100CFEF247F701975C70143CE20E4F5C79006 +:1011610001AA04120F47E5CE30E0FB53CEFE225315 +:06117100CEFB1218AC22B7 +:100F56009001A5E0700280479001A5E0B4010280EF +:100F66003E9001A5E06402703CE5CF7038E5CFAF56 +:100F7600CFEF601F247F702775C70153CEDF7F0137 +:100F860012188CE4F5C79001AA120F47E5CE30E09F +:100F9600FB8008120F48E5CE30E0FB53CEFE22530D +:060FA600CEFB1218AC2284 +:1016CE009001AC120EFE120F1F120F4FE5CE30E03E +:0D16DE00FB53CEFEE5CE544260FA120F26FB +:0116EB0022DC +:1016EC009001AC120EFE120F1F120F4FE5CE30E020 +:0D16FC00FB53CEFEE5CE544260FA120F26DD +:0117090022BD +:10166E009001AC120EFE120F1F75CF0A43CE10E57D +:10167E00CE30E0FB53CEFEE5CE544260FA120F267A +:01168E002239 +:10168F009001AC120EFE120F1F75CF0143CE10E565 +:10169F00CE30E0FB53CEFEE5CE544260FA120F2659 +:0116AF002218 +:0C1927009001B9120EFE120F3902195780 +:0C1933009001BD120EFE120F3902195770 +:0C193F009001C1120EFE120F3902195760 +:0C194B009001C5120EFE120F3902195750 +:0F189D0053CEFBE5CE544260FA53CEFD021957ED +:0E18D900E5CF9001A0E5CFF053CEFB021957EA +:1017C000120F1F9001A0E0F5CF121957E5CE544239 +:0617D00060FA120F262250 +:0F18AC0043CE20E5CE30E3FB53CEDF53CEF72201 +:0C19570043CE10E5CE30E0FB53CEFE2264 +:10024B001201100100000020EB0307FF4100010227 +:10025B00030112030904000000000000000000006D +:10026B00000000000C034B00790073006F00680066 +:10027B001203540075007800440072006F0069008F +:10028B0064000C03310030003000300031001203E9 +:10029B00540075007800440072006F006900640020 +:1002AB002203540075007800440072006F0069004F +:1002BB0064002D0053007000650061006B00650049 +:1002CB0072001E03540075007800440072006F002A +:1002DB00690064002D004D006900630072006F001F +:1002EB001A03540075007800440072006F00690017 +:1002FB0064002D005400540053001E03540075007D +:10030B007800440072006F00690064002D0041000A +:10031B007500640069006F0009022001060104806A +:10032B00320904000000010100080A240100013415 +:10033B00000201020C240201010200010000000670 +:10034B000C24020201010001000005000924030333 +:10035B00010100010609240304010300020509043D +:10036B00010000010200060904010101010200065F +:10037B00072401030102000B2402010101080140C3 +:10038B001F0009058101080001000007250100007D +:10039B00000009040200000102000509040201012A +:1003AB0001020005072401020102000B24020101D6 +:1003BB00010801803E000905020110000100000741 +:1003CB0025010000000009040300020000000007E3 +:1003DB0005840340000107050503400001090404DF +:1003EB0000000101000709240100011E0001050C9A +:1003FB002402070101000100000007092403080182 +:10040B0003000707090405000001020007090405A2 +:10041B00010101020007072401070102000B24025E +:10042B000101010801401F0009050301080001003B +:08043B0000072501000000008C +:0615C100C106C107C105CF +:1012C400E5F830E00BE4F5C7E5CE30E203121A4E40 +:1012D400E5F830E1031218E7E5F830E2031217EB02 +:1012E400E5F830E3031217D6E5F830E403121605E7 +:0C12F400E5F830E5061212011213AB22DF +:101813009001CEE0600B75C704E5CE20E40343CE10 +:02182300102291 +:0C19630075C70112172843CE10D20522D0 +:0E18E70075C701E5CE30E00553CEFEC20522E6 +:1017D60075C70330060B121A7EEF60057F081217D5 +:0517E6004453CEFD227A +:1017EB0075C70220060B121A7EEF60057F101217C9 +:0517FB004453CEFD2265 +:1013AB0075C7059001CDE0FF700CE5CE30E107531A +:1013BB00CEFD7401F022EFB4010EE5CE30E60953F9 +:1013CB00CEBFE49001CDF022E5CE30E60453CEBF84 +:0513DB002253CEFD22AB +:1016050075C704E5CE30E01A53CEFE9001CEE01446 +:10161500F0E0C394005002E4F09001CEE060034393 +:03162500CE1022C2 +:10162800EF24FFFFEE34FFFEED34FFFDEC34FFFC4A +:101638000201E2E0FCA3E0FDA3E0FEA3E0FFEC4D25 +:031648004E4F22E0 +:1012010075C705E5CE5442603A121A7EEF1490007C +:10121100FBF0AFCFE4FE9000FBE0FDEEC39D50106C +:1012210074BB2EF582E43400F583E5CFF00E80E641 +:10123100EF600A24FE6009047009020A40D2032209 +:03124100120CECA0 +:011244002287 +:100DD7003007659001CEE0C39402505C75C704E408 +:100DE700F5CF30A303FF80027F018FCF9000FEE095 +:100DF700F5CFE51060071313543FFF80027F008F84 +:100E0700CFE4F517E517C3951050091218488FCF8F +:100E1700051780F0851017E517C3943C5007E4F5D4 +:100E2700CF051780F21219C09001CEE004F0121816 +:080E370013E49000FEF0C20775 +:010E3F002290 +:1015230075C70475CFF0EF60047F0080027F018FE1 +:10153300CFAF058FCFAF038FCF9001B0E0F5CF9042 +:0815430001CEE004F0021813D0 +:100A40009000BBE07001229000BBE0B40120900058 +:100A5000BEE02403600F14600F14600F14600302E3 +:100A60000AE7D2072202154B0213E00210E89000B9 +:100A7000BBE0B4020DA3E0600614706BD20622C284 +:100A800006229000BBE06406705D1219C090191B2D +:100A9000120AE890191C120AE890191D120AEF9028 +:100AA000191E120AEF90191F120AF6901920120A45 +:100AB000F6901920E4740193FF12170A901922127C +:100AC0000AFD901923120AFD901924E493FF1217CE +:100AD0000A901924E4740193FF12170A901926E46E +:100AE00093FF12170AD20722E493FF12170A22E497 +:100AF00093FF12170A22E493FF12170A22E493FFCE +:040B000012170A229C +:0A13E000E4F5A8F5B175C314C2814D +:1013EA009001AC1201EE0000271043BC109001AC32 +:1013FA0012163B60089001AC12162880F053BCEF1D +:0A140A00D2B375A61E75A6E180FEA0 +:1010E800E4F5A8F5B175C314D2B3C2817B067D01BE +:0E10F8007F0412175F7B017DF47F0412175FE7 +:101106009001AC1201EE0000271043BC109001AC18 +:1011160012163B60089001AC12162880F053BCEF03 +:0B112600121A2375A61E75A6E180FEBC +:0919DE0053BDFE43BC40C281224E +:0D18F50053BCBF53BDFE53BDDF53BDF722F2 +:0919E70053BDEF1217AA0219C04A +:0C15C700C181C104C102C1004100FD004F +:1015E10090014FE02406FFE433FE900152E022E433 +:1015F100900151F0900150F022F582E43401F5831D +:04160100E0F5C52229 +:0C196F001215F0D201D291C202C2042273 +:10164B0053AFFE43C31043C30253C3F753C3FB4310 +:10165B00C32043C340D2B2D2B4D291D288D2A81203 +:03166B0015F02255 +:03000300020FAC3D +:100FAC00C0E0C083C082C0D075D000C007D2B730BB +:100FBC009104C2B78031E5C420E704C2B780289001 +:100FCC000155E0FF04F074FF2FF582E43400F58343 +:100FDC00E5C5F0900155E0FFB42704D2918006746A +:100FEC00262F1215FAC2B7D007D0D0D082D083D01A +:020FFC00E032E1 +:10090700D2B620B404C2008015200012D200C291D2 +:10091700E4900155F0E024261215FAC2B622209180 +:1009270003C2B622900155E0C394275003020A3D43 +:10093700E49001ADF0900155F0900100E09001AD19 +:10094700F09000FFE0FF900153E06F605FEFF090E1 +:1009570000FDE020E4047F0180027F009001ADE00C +:1009670020E1047E0180027E00EE6F602DE490019D +:10097700ACF09001ACE0FFC39404501774012FF55D +:1009870082E43401F583E0FF12170A9001ACE0041A +:10099700F080DF9000FDE06410F09001ADE030E200 +:1009A7000B7B017A0179057D11121300900154E048 +:1009B700FF04F0900126EFF09001ADE020E4047F02 +:1009C7000180027F009000FDE0FE20E1047D0180B0 +:1009D700027D00ED6F7037300334C203EE6402907E +:1009E70000FDF0E49001ACF09001ACE0FF24BBF512 +:1009F70082E43400F583E0FE74282FF582E43401A5 +:100A0700F583EEF09001ACE004F0E0B404DA121ADA +:100A170032EFC394219000FDE040104404F07B01C5 +:100A27007A01792C7D21121375800354FBF0900015 +:060A3700FDE0900127F034 +:020A3D00C2B63F +:010A3F002294 +:1004430030B410C204E4900152F01215F1C201C29B +:1004530091D202200203020620200403020620E4B4 +:100463009001B3F0C204900151E0FF701790014E68 +:10047300300304740A80027402F0F5C590015174CC +:1004830001F08051EFB40116900152E0B4110690CF +:1004930001517402F090014EE020E1398034900163 +:1004A30051E0FF64027027A3E0FEB4150F90014EE4 +:1004B300E030E302C2039001517403F090014EE077 +:1004C30030E30974062EF8E6F5C580098004EFB41D +:1004D3000303E4F5C5900152E004F0900150E0FFFE +:1004E3007030AEC4BE8003D38001C350F530A30384 +:1004F30002062090014DE5C5F0E5C590014F30E7B8 +:10050300057422F080037411F09001507401F0021D +:10051300060EEF64017045AFC4BF8003D38001C3EF +:1005230050F530A30302062090014DE030E112D2D2 +:1005330090900152E02497F582E43400F583E5C5F9 +:10054300F090014FE024011215E76F7001EE600394 +:1005530002060E9001507402F002060E900150E064 +:100563006402600302060EAFC4BF8003D38001C3DD +:1005730050F530A30302062090014DE0F930E34E1D +:1005830090014FE0FF2405FDE433FC900152E0FBB2 +:100593007A00D39DEC6480F87480985015C3EB9F68 +:1005A300FFEA9400FE74B32FF58274013EF583E5F0 +:1005B300C5F01215E1B50716E4B50612900156E52C +:1005C300C5F0E0FF9000FEE0C39F5002EFF012156C +:1005D300E16F7001EE7034C202D291D201E930E3CF +:1005E3003C9001B5E06036E49001B4F09001B4E0D2 +:1005F30024B5F582E43401F583E0FF12170A900174 +:10060300B4E004F0E0C3940440E2229001B3E004B8 +:0D061300F0300409E0C394055003020467B1 +:0106200022B7 +:0415D300410193003F +:1014140074BB2FF582E43400F583E0FF900194E07F +:10142400FE04F090019AE0FCA3E02EF582E43CF582 +:1014340083EFF09001ACE004F022E49001B0F0FB03 +:011444002285 +:100CEC009000BBE0B40105121286803120090E126F +:100CFC00143E7D01FF121523121A0B80209000BBAD +:100D0C00E0B4030F121A0B12143E7DFE7F01121574 +:100D1C0023800A9000BBE0B40203120BC79001952C +:100D2C00E0FF90019CE0FEB5072590019FE0FD904F +:100D3C000194E0B5051990019EE02DF090019DE025 +:100D4C003400F0E4900194F090019CF0D20822EE73 +:100D5C00C39F400C12143E7D05FF121523121A0B73 +:010D6C002264 +:10104E009000FCE0704830084578AC7C017D017B57 +:10105E00017A0179967E007F061201169001B27414 +:10106E0040F01214A4900097E020E0F99000FC7478 +:10107E0014F0900097E0C413135401FF900193E015 +:0F108E0004FDF0E49001B0F0FB121523C208221C +:100BC70090019CE070779000BCE0900197F0A3E45F +:100BD700F09000BDE0FF900198E02FF0900197E0C2 +:100BE7003400F09000FBE0B404028039900197E0F4 +:100BF700FEA3E0FFEE547FFC90019DE06C7003A321 +:100C0700E06F6024EF64C07003EE641D601A90010A +:100C170097E0640E7004A3E064C0600C12143E7D7C +:100C270003FF121523121A0B9001AC7403F0900105 +:100C3700ACE0FFC39423501A12141480F19001AC56 +:100C47007401F09001ACE0FFC39421500512141415 +:080C570080F190019CE004F023 +:010C5F002272 +:101286009000FC74FAF01218371215719000BCE049 +:1012960025E0900196F09000BDE090019FF090004F +:1012A600BEE0900195F0E490019DF0A3F0900194CA +:0E12B600F090019CF0900193F0D209C2A822A2 +:081A0B00C20912154B02196F0C +:10183700121A65121A2B90019A7400F0A37403F020 +:01184700227E +:1014A400900097E054BFF09001ACE0900098F09069 +:1014B40001ADE0FCA3E0FDEC900001F0A3EDF090A1 +:0C14C40001B2E02402900096F00218BB78 +:1011770090008AE0FF04F0748B2FF582E43400F5C9 +:1011870083E595F022E0FF04F074012FF582E43443 +:1011970000F58322900096E0FF900000E0C39F22B5 +:1011A700E0FBA3E0FAA3E0F9EA494B22A3E0FAA3A4 +:0611B700E0F5828A8322AC +:041A650075938022D3 +:071A2B007593C043B10222D4 +:0C197B00900083EBF0A3EAF0A3E9F02257 +:0C198700900087EBF0A3EAF0A3E9F02247 +:0F18BB00900097E04401F0E4900000F0021A69F9 +:041A69004393202261 +:0B19AB00439310900097E054FEF022E0 +:031A75008F952228 +:041A6D004393042279 +:041A71005393FB226E +:031A7800AF952205 +:031A7B00AF942203 +:030043000207AA07 +:1007AA00C0E0C0F0C083C082C0D075D008AF94EF5B +:1007BA0012021F08F600080F08080F100817180879 +:1007CA0037200817280837300841380847400837C3 +:1007DA004808445008345808576008576808577042 +:1007EA00085778086D80087F88086D90087F9808F8 +:1007FA0086A008B2A808B2B008D9B80841C0084112 +:10080A00C8000008F95393DF900098800812119BE2 +:10081A00500B12118CE0FF121A750208F91219AB6B +:10082A00900097E04440F00208F91211779000977F +:10083A00E04402F00208F60208F1121177900086ED +:10084A00E014FF90008AE0C39F502780229000970F +:10085A00E04401F090008AE4F0900097E054FBF045 +:10086A000208E712117790008AE0C3940850030245 +:10087A0008E70208EC900097E04404F0121A2B9063 +:10088A0000831211A7601890008AE0FF7B017A00AA +:10089A00798BC00A9000831211B3D00A12024990D0 +:1008AA000097E054FEF080479000871211A7601A63 +:1008BA007B017A007901C00A9000871211B3D00A2D +:1008CA007F82120249900096EFF0900000E4F090C7 +:1008DA00000012118CE0F59512119B5005121A6D49 +:1008EA00800D121A718008121A2B80031219AB5349 +:0D08FA0093F7D0D0D082D083D0F0D0E03280 +:061A5400E4F514F5132275 +:071A3200C3E5139514FF2228 +:101744008F17C3E51395146480600FAF130513EF6F +:0A175400547F2422F8A6CFD517E831 +:01175E002268 +:0B1375009001AEEBF0A3EAF0A3E9F05A +:10138000E4FFEFC39D5023AE140514EE547F2422D6 +:10139000F8E6FE9001AEE0FBA3E0FAA3E0F98F824D +:0A13A000758300EE1201940F80D84F +:0113AA002220 +:061A5A00E4F516F515226B +:0F18CA00C3E5159516D394204003D38001C322A4 +:051300009001AEEDF0CC +:10130500A3F0C3E51595166440602B9001AFE0FF8F +:101315009001AEE0C39FFFE494008F82F583120134 +:1013250055FFAE150515EE543F24A2F8A60790010A +:06133500AFE014F070CCE3 +:01133B00228F +:101728007F08E516B5150575CF80800DAE16051630 +:0B173800EE543F24A2F8E6F5CFDFE7F7 +:011743002283 +:0215D700C10B46 +:0A19C000E4F512F511F510C20B2238 +:10170A00300B031219C0AE10051074572EF582E47F +:0E171A003401F583EFF0E510B43C02D20B224F +:10184800AF11051174572FF582E43401F583E0FFD9 +:01185800226D +:0215D900C10C43 +:10186A00E0FEA3E0FFE4FCFDFB7AFAF9F8D30201FB +:01187A00CCA1 +:10154B00D291C281E49001ADF0A3F09001AD1218DD +:10155B006A40109001AEE004F070F09001ADE00431 +:05156B00F080E8D281D0 +:011570002258 +:10157100C291C281E49001ACF0A3F09001AC1218C9 +:101581006A40109001ADE004F070F09001ACE0040D +:05159100F080E8D281AA +:011596002232 +:1018590020A304D20CD322300C0312154BC20CC3A3 +:01186900225C +:0515DB004201CF0000F9 +:1015970030090A7D207C017F007E01801520A30A87 +:1015A7007D207C007F107E0080087D007C047F000A +:0615B7007E031214452220 +:101445009001D0E004F070069001CFE004F0900127 +:10145500CFE0FAA3E0FBB50707EAB50603C2B3225E +:10146500C3EB9DEA9C4009D2B3E49001CFF0A3F011 +:011475002254 +:0D19020012013CF5CF740129F9E43AFA22F4 +:071A39008FC7AF058FD42217 +:10133C0030F805E4F5C7802E30F90575C701802615 +:10134C0030FA0575C702801E30FB0575C703801681 +:10135C0030FC0575C704800E30FD0575C705800689 +:09136C0030FE0375C706AFC7226D +:031A7E00AFE222B2 +:0919F000AFE3EFFEADE2EDFF22D2 +:10182500E4F5C7AF051DEF600512190280F543CE3B +:0218350010227F +:0C199300AF051DEF600512190280F5225F +:10187B00AF051DEF600AE5CF12018212190780F048 +:01188B00223A +:0919F9008FC7E4F5CE43CE202295 +:10188C007401A807088002C333D8FCF5D5E4F5D55C +:01189C002229 +:071A400075A41043A302226C +:071A4700121A4043BC80228B +:1014FA0041746D656C202852290A63353133312DC8 +:10150A007573622D6364632D315F305F320A0A009E +:09151A001B631B5B3F32356C00C2 +:0B1245009001C9EBF0A3EAF0A3E9F070 +:101250009001C9E0FBA3E475F0011201B6A9F0FA10 +:1012600012013C9001CCF06013E0B40A057F0D122E +:101270001A139001CCE0FF121A1380D47F0D121ABA +:06128000137F0A021A139D +:091A02007BFF7A15791A021245E6 +:100D6D009001D2EDF09001D1EFF070097F0D121AC4 +:100D7D00137F0A80377F1B121A137F5B121A139091 +:100D8D0001D2E0FFD394094003120DCB9001D21292 +:100D9D000DBD7F3B121A139001D1E0FFD394094092 +:100DAD0003120DCB9001D1120DBD7F48121A1322E3 +:100DBD00E075F00A84E5F02430FF121A1322EF7566 +:0A0DCD00F00A842430FF121A1322EA +:051A6000A298920D2286 +:10177900759840538FF7438F0175CBFF75CAF37581 +:09178900C834D2CA439812D322DD +:081A13003099FDC2998F992260 +:071A1B003098FDAF99C2985D +:011A220022A1 +:0A19CA008FC5E5C430E7FB7F012262 +:0A19D40043A22012FFC053A2DF223D +:0C199F008F1CAF058F1F1219D4AF1D2242 +:10175F00A2AF920FC2AF8F1CAF038F1FAF058F1DAC +:09176F001219D4A20F92AF7F0100 +:01177800224E +:081476009001D3EFF0A3EDF0AB +:10147E00A2AF920EC2AFE4FD7F0812199F9001D366 +:10148E00E0F45FFFA3E04FF51D751C071219D4A2FF +:05149E000E92AF7F017A +:0114A3002226 +:081A2300C2AF43A22002F4004F +:03000000020C608F +:0C0C6000787FE4F6D8FD7581E1020CA756 +:10004600E709F608DFFA8046E709F208DFFA803E9C +:1000560088828C83E709F0A3DFFA8032E309F60889 +:10006600DFFA8078E309F208DFFA807088828C83F1 +:10007600E309F0A3DFFA806489828A83E0A3F608A5 +:10008600DFFA805889828A83E0A3F208DFFA804C7F +:1000960080D280FA80C680D4806980F28033801056 +:1000A60080A680EA809A80A880DA80E280CA8033BF +:1000B60089828A83ECFAE493A3C8C582C8CCC58337 +:1000C600CCF0A3C8C582C8CCC583CCDFE9DEE78007 +:1000D6000D89828A83E493A3F608DFF9ECFAA9F086 +:1000E600EDFB2289828A83ECFAE0A3C8C582C8CCDC +:1000F600C583CCF0A3C8C582C8CCC583CCDFEADEF5 +:10010600E880DB89828A83E493A3F208DFF980CC56 +:1001160088F0EF60010E4E60C388F0ED2402B4044F +:100126000050B9F582EB2402B4040050AF232345F6 +:0601360082239000967385 +:10013C00BB010689828A83E0225002E722BBFE02C1 +:09014C00E32289828A83E49322F4 +:10015500BB010CE58229F582E5833AF583E022505F +:1001650006E92582F8E622BBFE06E92582F8E222A9 +:0D017500E58229F582E5833AF583E49322C3 +:10018200BB010689828A83F0225002F722BBFE015C +:02019200F32256 +:10019400F8BB010DE58229F582E5833AF583E8F0A1 +:1001A400225006E92582C8F622BBFE05E92582C84D +:0201B400F22235 +:1001B600A3F8E0C5F025F0F0E582158270021583FC +:0601C600E0C838F0E82259 +:1001CC00EB9FF5F0EA9E42F0E99D42F0EC6480C8AA +:0601DC0064809845F0224A +:0C01E200ECF0A3EDF0A3EEF0A3EFF02290 +:1001EE00A8828583F0D083D08212020512020512F6 +:1001FE000205120205E473E493A3C583C5F0C5831B +:10020E00C8C582C8F0A3C583C5F0C583C8C582C85A +:01021E0022BD +:10021F00D083D082F8E4937012740193700DA3A36E +:10022F0093F8740193F5828883E473740293686082 +:06023F00EFA3A3A380DF82 +:060245008A838982E47344 +:100C6C00021800E493A3F8E493A34003F68001F286 +:100C7C0008DFF48029E493A3F85407240CC8C33389 +:100C8C00C4540F4420C8834004F456800146F6DF58 +:100C9C00E4800B01020408102040809015BDE47E16 +:100CAC00019360BCA3FF543F30E509541FFEE4934D +:100CBC00A360010ECF54C025E060A840B8E493A314 +:100CCC00FAE493A3F8E493A3C8C582C8CAC583CA3F +:100CDC00F0A3C8C582C8CAC583CADFE9DEE780BEF7 +:0115E000000A :00000001FF Modified: firmware/hex_dev/new_rf/tuxaudio.hex =================================================================== --- firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-18 13:49:38 UTC (rev 1342) +++ firmware/hex_dev/new_rf/tuxaudio.hex 2008-07-22 07:42:18 UTC (rev 1343) @@ -1,10 +1,10 @@ -:1000000019C0BEC6A9C631C09EC02FC02EC02DC00B +:1000000019C0B3C69EC631C09EC02FC02EC02DC021 :100010002CC02BC02AC029C028C027C026C025C09C :1000200005C123C022C021C020C01FC01EC01DC0EA -:10003000BBC91BC011241FBECFEFD4E0DEBFCDBFB4 -:1000400011E0A0E0B1E0ECE6F6E102C005900D920F +:10003000DAC91BC011241FBECFEFD4E0DEBFCDBF95 +:1000400011E0A0E0B1E0EAEAF6E102C005900D920D :10005000A635B107D9F713E0A6E5B1E001C01D92BE -:10006000A432B107E1F74FD100CBCACFCF93DF93D2 +:10006000A532B107E1F74FD11FCBCACFCF93DF93B2 :10007000CDB7DEB721970FB6F894DEBF0FBECDBF68 :100080008FEA84B987EC85B98FE088B988E087B9B1 :10009000198203C089818F5F898389818233D0F37C @@ -29,339 +29,343 @@ :1001C000238192818481F22FF81BF91781F0E22FAD :1001D000FF27892F99270197E823F9238D919C9177 :1001E0001197E80FF91F30832F5FED012B8380916A -:1001F0007A00806480937A00809106028150809317 -:100200000602882319F481E080930502FF91EF91A3 +:1001F0007A00806480937A00809107028150809316 +:100200000702882319F481E080930602FF91EF91A1 :10021000DF91CF91BF91AF919F918F914F913F917E :100220002F910F900FBE0F901F9018950FB6CF9380 :10023000C0910001CF5FC0930001C0FF02C08DDFFD :10024000F894CF910FBE1895CF93DF93CDB7DEB75B :1002500024970FB6F894DEBF0FBECDBF80EF898321 :1002600096B189B19F70807D982B9A831E9B02C0A6 -:1002700090629A838A819BE989278A838091CA0246 +:1002700090629A838A819BE989278A838091CB0245 :100280008B83882321F480916301882319F081E016 -:100290008C8301C01C82CE0101963FD624960FB6F6 +:100290008C8301C01C82CE01019609D624960FB62C :1002A000F894DEBF0FBECDBFDF91CF9108951092BD -:1002B000560187D1F89480E885B998E098B91BB8C1 +:1002B00056017CD1F89480E885B998E098B91BB8CC :1002C000E4E6F0E0208189EE808390936C0082E088 :1002D0008BBBE8E6F0E080818260808383B7817F1A :1002E000846083BF83B7816083BF7894889583B728 -:1002F0008E7F83BF10926C0020936400B7DE1BD703 -:100300000BD759D10895CEEFD4E0DEBFCDBFAEDE1E -:1003100080910701909108014ED080910E0190913B -:100320000F0149D07CD9F8D68AE090E09093620121 -:1003300080936101789483E08CBB8DBB789439D62F -:1003400080910502882389F110920502809156015F +:1002F0008E7F83BF10926C0020936400B7DE3AD7E4 +:100300002AD74ED10895CEEFD4E0DEBFCDBFAEDE0A +:10031000809107019091080143D080910E01909146 +:100320000F013ED09BD917D78AE090E090936201ED +:1003300080936101789483E08CBB8DBB78942ED63A +:1003400080910602882331F11092060280915601B5 :10035000823020F081508093560101C075DF90916A :1003600010019923B9F08AB183608AB9198203C058 :1003700089818F5F898389818F3FD1F7892F815050 :1003800080931001882319F48AB1836002C08AB176 -:100390008C7F8AB947B5E0910701F091080163812C -:1003A0008481681B20E08EEF9BD5809156018130BF -:1003B00029F67DDFC3CFFC01138214820895FC016E -:1003C00020E030E083819481891B9281891711F4A8 -:1003D00021E030E0C9010895DC01FC012381928114 -:1003E0008481F22FF81BF91719F481E090E0089549 -:1003F000E22FFF27892F99270197E823F9238D9171 -:100400009C911197E80FF91F60832F5FFD012383F3 -:1004100080E090E00895CF93DF93DC01EC012C8124 -:100420008B81281719F482E090E013C0E22FFF2798 -:10043000ED018A8199270197E823F9238D919C91F9 -:10044000E80FF91F8081FB0180832F5F2C8380E000 -:1004500090E0DF91CF9108958EBD0DB407FEFDCFE2 -:100460008EB599270895FF920F931F93182F062F8B -:10047000F42E299883E0F0DF812FEEDF802FECDF70 -:100480008F2DEADF80E0E8DF299A99271F910F91ED -:10049000FF900895FF920F931F93182F062FF42EAD -:1004A000299889E3D9DF812FD7DF802FD5DF8F2DE2 -:1004B000D3DF299A1F910F91FF9008951F93182F52 -:1004C000299881E0C9DF812FC7DF299A1F910895FC -:1004D000299884E0C1DF299A0895299886E0BCDF35 -:1004E000299A0895CF93DF9380E0E8DFC2E1D1E05D -:1004F000F4DF4A8169818881CDDF239681E0C333AF -:10050000D807B1F7DF91CF910895ECDFE6DF2998A6 -:1005100080E6A2DF299A0895299885E09DDF80E092 -:100520009BDF299A99270895EF92FF920F931F93CB -:10053000182F062FD7DFE02EE11AFF24102F129577 -:10054000107F13C0CADF299880E286DF802F829552 -:100550008F7082DF812F80DF80E07EDF299ADCDFF1 -:1005600080FDFDCF01501051FA948E2D8095F81624 -:1005700049F71F910F91FF90EF900895EF92FF922E -:100580000F931F93182F062FF42EE22EC5DF80FD48 -:10059000FDCFA3DF299882E05FDF812F5DDF802F11 -:1005A0005BDF8F2D59DF8E2D57DF299A1F910F9119 -:1005B000FF90EF900895289A29988BEA4DDF299AA9 -:1005C0000895289A299889EB47DF299A089510926F -:1005D000CA0210925C0120E040E060E08CEC80D424 -:1005E000289A299A08951F93CF93DF938091D3027D -:1005F000882309F4F5C01091CA02809188028823EB -:1006000009F48DC0112309F48AC0809188028117F2 -:1006100008F485C081E080936A0110926C01809398 -:100620006B0120E090E0312F315002C02F5F9F5FBF -:10063000931741F08F3F11F08E3F09F42F5F8D5FCC -:10064000A9F3F5CF892F880F890F8F5F20936C0155 -:1006500080936B019F5F90936A01299883E0FCDE91 -:1006600080E0FADE80916C01F7DE80916B01F4DEB0 -:10067000C2EFD1E080E0F0DE899381E0C83FD80787 -:10068000C9F71230A8F08091F301805F8093F301E5 -:100690008091F301807F8093F3018091F30188239F -:1006A00029F48091F2018F5F8093F2011092F4019E -:1006B000299A8091F201883090F58091F501883077 -:1006C00070F58091F201882321F48091F301843048 -:1006D00030F18091F601882321F48091F701843074 -:1006E000F0F09091F5018091F2019817C0F090918F -:1006F000F5018091F2019817B9F49091F60180917B -:10070000F301981760F09091F6018091F30198172A -:1007100059F49091F7018091F401891728F0109213 -:100720005C011092CA0268C0809107019091080193 -:1007300042DE299883E090DE8091F2018DDE809187 -:10074000F3018ADE8091F40187DE8AEF87BD109283 -:10075000D3026091880220E040E08CECC1D34CC011 -:1007600036DF4AC080E078DE2091FA01992702C086 -:10077000959587952A95E2F7682F809107019091CA -:1007800008012ADE8091F4018F5F8093F40180914B -:10079000F401882391F48091F3018F5F8093F3013A -:1007A0008091F301882349F48091F2018F5F809357 -:1007B000F2018091F201883099F29091F2018091DA -:1007C000F501981769F49091F3018091F60198175B -:1007D00039F49091F4018091F701981709F4C0CF92 -:1007E00080915801882341F480910701909108017C -:1007F000E6DD882309F4B6CFDF91CF911F910895EC -:100800001F9380913301882321F07FDE1092330102 -:100810002EC082DE80FD2BC011E0109333011092B8 -:100820005A012EEF40E060E080E0A8DE20E041E0E9 -:1008300060E080E0A3DE24E042E060E080E09EDE55 -:1008400020E043E060E080E099DE109288021092A0 -:10085000640120E040E060E08DEC42D360918802CA -:1008600020E0409164018BEC3BD310936E001F910C -:1008700008954091880283E0489FA00111244F5FB2 -:100880005F4F5093690140936801652F772780E09F -:10089000EADD8093F20140916801509169014F5F58 -:1008A0005F4F5093690140936801652F772780E07F -:1008B000DADD8093F30140916801509169014F5F47 -:1008C0005F4F5093690140936801652F772780E05F -:1008D000CADD8093F4018091F2019091F301829539 -:1008E000807F92959F70890F9927089581E080936A -:1008F0006B0110926C0110926A0140916B01609142 -:100900006C0180E0B0DD8F3FB9F080916C012091E7 -:100910006B01922F9F5F21F09F5F11F09F3F09F4C1 -:100920008F5F80936C012D5F20936B0180916A0132 -:100930008F5F80936A01E1CF80916A01815080933B -:100940006A0199270895FF920F931F93CF93DF9326 -:10095000CDB7DEB721970FB6F894DEBF0FBECDBF7F -:1009600080916701882309F08AC010926E008091FF -:100970008802882351F41092F20184E08093F301FD -:100980001092F40110926D0152C04091880283E0F0 -:10099000489FA00111244F5F5F4F5093690140931E -:1009A0006801652F772780E05EDD8093F20140913A -:1009B0006801509169014F5F5F4F50936901409307 -:1009C0006801652F772780E04EDD8093F301409129 -:1009D0006801509169014F5F5F4F509369014093E7 -:1009E0006801652F772780E03EDD8093F4018091D8 -:1009F000F301805F8093F3018091F301807F809306 -:100A0000F3018091F301882329F48091F2018F5F33 -:100A10008093F2011092F4019091F2018091F30120 -:100A20009295907F82958F70980F90936D01809131 -:100A3000070190910801BFDC8091F201883048F0F5 -:100A400085E08093670120E040E065E08DEC48D2CE -:100A500005C0809167018F5F8093670188E893E10B -:100A60009093600180935F01909362018093610194 -:100A70002091F3014091F20161E08DEC4FC1813092 -:100A800051F5F090F4010091F3011091F20125DD90 -:100A900029988FEAE1DC812FDFDC802FDDDC8F2DD0 -:100AA000DBDCBE016F5F7F4F8091070190910801F1 -:100AB000B2DC882311F4898101C080E8CDDC299A59 -:100AC000809167018F5F8093670181E08093D302FB -:100AD0001092660124C1823009F07EC08091D30259 -:100AE000882309F052C057C0E0910701F091080136 -:100AF000938184819817A9F181E0809366018AE04F -:100B000090E09093600180935F01909362018093E5 -:100B1000610129988FEAA0DCBE016F5F7F4F809151 -:100B200007019091080177DC898196DC299A8091F0 -:100B3000F4018F5F8093F4018091F401882371F4B4 -:100B40008091F3018F5F8093F3018091F3018823FB -:100B500029F48091F2018F5F8093F201DDDC80FD4A -:100B6000FDCF80915F0190916001892B09F4B6C09F -:100B70008091F201873049F48091F3018F3F29F48D -:100B80008091F4018F3F09F4A9C080915801882316 -:100B900009F4AACFC4C09CDC80916601882399F037 -:100BA0004091F2018091F3014295407F82958F70D0 -:100BB000480F4093640180916D01481B20E062E082 -:100BC0008DEC8ED187C020E040E066E08DEC88D1CE -:100BD00085E080936701A3C0833091F58091650122 -:100BE000813011F484E027C0823039F520E040E004 -:100BF00064E08DEC75D190916D01992371F481E0E1 -:100C000080935A018AE090E09093620180936101A1 -:100C10001092670110925B0110C06091F201809107 -:100C2000F3016295607F82958F70680F6093640115 -:100C3000892F7ADC85E080936701109265016FC08F -:100C4000843009F04EC020E040E063E08DEC48D1F4 -:100C5000809188028F5F809388024091880283E0B0 -:100C6000489FA00111244F5F5F4F5093690140934B -:100C700068012091F201652F772780E07FDC4091A9 -:100C80006801509169014F5F5F4F50936901409334 -:100C900068012091F301652F772780E06FDC409198 -:100CA0006801509169014F5F5F4F50936901409314 -:100CB00068012091F401652F772780E05FDC909137 -:100CC000F2018091F3019295907F82958F70980F39 -:100CD00090936401809167018F5F7BCF1092D30264 -:100CE0001EC08530E1F402DE809388028AE090E045 -:100CF00090936201809361011092670110925B01F1 -... [truncated message content] |
|
From: Paul_R <c2m...@c2...> - 2008-07-18 13:49:33
|
Author: Paul_R
Date: 2008-07-18 15:49:38 +0200 (Fri, 18 Jul 2008)
New Revision: 1342
Modified:
software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/waitingLoop.java
software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
Log:
* Bug with the spin button icon.
* Removed unused part of code.
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/waitingLoop.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/waitingLoop.java 2008-07-18 09:35:11 UTC (rev 1341)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/control/waitingLoop.java 2008-07-18 13:49:38 UTC (rev 1342)
@@ -17,14 +17,8 @@
{
refreshChargerImg();
win.spinChargerImg = false;
+ win.spinButtonActive = false;
}
-
- if (win.ledRunning)
- {
- wait(1000);
- control.checkLedsStatus();
- win.ledRunning = false;
- }
try {
Thread.sleep(100);
Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-18 09:35:11 UTC (rev 1341)
+++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/mainWindow.java 2008-07-18 13:49:38 UTC (rev 1342)
@@ -787,7 +787,7 @@
private boolean eyesButtonActive = false;
private boolean mouthButtonActive = false;
private boolean flippersButtonActive = false;
- private boolean spinButtonActive = false;
+ public boolean spinButtonActive = false;
public boolean ledsButtonActive = false;
public boolean spinChargerImg = false;
|
|
From: Paul_R <c2m...@c2...> - 2008-07-18 09:35:02
|
Author: Paul_R Date: 2008-07-18 11:35:11 +0200 (Fri, 18 Jul 2008) New Revision: 1341 Removed: software_suite_v2/software/tools/tuxController/.classpath software_suite_v2/software/tools/tuxController/.project Modified: software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties Log: * Finished the french translation * Deleted the .classpath and .project from the tree. Deleted: software_suite_v2/software/tools/tuxController/.classpath =================================================================== --- software_suite_v2/software/tools/tuxController/.classpath 2008-07-18 09:09:41 UTC (rev 1340) +++ software_suite_v2/software/tools/tuxController/.classpath 2008-07-18 09:35:11 UTC (rev 1341) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: software_suite_v2/software/tools/tuxController/.project =================================================================== --- software_suite_v2/software/tools/tuxController/.project 2008-07-18 09:09:41 UTC (rev 1340) +++ software_suite_v2/software/tools/tuxController/.project 2008-07-18 09:35:11 UTC (rev 1341) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>tuxController</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Modified: software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties =================================================================== --- software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties 2008-07-18 09:09:41 UTC (rev 1340) +++ software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle_fr.properties 2008-07-18 09:35:11 UTC (rev 1341) @@ -37,7 +37,7 @@ # Advanced control : flippers lblFlippers=Ailes -lblFlippersSpeed=Speed +lblFlippersSpeed=Vitesse radFlippersCount=cycles radFlippersDuring=sec. @@ -45,7 +45,7 @@ lblSpin=Rotation radSpinCount=cycles radSpinDuring=sec. -lblSpinSpeed=Speed +lblSpinSpeed=Vitesse radSpinLeft=Gauche radSpinRight=Droite @@ -56,8 +56,8 @@ # LEDs panel lblLeds=LEDs lblLedsEffectNone=aucun -lblLedsEffectFade=fading -lblLedsEffectGradiant=gradiant +lblLedsEffectFade=fondu +lblLedsEffectGradiant=paliers lblLedsIntensity=IntensitlblLedsSpeed=Vitesse |
|
From: Paul_R <c2m...@c2...> - 2008-07-18 09:09:31
|
Author: Paul_R Date: 2008-07-18 11:09:41 +0200 (Fri, 18 Jul 2008) New Revision: 1340 Added: software_suite_v2/software/tools/tuxController/trunk/.classpath software_suite_v2/software/tools/tuxController/trunk/.project Log: * Forget to move .classpath and .project Copied: software_suite_v2/software/tools/tuxController/trunk/.classpath (from rev 1339, software_suite_v2/software/tools/tuxController/.classpath) =================================================================== --- software_suite_v2/software/tools/tuxController/trunk/.classpath (rev 0) +++ software_suite_v2/software/tools/tuxController/trunk/.classpath 2008-07-18 09:09:41 UTC (rev 1340) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> +</classpath> Copied: software_suite_v2/software/tools/tuxController/trunk/.project (from rev 1339, software_suite_v2/software/tools/tuxController/.project) =================================================================== --- software_suite_v2/software/tools/tuxController/trunk/.project (rev 0) +++ software_suite_v2/software/tools/tuxController/trunk/.project 2008-07-18 09:09:41 UTC (rev 1340) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tuxController</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> |
|
From: Paul_R <c2m...@c2...> - 2008-07-18 09:05:42
|
Author: Paul_R Date: 2008-07-18 11:05:50 +0200 (Fri, 18 Jul 2008) New Revision: 1339 Added: software_suite_v2/software/tools/tuxController/branches/ software_suite_v2/software/tools/tuxController/tags/ software_suite_v2/software/tools/tuxController/trunk/ software_suite_v2/software/tools/tuxController/trunk/src/ Removed: software_suite_v2/software/tools/tuxController/src/ Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/advancedViewPanel.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/controlPanel.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/generalControlPanel.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/ledPanel.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/levelPanel.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/objects.java software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/tuxPanel.java software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.java software_suite_v2/software/tools/tuxController/trunk/src/tuxController/main.java Log: * Moved tuxController/src to tuxController/trunk/src Copied: software_suite_v2/software/tools/tuxController/trunk/src (from rev 1338, software_suite_v2/software/tools/tuxController/src) Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/advancedViewPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/advancedViewPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; import i18n.bundle; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/controlPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/controlPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; import i18n.bundle; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/generalControlPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/generalControlPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/ledPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/ledPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/levelPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/levelPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/objects.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/objects.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; Modified: software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/tuxPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/tuxPanel.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/GUI/componants/tuxPanel.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package GUI.componants; import java.awt.GridBagConstraints; Modified: software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/i18n/bundle.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/i18n/bundle.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package i18n; Modified: software_suite_v2/software/tools/tuxController/trunk/src/tuxController/main.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/tuxController/main.java 2008-07-18 08:53:59 UTC (rev 1338) +++ software_suite_v2/software/tools/tuxController/trunk/src/tuxController/main.java 2008-07-18 09:05:50 UTC (rev 1339) @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id:$ */ +/* $Id$ */ package tuxController; |
|
From: Paul_R <c2m...@c2...> - 2008-07-18 08:53:50
|
Author: Paul_R
Date: 2008-07-18 10:53:59 +0200 (Fri, 18 Jul 2008)
New Revision: 1338
Modified:
software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
Log:
* Added the gadget icon on the title bar
Modified: software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java 2008-07-18 08:38:48 UTC (rev 1337)
+++ software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java 2008-07-18 08:53:59 UTC (rev 1338)
@@ -26,7 +26,6 @@
import GUI.control.controlTux;
import GUI.control.ledsThread;
import GUI.control.waitingLoop;
-
import java.util.*;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
@@ -108,7 +107,13 @@
private void createMainWindow() {
/* Main layout */
thisLayout = new GridBagLayout();
+ this.setIconImage(new javax.swing.ImageIcon(getClass().getResource(
+ "/GUI/images/gadget.png")).getImage());
+
this.setTitle(bundle.getString("windowTitle")); //$NON-NLS-1$
+
+
+
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
dimWin = new java.awt.Dimension(400, 590); // 396, 592
this.setPreferredSize(new java.awt.Dimension(400, 600)); // 756, 591
@@ -957,7 +962,7 @@
public javax.swing.ImageIcon iconLight;
public javax.swing.ImageIcon iconBattery;
public javax.swing.ImageIcon iconMicro;
-
+
/* Misc objects */
public java.awt.Dimension dimWin;
public java.awt.Dimension dimProg;
|
|
From: Paul_R <c2m...@c2...> - 2008-07-18 08:38:43
|
Author: Paul_R Date: 2008-07-18 10:38:48 +0200 (Fri, 18 Jul 2008) New Revision: 1337 Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle.java software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties Log: * Added headers on the .properties files Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/i18n/bundle.java 2008-07-18 08:36:14 UTC (rev 1336) +++ software_suite_v2/software/tools/tuxController/src/i18n/bundle.java 2008-07-18 08:38:48 UTC (rev 1337) @@ -1,3 +1,24 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + package i18n; import java.util.MissingResourceException; Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties =================================================================== --- software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties 2008-07-18 08:36:14 UTC (rev 1336) +++ software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties 2008-07-18 08:38:48 UTC (rev 1337) @@ -1,3 +1,24 @@ +## + # TuxController - Gadget for the TuxDroid software suite. + # Copyright (C) 2007 C2ME S.A. <tux...@c2...> + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## + +## $Id:$ + # Window title windowTitle=Tux Controller Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties =================================================================== --- software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties 2008-07-18 08:36:14 UTC (rev 1336) +++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties 2008-07-18 08:38:48 UTC (rev 1337) @@ -1,3 +1,24 @@ +## + # TuxController - Gadget for the TuxDroid software suite. + # Copyright (C) 2007 C2ME S.A. <tux...@c2...> + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## + +## $Id:$ + # Window title windowTitle=Tux Controller Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties =================================================================== --- software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties 2008-07-18 08:36:14 UTC (rev 1336) +++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties 2008-07-18 08:38:48 UTC (rev 1337) @@ -1,3 +1,24 @@ +## + # TuxController - Gadget for the TuxDroid software suite. + # Copyright (C) 2007 C2ME S.A. <tux...@c2...> + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## + +## $Id:$ + # Window title windowTitle=Control du robot |
|
From: Paul_R <c2m...@c2...> - 2008-07-18 08:36:13
|
Author: Paul_R
Date: 2008-07-18 10:36:14 +0200 (Fri, 18 Jul 2008)
New Revision: 1336
Added:
software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties
software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties
Removed:
software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_GB.properties
software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_US.properties
software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr_FR.properties
Modified:
software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java
software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties
Log:
* Removed the region on the locale files.
* Improved the GUI
Modified: software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java
===================================================================
--- software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java 2008-07-17 14:42:49 UTC (rev 1335)
+++ software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java 2008-07-18 08:36:14 UTC (rev 1336)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
package GUI.componants;
import i18n.bundle;
@@ -139,7 +139,7 @@
win.btnTTSPlay = new JButton();
win.panTTSButtons.add(win.btnTTSPlay);
win.btnTTSPlay.setText(bundle.getString("btnTTSPlay")); //$NON-NLS-1$
- win.btnTTSPlay.setBounds(300, 5, 70, 20);
+ win.btnTTSPlay.setBounds(270, 5, 100, 20);
win.btnTTSPlay.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent evt) {
win.btnTTSPlayMouseClicked(evt);
@@ -149,7 +149,7 @@
win.btnTTSStop = new JButton();
win.panTTSButtons.add(win.btnTTSStop);
win.btnTTSStop.setText(bundle.getString("btnTTSStop")); //$NON-NLS-1$
- win.btnTTSStop.setBounds(220, 5, 70, 20);
+ win.btnTTSStop.setBounds(155, 5, 100, 20);
win.btnTTSStop.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent evt) {
win.btnTTSStopMouseClicked(evt);
@@ -183,7 +183,7 @@
win.lblTTSPitch = new JLabel();
win.panTTSConfig.add(win.lblTTSPitch);
win.lblTTSPitch.setText(bundle.getString("lblTTSPitch")); //$NON-NLS-1$
- win.lblTTSPitch.setBounds(120, 70, 70, 25);
+ win.lblTTSPitch.setBounds(120, 70, 250, 25);
}
}
Modified: software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties 2008-07-17 14:42:49 UTC (rev 1335)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -45,4 +45,4 @@
textTTS=Hello world
btnTTSPlay=Play
btnTTSStop=Stop
-lblPitch=Pitch
+lblTTSPitch=Pitch
Added: software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties (rev 0)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_en.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -0,0 +1,48 @@
+# Window title
+windowTitle=Tux Controller
+
+# Check box : advanced view
+chkAdvancedView=Advanced view
+
+# Advanced control : eyes
+lblEyes=Eyes
+radEyesCount=cycles
+radEyesDuring=sec.
+
+# Advanced control : mouth
+lblMouth=Mouth
+radMouthCount=cycles
+radMouthDuring=sec.
+
+# Advanced control : flippers
+lblFlippers=Flippers
+lblFlippersSpeed=Speed
+radFlippersCount=cycles
+radFlippersDuring=sec.
+
+# Advanced control : spinning
+lblSpin=Spinning
+radSpinCount=cycles
+radSpinDuring=sec.
+lblSpinSpeed=Speed
+radSpinLeft=Left
+radSpinRight=Right
+
+# General panel
+lblGeneral=General
+btnGeneral=Stop all movements
+
+# LEDs panel
+lblLeds=LEDs
+lblLedsEffectNone=none
+lblLedsEffectFade=fading
+lblLedsEffectGradiant=gradiant
+lblLedsIntensity=Intensity
+lblLedsSpeed=Speed
+
+# TTS panel
+chkTTS=TTS
+textTTS=Hello world
+btnTTSPlay=Play
+btnTTSStop=Stop
+lblTTSPitch=Pitch
Deleted: software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_GB.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_GB.properties 2008-07-17 14:42:49 UTC (rev 1335)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_GB.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -1,48 +0,0 @@
-# Window title
-windowTitle=Tux Controller
-
-# Check box : advanced view
-chkAdvancedView=Advanced view
-
-# Advanced control : eyes
-lblEyes=Eyes
-radEyesCount=cycles
-radEyesDuring=sec.
-
-# Advanced control : mouth
-lblMouth=Mouth
-radMouthCount=cycles
-radMouthDuring=sec.
-
-# Advanced control : flippers
-lblFlippers=Flippers
-lblFlippersSpeed=Speed
-radFlippersCount=cycles
-radFlippersDuring=sec.
-
-# Advanced control : spinning
-lblSpin=Spinning
-radSpinCount=cycles
-radSpinDuring=sec.
-lblSpinSpeed=Speed
-radSpinLeft=Left
-radSpinRight=Right
-
-# General panel
-lblGeneral=General
-btnGeneral=Stop all movements
-
-# LEDs panel
-lblLeds=LEDs
-lblLedsEffectNone=none
-lblLedsEffectFade=fading
-lblLedsEffectGradiant=gradiant
-lblLedsIntensity=Intensity
-lblLedsSpeed=Speed
-
-# TTS panel
-chkTTS=TTS
-textTTS=Hello world
-btnTTSPlay=Play
-btnTTSStop=Stop
-lblPitch=Pitch
Deleted: software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_US.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_US.properties 2008-07-17 14:42:49 UTC (rev 1335)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_US.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -1,48 +0,0 @@
-# Window title
-windowTitle=Tux Controller
-
-# Check box : advanced view
-chkAdvancedView=Advanced view
-
-# Advanced control : eyes
-lblEyes=Eyes
-radEyesCount=cycles
-radEyesDuring=sec.
-
-# Advanced control : mouth
-lblMouth=Mouth
-radMouthCount=cycles
-radMouthDuring=sec.
-
-# Advanced control : flippers
-lblFlippers=Flippers
-lblFlippersSpeed=Speed
-radFlippersCount=cycles
-radFlippersDuring=sec.
-
-# Advanced control : spinning
-lblSpin=Spinning
-radSpinCount=cycles
-radSpinDuring=sec.
-lblSpinSpeed=Speed
-radSpinLeft=Left
-radSpinRight=Right
-
-# General panel
-lblGeneral=General
-btnGeneral=Stop all movements
-
-# LEDs panel
-lblLeds=LEDs
-lblLedsEffectNone=none
-lblLedsEffectFade=fading
-lblLedsEffectGradiant=gradiant
-lblLedsIntensity=Intensity
-lblLedsSpeed=Speed
-
-# TTS panel
-chkTTS=TTS
-textTTS=Hello world
-btnTTSPlay=Play
-btnTTSStop=Stop
-lblPitch=Pitch
Added: software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties (rev 0)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -0,0 +1,48 @@
+# Window title
+windowTitle=Control du robot
+
+# Check box : advanced view
+chkAdvancedView=Panneau avanc
+# Advanced control : eyes
+lblEyes=Yeux
+radEyesCount=cycles
+radEyesDuring=sec.
+
+# Advanced control : mouth
+lblMouth=Bec
+radMouthCount=cycles
+radMouthDuring=sec.
+
+# Advanced control : flippers
+lblFlippers=Ailes
+lblFlippersSpeed=Speed
+radFlippersCount=cycles
+radFlippersDuring=sec.
+
+# Advanced control : spinning
+lblSpin=Rotation
+radSpinCount=cycles
+radSpinDuring=sec.
+lblSpinSpeed=Speed
+radSpinLeft=Gauche
+radSpinRight=Droite
+
+# General panel
+lblGeneral=General
+btnGeneral=Arreter tous les mouvement
+
+# LEDs panel
+lblLeds=LEDs
+lblLedsEffectNone=aucun
+lblLedsEffectFade=fading
+lblLedsEffectGradiant=gradiant
+lblLedsIntensity=IntensitlblLedsSpeed=Vitesse
+
+# TTS panel
+chkTTS=TTS
+textTTS=Bonjour le monde
+btnTTSPlay=Lecture
+btnTTSStop=Stop
+lblTTSPitch=Hauteur du son
Deleted: software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr_FR.properties
===================================================================
--- software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr_FR.properties 2008-07-17 14:42:49 UTC (rev 1335)
+++ software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr_FR.properties 2008-07-18 08:36:14 UTC (rev 1336)
@@ -1,48 +0,0 @@
-# Window title
-windowTitle=Control du robot
-
-# Check box : advanced view
-chkAdvancedView=Panneau avanc
-# Advanced control : eyes
-lblEyes=Yeux
-radEyesCount=cycles
-radEyesDuring=sec.
-
-# Advanced control : mouth
-lblMouth=Bec
-radMouthCount=cycles
-radMouthDuring=sec.
-
-# Advanced control : flippers
-lblFlippers=Ailes
-lblFlippersSpeed=Speed
-radFlippersCount=cycles
-radFlippersDuring=sec.
-
-# Advanced control : spinning
-lblSpin=Rotation
-radSpinCount=cycles
-radSpinDuring=sec.
-lblSpinSpeed=Speed
-radSpinLeft=Left
-radSpinRight=Right
-
-# General panel
-lblGeneral=General
-btnGeneral=Arreter tous les mouvement
-
-# LEDs panel
-lblLeds=LEDs
-lblLedsEffectNone=aucun
-lblLedsEffectFade=fading
-lblLedsEffectGradiant=gradiant
-lblLedsIntensity=IntensitlblLedsSpeed=Vitesse
-
-# TTS panel
-chkTTS=TTS
-textTTS=Bonjour le monde
-btnTTSPlay=Lecture
-btnTTSStop=Stop
-lblPitch=Hauteur du son
|
|
From: Paul_R <c2m...@c2...> - 2008-07-17 14:42:40
|
Author: Paul_R
Date: 2008-07-17 16:42:49 +0200 (Thu, 17 Jul 2008)
New Revision: 1335
Modified:
software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
Log:
* Fix bug with the radio connection state
* Fix bug with the speed sliders
Modified: software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java
===================================================================
--- software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java 2008-07-17 13:52:34 UTC (rev 1334)
+++ software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java 2008-07-17 14:42:49 UTC (rev 1335)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
package GUI.control;
import GUI.mainWindow;
@@ -111,7 +111,7 @@
"onSpinCounter");
tux.event.handler.register(TuxAPIConst.ST_NAME_RADIO_STATE, this,
- "onRadioConnected");
+ "onRadioConnected", "True", null);
}
/* EYES CONTROL ----------------------------------------------------------*/
@@ -213,8 +213,8 @@
* @param count Nb of movements.
* @param fs Final state
*/
- public void moveFlippers(int count, String fs) {
- tux.flippers.onAsync(count, fs);
+ public void moveFlippers(int count, String fs, Integer speed) {
+ tux.flippers.onAsync(count, fs, speed);
}
/**
@@ -258,7 +258,7 @@
* @param value The nb of turn.
* @param dir The direction.
*/
- public void spinOn(Integer value, String dir) {
+ public void spinOn(Integer value, String dir, Integer speed) {
String charger = (String)tux.status.requestOne("charger_state")[0];
Double val = value.doubleValue();
if (!charger.equalsIgnoreCase("UNPLUGGED"))
@@ -268,9 +268,9 @@
}
if (dir.equalsIgnoreCase(TuxAPIConst.SSV_RIGHT))
- tux.spinning.leftOnAsync(val / 4, TuxAPIConst.SPV_VERYFAST);
+ tux.spinning.leftOnAsync(val / 4, speed);
else
- tux.spinning.rightOnAsync(val / 4, TuxAPIConst.SPV_VERYFAST);
+ tux.spinning.rightOnAsync(val / 4, speed);
}
/**
Modified: software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java
===================================================================
--- software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java 2008-07-17 13:52:34 UTC (rev 1334)
+++ software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java 2008-07-17 14:42:49 UTC (rev 1335)
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id:$ */
+/* $Id$ */
package GUI;
@@ -368,7 +368,7 @@
if (radFlippers.getSelection().equals(radFlippersCount.getModel()))
{
control.moveFlippers((Integer) spinFlippers.getValue() * 2,
- TuxAPIConst.SSV_NDEF);
+ TuxAPIConst.SSV_NDEF, (Integer) slideFlippers.getValue());
btnFlippersRun.setIcon(iconStop);
flippersButtonActive = true;
}
@@ -445,12 +445,14 @@
if (radSpin.getSelection().equals(radSpinCount.getModel()))
{
- control.spinOn((Integer) spinSpin.getValue(), dir);
+ control.spinOn((Integer) spinSpin.getValue(), dir,
+ (Integer) slideSpin.getValue());
btnSpinRun.setIcon(iconStop);
spinButtonActive = true;
}
else
{
+ System.out.println((Integer) slideSpin.getValue());
control.spinDuring((Double) spinSpin.getValue(),
(Integer) slideSpin.getValue(), dir);
if ((Double) spinSpin.getValue() >= 0.5)
|
|
From: jaguarondi <c2m...@c2...> - 2008-07-17 13:52:25
|
Author: jaguarondi
Date: 2008-07-17 15:52:34 +0200 (Thu, 17 Jul 2008)
New Revision: 1334
Modified:
firmware/rf/trunk/main.c
firmware/rf/trunk/prot.c
firmware/rf/trunk/rf_ctrl.c
firmware/rf/trunk/varis.c
firmware/rf/trunk/varis.h
Log:
* Better separation of master and slave with definitions.
Modified: firmware/rf/trunk/main.c
===================================================================
--- firmware/rf/trunk/main.c 2008-07-17 13:52:10 UTC (rev 1333)
+++ firmware/rf/trunk/main.c 2008-07-17 13:52:34 UTC (rev 1334)
@@ -74,7 +74,7 @@
*/
int main(void)
{
-#ifdef _SLAVE
+#if defined(_SLAVE)
volatile uint16_t _count=0;
/* Wait for the head button signal to rise if it isn't pressed. */
for (;_count<0xFFFF; _count++);
Modified: firmware/rf/trunk/prot.c
===================================================================
--- firmware/rf/trunk/prot.c 2008-07-17 13:52:10 UTC (rev 1333)
+++ firmware/rf/trunk/prot.c 2008-07-17 13:52:34 UTC (rev 1334)
@@ -118,9 +118,7 @@
if(rf_rx_state==0xFF){//something received
if(checksum==0x00){//correct received
//pwr_dwn_atr2406();
-
rf_rx_state = 0x00;
- rf_status |= SLAVE;
j = TCNT1;
/* XXX have to change this so ts isn't global anymore */
@@ -129,7 +127,6 @@
j = j << 3;
OCR1A = T_SYNC - j;
start_rf_timer();
-
return;
}
}
@@ -141,7 +138,6 @@
#endif
/* MASTER mode. */
- rf_status |= MASTER;
pwr_dwn_atr2406();
pwr_up_atr2406();
start_rf_timer();
Modified: firmware/rf/trunk/rf_ctrl.c
===================================================================
--- firmware/rf/trunk/rf_ctrl.c 2008-07-17 13:52:10 UTC (rev 1333)
+++ firmware/rf/trunk/rf_ctrl.c 2008-07-17 13:52:34 UTC (rev 1334)
@@ -224,19 +224,11 @@
rf_buffer_rx = rf_buffer_rx_full;
rf_buffer_rx_full = p;
}
-
- if (rf_status & SLAVE)
- /* SLAVE, resynchronized already. */
- {
- //OCR1A = ts + T_SYNC - T_LATENCY;
- }
- else
- /* MASTER */
- {
- OCR1A = OCR1A + T_PWR_DWN;
- }
}
+#if defined(_SLAVE)
+ /* If slave, synchronisation occurs when a frame is received. */
else
+#endif
/* Wrong frame, just continue. */
{
OCR1A = OCR1A + T_PWR_DWN;
@@ -248,14 +240,12 @@
//PORTD ^= 0x08; // XXX DEBUG
}
-volatile uint16_t testt = T_HEADER;
/*
* Setup 16 bit timer1 which is used to generate all RF related timings.
* We're using a crystal @ sys_clk = 13.824 MHz
*/
void start_rf_timer(void)
{
- testt = T_PWR_DWN;
TCNT1H = 0x00;
TCNT1L = 0x00;
TCCR1A = 0x00;
Modified: firmware/rf/trunk/varis.c
===================================================================
--- firmware/rf/trunk/varis.c 2008-07-17 13:52:10 UTC (rev 1333)
+++ firmware/rf/trunk/varis.c 2008-07-17 13:52:34 UTC (rev 1334)
@@ -73,8 +73,6 @@
-volatile uint8_t rf_status;
-//Satus of the RF - Task (Locked or Unlocked)
volatile uint8_t channel;
//Currently used RF - Channel
uint8_t channel_width;
Modified: firmware/rf/trunk/varis.h
===================================================================
--- firmware/rf/trunk/varis.h 2008-07-17 13:52:10 UTC (rev 1333)
+++ firmware/rf/trunk/varis.h 2008-07-17 13:52:34 UTC (rev 1334)
@@ -52,7 +52,6 @@
extern uint8_t volatile *rf_buffer_rx;
extern uint8_t volatile *rf_buffer_rx_full;
extern uint8_t sof_ary[];
-extern volatile uint8_t rf_status;
extern volatile uint8_t channel;
extern uint8_t channel_width;
extern volatile uint8_t tx_pac_len;
|
|
From: Paul_R <c2m...@c2...> - 2008-07-17 13:52:09
|
Author: Paul_R Date: 2008-07-17 15:52:10 +0200 (Thu, 17 Jul 2008) New Revision: 1333 Added: software_suite_v2/software/ software_suite_v2/software/tools/ software_suite_v2/software/tools/tuxController/ software_suite_v2/software/tools/tuxController/.classpath software_suite_v2/software/tools/tuxController/.project software_suite_v2/software/tools/tuxController/src/ software_suite_v2/software/tools/tuxController/src/GUI/ software_suite_v2/software/tools/tuxController/src/GUI/JVerticalLabel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/ software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java software_suite_v2/software/tools/tuxController/src/GUI/componants/tuxPanel.java software_suite_v2/software/tools/tuxController/src/GUI/control/ software_suite_v2/software/tools/tuxController/src/GUI/control/controlTux.java software_suite_v2/software/tools/tuxController/src/GUI/control/ledsThread.java software_suite_v2/software/tools/tuxController/src/GUI/control/waitingLoop.java software_suite_v2/software/tools/tuxController/src/GUI/images/ software_suite_v2/software/tools/tuxController/src/GUI/images/flippersDown.png software_suite_v2/software/tools/tuxController/src/GUI/images/flippersUp.png software_suite_v2/software/tools/tuxController/src/GUI/images/gadget.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconBattery.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconDown.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconLeft.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconLight.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconMicro.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconRight.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconRun.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconStop.png software_suite_v2/software/tools/tuxController/src/GUI/images/iconUp.png software_suite_v2/software/tools/tuxController/src/GUI/images/leftEyeClosed.png software_suite_v2/software/tools/tuxController/src/GUI/images/leftEyeOff.png software_suite_v2/software/tools/tuxController/src/GUI/images/leftEyeOn.png software_suite_v2/software/tools/tuxController/src/GUI/images/mouthClosed.png software_suite_v2/software/tools/tuxController/src/GUI/images/mouthOpened.png software_suite_v2/software/tools/tuxController/src/GUI/images/rightEyeClosed.png software_suite_v2/software/tools/tuxController/src/GUI/images/rightEyeOff.png software_suite_v2/software/tools/tuxController/src/GUI/images/rightEyeOn.png software_suite_v2/software/tools/tuxController/src/GUI/images/spinCharging.png software_suite_v2/software/tools/tuxController/src/GUI/images/spinLeft.png software_suite_v2/software/tools/tuxController/src/GUI/images/spinOff.png software_suite_v2/software/tools/tuxController/src/GUI/images/spinRight.png software_suite_v2/software/tools/tuxController/src/GUI/mainWindow.java software_suite_v2/software/tools/tuxController/src/i18n/ software_suite_v2/software/tools/tuxController/src/i18n/bundle.java software_suite_v2/software/tools/tuxController/src/i18n/bundle.properties software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_GB.properties software_suite_v2/software/tools/tuxController/src/i18n/bundle_en_US.properties software_suite_v2/software/tools/tuxController/src/i18n/bundle_fr_FR.properties software_suite_v2/software/tools/tuxController/src/tuxController/ software_suite_v2/software/tools/tuxController/src/tuxController/main.java Log: * First import of the tux controller gadget. - GUI almost done. - Functionnalities done. - Internalization : fr-FR, en-US, en-GB (default : english). The API isn't included on the source directory. To open the project, copy the java api to src/ (src/com/tuxisalive/api/). Added: software_suite_v2/software/tools/tuxController/.classpath =================================================================== --- software_suite_v2/software/tools/tuxController/.classpath (rev 0) +++ software_suite_v2/software/tools/tuxController/.classpath 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: software_suite_v2/software/tools/tuxController/.project =================================================================== --- software_suite_v2/software/tools/tuxController/.project (rev 0) +++ software_suite_v2/software/tools/tuxController/.project 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>tuxController</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: software_suite_v2/software/tools/tuxController/src/GUI/JVerticalLabel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/JVerticalLabel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/JVerticalLabel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,79 @@ +/* This file is part of "TuxDroid Control Center". + * Copyright 2008, kysoh + * Author : Jérôme conan + * eMail : jer...@ky... + * Site : http://www.kysoh.com/ + * + * "TuxDroid Control Center" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid Control Center" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid Control Center"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package GUI; + +import javax.swing.*; +import java.awt.*; + +public class JVerticalLabel extends JLabel{ + /** + * + */ + private static final long serialVersionUID = 1L; + private String txt; + private byte hpos = 0; + private byte vpos = 0; + private float translation = 0; + + public JVerticalLabel(String s, float trans){ + super(); + txt = s; + translation = trans; + } + + public void paintComponent(Graphics g){ + Graphics2D g2d = (Graphics2D)g; + g2d.translate(12.0, translation); + g2d.rotate(4.712389); + if(txt != null){ + g2d.drawString(txt, this.vpos, this.hpos); + } + } + + public void setBounds(Rectangle rect){ + this.setBounds(rect); + } + + public void setHorizontalAlignment(int alignement){ + this.hpos = (byte)alignement; + } + + public void setVerticalAlignment(int alignement){ + this.vpos = (byte)alignement; + } + + public void setSize(Dimension dim){ + super.setSize(dim); + setPreferredSize(dim); + setMinimumSize(dim); + repaint(); + } + + public void setSize(int width, int height){ + super.setSize(width, height); + setPreferredSize(new Dimension(width, height)); + setMinimumSize(new Dimension(width, height)); + repaint(); + } +} + Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/JVerticalLabel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,70 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; +import i18n.bundle; + +import java.awt.GridBagConstraints; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JCheckBox; + +import GUI.mainWindow; + +/** + * Advanced view panel + * @author paul + * + */ +public class advancedViewPanel { + private mainWindow win; + + /** + * Create the advanced view panel. + * @param inst a ainWindow instance. + */ + public advancedViewPanel(mainWindow inst) { + win = inst; + createAdvancedViewSection(); + } + + /** + * Create the panel with the checkbox. + */ + private void createAdvancedViewSection() { + win.chkAdvancedView = new JCheckBox(); + win.getContentPane().add(win.chkAdvancedView, + new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.WEST, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.chkAdvancedView.setText(bundle.getString("chkAdvancedView")); //$NON-NLS-1$ + win.chkAdvancedView.setMargin(new java.awt.Insets(2, 10, 2, 1)); + + win.chkAdvancedView.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + win.chkAdvancedViewActionPerformed(evt); + } + }); + } +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/advancedViewPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,476 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; +import i18n.bundle; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JSeparator; +import javax.swing.JSlider; +import javax.swing.JSpinner; +import javax.swing.SwingConstants; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import GUI.JVerticalLabel; +import GUI.mainWindow; + +/** + * Create the control panel + * @author paul + * + */ +public class controlPanel { + + private mainWindow win; + + /** + * Create the control panel. + * @param inst a mainWindow instance. + */ + public controlPanel(mainWindow inst) { + win = inst; + + createPanel(); + dummyPanel(); + + createEyesPanel(); + eyesSeparators(); + eyesObjects(); + + createMouthPanel(); + mouthSeparators(); + mouthObjects(); + + createFlippersPanel(); + flippersSeparators(); + flippersObjects(); + + createSpinPanel(); + spinSeparators(); + spinObjects(); + } + + /** + * Create the main panel. + */ + private void createPanel() { + win.panMainCtl = new JPanel(); + win.getContentPane().add(win.panMainCtl, + new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panMainCtl.setLayout(null); + + win.panCtl = new JPanel(); + win.panMainCtl.add(win.panCtl); + win.panCtl.setBounds(0, 0, 360, 390); + java.awt.Dimension panDim = new java.awt.Dimension(360, 390); + GridBagLayout panControlLayout = new GridBagLayout(); + win.panCtl.setLayout(panControlLayout); + win.panCtl.setMaximumSize(panDim); + win.panCtl.setMinimumSize(panDim); + panControlLayout.rowWeights = new double[] {0.1, 0.1, 0.1, 0.1, 0.0}; + panControlLayout.rowHeights = new int[] {10, 79, 62, 142, 97}; + panControlLayout.columnWeights = new double[] {0.0}; + panControlLayout.columnWidths = new int[] {360}; + } + + /** + * Create a dummy panel, only used for the alignment. + */ + private void dummyPanel() { + win.panDummyCtl = new JPanel(); + win.panCtl.add(win.panDummyCtl, + new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panDummyCtl.setLayout(null); + + dummySeparators(); + } + + /** + * Create the dummy separators. + */ + private void dummySeparators() { + win.sepDummy1 = new JSeparator(); + win.panDummyCtl.add(win.sepDummy1); + win.sepDummy1.setBounds(2, 4, 2, 6); + win.sepDummy1.setOrientation(SwingConstants.VERTICAL); + + win.sepDummy2 = new JSeparator(); + win.panDummyCtl.add(win.sepDummy2); + win.sepDummy2.setBounds(18, 4, 2, 6); + win.sepDummy2.setOrientation(SwingConstants.VERTICAL); + } + + /** + * Create the eyes control panel. + */ + private void createEyesPanel() { + win.panEyesCtl = new JPanel(); + win.panCtl.add(win.panEyesCtl, + new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panEyesCtl.setLayout(null); + } + + /** + * Create the eyes panel separators and label. + */ + private void eyesSeparators() { + win.sepEyes1 = new JSeparator(); + win.panEyesCtl.add(win.sepEyes1); + win.sepEyes1.setBounds(2, 0, 2, 75); + win.sepEyes1.setOrientation(SwingConstants.VERTICAL); + + win.sepEyes2 = new JSeparator(); + win.panEyesCtl.add(win.sepEyes2); + win.sepEyes2.setBounds(18, 0, 2, 75); + win.sepEyes2.setOrientation(SwingConstants.VERTICAL); + + win.lblEyes = new JVerticalLabel(bundle.getString("lblEyes"), 52); //$NON-NLS-1$ + win.panEyesCtl.add(win.lblEyes); + win.lblEyes.setBounds(2, 0, 16, 79); + } + + /** + * Create the eyes objects + */ + private void eyesObjects() { + win.btnEyesRun = new JButton(); + win.panEyesCtl.add(win.btnEyesRun); + win.btnEyesRun.setBounds(25, 27, 25, 25); + win.btnEyesRun.setContentAreaFilled(false); + win.btnEyesRun.setBorderPainted(false); + win.btnEyesRun.setIcon(win.iconRun); + win.btnEyesRun.setFocusable(false); + win.btnEyesRun.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnEyesRunMouseClicked(evt); + } + }); + + win.spinEyes = new JSpinner(); + win.panEyesCtl.add(win.spinEyes); + win.spinEyes.setModel(win.spinEyesCountModel); + win.spinEyes.setBounds(59, 27, 60, 25); + win.spinEyes.setValue(1); + + win.radEyesCount = new JRadioButton(); + win.radEyesDuring = new JRadioButton(); + win.panEyesCtl.add(win.radEyesCount); + win.panEyesCtl.add(win.radEyesDuring); + win.radEyesCount.setSelected(true); + win.radEyesCount.setText(bundle.getString("radEyesCount")); //$NON-NLS-1$ + win.radEyesDuring.setText(bundle.getString("radEyesDuring")); //$NON-NLS-1$ + win.getRadEyes().add(win.radEyesCount); + win.getRadEyes().add(win.radEyesDuring); + win.radEyesCount.setBounds(125, 20, 65, 20); + win.radEyesDuring.setBounds(125, 37, 65, 20); + win.radEyesCount.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.radEyesCountStateChanged(evt); + } + }); + } + + /** + * Create the mouth panel. + */ + private void createMouthPanel() { + win.panMouthCtl = new JPanel(); + win.panCtl.add(win.panMouthCtl, + new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panMouthCtl.setLayout(null); + } + + /** + * Create the mouth panel separators and label. + */ + private void mouthSeparators() { + win.sepMouth1 = new JSeparator(); + win.panMouthCtl.add(win.sepMouth1); + win.sepMouth1.setBounds(2, 2, 2, 58); + win.sepMouth1.setOrientation(SwingConstants.VERTICAL); + + win.sepMouth2 = new JSeparator(); + win.panMouthCtl.add(win.sepMouth2); + win.sepMouth2.setBounds(18, 2, 2, 58); + win.sepMouth2.setOrientation(SwingConstants.VERTICAL); + + win.lblMouth = new JVerticalLabel(bundle.getString("lblMouth"), 48); //$NON-NLS-1$ + win.panMouthCtl.add(win.lblMouth); + win.lblMouth.setBounds(2, 0, 16, 62); + } + + /** + * Create the mouth panel objects. + */ + private void mouthObjects() { + win.btnMouthRun = new JButton(); + win.panMouthCtl.add(win.btnMouthRun); + win.btnMouthRun.setBounds(25, 19, 25, 25); + win.btnMouthRun.setContentAreaFilled(false); + win.btnMouthRun.setBorderPainted(false); + win.btnMouthRun.setIcon(win.iconRun); + win.btnMouthRun.setFocusable(false); + win.btnMouthRun.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnMouthRunMouseClicked(evt); + } + }); + + win.spinMouth = new JSpinner(); + win.panMouthCtl.add(win.spinMouth); + win.spinMouth.setModel(win.spinMouthCountModel); + win.spinMouth.setBounds(59, 19, 60, 25); + win.spinMouth.setValue(1); + + win.radMouthCount = new JRadioButton(); + win.radMouthDuring = new JRadioButton(); + win.panMouthCtl.add(win.radMouthCount); + win.panMouthCtl.add(win.radMouthDuring); + win.radMouthCount.setText(bundle.getString("radMouthCount")); //$NON-NLS-1$ + win.radMouthDuring.setText(bundle.getString("radMouthDuring")); //$NON-NLS-1$ + win.radMouthCount.setSelected(true); + win.getRadMouth().add(win.radMouthCount); + win.getRadMouth().add(win.radMouthDuring); + win.radMouthCount.setBounds(125, 12, 65, 20); + win.radMouthDuring.setBounds(125, 29, 65, 20); + win.radMouthCount.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.radMouthCountStateChanged(evt); + } + }); + } + + /** + * Create the flippers panel + */ + private void createFlippersPanel() { + win.panFlippersCtl = new JPanel(); + win.panCtl.add(win.panFlippersCtl, + new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panFlippersCtl.setLayout(null); + } + + /** + * Create the flippers panel separators and label. + */ + private void flippersSeparators() { + win.sepFlippers1 = new JSeparator(); + win.panFlippersCtl.add(win.sepFlippers1); + win.sepFlippers1.setBounds(2, 2, 2, 138); + win.sepFlippers1.setOrientation(SwingConstants.VERTICAL); + + win.sepFlippers2 = new JSeparator(); + win.panFlippersCtl.add(win.sepFlippers2); + win.sepFlippers2.setBounds(18, 2, 2, 138); + win.sepFlippers2.setOrientation(SwingConstants.VERTICAL); + + win.lblFlippers = new JVerticalLabel(bundle.getString("lblFlippers"), 90); //$NON-NLS-1$ + win.panFlippersCtl.add(win.lblFlippers); + win.lblFlippers.setBounds(2, 0, 16, 142); + } + + /** + * Create the flippers objects. + */ + private void flippersObjects() { + win.btnFlippersRun = new JButton(); + win.panFlippersCtl.add(win.btnFlippersRun); + win.btnFlippersRun.setBounds(25, 59, 25, 25); + win.btnFlippersRun.setContentAreaFilled(false); + win.btnFlippersRun.setBorderPainted(false); + win.btnFlippersRun.setIcon(win.iconRun); + win.btnFlippersRun.setFocusable(false); + win.btnFlippersRun.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnFlippersRunMouseClicked(evt); + } + }); + + win.spinFlippers = new JSpinner(); + win.panFlippersCtl.add(win.spinFlippers); + win.spinFlippers.setModel(win.spinFlippersCountModel); + win.spinFlippers.setBounds(59, 59, 60, 25); + win.spinFlippers.setValue(1); + + win.slideFlippers = new JSlider(); + win.panFlippersCtl.add(win.slideFlippers); + win.slideFlippers.setBounds(220, 72, 110, 16); + win.slideFlippers.setMinimum(1); + win.slideFlippers.setMaximum(5); + win.slideFlippers.setValue(5); + win.slideFlippers.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.slideFlippersStateChanged(evt); + } + }); + + win.lblFlippersSpeed = new JLabel(); + win.panFlippersCtl.add(win.lblFlippersSpeed); + win.lblFlippersSpeed.setText(bundle.getString("lblFlippersSpeed")); //$NON-NLS-1$ + win.lblFlippersSpeed.setBounds(220, 54, 110, 16); + win.lblFlippersSpeed.setHorizontalAlignment(SwingConstants.CENTER); + + win.radFlippersCount = new JRadioButton(); + win.radFlippersDuring = new JRadioButton(); + win.panFlippersCtl.add(win.radFlippersCount); + win.panFlippersCtl.add(win.radFlippersDuring); + win.radFlippersCount.setText(bundle.getString("radFlippersCount")); //$NON-NLS-1$ + win.radFlippersDuring.setText(bundle.getString("radFlippersDuring")); //$NON-NLS-1$ + win.radFlippersCount.setSelected(true); + win.getRadFlippers().add(win.radFlippersCount); + win.getRadFlippers().add(win.radFlippersDuring); + win.radFlippersCount.setBounds(125, 52, 65, 20); + win.radFlippersDuring.setBounds(125, 69, 65, 20); + win.radFlippersCount.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.radFlippersCountStateChanged(evt); + } + }); + } + + /** + * Create the spin panel. + */ + private void createSpinPanel() { + win.panSpinCtl = new JPanel(); + win.panCtl.add(win.panSpinCtl, + new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panSpinCtl.setLayout(null); + } + + /** + * Create the spin panel separator and label. + */ + private void spinSeparators() { + win.sepSpin1 = new JSeparator(); + win.panSpinCtl.add(win.sepSpin1); + win.sepSpin1.setBounds(2, 2, 2, 93); + win.sepSpin1.setOrientation(SwingConstants.VERTICAL); + + win.sepSpin2 = new JSeparator(); + win.panSpinCtl.add(win.sepSpin2); + win.sepSpin2.setBounds(18, 2, 2, 93); + win.sepSpin2.setOrientation(SwingConstants.VERTICAL); + + win.lblSpin = new JVerticalLabel(bundle.getString("lblSpin"), 74); //$NON-NLS-1$ + win.panSpinCtl.add(win.lblSpin); + win.lblSpin.setBounds(2, 0, 16, 97); + } + + /** + * Create the spin objects. + */ + private void spinObjects() { + win.btnSpinRun = new JButton(); + win.panSpinCtl.add(win.btnSpinRun); + win.btnSpinRun.setBounds(25, 29, 25, 25); + win.btnSpinRun.setContentAreaFilled(false); + win.btnSpinRun.setBorderPainted(false); + win.btnSpinRun.setIcon(win.iconRun); + win.btnSpinRun.setFocusable(false); + win.btnSpinRun.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnSpinRunMouseClicked(evt); + } + }); + + win.spinSpin = new JSpinner(); + win.panSpinCtl.add(win.spinSpin); + win.spinSpin.setModel(win.spinSpinCountModel); + win.spinSpin.setBounds(59, 29, 60, 25); + win.spinSpin.setValue(1); + + win.radSpinCount = new JRadioButton(); + win.radSpinDuring = new JRadioButton(); + win.panSpinCtl.add(win.radSpinCount); + win.panSpinCtl.add(win.radSpinDuring); + win.radSpinCount.setText(bundle.getString("radSpinCount")); //$NON-NLS-1$ + win.radSpinDuring.setText(bundle.getString("radSpinDuring")); //$NON-NLS-1$ + win.radSpinCount.setSelected(true); + win.getRadSpin().add(win.radSpinCount); + win.getRadSpin().add(win.radSpinDuring); + win.radSpinCount.setBounds(125, 22, 65, 20); + win.radSpinDuring.setBounds(125, 39, 65, 20); + win.radSpinCount.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.radSpinCountStateChanged(evt); + } + }); + + win.slideSpin = new JSlider(); + win.panSpinCtl.add(win.slideSpin); + win.slideSpin.setBounds(220, 43, 110, 16); + win.slideSpin.setMinimum(1); + win.slideSpin.setMaximum(5); + win.slideSpin.setValue(5); + win.slideSpin.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.slideSpinStateChanged(evt); + } + }); + + win.lblSpinSpeed = new JLabel(); + win.panSpinCtl.add(win.lblSpinSpeed); + win.lblSpinSpeed.setText(bundle.getString("lblSpinSpeed")); //$NON-NLS-1$ + win.lblSpinSpeed.setBounds(220, 25, 110, 16); + win.lblSpinSpeed.setHorizontalAlignment(SwingConstants.CENTER); + + win.radSpinLeft = new JRadioButton(); + win.radSpinRight = new JRadioButton(); + win.panSpinCtl.add(win.radSpinLeft); + win.panSpinCtl.add(win.radSpinRight); + win.radSpinLeft.setText(bundle.getString("radSpinLeft")); //$NON-NLS-1$ + win.radSpinRight.setText(bundle.getString("radSpinRight")); //$NON-NLS-1$ + win.radSpinLeft.setSelected(true); + win.getRadDir().add(win.radSpinLeft); + win.getRadDir().add(win.radSpinRight); + win.radSpinLeft.setBounds(40, 60, 80, 20); + win.radSpinRight.setBounds(125, 60, 80, 20); + } +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/controlPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,95 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; + +import i18n.bundle; + +import java.awt.GridBagConstraints; +import java.awt.Insets; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.SwingConstants; + +import GUI.JVerticalLabel; +import GUI.mainWindow; + +public class generalControlPanel { + + private mainWindow win; + + public generalControlPanel(mainWindow inst) { + win = inst; + createPanel(); + separators(); + button(); + } + + private void createPanel() { + win.panGeneralControl = new JPanel(); + win.getContentPane().add(win.panGeneralControl, + new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panGeneralControl.setLayout(null); + } + + private void separators() { + + win.sepGeneralControl1 = new JSeparator(); + win.panGeneralControl.add(win.sepGeneralControl1); + win.sepGeneralControl1.setBounds(2, 4, 2, 86); + win.sepGeneralControl1.setOrientation(SwingConstants.VERTICAL); + + win.sepGeneralControl2 = new JSeparator(); + win.panGeneralControl.add(win.sepGeneralControl2); + win.sepGeneralControl2.setBounds(18, 4, 2, 86); + win.sepGeneralControl2.setOrientation(SwingConstants.VERTICAL); + + win.lblGeneral = new JVerticalLabel(bundle.getString("lblGeneral"), 67); //$NON-NLS-1$ + win.panGeneralControl.add(win.lblGeneral); + win.lblGeneral.setBounds(2, 0, 16, 90); + } + + private void button() { + win.btnGeneralStop = new JButton(); + win.panGeneralControl.add(win.btnGeneralStop); + win.btnGeneralStop.setBounds(8, 32, 352, 25); + win.btnGeneralStop.setContentAreaFilled(false); + win.btnGeneralStop.setBorderPainted(false); + win.btnGeneralStop.setIcon(win.iconStop); + win.btnGeneralStop.setText(bundle.getString("btnGeneral")); //$NON-NLS-1$ + win.btnGeneralStop.setHorizontalTextPosition(SwingConstants.RIGHT); + win.btnGeneralStop.setHorizontalAlignment(SwingConstants.LEFT); + win.btnGeneralStop.setFocusable(false); + win.btnGeneralStop.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnGeneralStopMouseClicked(evt); + } + }); + } + +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/generalControlPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,189 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; + +import i18n.bundle; + +import java.awt.GridBagConstraints; +import java.awt.Insets; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JSeparator; +import javax.swing.JSlider; +import javax.swing.JSpinner; +import javax.swing.SwingConstants; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import GUI.JVerticalLabel; +import GUI.mainWindow; + +/** + * LED control panel. + * @author paul + * + */ +public class ledPanel { + private mainWindow win; + + /** + * Create the LED panel + * @param inst a mainWindow instance + */ + public ledPanel(mainWindow inst) { + win = inst; + createPanel(); + createSeparators(); + createButtons(); + createSpinners(); + createRadios(); + createSliders(); + } + + /** + * Create the panel + */ + private void createPanel() { + win.panLedsCtl = new JPanel(); + win.getContentPane().add(win.panLedsCtl, + new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panLedsCtl.setLayout(null); + } + + /** + * Create the buttons + */ + private void createButtons() { + win.btnLedsRun = new JButton(); + win.panLedsCtl.add(win.btnLedsRun); + win.btnLedsRun.setBounds(26, 24, 25, 25); + win.btnLedsRun.setContentAreaFilled(false); + win.btnLedsRun.setBorderPainted(false); + win.btnLedsRun.setIcon(win.iconRun); + win.btnLedsRun.setFocusable(false); + win.btnLedsRun.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnLedsRunMouseClicked(evt); + } + }); + } + + /** + * Create the separators + */ + private void createSeparators() { + win.sepLed1 = new JSeparator(); + win.panLedsCtl.add(win.sepLed1); + win.sepLed1.setBounds(2, 4, 2, 74); + win.sepLed1.setOrientation(SwingConstants.VERTICAL); + + win.sepLed2 = new JSeparator(); + win.panLedsCtl.add(win.sepLed2); + win.sepLed2.setBounds(18, 4, 2, 74); + win.sepLed2.setOrientation(SwingConstants.VERTICAL); + + win.lblLed = new JVerticalLabel(bundle.getString("lblLeds"), 50); //$NON-NLS-1$ + win.panLedsCtl.add(win.lblLed); + win.lblLed.setBounds(2, 2, 16, 80); + } + + /** + * Create the spinners + */ + private void createSpinners() { + win.spinLeds = new JSpinner(); + win.panLedsCtl.add(win.spinLeds); + win.spinLeds.setModel(win.spinLedsCountModel); + win.spinLeds.setBounds(59, 24, 60, 25); + win.spinLeds.setValue(1); + } + + /** + * Create the radio buttons + */ + private void createRadios() { + win.radLedsNone = new JRadioButton(); + win.radLedsFade = new JRadioButton(); + win.radLedsGradiant = new JRadioButton(); + win.panLedsCtl.add(win.radLedsNone); + win.panLedsCtl.add(win.radLedsFade); + win.panLedsCtl.add(win.radLedsGradiant); + win.radLedsNone.setSelected(true); + win.radLedsNone.setText(bundle.getString("lblLedsEffectNone")); //$NON-NLS-1$ + win.radLedsFade.setText(bundle.getString("lblLedsEffectFade")); //$NON-NLS-1$ + win.radLedsGradiant.setText(bundle.getString("lblLedsEffectGradiant")); //$NON-NLS-1$ + + win.getRadLeds().add(win.radLedsNone); + win.getRadLeds().add(win.radLedsFade); + win.getRadLeds().add(win.radLedsGradiant); + win.radLedsNone.setBounds(125, 10, 80, 20); + win.radLedsFade.setBounds(125, 27, 80, 20); + win.radLedsGradiant.setBounds(125, 44, 80, 20); + } + + /** + * Create the sliders + */ + private void createSliders() { + win.slideLedsIntensity = new JSlider(); + win.panLedsCtl.add(win.slideLedsIntensity); + win.slideLedsIntensity.setBounds(220, 20, 110, 16); + win.slideLedsIntensity.setMinimum(0); + win.slideLedsIntensity.setMaximum(10); + win.slideLedsIntensity.setValue(10); + win.slideLedsIntensity.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent evt) { + win.slideLedsIntensityStateChanged(evt); + } + }); + + win.lblLedsIntensity = new JLabel(); + win.panLedsCtl.add(win.lblLedsIntensity); + win.lblLedsIntensity.setText(bundle.getString("lblLedsIntensity")); //$NON-NLS-1$ + win.lblLedsIntensity.setBounds(220, 3, 110, 16); + win.lblLedsIntensity.setHorizontalAlignment(SwingConstants.CENTER); + + win.slideLedsSpeed = new JSlider(); + win.panLedsCtl.add(win.slideLedsSpeed); + win.slideLedsSpeed.setBounds(220, 53, 110, 16); + win.slideLedsSpeed.setMinimum(1); + win.slideLedsSpeed.setMaximum(5); + win.slideLedsSpeed.setValue(3); + win.slideLedsSpeed.setMinorTickSpacing(5); + win.slideLedsSpeed.setMajorTickSpacing(5); + + win.lblLedsBlinkSpeed = new JLabel(); + win.panLedsCtl.add(win.lblLedsBlinkSpeed); + win.lblLedsBlinkSpeed.setText(bundle.getString("lblLedsSpeed")); //$NON-NLS-1$ + win.lblLedsBlinkSpeed.setBounds(220, 35, 110, 16); + win.lblLedsBlinkSpeed.setHorizontalAlignment(SwingConstants.CENTER); + } + +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/ledPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,158 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; + +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; + +import GUI.mainWindow; + +public class levelPanel { + private mainWindow win; + + public levelPanel(mainWindow inst) { + win = inst; + createPanel(); + createLightSection(); + createBatterySection(); + createMicroSection(); + } + + private void createPanel() { + win.panLevelAbs = new JPanel(); + win.getContentPane().add(win.panLevelAbs, + new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panLevelAbs.setLayout(null); + + /* Create the panel */ + win.panLevel = new JPanel(); + win.panLevelAbs.add(win.panLevel); + win.panLevel.setBounds(0, 0, 406, 79); + java.awt.Dimension panDim = new java.awt.Dimension(406, 90); + GridBagLayout panLevelLayout = new GridBagLayout(); + win.panLevel.setLayout(panLevelLayout); + win.panLevel.setMaximumSize(panDim); + win.panLevel.setMinimumSize(panDim); + panLevelLayout.rowWeights = new double[] {0.1, 0.1, 0.1}; + panLevelLayout.rowHeights = new int[] {30, 30, 30}; + panLevelLayout.columnWeights = new double[] {0.0, 0.0, 0.0}; + panLevelLayout.columnWidths = new int[] {55, 260, 70}; + } + + private void createLightSection() { + win.dimProg = new java.awt.Dimension(250, 15); + win.imgLightLevel = new JLabel(); + win.imgLightLevel.setIcon(win.iconLight); + win.panLevel.add(win.imgLightLevel, + new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + + win.progLightLevel = new JProgressBar(); + win.panLevel.add(win.progLightLevel, + new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + win.progLightLevel.setPreferredSize(win.dimProg); + win.progLightLevel.setMinimumSize(win.dimProg); + win.progLightLevel.setMaximumSize(win.dimProg); + + win.lblLightLevel = new JLabel(); + win.panLevel.add(win.lblLightLevel, + new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.lblLightLevel.setText("0.00 %"); + win.lblLightLevel.setSize(60, 22); + } + + private void createBatterySection() { + win.imgBatteryLevel = new JLabel(); + win.panLevel.add(win.imgBatteryLevel, + new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + win.imgBatteryLevel.setIcon(win.iconBattery); + + win.progBatteryLevel = new JProgressBar(); + win.panLevel.add(win.progBatteryLevel, + new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + win.progBatteryLevel.setPreferredSize(win.dimProg); + win.progBatteryLevel.setMaximum(70); + win.progBatteryLevel.setMinimumSize(win.dimProg); + win.progBatteryLevel.setMaximumSize(win.dimProg); + + win.lblBatteryLevel = new JLabel(); + win.panLevel.add(win.lblBatteryLevel, + new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.lblBatteryLevel.setText("0.00 V"); + win.lblBatteryLevel.setSize(60, 22); + } + + private void createMicroSection() { + win.imgMicroLevel = new JLabel(); + win.panLevel.add(win.imgMicroLevel, + new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + win.imgMicroLevel.setIcon(win.iconMicro); + + win.progMicroLevel = new JProgressBar(); + win.panLevel.add(win.progMicroLevel, + new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.NONE, + new Insets(0, 0, 0, 0), 0, 0)); + win.progMicroLevel.setPreferredSize(win.dimProg); + win.progMicroLevel.setMinimumSize(win.dimProg); + win.progMicroLevel.setMaximumSize(win.dimProg); + + win.lblMicroLevel = new JLabel(); + win.panLevel.add(win.lblMicroLevel, + new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.lblMicroLevel.setText("0.00 %"); + win.lblMicroLevel.setSize(60, 22); + } + +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/levelPanel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,128 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; + +import javax.swing.DefaultComboBoxModel; + +import GUI.mainWindow; + +public class objects { + private mainWindow win; + + public objects(mainWindow inst) { + win = inst; + createImagesObjects(); + createSpinnerModels(); + createComboboxModels(); + } + + private void createImagesObjects() { + /* Spinning images */ + win.spinLeft = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/spinLeft.png")); + win.spinRight = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/spinRight.png")); + win.spinOff = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/spinOff.png")); + win.spinCharger = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/spinCharging.png")); + + /* Flippers images */ + win.flippersUp = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/flippersUp.png")); + win.flippersDown = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/flippersDown.png")); + + /* Beak images */ + win.mouthOpen = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/mouthOpened.png")); + win.mouthClose = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/mouthClosed.png")); + + /* Right eye */ + win.eyeRightOn = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/rightEyeOn.png")); + win.eyeRightOff = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/rightEyeOff.png")); + win.eyeRightClose = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/rightEyeClosed.png")); + + /* Left eye */ + win.eyeLeftOn = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/leftEyeOn.png")); + win.eyeLeftOff = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/leftEyeOff.png")); + win.eyeLeftClose = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/leftEyeClosed.png")); + + /* Buttons images */ + win.iconUp = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconUp.png")); + win.iconDown = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconDown.png")); + win.iconLeft = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconLeft.png")); + win.iconRight = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconRight.png")); + win.iconRun = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconRun.png")); + win.iconStop = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconStop.png")); + + /* Levels images */ + win.iconLight = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconLight.png")); + win.iconBattery = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconBattery.png")); + win.iconMicro = new javax.swing.ImageIcon(getClass().getResource( + "/GUI/images/iconMicro.png")); + } + + private void createSpinnerModels() { + win.spinEyesCountModel = + new javax.swing.SpinnerNumberModel(1, 1, 127, 1); + win.spinEyesDuringModel = + new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05); + win.spinMouthCountModel = + new javax.swing.SpinnerNumberModel(1, 1, 127, 1); + win.spinMouthDuringModel = + new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05); + win.spinFlippersCountModel = + new javax.swing.SpinnerNumberModel(1, 1, 127, 1); + win.spinFlippersDuringModel = + new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05); + win.spinSpinCountModel = + new javax.swing.SpinnerNumberModel(1, 1, 127, 1); + win.spinSpinDuringModel = + new javax.swing.SpinnerNumberModel(1, 0.04, 20, 0.05); + win.spinLedsCountModel = + new javax.swing.SpinnerNumberModel(1, 1, 127, 1); + win.spinTTSPitchModel = + new javax.swing.SpinnerNumberModel(100, 70, 200, 1); + } + + private void createComboboxModels() { + win.voiceList = new String[] {"No voice"}; + win.cmbVoicesModel = new DefaultComboBoxModel(win.voiceList); + } + +} Property changes on: software_suite_v2/software/tools/tuxController/src/GUI/componants/objects.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java =================================================================== --- software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java (rev 0) +++ software_suite_v2/software/tools/tuxController/src/GUI/componants/ttsPanel.java 2008-07-17 13:52:10 UTC (rev 1333) @@ -0,0 +1,189 @@ +/* + * TuxController - Gadget for the TuxDroid software suite. + * Copyright (C) 2007 C2ME S.A. <tux...@c2...> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* $Id:$ */ + +package GUI.componants; +import i18n.bundle; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSpinner; +import javax.swing.JTextArea; + +import GUI.mainWindow; + +/** + * TTS Text entry panel. + * @author paul + * + */ +public class ttsPanel { + + private mainWindow win; + + /** + * Create the TTS text entry panel. + * @param inst a mainWindow instance. + */ + public ttsPanel(mainWindow inst) { + win = inst; + + createTextPanel(); + createCheckboxPanel(); + createTextEntryPanel(); + createButtonsPanel(); + + createConfigPanel(); + createConfigObjects(); + } + + /** + * Create the panel layout. + */ + private void createTextPanel() { + win.panTTSAbs = new JPanel(); + win.getContentPane().add(win.panTTSAbs, + new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0, + GridBagConstraints.NORTH, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panTTSAbs.setLayout(null); + + win.panTTS = new JPanel(); + win.panTTSAbs.add(win.panTTS); + win.panTTS.setBounds(0, 0, 406, 140); + java.awt.Dimension panDim = new java.awt.Dimension(390, 140); + GridBagLayout panTTSLayout = new GridBagLayout(); + win.panTTS.setLayout(panTTSLayout); + win.panTTS.setMaximumSize(panDim); + win.panTTS.setMinimumSize(panDim); + panTTSLayout.rowWeights = new double[] {0.1, 0.1, 0.1}; + panTTSLayout.rowHeights = new int[] {30, 70, 30}; + panTTSLayout.columnWeights = new double[] {0.0, 0.0, 0.0}; + panTTSLayout.columnWidths = new int[] {390}; + + } + + /** + * Create the enable/disable checkbox. + */ + private void createCheckboxPanel() { + win.chkTTS = new JCheckBox(); + win.panTTS.add(win.chkTTS, + new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, + GridBagConstraints.WEST, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.chkTTS.setText(bundle.getString("chkTTS")); //$NON-NLS-1$ + win.chkTTS.setMargin(new java.awt.Insets(2, 10, 2, 1)); + win.chkTTS.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + win.chkTTSActionPerformed(evt); + } + }); + } + + /** + * Create the text entry. + */ + private void createTextEntryPanel() { + win.textTTS = new JTextArea(); + win.panTTS.add(win.textTTS, + new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(4, 4, 4, 20), 0, 0)); + win.textTTS.setText(bundle.getString("textTTS")); //$NON-NLS-1$ + win.textTTS.setSize(370, 60); + } + + /** + * Create the buttons. + */ + private void createButtonsPanel() { + win.panTTSButtons = new JPanel(); + win.panTTS.add(win.panTTSButtons, + new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, + GridBagConstraints.CENTER, + GridBagConstraints.BOTH, + new Insets(0, 0, 0, 0), 0, 0)); + win.panTTSButtons.setLayout(null); + + win.btnTTSPlay = new JButton(); + win.panTTSButtons.add(win.btnTTSPlay); + win.btnTTSPlay.setText(bundle.getString("btnTTSPlay")); //$NON-NLS-1$ + win.btnTTSPlay.setBounds(300, 5, 70, 20); + win.btnTTSPlay.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent evt) { + win.btnTTSPlayMouseClicked(evt); + } + }); + + win.btnTTSStop = new JButton(); + wi... [truncated message content] |
1 message has been excluded from this view by a project administrator.
