tux-droid-svn Mailing List for Tux Droid CE (Page 27)
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: gwadavel <c2m...@c2...> - 2009-09-14 14:01:33
|
Author: gwadavel
Date: 2009-09-14 16:01:16 +0200 (Mon, 14 Sep 2009)
New Revision: 5380
Modified:
software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
Log:
plugin-charger, updated for working with server user mode
Modified: software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py
===================================================================
--- software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py 2009-09-14 12:21:56 UTC (rev 5379)
+++ software_suite_v3/software/plugin/plugin-charger/trunk/executables/plugin-charger.py 2009-09-14 14:01:16 UTC (rev 5380)
@@ -44,17 +44,16 @@
"""
Manage the battery.
"""
-
- tgp_language = "en"
- tgp_ip = "127.0.0.1"
- tgp_port = 270
- tux = TuxAPI("127.0.0.1", 270)
def __init__(self, plug):
'''
'''
- self.plugin = plug
+ self.tgp_language = "en"
+ self.tgp_ip = "127.0.0.1"
+ self.tgp_port = 270
+ self.plugin = plug
+
# Test language, ip, port
if "tgp_language" in os.environ:
self.tgp_language = os.environ["tgp_language"]
@@ -65,15 +64,19 @@
if "tgp_port" in os.environ:
self.tgp_port = int(os.environ["tgp_port"])
- tux = TuxAPI(self.tgp_ip, self.tgp_port)
-
-
+ self.tux = TuxAPI(self.tgp_ip, self.tgp_port)
+
+ self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+ if not self.tux.server.getConnected():
+ self.tgp_port = 54321
+ self.tux = TuxAPI(self.tgp_ip, self.tgp_port)
+ self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+
def tuxConnect(self):
'''
Wait connected
'''
-
- self.tux.server.autoConnect(CLIENT_LEVEL_RESTRICTED, 'batterylevel', 'plugin-battery')
+
self.tux.server.waitConnected(5.0)
self.tux.dongle.waitConnected(5.0)
self.tux.radio.waitConnected(5.0)
|
|
From: jerome <c2m...@c2...> - 2009-09-14 12:43:40
|
Author: jerome
Date: 2009-09-14 14:21:56 +0200 (Mon, 14 Sep 2009)
New Revision: 5379
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/SecondInstaller.dpr
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/images/bmp/Thumbs.db
Log:
* Code cleanup.
* Added '"' to start attitune ( bug seen on xp testing into 'program files' directory ).
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/SecondInstaller.dpr
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/SecondInstaller.dpr 2009-09-14 12:20:09 UTC (rev 5378)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/SecondInstaller.dpr 2009-09-14 12:21:56 UTC (rev 5379)
@@ -8,8 +8,7 @@
Box in 'Box.pas' {Form2},
BoxOk in 'BoxOk.pas' {Form3},
Report in 'Report.pas',
- TuxGauge in 'TuxGauge.pas' {Form4},
- TestsUtils in 'TestsUtils.pas';
+ TuxGauge in 'TuxGauge.pas' {Form4};
{$R *.res}
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm 2009-09-14 12:20:09 UTC (rev 5378)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxGauge.dfm 2009-09-14 12:21:56 UTC (rev 5379)
@@ -3,8 +3,8 @@
Top = 260
BorderStyle = bsNone
Caption = 'Form4'
- ClientHeight = 103
- ClientWidth = 329
+ ClientHeight = 107
+ ClientWidth = 333
Color = clFuchsia
TransparentColor = True
TransparentColorValue = clFuchsia
@@ -19,3525 +19,367 @@
PixelsPerInch = 96
TextHeight = 13
object Image1: TImage
- Left = -4
- Top = -4
- Width = 337
- Height = 111
+ Left = 2
+ Top = 2
+ Width = 330
+ Height = 104
AutoSize = True
Picture.Data = {
- 07544269746D617002B70100424D02B701000000000036000000280000005101
- 00006F0000000100180000000000CCB60100120B0000120B0000000000000000
- 0000FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF00FF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFF0F0F0F0F0F0FFFFFFFDFDFDFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFDFDFFFFFFF0F0
- F0F0F0F0FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF
- 00FFFF00FF00FF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FFEFEFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFEFFF00
- FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FF
- FF00FFFF00FFFF00FFFF00FFFF00FFE5E5E5FFFFFFFFFFFFEAEAEA9191915E5E
- 5E5050502D2D2D25252525252526262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626262626262626
- 2626262626262626262626262626262626262626262626262626252525252525
- 2D2D2D5050505E5E5E919191EAEAEAFFFFFFFFFFFFE5E5E5FF00FFFF00FFFF00
- FFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF00FFFF00FFFF00FF
- EBEBEBFFFFFFF7F7F78484842A2A2A2828282A2A2A2B2B2B2C2C2C2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D
- 2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2D2C2C2C2B2B2B2A2A2A282828
- 2A2A2A848484F7F7F7FFFFFFEBEBEBFF00FFFF00FFFF00FFFF00FFFF00FFFF00
- FF00FF00FFFF00FFFF00FFFF00FFFF00FFE5E5E5FFFFFFEAEAEA525252272727
- 2B2B2B2E2E2E3030303131313131313232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 3232323232323232323232323232323232323232323232323232323232323232
- 32323232323232323131313131313030302E2E2E2B2B2B272727525252EAEAEA
- FFFFFFFF00FFFF00FFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF
- 00FFFF00FFFFFFFFF7F7F75252522929292D2D2D313131333333343434353535
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363636
- 3636363636363636363636363636363636363636363636363636363636363635
- 35353434343333333131312D2D2D292929525252F7F7F7FFFFFFFF00FFFF00FF
- FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF00FFEFEFEFFFFFFF87878728
- 28282E2E2E333333353535373737383838393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393938383837373735353533
- 33332E2E2E282828878787FFFFFFEFEFEFFF00FFFF00FFFF00FFFF00FF00FF00
- FFFF00FFFF00FFFF00FFFFFFFFE7E7E72B2B2B2C2C2C32323235353538383839
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 3939393939393939393939393939393939393939393939393939393939393939
- 393939393939393939393939393939393838383535353232322C2C2C2B2B2BE7
- E7E7FFFFFFFF00FFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFFF00FFFFFF
- FF9C9C9C2A2A2A3030303535353838383A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A3A
- 3A3A3A3A3A3A3A3838383535353030302A2A2A9C9C9CFFFFFFF0F0F0FF00FFFF
- 00FFFF00FF00FF00FFFF00FFFF00FFF0F0F0FFFFFF6363632D2D2D3333333737
- 373A3A3A3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B
- 3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3A3A3A3737
- 373333332D2D2D636363FFFFFFF0F0F0FF00FFFF00FFFF00FF00FF00FFFF00FF
- FF00FFFFFFFFFFFFFF4D4D4D2F2F2F3535353939393B3B3B3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C
- 3C3C3C3C3C3C3C3C3C3C3C3C3C3C3C3B3B3B3939393535352F2F2F4D4D4DFFFF
- FFFFFFFFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF7F7F7FFFFFF424242
- 3131313636363A3A3A3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3D
- 3D3D3D3D3D3D3A3A3A363636313131424242FFFFFFF7F7F7FF00FFFF00FFFF00
- FF00FF00FFFF00FFFF00FFF7F7F7FFFFFF4343433232323838383C3C3C3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E
- 3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3C3C3C383838
- 323232434343FFFFFFF7F7F7FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF7
- F7F7FFFFFF4444443333333939393D3D3D3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F
- 3F3F3F3F3F3F3F3F3F3F3F3F3F3F3D3D3D393939333333444444FFFFFFF7F7F7
- FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF7F7F7FFFFFF4545453434343A
- 3A3A3D3D3D404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 40403D3D3D3A3A3A343434454545FFFFFFF7F7F7FF00FFFF00FFFF00FF00FF00
- FFFF00FFFF00FFFFFFFFFFFFFF4545453434343A3A3A3D3D3D40404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 4040404040404040404040404040404040404040404040404040404040404040
- 404040404040404040404040404040404040404040403D3D3D3A3A3A34343445
- 4545FFFFFFFFFFFFFF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF6F6F6FFFF
- FF4545453535353B3B3B3E3E3E41414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 4141414141414141414141414141414141414141414141414141414141414141
- 414141414141414141413E3E3E3B3B3B353535454545FFFFFFF6F6F6FF00FFFF
- 00FFFF00FF00FF00FFFF00FFFF00FFF6F6F6FFFFFF4747473636363C3C3C4040
- 4043434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434343
- 4343434343434343434343434343434343434343434343434343434343434040
- 403C3C3C363636474747FFFFFFF6F6F6FF00FFFF00FFFF00FF00FF00FFFF00FF
- FF00FFF6F6F6FFFFFF4747473737373D3D3D4141414444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444444444444444444444444444444
- 4444444444444444444444444444444444444141413D3D3D373737474747FFFF
- FFF6F6F6FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF6F6F6FFFFFF474747
- 3838383E3E3E4242424545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454545454545454545454545454545454545454545454545454545
- 4545454545454242423E3E3E383838474747FFFFFFF6F6F6FF00FFFF00FFFF00
- FF00FF00FFFF00FFFF00FFF6F6F6FFFFFF4848483939393F3F3F434343464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 4646464646464646464646464646464646464646464646464646464646464646
- 46464646464646464646464646464646464646464646464646464343433F3F3F
- 393939484848FFFFFFF6F6F6FF00FFFF00FFFF00FF00FF00FFFF00FFFF00FFF6
- F6F6FFFFFF484848393939404040444444474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 4747474747474747474747474747474747474747474747474747474747474747
- 47474747474747474...
[truncated message content] |
|
From: ks156 <c2m...@c2...> - 2009-09-14 12:43:07
|
Author: ks156
Date: 2009-09-14 14:20:09 +0200 (Mon, 14 Sep 2009)
New Revision: 5378
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/GadgetGenerator.py
Log:
* Fixed a bug with the gadget creation.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/GadgetGenerator.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/GadgetGenerator.py 2009-09-14 11:41:51 UTC (rev 5377)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/applicationserver/gadget/GadgetGenerator.py 2009-09-14 12:20:09 UTC (rev 5378)
@@ -442,7 +442,10 @@
tmpFile = open(os.path.join(tmpRootDir, "help.wiki"), "w")
tmpFile.write(helpFileContent)
tmpFile.close()
- tmpGadgetFile = "gadget_%s.scg" % gadgetUuid
+ if os.name == 'nt':
+ tmpGadgetFile = "gadget_%s.scg" % gadgetUuid
+ else:
+ tmpGadgetFile = "/tmp/gadget_%s.scg" % gadgetUuid
zout = zipfile.ZipFile(tmpGadgetFile, "w")
zout.write(os.path.join(tmpRootDir, "gadget.xml"), "gadget.xml")
zout.write(os.path.join(tmpRootDir, "gadget.png"), "gadget.png")
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 11:42:04
|
Author: ks156
Date: 2009-09-14 13:41:51 +0200 (Mon, 14 Sep 2009)
New Revision: 5377
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py
Log:
* Fixed mispelled "resources"
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py 2009-09-14 11:34:18 UTC (rev 5376)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py 2009-09-14 11:41:51 UTC (rev 5377)
@@ -65,10 +65,10 @@
return "None"
else:
if os.geteuid() == 0:
- return os.path.join("/etc/tuxdroid", "resource_conf")
+ return os.path.join("/etc/tuxdroid", "resources_conf")
else:
h = os.getenv("HOME")
- path = os.path.join(h, ".tuxdroid", "resource_conf")
+ path = os.path.join(h, ".tuxdroid", "resources_conf")
if not os.path.isdir(path):
os.makedirs(path, mode=0755)
return path
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 11:34:30
|
Author: ks156
Date: 2009-09-14 13:34:18 +0200 (Mon, 14 Sep 2009)
New Revision: 5376
Modified:
software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
Log:
* Added a test to determine if the server is on the port 270 or 54321
Modified: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java
===================================================================
--- software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2009-09-14 11:15:33 UTC (rev 5375)
+++ software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/src/com/tuxisalive/attitunes/visual/ATTBlockViewer.java 2009-09-14 11:34:18 UTC (rev 5376)
@@ -104,7 +104,7 @@
public ATTFormatReadWrite attituneFile;
- public TuxAPI tux = new TuxAPI("localhost", 270); //$NON-NLS-1$
+ public TuxAPI tux; //$NON-NLS-1$
private boolean sceneHaveChanged = false;
@@ -210,8 +210,25 @@
/* Set visible */
this.setVisible(true);
/* Connect the tuxdroid api */
+ tux = new TuxAPI("127.0.0.1", 270);
tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED, "AttitunesStudio", "attscene"); //$NON-NLS-1$ //$NON-NLS-2$
- /* Refresh the viewer */
+
+ /* Wait 1 second, and check if the API is connected */
+ try {
+ Thread.sleep(1000);
+ }
+ catch(Exception except) {
+ except.printStackTrace();
+ }
+
+ /* If the API is not connected, try with the port 54321 */
+ if (tux.server.getConnected() != true)
+ {
+ tux = new TuxAPI("127.0.0.1", 54321);
+ tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED, "AttitunesStudio", "attscene"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /* Refresh the viewer */
this.setZoomFactor(1);
}
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 11:15:46
|
Author: ks156 Date: 2009-09-14 13:15:33 +0200 (Mon, 14 Sep 2009) New Revision: 5375 Added: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode/ Log: * Created a new branch to use attitune studio with the server port 54321 if the server is started as normal user, and with the port 270 instead. Copied: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode (from rev 5374, software_suite_v3/software/tool/tool-attitunes-studio/trunk) Property changes on: software_suite_v3/software/tool/tool-attitunes-studio/branches/user_mode ___________________________________________________________________ Name: svn:mergeinfo + |
|
From: ks156 <c2m...@c2...> - 2009-09-14 11:10:06
|
Author: ks156
Date: 2009-09-14 13:09:54 +0200 (Mon, 14 Sep 2009)
New Revision: 5374
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/00_smart_server_base/04_resourceMenu.py
Log:
* Changed the log path for the debug page.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/00_smart_server_base/04_resourceMenu.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/00_smart_server_base/04_resourceMenu.py 2009-09-14 11:06:02 UTC (rev 5373)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/00_smart_server_base/04_resourceMenu.py 2009-09-14 11:09:54 UTC (rev 5374)
@@ -224,7 +224,9 @@
self.__logPath = os.path.join(os.environ['ALLUSERSPROFILE'],
"Kysoh", "Tux Droid", "logs")
else:
- self.__logPath = "/var/log/tuxdroid"
+ from util.misc.systemPaths import systemPaths
+ path = systemPaths.getLogPath()
+ self.__logPath = path
# --------------------------------------------------------------------------
# Execute the service.
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 11:06:13
|
Author: ks156
Date: 2009-09-14 13:06:02 +0200 (Mon, 14 Sep 2009)
New Revision: 5373
Modified:
software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/control/controlTux.java
Log:
* Added a test to determines if the server is on the port 270 or 54321
Modified: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/control/controlTux.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/control/controlTux.java 2009-09-14 10:42:19 UTC (rev 5372)
+++ software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/src/GUI/control/controlTux.java 2009-09-14 11:06:02 UTC (rev 5373)
@@ -34,9 +34,27 @@
public controlTux(mainWindow winInstance) {
win = winInstance;
+
+ /* Try to connect with the port 270 */
tux = new TuxAPI("127.0.0.1", 270);
tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED,
"TuxController", "98765");
+
+ /* Wait 1 second, and check if the API is connected */
+ try {
+ Thread.sleep(1000);
+ }
+ catch(Exception except) {
+ except.printStackTrace();
+ }
+
+ /* If the API is not connected, try with the port 54321 */
+ if (tux.server.getConnected() != true)
+ {
+ tux = new TuxAPI("127.0.0.1", 54321);
+ tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_RESTRICTED,
+ "TuxController", "98765");
+ }
tux.server.waitConnected(0.5);
registerEvents();
if (tux.radio.waitConnected(0.5))
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 10:42:31
|
Author: ks156 Date: 2009-09-14 12:42:19 +0200 (Mon, 14 Sep 2009) New Revision: 5372 Added: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode/ Log: * Added a new branch for the user_mode functions. This branch will be used to adapt the API initialization in order to use the server pot 54321 when it's started as normal user. Copied: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode (from rev 5371, software_suite_v3/software/tool/tool-tux-controller/trunk) Property changes on: software_suite_v3/software/tool/tool-tux-controller/branches/user_mode ___________________________________________________________________ Name: svn:mergeinfo + |
|
From: ks156 <c2m...@c2...> - 2009-09-14 10:24:39
|
Author: ks156
Date: 2009-09-14 12:24:25 +0200 (Mon, 14 Sep 2009)
New Revision: 5371
Modified:
software_suite_v3/smart-core/smart-api/python/branches/user_mode/tuxisalive/api/sh.py
Log:
* Changed the way to connect the API to automatically determine which port
must be used.
Modified: software_suite_v3/smart-core/smart-api/python/branches/user_mode/tuxisalive/api/sh.py
===================================================================
--- software_suite_v3/smart-core/smart-api/python/branches/user_mode/tuxisalive/api/sh.py 2009-09-14 10:22:24 UTC (rev 5370)
+++ software_suite_v3/smart-core/smart-api/python/branches/user_mode/tuxisalive/api/sh.py 2009-09-14 10:24:25 UTC (rev 5371)
@@ -7,6 +7,7 @@
"Free" client mode.
"""
import os
+import time
if os.name == 'nt':
from version import author, date, version, licence
else:
@@ -35,7 +36,13 @@
global tux
+# Try to connect to the port 270
tux = TuxAPI("127.0.0.1", 270)
+time.sleep(1)
+# If the API is not connected to the port 270, then try the port 54321 (user
+# mode)
+if not tux.server.getConnected():
+ tux = TuxAPI("127.0.0.1", 54321)
verString = tux.getVersion()
verH = "".join("=" * len(verString))
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 10:22:39
|
Author: ks156 Date: 2009-09-14 12:22:24 +0200 (Mon, 14 Sep 2009) New Revision: 5370 Added: software_suite_v3/smart-core/smart-api/python/branches/user_mode/ Log: * Created a new branch for the "user_mode" This branch will be used to adapt the API in order to works with the server started on the port 54321 (server started as normal user). Copied: software_suite_v3/smart-core/smart-api/python/branches/user_mode (from rev 5369, software_suite_v3/smart-core/smart-api/python/trunk) Property changes on: software_suite_v3/smart-core/smart-api/python/branches/user_mode ___________________________________________________________________ Name: svn:mergeinfo + |
|
From: remi <c2m...@c2...> - 2009-09-14 10:19:08
|
Author: remi
Date: 2009-09-14 12:19:00 +0200 (Mon, 14 Sep 2009)
New Revision: 5369
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginDescription.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterContext.py
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterJava.py
Log:
* Added support of splash screen for the java plugins on Windows
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginDescription.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginDescription.py 2009-09-14 10:17:52 UTC (rev 5368)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/PluginDescription.py 2009-09-14 10:19:00 UTC (rev 5369)
@@ -32,6 +32,7 @@
self.__version = None
self.__description = None
self.__iconFile = None
+ self.__splashScreenFile = None
self.__helpFile = None
self.__platform = None
self.__ttsName = None
@@ -69,6 +70,12 @@
self.__version = dictionary['version']
self.__uuid = dictionary['uuid']
self.__iconFile = os.path.join(workingPath, dictionary['iconFile'])
+ tmpFileName = os.path.join(workingPath, "resources", "splash.gif")
+ if os.path.isfile(tmpFileName):
+ self.__splashScreenFile = tmpFileName
+ print self.__splashScreenFile
+ else:
+ self.__splashScreenFile = None
self.__description = dictionary['description']
self.__workingPath = workingPath
self.__platform = "all"
@@ -160,6 +167,15 @@
return self.__iconFile
# --------------------------------------------------------------------------
+ # Get the splash-screen image of the plugin.
+ # --------------------------------------------------------------------------
+ def getSplashScreenFile(self):
+ """Get the splash-screen image of the plugin.
+ @return: A string.
+ """
+ return self.__splashScreenFile
+
+ # --------------------------------------------------------------------------
# Get the translated help content of the plugin.
# --------------------------------------------------------------------------
def getHelpFile(self, language = None):
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-14 10:17:52 UTC (rev 5368)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreter.py 2009-09-14 10:19:00 UTC (rev 5369)
@@ -30,6 +30,7 @@
self.__process = None
self.__pid = None
self.__daemon = False
+ self.__splashScreen = None
self.__onPluginStartedCallback = None
self.__onPluginStoppedCallback = None
self.__onNotificationThrowedCallback = None
@@ -78,6 +79,24 @@
return self.__workingPath
# --------------------------------------------------------------------------
+ # Set the splash screen image.
+ # --------------------------------------------------------------------------
+ def setSplashScreen(self, splashScreen):
+ """Set the splash screen image.
+ @param splashScreen: Splash screen image path.
+ """
+ self.__splashScreen = splashScreen
+
+ # --------------------------------------------------------------------------
+ # Get the splash screen image.
+ # --------------------------------------------------------------------------
+ def getSplashScreen(self):
+ """Get the splash screen image.
+ @return: A string.
+ """
+ return self.__splashScreen
+
+ # --------------------------------------------------------------------------
# Set the executable.
# --------------------------------------------------------------------------
def setExecutable(self, executable):
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterContext.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterContext.py 2009-09-14 10:17:52 UTC (rev 5368)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterContext.py 2009-09-14 10:19:00 UTC (rev 5369)
@@ -26,6 +26,7 @@
self.__pluginInterpreter.setOnNotificationThrowedCallback(self.__onInterpreterNotification)
self.__pluginInterpreter.setWorkingPath(self.__parentPlugin.getWorkingPath())
self.__pluginInterpreter.setExecutable(interpreterExecution)
+ self.__pluginInterpreter.setSplashScreen(self.__parentPlugin.getDescription().getSplashScreenFile())
self.__pluginInstanceParameters = {}
self.__pluginInstanceCommand = ""
self.__pluginInstanceIsDaemon = False
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterJava.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterJava.py 2009-09-14 10:17:52 UTC (rev 5368)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/interpreters/PluginInterpreterJava.py 2009-09-14 10:19:00 UTC (rev 5369)
@@ -67,4 +67,7 @@
fClassPath,
self.getExecutable(),
]
+ if self.getSplashScreen() != None:
+ if os.name == 'nt':
+ command.insert(1, "-splash:%s" % self.getSplashScreen())
return command
|
|
From: remi <c2m...@c2...> - 2009-09-14 10:18:04
|
Author: remi Date: 2009-09-14 12:17:52 +0200 (Mon, 14 Sep 2009) New Revision: 5368 Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/splash.gif Log: * Added splash screen image Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/splash.gif =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/splash.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: remi <c2m...@c2...> - 2009-09-14 10:15:03
|
Author: remi Date: 2009-09-14 12:14:52 +0200 (Mon, 14 Sep 2009) New Revision: 5367 Added: software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/splash.gif Log: * Added splash screen image Added: software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/splash.gif =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-attitunes-studio/trunk/resources/splash.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: ks156 <c2m...@c2...> - 2009-09-14 10:12:10
|
Author: ks156
Date: 2009-09-14 12:12:00 +0200 (Mon, 14 Sep 2009)
New Revision: 5366
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/
software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/02_resourceGagdetsServer.py
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py
Log:
* Merged rev 5346 to 5365 trunk -> user_mode
Property changes on: software_suite_v3/smart-core/smart-server/branches/user_mode
___________________________________________________________________
Name: svn:mergeinfo
-
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py 2009-09-14 10:07:31 UTC (rev 5365)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/TDSAutoUpdater.py 2009-09-14 10:12:00 UTC (rev 5366)
@@ -175,8 +175,6 @@
currentVersion = confDict[archName]["version"]
if self.__getCurrentPartVersion(partName) == currentVersion:
continue
- # Write CVER file
- self.__writeCVerFile(partName, currentVersion)
installerFile = os.path.join(TDS_UPDATES_PATH, installerName)
if os.name == "nt":
cmd = [
@@ -186,6 +184,8 @@
]
self.__logger.logInfo("Installation started [%s] (%s)" % (installerName, currentVersion))
process = subprocess.Popen(cmd)
+ process.wait()
+ self.__writeCVerFile(partName, currentVersion)
self.__logger.logInfo("Installation finished")
else:
pass
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py 2009-09-14 10:07:31 UTC (rev 5365)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/02_robot/10_resourceRF.py 2009-09-14 10:12:00 UTC (rev 5366)
@@ -97,6 +97,16 @@
'avoided_channel' : None,
'avoided_bandwidth' : WIFI_DEFAULT_AVOIDED_BANDWIDTH,
}
+ # Create a logger
+ self.logger = SimpleLogger("rf")
+ self.logger.resetLog()
+ self.logger.setLevel(TDS_CONF_LOG_LEVEL)
+ self.logger.setTarget(TDS_CONF_LOG_TARGET)
+ self.logger.logInfo("-----------------------------------------------")
+ self.logger.logInfo("Smart-core RF")
+ self.logger.logInfo("Licence : GPL")
+ self.logger.logInfo("-----------------------------------------------")
+ # Load configuration
self.configurator.load('resourceRF.conf', defaultConfiguration)
self.statesChecker()
resourceScheduler.createTask_RunEveryX(
@@ -142,11 +152,12 @@
userBandwidth = self.configurator.getConfiguration()['avoided_bandwidth']
if self.__channelIsInUse() == None:
if userChannel != None:
- print "Avoid user selected channel :", userChannel
+ self.logger.logInfo("Manual wifi channel avoidance : ch=%d bw=%d" % (userChannel, userBandwidth))
self.avoidChannel(userChannel, userBandwidth)
self.__setChannelInUse(userChannel)
self.__setConnectionDetected(True)
else:
+ """
if URLTools.URLCheck("http://ftp.kysoh.com", 5.0):
detectedChannel = self.detectChannel()
if detectedChannel != None:
@@ -159,9 +170,17 @@
self.avoidChannel(1, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
self.__setChannelInUse(1)
self.__setConnectionDetected(True)
+ """
+ # Don't detect internet connection seems to have better results
+ detectedChannel = self.detectChannel()
+ if detectedChannel != None:
+ self.logger.logInfo("Automatic wifi channel avoidance : ch=%d" % detectedChannel)
+ self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ self.__setChannelInUse(detectedChannel)
+ self.__setConnectionDetected(True)
def resetStates(self):
- print "Reset wifi channel states"
+ self.logger.logInfo("Reset wifi channel avoidance states")
self.__setChannelInUse(None)
self.__setConnectionDetected(False)
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/02_resourceGagdetsServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/02_resourceGagdetsServer.py 2009-09-14 10:07:31 UTC (rev 5365)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/02_resourceGagdetsServer.py 2009-09-14 10:12:00 UTC (rev 5366)
@@ -87,7 +87,7 @@
scgName = os.path.split(gadget.getScgFile())[-1]
gadgetDlUrl = '/gadgets/%s' % scgName
resourcesManager.addFileToServe(gadget.getScgFile(), gadgetDlUrl)
- self.logger.logDebug("Gadget deployed [%s] to [%s]" % (
+ self.logger.logInfo("Gadget deployed [%s] to [%s]" % (
gadget.getDescription().getName(), gadgetWorkingPath))
self.__publishEvents(False, ST_NAME_GS_GADGET_LOADED, [uuid,])
@@ -108,7 +108,7 @@
scgName = os.path.split(gadget.getScgFile())[-1]
gadgetDlUrl = '/gadgets/%s' % scgName
resourcesManager.removeFileToServe(gadgetDlUrl)
- self.logger.logDebug("Gadget undeployed [%s] to [%s]" % (
+ self.logger.logInfo("Gadget undeployed [%s] to [%s]" % (
gadget.getDescription().getName(), gadgetWorkingPath))
self.__publishEvents(False, ST_NAME_GS_GADGET_UNLOADED, [uuid,])
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-14 10:07:31 UTC (rev 5365)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/03_content_servers/03_resourceUgcServer.py 2009-09-14 10:12:00 UTC (rev 5366)
@@ -70,7 +70,7 @@
ugcName = os.path.split(ugc.getUgcFile())[-1]
ugcDlUrl = '/ugcs/%s' % ugcName
resourcesManager.addFileToServe(ugc.getUgcFile(), ugcDlUrl)
- self.logger.logDebug("UGC deployed [%s] to [%s]" % (
+ self.logger.logInfo("UGC deployed [%s] to [%s]" % (
ugc.getDescription().getName(), ugcFile))
self.__publishEvents(False, ST_NAME_US_UGC_LOADED, [uuid,])
self.insertAlertsInScheduler(ugc)
@@ -92,7 +92,7 @@
ugcName = os.path.split(ugc.getUgcFile())[-1]
ugcDlUrl = '/ugcs/%s' % ugcName
resourcesManager.removeFileToServe(ugcDlUrl)
- self.logger.logDebug("UGC undeployed [%s] from [%s]" % (
+ self.logger.logInfo("UGC undeployed [%s] from [%s]" % (
ugc.getDescription().getName(), ugcFile))
self.__publishEvents(False, ST_NAME_US_UGC_UNLOADED, [uuid,])
self.deleteAlertsFromScheduler(ugc)
@@ -300,26 +300,28 @@
[delay['hour'], delay['minute'], delay['second']],
data)
ugcTask.setTaskId1(taskId)
- if ugc.getCommand(parentTask.getCommand()).isDaemon() and \
- parentTask.getType() == "DAILY AT":
- command = "resourceUgcServer.stopUgc"
- arguments = (ugc.getDescription().getUuid(),)
- data = {
- 'commandType' : 'ugc_stop',
- 'uuid' : ugc.getDescription().getUuid(),
- }
- taskId, taskName = resourceScheduler.createTask(
- command,
- arguments,
- parentTask.getType(),
- ugcTask.getName(),
- ugcTask.getWeekMask(),
- [date['year'], date['month'], date['day']],
- [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
- [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
- [delay['hour'], delay['minute'], delay['second']],
- data)
- ugcTask.setTaskId2(taskId)
+ parentCommand = ugc.getCommand(parentTask.getCommand())
+ if parentCommand != None:
+ if parentCommand.isDaemon() and \
+ parentTask.getType() == "DAILY AT":
+ command = "resourceUgcServer.stopUgc"
+ arguments = (ugc.getDescription().getUuid(),)
+ data = {
+ 'commandType' : 'ugc_stop',
+ 'uuid' : ugc.getDescription().getUuid(),
+ }
+ taskId, taskName = resourceScheduler.createTask(
+ command,
+ arguments,
+ parentTask.getType(),
+ ugcTask.getName(),
+ ugcTask.getWeekMask(),
+ [date['year'], date['month'], date['day']],
+ [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
+ [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
+ [delay['hour'], delay['minute'], delay['second']],
+ data)
+ ugcTask.setTaskId2(taskId)
def deleteAlertsFromScheduler(self, ugc):
"""Delete activated ugc alerts from the scheduler.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py 2009-09-14 10:07:31 UTC (rev 5365)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py 2009-09-14 10:12:00 UTC (rev 5366)
@@ -47,9 +47,6 @@
time.sleep(0.5)
def runServer():
- killOldSmartCoreChildren()
- killPreviousSmartServer()
- refreshTaskBar()
from TuxDroidServer import initializeServer
from TuxDroidServer import httpServer
from TuxDroidServer import finalizeServer
|
|
From: ks156 <c2m...@c2...> - 2009-09-14 10:07:49
|
Author: ks156
Date: 2009-09-14 12:07:31 +0200 (Mon, 14 Sep 2009)
New Revision: 5365
Added:
software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py
Modified:
software_suite_v3/smart-core/smart-server/branches/user_mode/TDSConfiguration.py
software_suite_v3/smart-core/smart-server/branches/user_mode/resources/05_user_configurations/00_resourceUsers.py
software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/daemonizer/Daemonizer.py
software_suite_v3/smart-core/smart-server/branches/user_mode/util/logger/SimpleLogger.py
Log:
* Added a set of function to determines if the server has been started as
normal user or not.
This version can be started as normal user, and accessed with the port
"54321".
All the configurations, logs, and so on are located on ~/.tuxdroid.
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/TDSConfiguration.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/TDSConfiguration.py 2009-09-14 09:53:42 UTC (rev 5364)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/TDSConfiguration.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -16,6 +16,7 @@
from util.logger import *
from util.misc.tuxPaths import *
+from util.misc.systemPaths import systemPaths
# ==============================================================================
# Class to retrieve the py file path.
@@ -37,8 +38,9 @@
TDS_CONF_HOST_ADDRESS = '127.0.0.1'
else:
TDS_CONF_HOST_ADDRESS = ''
+
# HTTP server Port
-TDS_HTTP_PORT = 270
+TDS_HTTP_PORT = systemPaths.getServerPort()
# Use 50msec delay in request (CPU optimisation)
TDS_50MSEC_OPTIMISATION = False
# Use asynchronous requests treatment
@@ -51,7 +53,7 @@
# TCP/IP server configuration
# ------------------------------------------------------------------------------
# Raw data server port
-TDS_RAW_DATA_PORT = 271
+TDS_RAW_DATA_PORT = systemPaths.getServerPort() + 1
# ------------------------------------------------------------------------------
# Loggers configuration
@@ -86,19 +88,22 @@
if os.name == 'nt':
TDS_RESOURCES_CONF_PATH = os.path.join(ALLUSERSBASEDIR, "configurations", "resources")
else:
- TDS_RESOURCES_CONF_PATH = os.path.join("/etc/tuxdroid", "resources_conf")
+ TDS_RESOURCES_CONF_PATH = systemPaths.getResourcesConfPath()
# Path of the user configurations
if os.name == 'nt':
TDS_USERS_CONF_PATH = os.path.join(ALLUSERSBASEDIR, "configurations", "users_conf")
else:
- TDS_USERS_CONF_PATH = os.path.join("/etc/tuxdroid", "users_conf")
+ TDS_USERS_CONF_PATH = systemPaths.getUserConfPath()
# Path of the default content of the server
if os.name == 'nt':
TDS_DEFAULT_CONTENT_PATH = os.path.join(ALLUSERSBASEDIR, "resources")
else:
TDS_DEFAULT_CONTENT_PATH = os.path.join(TUXDROID_BASE_PATH, "resources")
# Path of the server updates
-TDS_UPDATES_PATH = os.path.join(TDS_DEFAULT_CONTENT_PATH, "updates")
+if os.name == 'nt':
+ TDS_UPDATES_PATH = os.path.join(TDS_DEFAULT_CONTENT_PATH, "updates")
+else:
+ TDS_UPDATES_PATH = systemPaths.getUpdateContentPath()
# ------------------------------------------------------------------------------
# Resources configuration
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/resources/05_user_configurations/00_resourceUsers.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/resources/05_user_configurations/00_resourceUsers.py 2009-09-14 09:53:42 UTC (rev 5364)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/resources/05_user_configurations/00_resourceUsers.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -70,6 +70,14 @@
"""
userName = self.__lastUser
userConfFile = os.path.join(TDS_USERS_CONF_PATH, userName, "user.conf")
+
+ # If the server has been started as normal user on Linux and
+ # if the user configuration file doesn't exists, copy the master
+ # configuration located in /etc/tuxdroid/users_conf/default/user.conf
+ if not os.path.isfile(userConfFile) and os.name != 'nt':
+ if systemPaths.isUser():
+ os.system("cp /etc/tuxdroid/users_conf/default/user.conf %s"%userConfFile)
+
if not os.path.isfile(userConfFile):
# Create default configuration
splitedLC = TUXDROID_LANGUAGE.split("_")
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py 2009-09-14 09:53:42 UTC (rev 5364)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/tuxhttpserver.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -86,7 +86,8 @@
else: # Linux
if __daemon:
from util.daemonizer import Daemonizer
- tuxDroidDaemon = Daemonizer('tuxhttpserver', '/var/log/tuxdroid',
+ from util.misc.systemPaths import systemPaths
+ tuxDroidDaemon = Daemonizer('tuxhttpserver', systemPaths.getLogPath(),
runServer, True)
tuxDroidDaemon.start()
else:
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/daemonizer/Daemonizer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/daemonizer/Daemonizer.py 2009-09-14 09:53:42 UTC (rev 5364)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/daemonizer/Daemonizer.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -14,6 +14,7 @@
import os
import sys
import errno
+from util.misc.systemPaths import systemPaths
# ==============================================================================
# Public class
@@ -37,6 +38,11 @@
@param name: name of the daemon.
@param path: path of the pid file.
"""
+ # Search where the PID file must be placed
+ path = systemPaths.getPidPath()
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+
self.__PIDFILE = "%s/%s.pid" % (path, name)
# --------------------------------------------------------------------------
Modified: software_suite_v3/smart-core/smart-server/branches/user_mode/util/logger/SimpleLogger.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/logger/SimpleLogger.py 2009-09-14 09:53:42 UTC (rev 5364)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/logger/SimpleLogger.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -16,6 +16,8 @@
import threading
import time
+from util.misc.systemPaths import systemPaths
+
# Levels
LOG_LEVEL_DEBUG = 0
LOG_LEVEL_INFO = 1
@@ -59,9 +61,10 @@
if not os.path.isdir(self.__logPath):
os.makedirs(self.__logPath)
else:
- if not os.path.isdir("/var/log/tuxdroid"):
- os.makedirs("/var/log/tuxdroid", mode=0755)
- self.__logPath = "/var/log/tuxdroid/"
+ path = systemPaths.getLogPath()
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ self.__logPath = path
else:
self.__logPath = logPath
Added: software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py
===================================================================
--- software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py (rev 0)
+++ software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py 2009-09-14 10:07:31 UTC (rev 5365)
@@ -0,0 +1,120 @@
+# -*- coding: latin1 -*-
+
+# Copyright (C) 2009 Kysoh SA (http://www.kysoh.com)
+# Paul Rathgeb ( paul dot rathgeb at kysoh dot com )
+# Distributed under the terms of the GNU General Public License
+# http://www.gnu.org/copyleft/gpl.html
+
+import os
+
+class systemPaths(object):
+
+
+ def getServerPort():
+ """Get the server port
+ """
+ if os.name == "nt":
+ return 270
+ else:
+ if os.geteuid() == 0:
+ return 270
+ else:
+ return 54321
+
+ def getLogPath():
+ """Get the logs path
+ """
+ if os.name == "nt":
+ #Default Path
+ print "FIXME: Add the log path for Windows"
+ return "None"
+ else:
+ if os.geteuid() == 0:
+ #root
+ return "/var/log/tuxdroid/"
+ else:
+ # Retrieve the HOME directory
+ h = os.getenv("HOME")
+ path = os.path.join(h, ".tuxdroid", "logs")
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ return path
+
+ def getPidPath():
+ """Get the PID file Path
+ """
+ if os.name == "nt":
+ print "FIXME: Add the PID file path for Windows"
+ return "None"
+ else:
+ if os.geteuid() == 0:
+ return "/var/run/"
+ else:
+ # Retrieve the HOME directory
+ h = os.getenv("HOME")
+ path = os.path.join(h, ".tuxdroid", "run")
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ return path
+
+ def getResourcesConfPath():
+ """Get the resource configuration path
+ """
+ if os.name == "nt":
+ print "FIXME: Add the resource configuration PATH for Windows"
+ return "None"
+ else:
+ if os.geteuid() == 0:
+ return os.path.join("/etc/tuxdroid", "resource_conf")
+ else:
+ h = os.getenv("HOME")
+ path = os.path.join(h, ".tuxdroid", "resource_conf")
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ return path
+
+ def getUserConfPath():
+ """Get the user configuration path
+ """
+ if os.name == "nt":
+ print "FIXME: Add the user configuration PATH for Windows"
+ return "None"
+ else:
+ if os.geteuid() == 0:
+ return os.path.join("/etc/tuxdroid", "users_conf")
+ else:
+ h = os.getenv("HOME")
+ path = os.path.join(h, ".tuxdroid", "users_conf")
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ return path
+
+ def getUpdateContentPath():
+ """Get the user configuration path
+ """
+ if os.name == "nt":
+ print "FIXME: Add the user configuration PATH for Windows"
+ return "None"
+ else:
+ if os.geteuid() == 0:
+ return os.path.join("/usr/share/tuxdroid/resources", "updates")
+ else:
+ h = os.getenv("HOME")
+ path = os.path.join(h, ".tuxdroid", "updates")
+ if not os.path.isdir(path):
+ os.makedirs(path, mode=0755)
+ return path
+
+ def isUser():
+ if os.geteuid() == 0:
+ return False
+ else:
+ return True
+
+ getServerPort = staticmethod(getServerPort)
+ getLogPath = staticmethod(getLogPath)
+ getPidPath = staticmethod(getPidPath)
+ getResourcesConfPath = staticmethod(getResourcesConfPath)
+ getUserConfPath = staticmethod(getUserConfPath)
+ getUpdateContentPath = staticmethod(getUpdateContentPath)
+ isUser = staticmethod(isUser)
Property changes on: software_suite_v3/smart-core/smart-server/branches/user_mode/util/misc/systemPaths.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-python
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
|
|
From: jerome <c2m...@c2...> - 2009-09-14 09:54:03
|
Author: jerome Date: 2009-09-14 11:53:42 +0200 (Mon, 14 Sep 2009) New Revision: 5364 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/dependencies/PngComponentsSetup.zip Log: * Added png components dependency. Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/dependencies/PngComponentsSetup.zip =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/dependencies/PngComponentsSetup.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: remi <c2m...@c2...> - 2009-09-14 09:27:04
|
Author: remi
Date: 2009-09-14 11:26:41 +0200 (Mon, 14 Sep 2009)
New Revision: 5363
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
Log:
* Added a logger in the RF resource
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-11 14:50:10 UTC (rev 5362)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-14 09:26:41 UTC (rev 5363)
@@ -97,6 +97,16 @@
'avoided_channel' : None,
'avoided_bandwidth' : WIFI_DEFAULT_AVOIDED_BANDWIDTH,
}
+ # Create a logger
+ self.logger = SimpleLogger("rf")
+ self.logger.resetLog()
+ self.logger.setLevel(TDS_CONF_LOG_LEVEL)
+ self.logger.setTarget(TDS_CONF_LOG_TARGET)
+ self.logger.logInfo("-----------------------------------------------")
+ self.logger.logInfo("Smart-core RF")
+ self.logger.logInfo("Licence : GPL")
+ self.logger.logInfo("-----------------------------------------------")
+ # Load configuration
self.configurator.load('resourceRF.conf', defaultConfiguration)
self.statesChecker()
resourceScheduler.createTask_RunEveryX(
@@ -142,7 +152,7 @@
userBandwidth = self.configurator.getConfiguration()['avoided_bandwidth']
if self.__channelIsInUse() == None:
if userChannel != None:
- print "Avoid user selected channel :", userChannel
+ self.logger.logInfo("Manual wifi channel avoidance : ch=%d bw=%d" % (userChannel, userBandwidth))
self.avoidChannel(userChannel, userBandwidth)
self.__setChannelInUse(userChannel)
self.__setConnectionDetected(True)
@@ -164,13 +174,13 @@
# Don't detect internet connection seems to have better results
detectedChannel = self.detectChannel()
if detectedChannel != None:
- print "Avoid auto detected channel :", detectedChannel
+ self.logger.logInfo("Automatic wifi channel avoidance : ch=%d" % detectedChannel)
self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
self.__setChannelInUse(detectedChannel)
self.__setConnectionDetected(True)
def resetStates(self):
- print "Reset wifi channel states"
+ self.logger.logInfo("Reset wifi channel avoidance states")
self.__setChannelInUse(None)
self.__setConnectionDetected(False)
|
|
From: remi <c2m...@c2...> - 2009-09-11 14:50:26
|
Author: remi
Date: 2009-09-11 16:50:10 +0200 (Fri, 11 Sep 2009)
New Revision: 5362
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
Log:
* Fixed bug with ugc task insertions
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-11 13:11:01 UTC (rev 5361)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-11 14:50:10 UTC (rev 5362)
@@ -300,26 +300,28 @@
[delay['hour'], delay['minute'], delay['second']],
data)
ugcTask.setTaskId1(taskId)
- if ugc.getCommand(parentTask.getCommand()).isDaemon() and \
- parentTask.getType() == "DAILY AT":
- command = "resourceUgcServer.stopUgc"
- arguments = (ugc.getDescription().getUuid(),)
- data = {
- 'commandType' : 'ugc_stop',
- 'uuid' : ugc.getDescription().getUuid(),
- }
- taskId, taskName = resourceScheduler.createTask(
- command,
- arguments,
- parentTask.getType(),
- ugcTask.getName(),
- ugcTask.getWeekMask(),
- [date['year'], date['month'], date['day']],
- [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
- [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
- [delay['hour'], delay['minute'], delay['second']],
- data)
- ugcTask.setTaskId2(taskId)
+ parentCommand = ugc.getCommand(parentTask.getCommand())
+ if parentCommand != None:
+ if parentCommand.isDaemon() and \
+ parentTask.getType() == "DAILY AT":
+ command = "resourceUgcServer.stopUgc"
+ arguments = (ugc.getDescription().getUuid(),)
+ data = {
+ 'commandType' : 'ugc_stop',
+ 'uuid' : ugc.getDescription().getUuid(),
+ }
+ taskId, taskName = resourceScheduler.createTask(
+ command,
+ arguments,
+ parentTask.getType(),
+ ugcTask.getName(),
+ ugcTask.getWeekMask(),
+ [date['year'], date['month'], date['day']],
+ [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
+ [hoursEnd['hour'], hoursEnd['minute'], hoursEnd['second']],
+ [delay['hour'], delay['minute'], delay['second']],
+ data)
+ ugcTask.setTaskId2(taskId)
def deleteAlertsFromScheduler(self, ugc):
"""Delete activated ugc alerts from the scheduler.
|
|
From: jerome <c2m...@c2...> - 2009-09-11 13:11:15
|
Author: jerome Date: 2009-09-11 15:11:01 +0200 (Fri, 11 Sep 2009) New Revision: 5361 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/images/bmp/splash-tuxbox2.png Log: * Added new splash screen. Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/images/bmp/splash-tuxbox2.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/images/bmp/splash-tuxbox2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: jerome <c2m...@c2...> - 2009-09-11 12:59:49
|
Author: jerome
Date: 2009-09-11 14:59:36 +0200 (Fri, 11 Sep 2009)
New Revision: 5360
Modified:
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.dfm
software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.pas
Log:
* Updated project to allow Second installer to keep priority on 'run'.
Modified: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.dfm 2009-09-11 12:58:43 UTC (rev 5359)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.dfm 2009-09-11 12:59:36 UTC (rev 5360)
@@ -104,8 +104,14 @@
DisableCtrlShortcuts = 'N'
UserInterfaceOptions = [EnablesFormsAutoComplete, EnableThemes]
About = ' EmbeddedWB http://bsalsa.com/'
+ PrintOptions.Margins.Left = 19.05
+ PrintOptions.Margins.Right = 19.05
+ PrintOptions.Margins.Top = 19.05
+ PrintOptions.Margins.Bottom = 19.05
+ PrintOptions.Header = '&w&bPage &p of &P'
PrintOptions.HTMLHeader.Strings = (
'<HTML></HTML>')
+ PrintOptions.Footer = '&u&b&d'
PrintOptions.Orientation = poPortrait
ControlData = {
4C000000E20E00007A0800000000000000000000000000000000000000000000
Modified: software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.pas 2009-09-11 12:58:43 UTC (rev 5359)
+++ software_suite_v3/software/tool/tux_droid_browser_launcher/trunk/tux_droid_browser_launcher/start.pas 2009-09-11 12:59:36 UTC (rev 5360)
@@ -151,7 +151,8 @@
ShellExecute(HWND(nil), 'open', PChar(APPLICATION), PChar(action), nil, SW_HIDE);
end;
-
+var
+ timeout : Integer;
{#### Main entry point ####}
begin
if not isSmartServerRunning then
@@ -183,6 +184,27 @@
if ParamStr(1) = 'minimize' then
begin
startAll('hide');
+ end
+ else if ParamStr(1) = 'keep' then
+ begin
+ timeout := 120; //seconds.
+ while not isTuxBoxRunning() do
+ begin
+ if timeout <> 0 then
+ begin
+ //sleeping until the other instance is running.
+ sleep(1000);
+ Application.ProcessMessages();
+ Dec(timeout, 1);
+ end
+ else
+ begin
+ exit;
+ end;
+ end;
+ KillTask('TuxBox.exe');
+ sleep(2000);
+ startAll('show');
end;
end
else
|
|
From: jerome <c2m...@c2...> - 2009-09-11 12:59:02
|
Author: jerome
Date: 2009-09-11 14:58:43 +0200 (Fri, 11 Sep 2009)
New Revision: 5359
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Updated the command sent to start TuxBox at run once.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-11 12:43:18 UTC (rev 5358)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-11 12:58:43 UTC (rev 5359)
@@ -548,7 +548,7 @@
begin
//This function handle the 'Finish' button click.
command := '"' + TuxUtils.GetTuxDroidBinariesDirectory() + '\tuxbox_launcher.exe' + '"';
- ShellExecute(HWND(nil), 'open', PChar(command), nil, nil, SW_HIDE);
+ ShellExecute(HWND(nil), 'open', PChar(command), PChar('keep'), nil, SW_SHOW);
end;
//We provide the time to tuxbox to be started faster.
|
|
From: remi <c2m...@c2...> - 2009-09-11 12:43:34
|
Author: remi
Date: 2009-09-11 14:43:18 +0200 (Fri, 11 Sep 2009)
New Revision: 5358
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
Log:
* Updated some log levels
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py 2009-09-11 12:42:48 UTC (rev 5357)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/02_resourceGagdetsServer.py 2009-09-11 12:43:18 UTC (rev 5358)
@@ -87,7 +87,7 @@
scgName = os.path.split(gadget.getScgFile())[-1]
gadgetDlUrl = '/gadgets/%s' % scgName
resourcesManager.addFileToServe(gadget.getScgFile(), gadgetDlUrl)
- self.logger.logDebug("Gadget deployed [%s] to [%s]" % (
+ self.logger.logInfo("Gadget deployed [%s] to [%s]" % (
gadget.getDescription().getName(), gadgetWorkingPath))
self.__publishEvents(False, ST_NAME_GS_GADGET_LOADED, [uuid,])
@@ -108,7 +108,7 @@
scgName = os.path.split(gadget.getScgFile())[-1]
gadgetDlUrl = '/gadgets/%s' % scgName
resourcesManager.removeFileToServe(gadgetDlUrl)
- self.logger.logDebug("Gadget undeployed [%s] to [%s]" % (
+ self.logger.logInfo("Gadget undeployed [%s] to [%s]" % (
gadget.getDescription().getName(), gadgetWorkingPath))
self.__publishEvents(False, ST_NAME_GS_GADGET_UNLOADED, [uuid,])
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-11 12:42:48 UTC (rev 5357)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/03_resourceUgcServer.py 2009-09-11 12:43:18 UTC (rev 5358)
@@ -70,7 +70,7 @@
ugcName = os.path.split(ugc.getUgcFile())[-1]
ugcDlUrl = '/ugcs/%s' % ugcName
resourcesManager.addFileToServe(ugc.getUgcFile(), ugcDlUrl)
- self.logger.logDebug("UGC deployed [%s] to [%s]" % (
+ self.logger.logInfo("UGC deployed [%s] to [%s]" % (
ugc.getDescription().getName(), ugcFile))
self.__publishEvents(False, ST_NAME_US_UGC_LOADED, [uuid,])
self.insertAlertsInScheduler(ugc)
@@ -92,7 +92,7 @@
ugcName = os.path.split(ugc.getUgcFile())[-1]
ugcDlUrl = '/ugcs/%s' % ugcName
resourcesManager.removeFileToServe(ugcDlUrl)
- self.logger.logDebug("UGC undeployed [%s] from [%s]" % (
+ self.logger.logInfo("UGC undeployed [%s] from [%s]" % (
ugc.getDescription().getName(), ugcFile))
self.__publishEvents(False, ST_NAME_US_UGC_UNLOADED, [uuid,])
self.deleteAlertsFromScheduler(ugc)
|
|
From: remi <c2m...@c2...> - 2009-09-11 12:43:10
|
Author: remi
Date: 2009-09-11 14:42:48 +0200 (Fri, 11 Sep 2009)
New Revision: 5357
Modified:
software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
Log:
* Updated runServer command
Modified: software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py 2009-09-11 12:05:06 UTC (rev 5356)
+++ software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py 2009-09-11 12:42:48 UTC (rev 5357)
@@ -47,9 +47,6 @@
time.sleep(0.5)
def runServer():
- killOldSmartCoreChildren()
- killPreviousSmartServer()
- refreshTaskBar()
from TuxDroidServer import initializeServer
from TuxDroidServer import httpServer
from TuxDroidServer import finalizeServer
|
|
From: remi <c2m...@c2...> - 2009-09-11 12:05:19
|
Author: remi
Date: 2009-09-11 14:05:06 +0200 (Fri, 11 Sep 2009)
New Revision: 5356
Modified:
software_suite_v3/smart-core/smart-server/trunk/TDSAutoUpdater.py
Log:
* Force to wait the end of the update installation.
Modified: software_suite_v3/smart-core/smart-server/trunk/TDSAutoUpdater.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/TDSAutoUpdater.py 2009-09-11 08:18:18 UTC (rev 5355)
+++ software_suite_v3/smart-core/smart-server/trunk/TDSAutoUpdater.py 2009-09-11 12:05:06 UTC (rev 5356)
@@ -175,8 +175,6 @@
currentVersion = confDict[archName]["version"]
if self.__getCurrentPartVersion(partName) == currentVersion:
continue
- # Write CVER file
- self.__writeCVerFile(partName, currentVersion)
installerFile = os.path.join(TDS_UPDATES_PATH, installerName)
if os.name == "nt":
cmd = [
@@ -186,6 +184,8 @@
]
self.__logger.logInfo("Installation started [%s] (%s)" % (installerName, currentVersion))
process = subprocess.Popen(cmd)
+ process.wait()
+ self.__writeCVerFile(partName, currentVersion)
self.__logger.logInfo("Installation finished")
else:
pass
|
1 message has been excluded from this view by a project administrator.
