tux-droid-svn Mailing List for Tux Droid CE (Page 28)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-09-11 08:18:31
|
Author: jerome Date: 2009-09-11 10:18:18 +0200 (Fri, 11 Sep 2009) New Revision: 5355 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po Log: * Updated po and mo files. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-11 08:18:18 UTC (rev 5355) @@ -76,4 +76,5 @@ msgstr "Your fish dongle was not properly detected by Windows. Please replug your dongle." msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." -msgstr "" +msgstr "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." + Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-11 08:18:18 UTC (rev 5355) @@ -76,4 +76,5 @@ msgstr "Votre poisson n'a pas correctement été détecté par Windows. S'il vous plait, reconnectez votre dongle." msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." -msgstr "" +msgstr "Il semble y avoir un problème avec votre installation logicielle. Essayez d'installer à nouveau la suite logicielle. Dans le cas où celà n'aiderais pas, s'il vous plait, visitez notre forum ou contactez le service clientelle." + Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo =================================================================== (Binary files differ) Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-11 08:18:18 UTC (rev 5355) @@ -76,4 +76,5 @@ msgstr "Je vis dongle werd niet correct gedetecteerd door Windows. Gelieve je vis dongle uit de USB poort te nemen en dan terug in te steken." msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." -msgstr "" +msgstr "Er is een probleem opgetreden met de software installatie. Gelieve de Tux Droid software opnieuw te installeren. Als dit ook niet helpt, neem een kijkje op onze forums of contacteer onze customer support." + |
|
From: jerome <c2m...@c2...> - 2009-09-11 07:55:43
|
Author: jerome Date: 2009-09-11 09:55:29 +0200 (Fri, 11 Sep 2009) New Revision: 5354 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po Log: * Updated po files. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-11 07:27:59 UTC (rev 5353) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) @@ -75,3 +75,5 @@ msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." msgstr "Your fish dongle was not properly detected by Windows. Please replug your dongle." +msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." +msgstr "" Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-11 07:27:59 UTC (rev 5353) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) @@ -75,3 +75,5 @@ msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." msgstr "Votre poisson n'a pas correctement été détecté par Windows. S'il vous plait, reconnectez votre dongle." +msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." +msgstr "" Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-11 07:27:59 UTC (rev 5353) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-11 07:55:29 UTC (rev 5354) @@ -75,3 +75,5 @@ msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." msgstr "Je vis dongle werd niet correct gedetecteerd door Windows. Gelieve je vis dongle uit de USB poort te nemen en dan terug in te steken." +msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." +msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-09-11 07:28:16
|
Author: jerome Date: 2009-09-11 09:27:59 +0200 (Fri, 11 Sep 2009) New Revision: 5353 Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot Log: * Added a message id in case of 3 failed tests. Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot 2009-09-10 14:10:04 UTC (rev 5352) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/default.pot 2009-09-11 07:27:59 UTC (rev 5353) @@ -63,4 +63,7 @@ msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." msgstr "" + +msgid "There seems to be a problem with your software installation. Please try to re-install the Tux Droid software. In case that does not help please visit our forums or contact customer support." +msgstr "" \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-09-10 14:10:33
|
Author: remi
Date: 2009-09-10 16:10:04 +0200 (Thu, 10 Sep 2009)
New Revision: 5352
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
Log:
* Improved wifi auto-avoidance strategy.
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-10 10:52:06 UTC (rev 5351)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-10 14:10:04 UTC (rev 5352)
@@ -147,6 +147,7 @@
self.__setChannelInUse(userChannel)
self.__setConnectionDetected(True)
else:
+ """
if URLTools.URLCheck("http://ftp.kysoh.com", 5.0):
detectedChannel = self.detectChannel()
if detectedChannel != None:
@@ -159,6 +160,14 @@
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:
+ print "Avoid auto detected channel :", detectedChannel
+ self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ self.__setChannelInUse(detectedChannel)
+ self.__setConnectionDetected(True)
def resetStates(self):
print "Reset wifi channel states"
|
|
From: jerome <c2m...@c2...> - 2009-09-10 10:52:20
|
Author: jerome
Date: 2009-09-10 12:52:06 +0200 (Thu, 10 Sep 2009)
New Revision: 5351
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Added dialog box in case of 3 failed tests.
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-10 10:41:13 UTC (rev 5350)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-10 10:52:06 UTC (rev 5351)
@@ -92,6 +92,11 @@
CANCEL = 'Cancel';
+ TEST_FAILD = 'There seems to be a problem with your software installation. ' +
+ 'Please try to re-install the Tux Droid software. In case that does not ' +
+ 'help please visit our forums or contact customer support.';
+
+
type
TForm1 = class(TForm)
IdAntiFreeze1: TIdAntiFreeze;
@@ -509,6 +514,12 @@
AskAndSend();
end;
}
+ else { TB removed after 30th September }
+ begin
+ Form1.Hide;
+ BoxOk1.showMessageDialog(gettext(TEST_FAILD), gettext(OK));
+ Application.Terminate;
+ end;
end;
end;
|
|
From: jerome <c2m...@c2...> - 2009-09-10 10:41:26
|
Author: jerome
Date: 2009-09-10 12:41:13 +0200 (Thu, 10 Sep 2009)
New Revision: 5350
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Updated test count from 2 to 3.
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-10 10:37:06 UTC (rev 5349)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-10 10:41:13 UTC (rev 5350)
@@ -473,7 +473,7 @@
Box.bCancel:
begin
- if testCount < 2 then
+ if testCount < 3 then
begin
result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
@@ -490,7 +490,7 @@
end
else
begin
- if testCount < 2 then
+ if testCount < 3 then
begin
TuxUtils.stopServer();
sleep(500);
|
|
From: jerome <c2m...@c2...> - 2009-09-10 10:37:22
|
Author: jerome
Date: 2009-09-10 12:37:06 +0200 (Thu, 10 Sep 2009)
New Revision: 5349
Modified:
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
Log:
* Getting used language in the Registery.
Modified: 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/TuxUtils.pas 2009-09-10 10:09:14 UTC (rev 5348)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-10 10:37:06 UTC (rev 5349)
@@ -53,6 +53,7 @@
function GetProgramFilesDir() : string;
function GetTuxDroidDataBaseDirectory() : string;
function GetTuxDroidBinariesDirectory() : string;
+ function getRegisteryLanguage(): string;
var
XmlScanner1 : TXmlScanner;
@@ -506,4 +507,32 @@
result := TuxUtils.GetProgramFilesDir + '\Kysoh\Tux Droid\bin';
end;
+function getRegisteryLanguage(): string;
+const
+ TUXDROID_REGISTRY_PATH = 'SOFTWARE\Tux Droid\Installation';
+begin
+ with TRegistry.Create do
+ try
+ RootKey := HKEY_LOCAL_MACHINE;
+
+ // From Tuxdroid setup
+ if OpenKey(TUXDROID_REGISTRY_PATH, False) then
+ begin
+ // Get tuxdroid installation language
+
+ result := ReadString('Language');
+
+ if ( result <> 'en' ) and (result <> 'en_US') and (result <> 'en_GB') and (result <> 'fr')
+ and(result <> 'nl') and (result <> 'nl_BE') and (result <> 'it') and (result <> 'es')
+ and(result <> 'de') and (result <> 'ar') and (result <> 'da') and (result <> 'sv')
+ and(result <> 'no') and (result <> 'pt' ) then
+ result := 'en';
+
+ CloseKey;
+ end;
+ finally
+ Free;
+ end;
+end;
+
end.
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-10 10:09:14 UTC (rev 5348)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-10 10:37:06 UTC (rev 5349)
@@ -43,9 +43,9 @@
SCREEN_3 = 'Connect the fish dongle to an available USB port on your computer using' +
' the included USB cable.';
- SCREEN_4 = 'Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit.' +
- ' This indicates Tux Droid is detected by the dongle and Tux Droid is ready to' +
- ' communicate with your computer';
+ SCREEN_4 = 'Wait a moment and the blue LED''''s in the dongle and Tux Droid should be lit. ' +
+ 'This indicates Tux Droid is detected by the dongle and Tux Droid is ready to ' +
+ 'communicate with your computer';
SCREEN_5 = 'Everything is set up to test your configuration. Click the Test button' +
' to start the test.';
@@ -218,12 +218,15 @@
procedure TForm1.FormCreate(Sender: TObject);
begin
//Creating gnugettext object.
- gnugettext.UseLanguage('en');
+
+ try
+ gnugettext.UseLanguage(TuxUtils.getRegisteryLanguage());
+ except
+ gnugettext.UseLanguage('en');
+ end;
+
TranslateComponent(self);
- if ParamCount > 0 then
- gnugettext.UseLanguage(ParamStr(1));
-
//Setting up steps text.
ScreenText1.Caption := gettext(SCREEN_1);
ScreenText2.Caption := gettext(SCREEN_2);
|
|
From: jerome <c2m...@c2...> - 2009-09-10 10:09:26
|
Author: jerome Date: 2009-09-10 12:09:14 +0200 (Thu, 10 Sep 2009) New Revision: 5348 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po Removed: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.po Log: * Renamed files. * Fixed nl translations. * Fixed nl iso -> utf-8. Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.mo (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.mo) =================================================================== (Binary files differ) Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.po) =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po (rev 0) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/default.po 2009-09-10 10:09:14 UTC (rev 5348) @@ -0,0 +1,77 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." +msgstr "De software installatie is voltooid. Nu volgen nog enkele stappen om the controleren of je Tux Droid correct werkt met de software." + +msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" +msgstr "Gelieve de oplader in te pluggen om Tux Droid op te laden. De batterijen zijn waarschijnlijk leeg en dit kan problemen veroorzaken bij deze test. Zet vervolgens je Tux Droid aan door de schakelaar achteraan Tux in de 'aan' positie te zetten." + +msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." +msgstr "Verbind je vis dongle met een beschikbare USB poort in je computer. Gebruik hiervoor de bijgeleverde USB kabel." + +msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" +msgstr "Wacht een ogenblik en de ogen in Tux Droid en de vis dongle zullen blauw oplichten. Dit betekent dat Tux Droid gedetecteerd wordt door je vis dongle en nu klaar is om met je computer te communiceren." + +msgid "Everything is set up to test your configuration. Click the Test button to start the test." +msgstr "Alles is klaar om je software te testen. Klik op de test knop om de test te starten." + +msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" +msgstr "Je Tux Droid is correct geconfigureerd en klaar om te spelen ! Klik op de knop Voltooien om verder te gaan." + +msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." +msgstr "Heeft Tux Droid gesproken en bewogen? Zo ja, klik dan op de ja. Indien niet, klik je op nee." + +msgid "Your Tux Droid was not detected correctly. Please, try again." +msgstr "Je Tux Droid werd niet correct gedetecteerd. Gelieve opnieuw te proberen." + +msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" +msgstr "Een fout is opgetreden bij de test met je Tux Droid. Wil je je testresultaten naar Kysoh verzenden om geholpen te worden? (aanbevolen)" + +msgid "Launch TuxBox 2.0 now?" +msgstr "TuxBox 2.0 nu starten?" + +msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." +msgstr "Help ons onze software te verbeteren door ons je testresultaten te sturen. Persoonlijke informatie wordt in geen geval uitgewisseld." + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nee" + +msgid "Test" +msgstr "Testen" + +msgid "Finish" +msgstr "Voltooien" + +msgid "Next" +msgstr "Volgende" + +msgid "Previous" +msgstr "Vorige" + +msgid "Exit" +msgstr "Exit" + +msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." +msgstr "De Tux Droid software werd niet correct gestart. Gelieve op de Test knop te klikken om opnieuw te proberen." + +msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." +msgstr "Je vis dongle werd niet gedetecteerd. Controleer of je dongle goed verbonden is op een beschikbare USB poort achteraan je computer." + +msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." +msgstr "Tux Droid en je vis dongle kunnen geen radioverbinding maken. Gelieve te controleren of je Tux Droid verbonden is met de oplader. Doe ook een reset door Tux Droid uit en dan weer aan te zetten." + +msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." +msgstr "Je vis dongle werd niet correct gedetecteerd door Windows. Gelieve je vis dongle uit de USB poort te nemen en dan terug in te steken." + Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.mo =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.po 2009-09-10 10:06:16 UTC (rev 5347) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/LC_MESSAGES/nl.po 2009-09-10 10:09:14 UTC (rev 5348) @@ -1,77 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: nux <jer...@ky...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." -msgstr "De software installatie is voltooid. Nu volgen nog enkele stappen om the controleren of je Tux Droid correct werkt met de software." - -msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" -msgstr "Gelieve de oplader in te pluggen om Tux Droid op te laden. De batterijen zijn waarschijnlijk leeg en dit kan problemen veroorzaken bij deze test. Zet vervolgens je Tux Droid aan door de schakelaar achteraan Tux in de 'aan' positie te zetten." - -msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." -msgstr "Verbind je vis dongle met een beschikbare USB poort in je computer. Gebruik hiervoor de bijgeleverde USB kabel." - -msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" -msgstr "Wacht een ogenblik en de ogen in Tux Droid en de vis dongle zullen blauw oplichten. Dit betekent dat Tux Droid gedetecteerd wordt door je vis dongle en nu klaar is om met je computer te communiceren." - -msgid "Everything is set up to test your configuration. Click the Test button to start the test." -msgstr "Alles is klaar om je software te testen. Klik op de test knop om de test te starten." - -msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" -msgstr "Je Tux Droid is correct geconfigureerd en klaar om te spelen ! Klik op de knop Voltooien om verder te gaan." - -msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." -msgstr "Heeft Tux Droid gesproken en bewogen? Zo ja, klik dan op de ja. Indien niet, klik je op nee." - -msgid "Your Tux Droid was not detected correctly. Please, try again." -msgstr "Je Tux Droid werd niet correct gedetecteerd. Gelieve opnieuw te proberen." - -msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" -msgstr "Een fout is opgetreden bij de test met je Tux Droid. Wil je je testresultaten naar Kysoh verzenden om geholpen te worden? (aanbevolen)" - -msgid "Launch TuxBox 2.0 now?" -msgstr "TuxBox 2.0 nu starten?" - -msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." -msgstr "Help ons onze software te verbeteren door ons je testresultaten te sturen. Persoonlijke informatie wordt in geen geval uitgewisseld." - -msgid "Yes" -msgstr "Ja" - -msgid "No" -msgstr "Nee" - -msgid "Test" -msgstr "Testen" - -msgid "Finish" -msgstr "Voltooien" - -msgid "Next" -msgstr "Volgende" - -msgid "Previous" -msgstr "Vorige" - -msgid "Exit" -msgstr "Exit" - -msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." -msgstr "De Tux Droid software werd niet correct gestart. Gelieve op de Test knop te klikken om opnieuw te proberen." - -msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." -msgstr "Je vis dongle werd niet gedetecteerd. Controleer of je dongle goed verbonden is op een beschikbare USB poort achteraan je computer." - -msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." -msgstr "Tux Droid en je vis dongle kunnen geen radioverbinding maken. Gelieve te controleren of je Tux Droid verbonden is met de oplader. Doe ook een reset door Tux Droid uit en dan weer aan te zetten." - -msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." -msgstr "Je vis dongle werd niet correct gedetecteerd door Windows. Gelieve je vis dongle uit de USB poort te nemen en dan terug in te steken." - |
|
From: jerome <c2m...@c2...> - 2009-09-10 10:06:26
|
Author: jerome Date: 2009-09-10 12:06:16 +0200 (Thu, 10 Sep 2009) New Revision: 5347 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po Removed: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.po Log: * Renamed files. * Fixed english translations. * Fixed encoding iso -> utf-8. Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.mo (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.mo) =================================================================== (Binary files differ) Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.po) =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po (rev 0) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/default.po 2009-09-10 10:06:16 UTC (rev 5347) @@ -0,0 +1,77 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." +msgstr "The software installation is completed sucessfully. Next, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." + +msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" +msgstr "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues. Next, put the power switch on the back of Tux Droid in the on position." + +msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." +msgstr "Connect the fish dongle to an available USB port on your computer using the included USB cable." + +msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" +msgstr "Wait a moment and the blue eyes in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer." + +msgid "Everything is set up to test your configuration. Click the Test button to start the test." +msgstr "Everything is set up to test your configuration. Click the Test button to start the test." + +msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" +msgstr "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue." + +msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." +msgstr "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." + +msgid "Your Tux Droid was not detected correctly. Please, try again." +msgstr "Your Tux Droid was not detected correctly. Please, try again." + +msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" +msgstr "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh mailbox to get help? ( recommended )" + +msgid "Launch TuxBox 2.0 now?" +msgstr "Launch TuxBox 2.0 now?" + +msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." +msgstr "Help us to improve our software by sending the test report. No personal information will be exchanged." + +msgid "Yes" +msgstr "Yes" + +msgid "No" +msgstr "No" + +msgid "Test" +msgstr "Test" + +msgid "Finish" +msgstr "Finish" + +msgid "Next" +msgstr "Next" + +msgid "Previous" +msgstr "Previous" + +msgid "Exit" +msgstr "Exit" + +msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." +msgstr "The Tux Droid software was not started correctly. Please, click the Test button to try again." + +msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." +msgstr "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." + +msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." +msgstr "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." + +msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." +msgstr "Your fish dongle was not properly detected by Windows. Please replug your dongle." + Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.mo =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.po 2009-09-10 09:57:45 UTC (rev 5346) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/en/LC_MESSAGES/en.po 2009-09-10 10:06:16 UTC (rev 5347) @@ -1,77 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: nux <jer...@ky...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." -msgstr "The software installation is completed sucessfully. Next, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." - -msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" -msgstr "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues. Next, put the power switch on the back of Tux Droid in the on position." - -msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." -msgstr "Connect the fish dongle to an available USB port on your computer using the included USB cable." - -msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" -msgstr "Wait a moment and the blue eyes in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer." - -msgid "Everything is set up to test your configuration. Click the Test button to start the test." -msgstr "Everything is set up to test your configuration. Click the Test button to start the test." - -msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" -msgstr "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue." - -msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." -msgstr "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." - -msgid "Your Tux Droid was not detected correctly. Please, try again." -msgstr "Your Tux Droid was not detected correctly. Please, try again." - -msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" -msgstr "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh mailbox to get help? ( recommended )" - -msgid "Launch TuxBox 2.0 now?" -msgstr "Launch TuxBox 2.0 now?" - -msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." -msgstr "Help us to improve our software by sending the test report. No personal information will be exchanged." - -msgid "Yes" -msgstr "Yes" - -msgid "No" -msgstr "No" - -msgid "Test" -msgstr "Test" - -msgid "Finish" -msgstr "Finish" - -msgid "Next" -msgstr "Next" - -msgid "Previous" -msgstr "Previous" - -msgid "Exit" -msgstr "Exit" - -msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." -msgstr "The Tux Droid software was not started correctly. Please, click the Test button to try again." - -msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." -msgstr "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." - -msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." -msgstr "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." - -msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." -msgstr "Your fish dongle was not properly detected by Windows. Please replug your dongle." - |
|
From: jerome <c2m...@c2...> - 2009-09-10 09:57:58
|
Author: jerome Date: 2009-09-10 11:57:45 +0200 (Thu, 10 Sep 2009) New Revision: 5346 Added: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po Removed: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.po Log: * Fixed french translations. * Fixed a bug with msgid in source. Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.mo (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.mo) =================================================================== (Binary files differ) Copied: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po (from rev 5342, software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.po) =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po (rev 0) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/default.po 2009-09-10 09:57:45 UTC (rev 5346) @@ -0,0 +1,77 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: nux <jer...@ky...>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." +msgstr "L'installation du logiciel s'est correctement déroulée. Maintenant, vous allez être guidé à travers quelques étapes pour vérifier que votre Tux Droid fonctionne correctement avec le logiciel." + +msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" +msgstr "S'il vous plait, connectez le chargeur à une prise de courrant pour allumer votre Tux Droid. Le niveau de batterie pourrait être bas à ca stade, pouvant causer des problèmes de stabilité. Ensuite, allumez votre Tux Droid grâce au bouton se trouvant à l'arrière." + +msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." +msgstr "Connectez le poisson à un port USB disponible sur votre ordinateur en utilisant le cable USB fourni." + +msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" +msgstr "Attendez un moment et les LED's sur le poisson et sur Tux Droid devraient être allumées. Ceci indique que Tux Droid est détecté par le dongle et prêt à communiquer avec votre ordinateur" + +msgid "Everything is set up to test your configuration. Click the Test button to start the test." +msgstr "Tout est prêt pour tester votre configuration. Cliquez sur le bouton Test pour démarrer le test." + +msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" +msgstr "Votre Tux Droid est correctement configuré et fonctionnel ! Cliquez sur le bouton terminer pour continuer" + +msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." +msgstr "Votre Tux Droid a-t-il parlé et bougé ? Cliquez sur le bouton oui si celà est le cas, sinon, cliquez sur non" + +msgid "Your Tux Droid was not detected correctly. Please, try again." +msgstr "Votre Tux Droid n'as pas correctement été détecté. S'il vous plait, essayez à nouveau." + +msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" +msgstr "Une erreur inattendue est survenue avec votre Tux Droid, souhaitez-vous envoyer le rapport de test chez Kysoh pour obtenir de l'aide ? ( recommandé )" + +msgid "Launch TuxBox 2.0 now?" +msgstr "Démarrer TuxBox 2.0 maintenant ?" + +msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." +msgstr "Aidez nous à améliorer nos logiciels en envoyant le rapport de test. Aucune donnée personelle ne sera envoyée." + +msgid "Yes" +msgstr "Oui" + +msgid "No" +msgstr "Non" + +msgid "Test" +msgstr "Test" + +msgid "Finish" +msgstr "Terminer" + +msgid "Next" +msgstr "Suivant" + +msgid "Previous" +msgstr "Précédant" + +msgid "Exit" +msgstr "Quitter" + +msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." +msgstr "Le logiciel de Tux Droid n'a pas démarré correctement. S'il vous plait, cliquez sue le bouton Tester pour essayer à nouveau." + +msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." +msgstr "Votre poisson n'a pas été détecté. S'il vous plait, assurez vous que votre dongle est connecté à un port USB disponible à l'arrière de votre ordinateur." + +msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." +msgstr "La connexion radio entre Tux Droid et le poisson n'a pas été établie. S'il vous plait, aussurez vous que Tux Droid est connecté à l'adaptateur et allumez le à nouveau." + +msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." +msgstr "Votre poisson n'a pas correctement été détecté par Windows. S'il vous plait, reconnectez votre dongle." + Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.mo =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.po 2009-09-10 09:29:02 UTC (rev 5345) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/fr/LC_MESSAGES/fr.po 2009-09-10 09:57:45 UTC (rev 5346) @@ -1,77 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: nux <jer...@ky...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." -msgstr "L'installation du logiciel s'est correctement dul Maintenant, vous allez e guid travers quelques pes pour vfier que votre Tux Droid fonctionne correctement avec le logiciel." - -msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" -msgstr "S'il vous plait, connectez le chargeur ne prise de courrent pour allumer votre Tux Droid. Le niveau de batterie pourrait e bas a stade, pouvant causer des probls de stabilitEnsuite, allumez votre Tux Droid gr au bouton on se trouvant 'arri." - -msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." -msgstr "Connectez le poisson n port USB disponible sur votre ordinateur en utilisant le cable USB fourni." - -msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" -msgstr "Attendez un moment et les LED''s sur le dongle et sur Tux Droid devraient s'allumer. Ceci indique que Tux Droid est dctar le dongle et qu'il est prommuniquer avec votre ordinateur" - -msgid "Everything is set up to test your configuration. Click the Test button to start the test." -msgstr "Tout est prpour tester votre configuration. Cliquez sur le bouton Test pour drrer le test." - -msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" -msgstr "Votre Tux Droid est correctement configurt fonctionnel ! Cliquez sur le bouton terminer pour continuer" - -msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." -msgstr "Votre Tux Droid a-t-il parlt boug Cliquez sur le bouton oui si celst le cas, sinon, cliquez sur non" - -msgid "Your Tux Droid was not detected correctly. Please, try again." -msgstr "Votre Tux Droid n'as pas correctement dctS'il vous plait, essayez ouveau." - -msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" -msgstr "Une erreur inattendue est survenue avec votre Tux Droid, souhaitez-vous envoyer le rapport de test chez Kysoh pour obtenir de l'aide ? ( recommand" - -msgid "Launch TuxBox 2.0 now?" -msgstr "Drrer TuxBox 2.0 maintenant ?" - -msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." -msgstr "Aidez nous morer nos logiciels en envoyant le rapport de test. Aucune donnpersonelle " - -msgid "Yes" -msgstr "Oui" - -msgid "No" -msgstr "Non" - -msgid "Test" -msgstr "Tester" - -msgid "Finish" -msgstr "Terminer" - -msgid "Next" -msgstr "Suivant" - -msgid "Previous" -msgstr "Prdant" - -msgid "Exit" -msgstr "Quitter" - -msgid "The Tux Droid software was not started correctly. Please, click the Test button to try again." -msgstr "Le logiciel de Tux Droid n'a pas drrorrectement. S'il vous plait, cliquez sue le bouton Tester pour essayer ouveau." - -msgid "Your Fish dongle was not detected. Please make sure your dongle is connected to an available USB port at the backside of your computer." -msgstr "Votre poisson n'a pas dctS'il vous plait, assurez vous que votre dongle est connect un port USB disponible 'arri de votre ordinateur." - -msgid "The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again." -msgstr "La connexion radio entre Tux Droid et le poisson n'a pas blie. S'il vous plait, aussurez vous que Tux Droid est connect l'adaptateur et allumez le ouveau." - -msgid "Your fish dongle was not properly detected by Windows. Please replug your dongle." -msgstr "Votre poisson n'a pas correctement dctar Windows. S'il vous plait, reconnectez votre dongle." - |
|
From: ks156 <c2m...@c2...> - 2009-09-10 09:29:16
|
Author: ks156 Date: 2009-09-10 11:29:02 +0200 (Thu, 10 Sep 2009) New Revision: 5345 Added: software_suite_v3/smart-core/smart-server/branches/user_mode/ Log: * Branched the trunk to "user_mode". This branch will be used to adapt the server in order to start it as normal user. The primary goal of these changes is to fix a security bug on Linux. Copied: software_suite_v3/smart-core/smart-server/branches/user_mode (from rev 5344, software_suite_v3/smart-core/smart-server/trunk) Property changes on: software_suite_v3/smart-core/smart-server/branches/user_mode ___________________________________________________________________ Name: svn:mergeinfo + |
|
From: jerome <c2m...@c2...> - 2009-09-09 14:45:05
|
Author: jerome
Date: 2009-09-09 16:44:47 +0200 (Wed, 09 Sep 2009)
New Revision: 5344
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Commented functions that will not be used for now.
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-09 14:13:10 UTC (rev 5343)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-09 14:44:47 UTC (rev 5344)
@@ -245,6 +245,11 @@
hardwareTestCount := 1;
TuxUtils.initKnowedVars();
+
+ //TB Removed after 30th September release.
+ CheckSendReport.Checked := False;
+ CheckSendReport.Visible := False;
+ LabelSendReport.Visible := False;
end;
@@ -407,113 +412,109 @@
attitunePlayed : boolean;
begin
//Checking current step and starting test.
- if Steps.ActivePageIndex = 4 then
- begin
- Form1.Enabled := false;
- setExitEnabled(false);
- setNextEnabled(false);
- setPreviousEnabled(false);
- try
+ Form1.Enabled := false;
+ setExitEnabled(false);
+ setNextEnabled(false);
+ setPreviousEnabled(false);
+ try
- //Getting attitune play time.
- if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
- begin
- try
- times := TStringList.Create;
- times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
- time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
- times.Free;
- except on e : Exception do
- time := 10;
- end;
- end
- else
- begin
- //define a defaulit.
+ //Getting attitune play time.
+ if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
+ begin
+ try
+ times := TStringList.Create;
+ times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
+ time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
+ times.Free;
+ except on e : Exception do
time := 10;
- end;
+ end;
+ end
+ else
+ begin
+ //define a defaulit.
+ time := 10;
+ end;
- //Playing Attitune only if server is started, dongle connected ,and radio connected.
- Report.ATTITUNE_READED := TuxUtils.playAttitune(getAttitunePath());
+ //Playing Attitune only if server is started, dongle connected ,and radio connected.
+ Report.ATTITUNE_READED := TuxUtils.playAttitune(getAttitunePath());
- Form1.setNextEnabled(false);
- setPreviousEnabled(false);
+ Form1.setNextEnabled(false);
+ setPreviousEnabled(false);
- setExitEnabled(false);
- Form1.Enabled := false;
- //Sleeping to the attitune end.
- sleep( ( time + 1 ) * 1000 );
+ setExitEnabled(false);
+ Form1.Enabled := false;
- //Ask user if something was hear
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
+ //Sleeping to the attitune end.
+ sleep( ( time + 1 ) * 1000 );
- Form1.setNextEnabled(true);
- setPreviousEnabled(true);
- Form1.setExitEnabled(true);
+ //Ask user if something was hear
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
- case result of
- Box.bOk:
+ Form1.setNextEnabled(true);
+ setPreviousEnabled(true);
+ Form1.setExitEnabled(true);
+
+ case result of
+ Box.bOk:
+ begin
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
+ end;
+
+ Box.bCancel:
+ begin
+ if testCount < 2 then
begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end;
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
- Box.bCancel:
- begin
- if testCount < 2 then
+ if result = Box.bCancel then
begin
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
-
- if result = Box.bCancel then
- begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end
- else
- begin
- if testCount < 2 then
- begin
- TuxUtils.stopServer();
- sleep(500);
- Steps.ActivePageIndex := 1;
- Inc(testCount, 1);
- NextLabel.Caption := gettext(NEXTB);
- Next.OnMouseUp := Form1.NextMouseUp;
- NextLabel.OnMouseUp := Form1.NextMouseUp;
- end;
- end;
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
end
else
begin
- AskAndSend();
+ if testCount < 2 then
+ begin
+ TuxUtils.stopServer();
+ sleep(500);
+ Steps.ActivePageIndex := 1;
+ Inc(testCount, 1);
+ NextLabel.Caption := gettext(NEXTB);
+ Next.OnMouseUp := Form1.NextMouseUp;
+ NextLabel.OnMouseUp := Form1.NextMouseUp;
+ end;
end;
+ end
+ { //30th September.
+ else
+ begin
+ //Ask if user want to send mail and exit application.
+ AskAndSend();
end;
- end;
-
- //Re-validate the form.
- Form1.Enabled := true;
- Except
- setExitEnabled(true);
- setNextEnabled(true);
- Form1.Enabled := true;
+ }
+ end;
end;
- end
- else
- begin
- Steps.ActivePageIndex := 4;
+ //Re-validate the form.
+ Form1.Enabled := true;
+ Except
+ setExitEnabled(true);
+ setNextEnabled(true);
+ Form1.Enabled := true;
end;
Form1.Enabled := true;
@@ -528,6 +529,7 @@
var
command : string;
begin
+
if CheckStartTB.Checked then
begin
//This function handle the 'Finish' button click.
@@ -536,12 +538,15 @@
end;
//We provide the time to tuxbox to be started faster.
+
+ { 30th September.
sleep(1000);
if CheckSendReport.Checked then
begin
sendReport(Report.INFO);
end;
+ }
Application.Terminate;
end;
|
|
From: jerome <c2m...@c2...> - 2009-09-09 14:13:25
|
Author: jerome
Date: 2009-09-09 16:13:10 +0200 (Wed, 09 Sep 2009)
New Revision: 5343
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.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.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Improved test steps.
* Restarting smart core at step 2 in all cases ( less problems with run at once ).
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-09 09:01:49 UTC (rev 5342)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-09 14:13:10 UTC (rev 5343)
@@ -25,7 +25,7 @@
uses
ShellAPI, Windows, TuxUtils, Dialogs, zLib, SysUtils, Controls, Classes,
- StdCtrls, ShlObj, Msinfo32Wrapper, KAZip, Forms, IdComponent, IdMessageCoder,
+ StdCtrls, ShlObj, KAZip, Forms, IdComponent, IdMessageCoder,
IdMessageCoderMIME, IdBaseComponent, IdMessage, IdSMTP, IdIOHandler,
IdIOHandlerSocket, IdSSLOpenSSL, WinInet, IdHttp, ComputerInfos,
Registry, TlHelp32;
@@ -255,8 +255,6 @@
//Create a file that contains computer base informations.
function TReportMaker.CreateReportDatas() : boolean;
- var
- msinfo : TMsinfo;
begin
computerDatas := ReportFilesDirectory + '\info.nfo';
// Get the computer informations
Modified: 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/TuxUtils.pas 2009-09-09 09:01:49 UTC (rev 5342)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-09 14:13:10 UTC (rev 5343)
@@ -164,9 +164,12 @@
beginPos, endPos : Integer;
begin
- values := TStringList.Create;
-
try
+ values := TStringList.Create;
+ except
+ end;
+
+ try
//Searching for dongle state ( <dongleState> )
beginPos := Pos('<dongleState>', aString) + Length('<dongleState>');
endPos := Pos('</dongleState>', aString);
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-09 09:01:49 UTC (rev 5342)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-09 14:13:10 UTC (rev 5343)
@@ -1,5 +1,5 @@
object Form1: TForm1
- Left = 426
+ Left = 427
Top = 221
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsNone
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-09 09:01:49 UTC (rev 5342)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-09 14:13:10 UTC (rev 5343)
@@ -87,8 +87,6 @@
RADIO_ERROR = 'The radio connection between Tux Droid and the fish dongle has not been established. Please make sure your Tux Droid is connected to the transformer and do a reset by turning Tux Droid off and on again.';
- WINDOWS_ERROR = 'Your fish dongle was not properly detected by Windows. Please replug your dongle.';
-
OK = 'Ok';
CANCEL = 'Cancel';
@@ -177,9 +175,13 @@
Y: Integer);
procedure startServer();
+ procedure AskAndSend();
+ procedure validateButtons();
+ procedure invalidateButtons();
+
private
{ Darations priv }
function getAttitunePath() : string;
@@ -203,6 +205,7 @@
BoxOk1 : TForm3;
values : TStringList;
testCount : byte;
+ hardwareTestCount : byte;
implementation
@@ -239,6 +242,7 @@
LabelSendReport.Caption := gettext(END_SEND_REPORT);
testCount := 1;
+ hardwareTestCount := 1;
TuxUtils.initKnowedVars();
end;
@@ -283,31 +287,36 @@
//Start smart core and display splashscreen.
procedure TForm1.startServer();
begin
- if (not TuxUtils.isTuxDroidServerStarted()) or (not TuxUtils.getStates(values)) then
- begin
- Form1.Enabled := False;
- Form1.ShowSplashScreen();
- TuxUtils.startServer(Application);
- Form1.HideSplashScreen();
- Steps.ActivePageIndex := 1;
- Form1.Enabled := True;
- if TuxUtils.isTuxDroidServerStarted() then
- Report.SERVER := True
- else
- Report.SERVER := False;
- end
+ Form1.Enabled := False;
+ Form1.ShowSplashScreen();
+ TuxUtils.startServer(Application);
+ Form1.HideSplashScreen();
+ Steps.ActivePageIndex := 1;
+ Form1.Enabled := True;
+
+ if TuxUtils.isTuxDroidServerStarted() then
+ Report.SERVER := True
else
- begin
- Report.SERVER := True;
- end;
+ Report.SERVER := False;
end;
{#### Next button clicked ####}
procedure TForm1.NextButtonClick();
begin
- //Go next in steps.
- Steps.SelectNextPage(true);
+ //Invalidate buttons
+ invalidateButtons();
+
+ //Refreshing server datas and tux statuses.
+ try
+ if values <> nil then
+ values.Clear;
+ TuxUtils.getStates(values);
+ sleep(500);
+ except
+ //Do nothing on exception, server not ready.
+ end;
+
setPreviousEnabled(true);
case Steps.ActivePageIndex of
@@ -325,36 +334,21 @@
//**************************************************//
//**** Step 3 on screen => Testing dongle state****//
begin
- //Checking dongle state.
- values.Clear;
- TuxUtils.getStates(values);
+
+ Inc(hardwareTestCount, 1);
+
if not TuxUtils.isDongleConnected(values) then
begin
- Form1.Enabled := False;
+ invalidateButtons();
Report.DONGLE := False;
- //Checking first if it's a hardware problem.
- if isHIDReady() then
- begin
- //Showing the error message.
- BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
-
- //Refreshing informations.
- startServer();
- values.Clear;
- TuxUtils.getStates(values);
- end
- else
- begin
- //Displaying HID error message.
- BoxOk1.showMessageDialog(gettext(WINDOWS_ERROR), gettext(OK));
- Steps.ActivePageIndex := 1;
- NextLabel.Caption := gettext(NEXTB);
- Next.OnMouseUp := Form1.NextMouseUp;
- NextLabel.OnMouseUp := Form1.NextMouseUp;
- end;
- Form1.Enabled := True;
+ BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
+ Steps.ActivePageIndex := 1;
+ NextLabel.Caption := gettext(NEXTB);
+ Next.OnMouseUp := Form1.NextMouseUp;
+ NextLabel.OnMouseUp := Form1.NextMouseUp;
end
else
+ Steps.SelectNextPage(true);
Report.DONGLE := True;
end;
@@ -362,43 +356,44 @@
//**************************************************//
//**** Step 4 on screen => Testing radio state****//
begin
- values.Clear;
- TuxUtils.getStates(values);
+
if not TuxUtils.isRadioConnected(values) then
begin
- Form1.Enabled := false;
+
+ invalidateButtons();
Report.RADIO := False;
//Showing the error message.
+
+ Next.Enabled := False;
BoxOk1.showMessageDialog(gettext(RADIO_ERROR), gettext(OK));
- //Refreshing informations.
- startServer();
- values.Clear;
- TuxUtils.getStates(values);
-
- Steps.ActivePageIndex := 1;
+ Steps.ActivePageIndex := 3;
NextLabel.Caption := gettext(NEXTB);
Next.OnMouseUp := Form1.NextMouseUp;
NextLabel.OnMouseUp := Form1.NextMouseUp;
- Form1.Enabled := True;
+
end
else
begin
+ Steps.SelectNextPage(true);
Report.RADIO := True;
+ NextLabel.Caption := gettext(TEST);
+ Next.OnMouseUp := Form1.TestButtonClick;
+ NextLabel.OnMouseUp := Form1.TestButtonClick;
end;
end;
- 4 :
- begin
- NextLabel.Caption := gettext(TEST);
- Next.OnMouseUp := Form1.TestButtonClick;
- NextLabel.OnMouseUp := Form1.TestButtonClick;
- end;
5 :
begin
Form1.setNextEnabled(false);
end;
end;
+
+ if Steps.ActivePageIndex in [0..1] then
+ Steps.SelectNextPage(true);
+
+ validateButtons();
+
end;
@@ -502,27 +497,7 @@
end
else
begin
- Form1.setNextEnabled(false);
- setPreviousEnabled(false);
-
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_3), gettext(YES), gettext(NO));
-
- if result = Box.bOk then
- begin
- sendReport(Report.ERROR);
- Application.Terminate;
- end
- else
- begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end;
+ AskAndSend();
end;
end;
end;
@@ -576,6 +551,62 @@
###########################################################
}
+
+procedure TForm1.AskAndSend();
+var
+ result : Integer;
+begin
+ Form1.setNextEnabled(false);
+ setPreviousEnabled(false);
+
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_3), gettext(YES), gettext(NO));
+
+ if result = Box.bOk then
+ begin
+ sendReport(Report.ERROR);
+ Application.Terminate;
+ end
+ else
+ begin
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
+ end;
+end;
+
+
+//Enable control buttons.
+procedure TForm1.validateButtons();
+begin
+ Next.Enabled := True;
+ Previous.Enabled := True;
+ Exit.Enabled := True;
+
+ NextLabel.Enabled := True;
+ PreviousLabel.Enabled := True;
+ ExitLabel.Enabled := True;
+end;
+
+
+//Disable control buttons.
+procedure TForm1.invalidateButtons();
+begin
+ Next.Enabled := False;
+ Previous.Enabled := False;
+ Exit.Enabled := False;
+
+ NextLabel.Enabled := False;
+ PreviousLabel.Enabled := False;
+ ExitLabel.Enabled := False;
+end;
+
+
+
function TForm1.isNextButtonEnabled() : boolean;
begin
result := Next.Tag = 1;
|
|
From: jerome <c2m...@c2...> - 2009-09-09 09:02:05
|
Author: jerome Date: 2009-09-09 11:01:49 +0200 (Wed, 09 Sep 2009) New Revision: 5342 Removed: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/info.bat Log: * Removed nfo bat file. Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/info.bat =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/info.bat 2009-09-09 09:01:24 UTC (rev 5341) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/info.bat 2009-09-09 09:01:49 UTC (rev 5342) @@ -1 +0,0 @@ -start /wait msinfo32.exe /nfo "%1" /categories +ComponentsMultimediaSound+ComponentsNetwork+ComponentsStorage+ComponentsProblemDevices+ComponentsUSB+SWEnvRunningTasks+SWEnvLoadedModules+SWEnvStartupPrograms \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-09-09 09:01:36
|
Author: jerome Date: 2009-09-09 11:01:24 +0200 (Wed, 09 Sep 2009) New Revision: 5341 Removed: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.mo software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.po Log: * Removed bad po and mo files. Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.mo =================================================================== (Binary files differ) Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.po =================================================================== --- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.po 2009-09-09 08:58:54 UTC (rev 5340) +++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/locale/nl/nl.po 2009-09-09 09:01:24 UTC (rev 5341) @@ -1,56 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: nux <jer...@ky...>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "The software installation is completed sucessfully. Now, you will be guided through a couple of steps to double-check if your Tux Droid is working correctly with the software." -msgstr "De software installatie is voltooid. Nu volgen nog enkele stappen om the controleren of je Tux Droid correct werkt met de software." - -msgid "Please, plug the transformer to an AC outlet to power your Tux Droid. The battery power might be low at this point and can cause stability issues Next, put the power switch on the back of Tux Droid in the on position" -msgstr "Gelieve de oplader in te pluggen om Tux Droid op te laden. De batterijen zijn waarschijnlijk leeg en dit kan problemen veroorzaken bij deze test. Zet vervolgens je Tux Droid aan door de schakelaar achteraan Tux in de 'aan' positie te zetten." - -msgid "Connect the fish dongle to an available USB port on your computer using the included USB cable." -msgstr "Verbind je vis dongle met een beschikbare USB poort in je computer. Gebruik hiervoor de bijgeleverde USB kabel." - -msgid "Wait a moment and the blue LED''s in the dongle and Tux Droid should be lit. This indicates Tux Droid is detected by the dongle and Tux Droid is ready to communicate with your computer" -msgstr "Wacht een ogenblik en de ogen in Tux Droid en de vis dongle zullen blauw oplichten. Dit betekent dat Tux Droid gedetecteerd wordt door je vis dongle en nu klaar is om met je computer te communiceren." - -msgid "Everything is set up to test your configuration. Click the Test button to start the test." -msgstr "Alles is klaar om je software te testen. Klik op de test knop om de test te starten." - -msgid "Your Tux Droid is configured correctly and ready to play ! Click the finish button to continue" -msgstr "Je Tux Droid is correct geconfigureerd en klaar om te spelen ! Klik op de knop Voltooien om verder te gaan." - -msgid "Did your Tux Droid speak and move? Click the yes button if so, and if nothing happened click no." -msgstr "Heeft Tux Droid gesproken en bewogen? Zo ja, klik dan op de ja. Indien niet, klik je op nee." - -msgid "Your Tux Droid was not detected correctly. Please, try again." -msgstr "Je Tux Droid werd niet correct gedetecteerd. Gelieve opnieuw te proberen." - -msgid "An unexpected error has occured with your Tux Droid, would you like I send a report to Kysoh box to get help? ( recommended )" -msgstr "Een fout is opgetreden bij de test met je Tux Droid. Wil je je testresultaten naar Kysoh verzenden om geholpen te worden? (aanbevolen)" - -msgid "Launch TuxBox 2.0 now?" -msgstr "TuxBox 2.0 nu starten?" - -msgid "Help us to improve our software by sending the test report. No personal information will be exchanged." -msgstr "Help ons onze software te verbeteren door ons je testresultaten te sturen. Persoonlijke informatie wordt in geen geval uitgewisseld." - -msgid "Yes" -msgstr "Ja" - -msgid "No" -msgstr "Nee" - -msgid "Test" -msgstr "Testen" - -msgid "Finish" -msgstr "Voltooien" - |
|
From: jerome <c2m...@c2...> - 2009-09-09 08:59:07
|
Author: jerome
Date: 2009-09-09 10:58:54 +0200 (Wed, 09 Sep 2009)
New Revision: 5340
Removed:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas
Log:
* Deleted removed object.
Deleted: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas 2009-09-09 08:58:11 UTC (rev 5339)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas 2009-09-09 08:58:54 UTC (rev 5340)
@@ -1,81 +0,0 @@
-unit Msinfo32Wrapper;
-
-interface
-
-uses
- Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls, ShellApi, ExtCtrls, WinSvc, Tlhelp32;
-
-type
- TMsinfo = class(TObject)
- public
- isWorking : boolean;
- constructor create(AOwner : TComponent);
- function createNfo(path : string) : boolean;
- end;
-
-implementation
-
-var
- tuxdroidPath : string;
-
-function ShellExecute_AndWait(Operation, FileName, Parameter, Directory: string;
- Show: Word; bWait: Boolean): Longint;
-var
- bOK: Boolean;
- Info: TShellExecuteInfo;
-begin
- FillChar(Info, SizeOf(Info), Chr(0));
- Info.cbSize := SizeOf(Info);
- Info.fMask := SEE_MASK_NOCLOSEPROCESS;
- Info.lpVerb := PChar(Operation);
- Info.lpFile := PChar(FileName);
- Info.lpParameters := PChar(Parameter);
- Info.lpDirectory := PChar(Directory);
- Info.nShow := Show;
- bOK := Boolean(ShellExecuteEx(@Info));
- if bOK then
- begin
- if bWait then
- begin
- while
- WaitForSingleObject(Info.hProcess, 100) = WAIT_TIMEOUT
- do Application.ProcessMessages;
- bOK := GetExitCodeProcess(Info.hProcess, DWORD(Result));
- end
- else
- Result := 0;
- end;
- if not bOK then Result := -1;
-end;
-
-
-constructor TMsinfo.create(AOwner : TComponent);
-begin
- isWorking := false;
-end;
-
-function TMsinfo.createNfo(path : string) : boolean;
-var
- ret : integer;
-begin
- isWorking := true;
-
- ret := ShellExecute_AndWait( 'open',
- PChar(extractFilePath(application.ExeName) +'info.bat'),
- PChar(path),
- PChar(''),
- SW_HIDE,
- True);
- isWorking := false;
-
- if ret <> 0 then
- begin
- result := false;
- exit;
- end;
-
- result := true;
-end;
-
-end.
|
|
From: jerome <c2m...@c2...> - 2009-09-09 08:58:35
|
Author: jerome
Date: 2009-09-09 10:58:11 +0200 (Wed, 09 Sep 2009)
New Revision: 5339
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas
Log:
* Removed nfo referencies.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-08 13:42:44 UTC (rev 5338)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-09 08:58:11 UTC (rev 5339)
@@ -260,8 +260,6 @@
begin
computerDatas := ReportFilesDirectory + '\info.nfo';
// Get the computer informations
- msinfo := TMsinfo.create(nil);
- msinfo.createNfo(computerDatas);
result := (CopyDir(ReportFiles, ReportFilesDirectory));
end;
|
|
From: jerome <c2m...@c2...> - 2009-09-08 14:13:01
|
Author: jerome
Date: 2009-09-08 15:42:44 +0200 (Tue, 08 Sep 2009)
New Revision: 5338
Modified:
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas
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/TuxUtils.pas
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Moved tests for each steps.
* Added some informations into the mail body.
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas 2009-09-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Msinfo32Wrapper.pas 2009-09-08 13:42:44 UTC (rev 5338)
@@ -4,7 +4,7 @@
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls, ShellApi;
+ Dialogs, StdCtrls, ShellApi, ExtCtrls, WinSvc, Tlhelp32;
type
TMsinfo = class(TObject)
@@ -60,6 +60,7 @@
ret : integer;
begin
isWorking := true;
+
ret := ShellExecute_AndWait( 'open',
PChar(extractFilePath(application.ExeName) +'info.bat'),
PChar(path),
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Report.pas 2009-09-08 13:42:44 UTC (rev 5338)
@@ -27,7 +27,8 @@
ShellAPI, Windows, TuxUtils, Dialogs, zLib, SysUtils, Controls, Classes,
StdCtrls, ShlObj, Msinfo32Wrapper, KAZip, Forms, IdComponent, IdMessageCoder,
IdMessageCoderMIME, IdBaseComponent, IdMessage, IdSMTP, IdIOHandler,
- IdIOHandlerSocket, IdSSLOpenSSL, WinInet, IdHttp, ComputerInfos;
+ IdIOHandlerSocket, IdSSLOpenSSL, WinInet, IdHttp, ComputerInfos,
+ Registry, TlHelp32;
{#### This object manage the Complete report creation ####}
type
@@ -45,7 +46,7 @@
procedure RMDir(directory : string);
function CreateReportDatas() : boolean;
procedure ListDir(Path:String; List:TStringList);
-
+
public
constructor Create(AOwner : TObject; TypeReport : Integer); overload;
function compressReport(AApplication : TApplication) : boolean;
@@ -63,6 +64,7 @@
Adress : string;
ReportFile : string;
function isInternetConnected() : boolean;
+ function isTuxBoxStarted() : boolean;
public
constructor Create; overload;
@@ -75,6 +77,14 @@
ERROR = 0;
INFO = 1;
+var
+ SERVER : boolean;
+ DONGLE : boolean;
+ RADIO : boolean;
+ BATERY_STATE : boolean;
+ ATTITUNE_READED : boolean;
+ TUXBOX : boolean;
+
implementation
@@ -214,7 +224,6 @@
GetDir(0, s);
if length(s) <> 3 then
s := s + '\';
- showmessage('found: ' + SearchRec.Name);
List.Add(s + SearchRec.Name);
ListDir(s + SearchRec.Name, List);
end;
@@ -227,12 +236,10 @@
if length(s) <> 3 then
begin
List.add(s + '\' + SearchRec.Name);
- showmessage('found: ' + SearchRec.Name);
end
else
begin
List.add(s + SearchRec.Name);
- showmessage('found: ' + SearchRec.Name);
end;
end;
end;
@@ -253,8 +260,8 @@
begin
computerDatas := ReportFilesDirectory + '\info.nfo';
// Get the computer informations
- //msinfo := TMsinfo.create(nil);
- //msinfo.createNfo(computerDatas);
+ msinfo := TMsinfo.create(nil);
+ msinfo.createNfo(computerDatas);
result := (CopyDir(ReportFiles, ReportFilesDirectory));
end;
@@ -262,7 +269,6 @@
//#### This function compress the log files.
function TReportMaker.compressReport(AApplication : TApplication) : boolean;
begin
- showmessage(ReportFilesDirectory);
Application := AApplication;
Result := true;
@@ -390,6 +396,12 @@
//Formating Quick vew computer informations.
body.Add(slinebreak + slinebreak + '************************* Error Infos *************************');
+ body.Add(' Transformer: ' + IntToStr( Abs( StrToInt(BoolToStr(Report.BATERY_STATE)))));
+ body.Add(' Dongle: ' + IntToStr( Abs( StrToInt(BoolToStr(Report.DONGLE)))));
+ body.Add(' Radio: ' + IntToStr( Abs( StrToInt(BoolToStr(Report.RADIO)))));
+ body.Add(' Smart Core: ' + IntToStr( Abs( StrToInt(BoolToStr(Report.SERVER)))));
+ TUXBOX := isTuxBoxStarted();
+ body.Add(' TuxBox started : ' + IntToStr( Abs( StrToInt(BoolToStr(Report.TUXBOX)))));
body.Add(slinebreak + slinebreak + '************************ ComputerInfos ************************');
@@ -406,8 +418,8 @@
ComputerInfos.wvWinVista : osType := 'Windows Vista';
end;
- body.Add(slinebreak + 'Windows version: ' + osType);
- body.Add('User locale: ' + ComputerInfos.GetUserLanguage());
+ body.Add(slinebreak + ' Windows version: ' + osType);
+ body.Add(' User locale: ' + ComputerInfos.GetUserLanguage());
IdMessage1.Body := body;
@@ -442,4 +454,37 @@
end;
+
+//Return true if TuxBox 2.0 is started, false if not.
+function TReportSender.isTuxBoxStarted() : boolean;
+var
+ ContinueLoop: BOOL;
+ FSnapshotHandle: THandle;
+ FProcessEntry32: TProcessEntry32;
+begin
+
+ FSnapshotHandle := CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+ FProcessEntry32.dwSize := SizeOf(FProcessEntry32);
+ ContinueLoop := Process32First(FSnapshotHandle, FProcessEntry32);
+
+ Result := False;
+
+ while Integer(ContinueLoop) <> 0 do
+ begin
+ if ((UpperCase(ExtractFileName(FProcessEntry32.szExeFile)) =
+ UpperCase('TuxBox.exe')) or (UpperCase(FProcessEntry32.szExeFile) =
+ UpperCase('TuxBox.exe')))
+ then begin
+ Result := True;
+ end;
+
+ ContinueLoop := Process32Next(FSnapshotHandle, FProcessEntry32);
+
+ end;
+
+ CloseHandle(FSnapshotHandle);
+
+end;
+
+
end.
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-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/SecondInstaller.dpr 2009-09-08 13:42:44 UTC (rev 5338)
@@ -8,7 +8,8 @@
Box in 'Box.pas' {Form2},
BoxOk in 'BoxOk.pas' {Form3},
Report in 'Report.pas',
- TuxGauge in 'TuxGauge.pas' {Form4};
+ TuxGauge in 'TuxGauge.pas' {Form4},
+ TestsUtils in 'TestsUtils.pas';
{$R *.res}
Modified: 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/TuxUtils.pas 2009-09-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/TuxUtils.pas 2009-09-08 13:42:44 UTC (rev 5338)
@@ -35,6 +35,7 @@
function isTuxDroidServerStarted() : boolean;
function KillServer(): Integer;
function isDongleConnected(states : TStringList) : boolean;
+ function isTransformerConnected(states : TStringList) : boolean;
function isSoundOn(states : TStringList) : boolean;
function isRadioConnected(states : TStringList) : boolean;
function isOnActivity(states : TStringList) : boolean;
@@ -214,6 +215,15 @@
knowed_language := 'en';
end;
+ try
+ //Searching for plugged transformer ( <batteryState> )
+ beginPos := Pos('<batteryState>', aString) + Length('<batteryState>');
+ endPos := Pos('</batteryState>', aString);
+ values.add(Copy(aString, beginPos, endPos - beginPos));
+ except on e: Exception do
+ values.add('false');
+ end;
+
end;
@@ -276,6 +286,19 @@
end;
+{#### Return the dongle state ####}
+function isTransformerConnected(states : TStringList) : boolean;
+begin
+ if states <> nil then
+ if states[4] = 'charge' then
+ result := true
+ else
+ result := false
+ else
+ result := false;
+end;
+
+
{#### Return the sound state ####}
function isSoundOn(states : TStringList) : boolean;
begin
Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.dfm 2009-09-08 13:42:44 UTC (rev 5338)
@@ -1,6 +1,6 @@
object Form1: TForm1
- Left = 491
- Top = 180
+ Left = 426
+ Top = 221
BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsNone
Caption = 'TuxBox 2.0'
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-08 08:47:46 UTC (rev 5337)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas 2009-09-08 13:42:44 UTC (rev 5338)
@@ -175,8 +175,11 @@
Y: Integer);
procedure LogoMouseMove(Sender: TObject; Shift: TShiftState; X,
Y: Integer);
-
+ procedure startServer();
+
+
+
private
{ Darations priv }
function getAttitunePath() : string;
@@ -198,6 +201,7 @@
Form1 : TForm1;
Box1 : TForm2;
BoxOk1 : TForm3;
+ values : TStringList;
testCount : byte;
implementation
@@ -236,6 +240,7 @@
testCount := 1;
+ TuxUtils.initKnowedVars();
end;
@@ -275,6 +280,29 @@
end;
+//Start smart core and display splashscreen.
+procedure TForm1.startServer();
+begin
+ if (not TuxUtils.isTuxDroidServerStarted()) or (not TuxUtils.getStates(values)) then
+ begin
+ Form1.Enabled := False;
+ Form1.ShowSplashScreen();
+ TuxUtils.startServer(Application);
+ Form1.HideSplashScreen();
+ Steps.ActivePageIndex := 1;
+ Form1.Enabled := True;
+ if TuxUtils.isTuxDroidServerStarted() then
+ Report.SERVER := True
+ else
+ Report.SERVER := False;
+ end
+ else
+ begin
+ Report.SERVER := True;
+ end;
+end;
+
+
{#### Next button clicked ####}
procedure TForm1.NextButtonClick();
begin
@@ -284,6 +312,82 @@
case Steps.ActivePageIndex of
+ 1 :
+ //***************************************************************************//
+ //**** Step 2 on screen => Testing server state ( start it if needed ). ****//
+ begin
+ //Step 2 on screen => Testing server state ( start it if needed ).
+ startServer();
+ Report.BATERY_STATE := TuxUtils.isTransformerConnected(values);
+ end;
+
+ 2 :
+ //**************************************************//
+ //**** Step 3 on screen => Testing dongle state****//
+ begin
+ //Checking dongle state.
+ values.Clear;
+ TuxUtils.getStates(values);
+ if not TuxUtils.isDongleConnected(values) then
+ begin
+ Form1.Enabled := False;
+ Report.DONGLE := False;
+ //Checking first if it's a hardware problem.
+ if isHIDReady() then
+ begin
+ //Showing the error message.
+ BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
+
+ //Refreshing informations.
+ startServer();
+ values.Clear;
+ TuxUtils.getStates(values);
+ end
+ else
+ begin
+ //Displaying HID error message.
+ BoxOk1.showMessageDialog(gettext(WINDOWS_ERROR), gettext(OK));
+ Steps.ActivePageIndex := 1;
+ NextLabel.Caption := gettext(NEXTB);
+ Next.OnMouseUp := Form1.NextMouseUp;
+ NextLabel.OnMouseUp := Form1.NextMouseUp;
+ end;
+ Form1.Enabled := True;
+ end
+ else
+ Report.DONGLE := True;
+ end;
+
+ 3 :
+ //**************************************************//
+ //**** Step 4 on screen => Testing radio state****//
+ begin
+ values.Clear;
+ TuxUtils.getStates(values);
+ if not TuxUtils.isRadioConnected(values) then
+ begin
+ Form1.Enabled := false;
+ Report.RADIO := False;
+ //Showing the error message.
+ BoxOk1.showMessageDialog(gettext(RADIO_ERROR), gettext(OK));
+
+ //Refreshing informations.
+ startServer();
+ values.Clear;
+ TuxUtils.getStates(values);
+
+ Steps.ActivePageIndex := 1;
+ NextLabel.Caption := gettext(NEXTB);
+ Next.OnMouseUp := Form1.NextMouseUp;
+ NextLabel.OnMouseUp := Form1.NextMouseUp;
+ Form1.Enabled := True;
+ end
+ else
+ begin
+ Report.RADIO := True;
+ end;
+ end;
+
4 :
begin
NextLabel.Caption := gettext(TEST);
@@ -302,7 +406,6 @@
procedure TForm1.TestButtonClick(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
var
- values : TStringList;
times : TStringList;
time : Integer;
result : Integer;
@@ -315,169 +418,117 @@
setExitEnabled(false);
setNextEnabled(false);
setPreviousEnabled(false);
- TuxUtils.initKnowedVars();
- attitunePlayed := false;
try
- if TuxUtils.isTuxDroidServerStarted() and TuxUtils.getStates(values) then
+
+ //Getting attitune play time.
+ if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
begin
- //Starting dongle state.
- if TuxUtils.isDongleConnected(values) then
- begin
- if TuxUtils.isRadioConnected(values) then
- begin
+ try
+ times := TStringList.Create;
+ times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
+ time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
+ times.Free;
+ except on e : Exception do
+ time := 10;
+ end;
+ end
+ else
+ begin
+ //define a defaulit.
+ time := 10;
+ end;
- //Getting attitune play time.
- if fileExists(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2') then
- begin
+ //Playing Attitune only if server is started, dongle connected ,and radio connected.
+ Report.ATTITUNE_READED := TuxUtils.playAttitune(getAttitunePath());
- try
- times := TStringList.Create;
- times.LoadFromFile(ExtractFilePath(Application.ExeName) + 'attitunes\times.is2');
- time := strtoint(times.Values[gnugettext.GetCurrentLanguage()]);
- times.Free;
- except on e : Exception do
- time := 10;
- end;
+ Form1.setNextEnabled(false);
+ setPreviousEnabled(false);
- end
- else
- begin
- //define a defaulit.
- time := 10;
- end;
+ setExitEnabled(false);
+ Form1.Enabled := false;
+ //Sleeping to the attitune end.
+ sleep( ( time + 1 ) * 1000 );
- //Playing Attitune only if server is started, dongle connected ,and radio connected.
- TuxUtils.playAttitune(getAttitunePath());
+ //Ask user if something was hear
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
- Form1.setNextEnabled(false);
- setPreviousEnabled(false);
+ Form1.setNextEnabled(true);
+ setPreviousEnabled(true);
+ Form1.setExitEnabled(true);
- setExitEnabled(false);
- Form1.Enabled := false;
- //Sleeping to the attitune end.
- sleep( ( time + 1 ) * 1000 );
+ case result of
+ Box.bOk:
+ begin
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
+ end;
- //Ask questions.
+ Box.bCancel:
+ begin
+ if testCount < 2 then
+ begin
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_1), gettext(YES), gettext(NO));
-
- Form1.setNextEnabled(true);
- setPreviousEnabled(true);
- Form1.setExitEnabled(true);
-
- case result of
- Box.bOk:
- begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end;
-
- Box.bCancel:
- begin
- if testCount < 2 then
- begin
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_2), gettext(OK), gettext(CANCEL));
-
- if result = Box.bCancel then
- begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end
- else
- begin
- if testCount < 2 then
- begin
- TuxUtils.stopServer();
- sleep(500);
- Steps.ActivePageIndex := 1;
- Inc(testCount, 1);
- NextLabel.Caption := gettext(NEXTB);
- Next.OnMouseUp := Form1.NextMouseUp;
- NextLabel.OnMouseUp := Form1.NextMouseUp;
- end;
- end;
- end
- else
- begin
- Form1.setNextEnabled(false);
- setPreviousEnabled(false);
-
- result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_3), gettext(YES), gettext(NO));
-
- if result = Box.bOk then
- begin
- sendReport(Report.ERROR);
- Application.Terminate;
- end
- else
- begin
- Steps.ActivePageIndex := 5;
- Next.Hide;
- Previous.Hide;
- NextLabel.Hide;
- PreviousLabel.Hide;
- ExitLabel.Caption := gettext(FINISH);
- Exit.OnMouseUp := FinishButtonClick;
- ExitLabel.OnMouseUp := FinishButtonClick;
- end;
- end;
- end;
+ if result = Box.bCancel then
+ begin
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
+ end
+ else
+ begin
+ if testCount < 2 then
+ begin
+ TuxUtils.stopServer();
+ sleep(500);
+ Steps.ActivePageIndex := 1;
+ Inc(testCount, 1);
+ NextLabel.Caption := gettext(NEXTB);
+ Next.OnMouseUp := Form1.NextMouseUp;
+ NextLabel.OnMouseUp := Form1.NextMouseUp;
+ end;
end;
-
- //Re-validate the form.
- Form1.Enabled := true;
end
-
- else //Radio not detected.
- begin
- //Showing the error message.
- BoxOk1.showMessageDialog(gettext(RADIO_ERROR), gettext(OK));
- Steps.ActivePageIndex := 1;
- NextLabel.Caption := gettext(NEXTB);
- Next.OnMouseUp := Form1.NextMouseUp;
- NextLabel.OnMouseUp := Form1.NextMouseUp;
- end;
- end //Dongle not connected.
-
else
begin
- //Checking first if it's a hardware problem.
- if isHIDReady() then
+ Form1.setNextEnabled(false);
+ setPreviousEnabled(false);
+
+ result := Box1.showMessageDialog(gettext(SCREEN_5_CHOICE_3), gettext(YES), gettext(NO));
+
+ if result = Box.bOk then
begin
- //Showing the error message.
- BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
+ sendReport(Report.ERROR);
+ Application.Terminate;
end
else
begin
- //Displaying HID error message.
- BoxOk1.showMessageDialog(gettext(WINDOWS_ERROR), gettext(OK));
- Steps.ActivePageIndex := 1;
- NextLabel.Caption := gettext(NEXTB);
- Next.OnMouseUp := Form1.NextMouseUp;
- NextLabel.OnMouseUp := Form1.NextMouseUp;
+ Steps.ActivePageIndex := 5;
+ Next.Hide;
+ Previous.Hide;
+ NextLabel.Hide;
+ PreviousLabel.Hide;
+ ExitLabel.Caption := gettext(FINISH);
+ Exit.OnMouseUp := FinishButtonClick;
+ ExitLabel.OnMouseUp := FinishButtonClick;
end;
end;
- end
- else
- //Starting the server and Display error message.
- begin
- Form1.ShowSplashScreen();
- TuxUtils.startServer(Application);
- Form1.HideSplashScreen();
- BoxOk1.showMessageDialog(gettext(SERVER_RESTART), gettext(OK));
+ end;
end;
+
+ //Re-validate the form.
+ Form1.Enabled := true;
Except
setExitEnabled(true);
setNextEnabled(true);
|
|
From: ks156 <c2m...@c2...> - 2009-09-08 08:48:03
|
Author: ks156 Date: 2009-09-08 10:47:46 +0200 (Tue, 08 Sep 2009) New Revision: 5337 Modified: software_suite_v2/tuxware/tuxdriver/trunk/src/log.c Log: * Changed the path of the log file from /var/log to /var/log/tuxdroid Modified: software_suite_v2/tuxware/tuxdriver/trunk/src/log.c =================================================================== --- software_suite_v2/tuxware/tuxdriver/trunk/src/log.c 2009-09-08 07:31:28 UTC (rev 5336) +++ software_suite_v2/tuxware/tuxdriver/trunk/src/log.c 2009-09-08 08:47:46 UTC (rev 5337) @@ -35,7 +35,7 @@ #ifdef WIN32 # define LOG_FILE "c:\\windows\\libtuxdriver.log" #else -# define LOG_FILE "/var/log/libtuxdriver.log" +# define LOG_FILE "/var/log/tuxdroid/libtuxdriver.log" #endif /** All logged messages are prefixed with this text */ |
|
From: remi <c2m...@c2...> - 2009-09-08 07:31:46
|
Author: remi
Date: 2009-09-08 09:31:28 +0200 (Tue, 08 Sep 2009)
New Revision: 5336
Added:
software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py
Log:
* Added a resource to manage the WIFI avoidance and the sleep mode.
Added: 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 (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/02_robot/10_resourceRF.py 2009-09-08 07:31:28 UTC (rev 5336)
@@ -0,0 +1,356 @@
+# ==============================================================================
+# Wifi avoidance resource.
+# ==============================================================================
+
+import math
+
+from util.wifi.TuxWifiChannel import TuxWifiChannel
+from util.misc import URLTools
+
+# ------------------------------------------------------------------------------
+# Wifi and ATR2406
+# ------------------------------------------------------------------------------
+
+FLOAT_INT_ROUND = 0
+FLOAT_INT_FLOOR = 1
+FLOAT_INT_CEIL = 0
+
+WIFI_LOWER_FREQ = 2401
+WIFI_FIRST_CHANNEL_C_FREQ = 2412
+WIFI_CHANNEL_STEP = 5
+WIFI_CHANNEL_BANDWIDTH = 22
+WIFI_DEFAULT_AVOIDED_BANDWIDTH = 55
+
+ATR2406_FIRST_FREQ = 2401.056
+ATR2406_CHANNEL_STEP = 0.864
+ATR2406_MIN_CHANNEL = 0
+ATR2406_MAX_CHANNEL = 94
+
+def ATR2406_ChannelToFreq(channel):
+ return ATR2406_FIRST_FREQ + (channel * ATR2406_CHANNEL_STEP)
+
+def ATR2406_FreqToChannel(freq, ff = FLOAT_INT_ROUND):
+ freq -= ATR2406_FIRST_FREQ
+ channel = freq / ATR2406_CHANNEL_STEP
+ if ff == FLOAT_INT_FLOOR:
+ result = int(math.floor(channel))
+ elif ff == FLOAT_INT_CEIL:
+ result = int(math.ceil(channel))
+ else:
+ result = int(channel + 0.5)
+ if result < ATR2406_MIN_CHANNEL:
+ result = ATR2406_MIN_CHANNEL
+ elif result > ATR2406_MAX_CHANNEL:
+ result = ATR2406_MAX_CHANNEL
+ return result
+
+def WIFI_ChannelToFreq(channel):
+ if channel == 14:
+ return 2484
+ else:
+ channel -= 1
+ return WIFI_FIRST_CHANNEL_C_FREQ + (WIFI_CHANNEL_STEP * channel)
+
+def WIFI_ChannelLowFreq(channel, bandwidth = WIFI_CHANNEL_BANDWIDTH):
+ freq = WIFI_ChannelToFreq(channel)
+ freq -= bandwidth / 2
+ if freq < WIFI_LOWER_FREQ:
+ freq = WIFI_LOWER_FREQ
+ return freq
+
+def WIFI_ChannelHighFreq(channel, bandwidth = WIFI_CHANNEL_BANDWIDTH):
+ freq = WIFI_ChannelToFreq(channel)
+ freq += bandwidth / 2
+ return freq
+
+def WIFI_ATR2406_ChannelInfos(channel, bandwidth = WIFI_CHANNEL_BANDWIDTH):
+ wCFreq = WIFI_ChannelToFreq(channel)
+ wLFreq = WIFI_ChannelLowFreq(channel, bandwidth)
+ wHFreq = WIFI_ChannelHighFreq(channel, bandwidth)
+ aCChan = ATR2406_FreqToChannel(wCFreq, FLOAT_INT_ROUND)
+ aCFreq = ATR2406_ChannelToFreq(aCChan)
+ aLChan = ATR2406_FreqToChannel(wLFreq, FLOAT_INT_FLOOR)
+ aLFreq = ATR2406_ChannelToFreq(aLChan)
+ aHChan = ATR2406_FreqToChannel(wHFreq, FLOAT_INT_CEIL)
+ aHFreq = ATR2406_ChannelToFreq(aHChan)
+ aBandWidth = aHFreq - aLFreq
+ return wCFreq, wLFreq, wHFreq, aCChan, aCFreq, aLChan, aLFreq, aHChan, aHFreq, aBandWidth
+
+# ------------------------------------------------------------------------------
+# Declaration of the resource "rf".
+# ------------------------------------------------------------------------------
+class TDSResourceRF(TDSResource):
+
+ # --------------------------------------------------------------------------
+ # Inherited methods from TDSResource
+ # --------------------------------------------------------------------------
+
+ def configure(self):
+ self.name = "rf"
+ self.comment = "Resource to manage the radio connection."
+ self.fileName = RESOURCE_FILENAME
+ self.__wifiChanDetector = TuxWifiChannel()
+ self.__flagsMutex = threading.Lock()
+ self.__channelInUse = None
+ self.__connectionDetected = False
+ defaultConfiguration = {
+ 'avoided_channel' : None,
+ 'avoided_bandwidth' : WIFI_DEFAULT_AVOIDED_BANDWIDTH,
+ }
+ self.configurator.load('resourceRF.conf', defaultConfiguration)
+ self.statesChecker()
+ resourceScheduler.createTask_RunEveryX(
+ "Wifi avoidance task",
+ [True, True, True, True, True, True, True],
+ [0, 0, 0],
+ [23, 59, 59],
+ [0, 0, 15],
+ "resourceRF.statesChecker",
+ (),
+ None)
+ eventsHandler.getEventHandler(ST_NAME_DONGLE_PLUG).register(self.__onDonglePlugCallback)
+ eventsHandler.getEventHandler(ST_NAME_RADIO_STATE).register(self.__onRadioStateCallback)
+
+ # --------------------------------------------------------------------------
+ # Inherited methods from TDSResource
+ # --------------------------------------------------------------------------
+
+ def __channelIsInUse(self):
+ self.__flagsMutex.acquire()
+ result = self.__channelInUse
+ self.__flagsMutex.release()
+ return result
+
+ def __setChannelInUse(self, channel):
+ self.__flagsMutex.acquire()
+ self.__channelInUse = channel
+ self.__flagsMutex.release()
+
+ def __connectionIsDetected(self):
+ self.__flagsMutex.acquire()
+ result = self.__connectionDetected
+ self.__flagsMutex.release()
+ return result
+
+ def __setConnectionDetected(self, value):
+ self.__flagsMutex.acquire()
+ self.__connectionDetected = value
+ self.__flagsMutex.release()
+
+ def statesChecker(self):
+ userChannel = self.configurator.getConfiguration()['avoided_channel']
+ userBandwidth = self.configurator.getConfiguration()['avoided_bandwidth']
+ if self.__channelIsInUse() == None:
+ if userChannel != None:
+ print "Avoid user selected channel :", userChannel
+ 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:
+ print "Avoid auto detected channel :", detectedChannel
+ self.avoidChannel(detectedChannel, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ self.__setChannelInUse(detectedChannel)
+ self.__setConnectionDetected(True)
+ else:
+ print "Can't detect wifi channel, default is 1"
+ self.avoidChannel(1, WIFI_DEFAULT_AVOIDED_BANDWIDTH)
+ self.__setChannelInUse(1)
+ self.__setConnectionDetected(True)
+
+ def resetStates(self):
+ print "Reset wifi channel states"
+ self.__setChannelInUse(None)
+ self.__setConnectionDetected(False)
+
+ def detectChannel(self):
+ """Get the currently used wifi channel by your wifi network.
+ @return: The channel as integer or None.
+ """
+ channel = self.__wifiChanDetector.getCurrent()
+ return channel
+
+ def avoidChannel(self, channel, bandwidth):
+ """Avoid a WIFI channel from the RF connection.
+ @param channel: Wifi channel to avoid.
+ @param bandwidth: Bandwith around the avoid channel (in MHz).
+ """
+ wCFreq, wLFreq, wHFreq, aCChan, aCFreq, aLChan, aLFreq, aHChan, aHFreq, aBandWidth = WIFI_ATR2406_ChannelInfos(channel, bandwidth)
+ cmd = "RAW_CMD:0x00:0x88:0x%.2x:0x%.2x:0x00" % (aLChan, aHChan)
+ resourceTuxDriver.executeRawCommand(cmd)
+
+ def sleepTuxDroid(self):
+ """Switch Tux Droid to sleep mode.
+ """
+ cmd = "RAW_CMD:0x00:0xB7:0x01:0x00:0x00"
+ resourceTuxDriver.executeRawCommand(cmd)
+
+ def wakeUpTuxDroid(self):
+ """Waking up Tux Droid.
+ """
+ cmd = "RAW_CMD:0x00:0xB6:0xFF:0x01:0x00"
+ resourceTuxDriver.executeRawCommand(cmd)
+
+ # ==========================================================================
+ # Private methods
+ # ==========================================================================
+
+ # --------------------------------------------------------------------------
+ # Event on dongle plug/unplug.
+ # --------------------------------------------------------------------------
+ def __onDonglePlugCallback(self, value, delay):
+ """Event on dongle plug/unplug.
+ """
+ if not value:
+ self.resetStates()
+
+ # --------------------------------------------------------------------------
+ # Event on radio state change.
+ # --------------------------------------------------------------------------
+ def __onRadioStateCallback(self, value, delay):
+ """Event on radio state change.
+ """
+ if value:
+ self.statesChecker()
+ else:
+ self.resetStates()
+
+# Create an instance of the resource
+resourceRF = TDSResourceRF("resourceRF")
+# Register the resource into the resources manager
+resourcesManager.addResource(resourceRF)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "avoid".
+# ------------------------------------------------------------------------------
+class TDSServiceRFAvoid(TDSService):
+
+ def configure(self):
+ self.parametersDict = {
+ 'channel' : 'uint8',
+ }
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "avoid"
+ self.comment = "Avoid a wifi channel in the RF connection."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ channel = parameters['channel']
+ configurator = resourceRF.getConfigurator()
+ configurator.getConfiguration()['avoided_channel'] = channel
+ configurator.getConfiguration()['avoided_bandwidth'] = WIFI_DEFAULT_AVOIDED_BANDWIDTH
+ configurator.store()
+ resourceRF.resetStates()
+ resourceRF.statesChecker()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRF.addService(TDSServiceRFAvoid)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "avoid_ex".
+# ------------------------------------------------------------------------------
+class TDSServiceRFAvoidEx(TDSService):
+
+ def configure(self):
+ self.parametersDict = {
+ 'channel' : 'uint8',
+ 'bandwidth' : 'uint8',
+ }
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "avoid_ex"
+ self.comment = "Avoid a wifi channel in the RF connection."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ channel = parameters['channel']
+ bandwidth = parameters['bandwidth']
+ configurator = resourceRF.getConfigurator()
+ configurator.getConfiguration()['avoided_channel'] = channel
+ configurator.getConfiguration()['avoided_bandwidth'] = bandwidth
+ configurator.store()
+ resourceRF.resetStates()
+ resourceRF.statesChecker()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRF.addService(TDSServiceRFAvoidEx)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "auto_avoid".
+# ------------------------------------------------------------------------------
+class TDSServiceRFAutoAvoid(TDSService):
+
+ def configure(self):
+ self.parametersDict = {}
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "auto_avoid"
+ self.comment = "Automatic avoidance of wifi channel in the RF connection."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ configurator = resourceRF.getConfigurator()
+ configurator.getConfiguration()['avoided_channel'] = None
+ configurator.getConfiguration()['avoided_bandwidth'] = WIFI_DEFAULT_AVOIDED_BANDWIDTH
+ configurator.store()
+ resourceRF.resetStates()
+ resourceRF.statesChecker()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRF.addService(TDSServiceRFAutoAvoid)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "sleep".
+# ------------------------------------------------------------------------------
+class TDSServiceRFSleep(TDSService):
+
+ def configure(self):
+ self.parametersDict = {}
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "sleep"
+ self.comment = "Sleeping."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ resourceRF.sleepTuxDroid()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRF.addService(TDSServiceRFSleep)
+
+# ------------------------------------------------------------------------------
+# Declaration of the service "wake_up".
+# ------------------------------------------------------------------------------
+class TDSServiceRFWakeUp(TDSService):
+
+ def configure(self):
+ self.parametersDict = {}
+ self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
+ self.exclusiveExecution = True
+ self.name = "wake_up"
+ self.comment = "Wake up."
+
+ def execute(self, id, parameters):
+ headersStruct = self.getDefaultHeadersStruct()
+ contentStruct = self.getDefaultContentStruct()
+ contentStruct['root']['result'] = getStrError(E_TDREST_SUCCESS)
+ resourceRF.wakeUpTuxDroid()
+ return headersStruct, contentStruct
+
+# Register the service into the resource
+resourceRF.addService(TDSServiceRFWakeUp)
|
|
From: remi <c2m...@c2...> - 2009-09-08 07:30:55
|
Author: remi
Date: 2009-09-08 09:30:45 +0200 (Tue, 08 Sep 2009)
New Revision: 5335
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/00_resourceTuxDriver.py
Log:
* Added method to send RAW commands
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/00_resourceTuxDriver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/00_resourceTuxDriver.py 2009-09-08 07:30:09 UTC (rev 5334)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/01_drivers/00_resourceTuxDriver.py 2009-09-08 07:30:45 UTC (rev 5335)
@@ -166,6 +166,16 @@
"""
self.__tuxDriver.PerformMacroText(macro)
+ # --------------------------------------------------------------------------
+ # Execute a RAW command.
+ # --------------------------------------------------------------------------
+ def executeRawCommand(self, rawCommand, delay = 0.0):
+ """Execute a RAW command.
+ @param rawCommand: RAW command.
+ @param delay: Delay before to execute the command.
+ """
+ self.__tuxDriver.PerformCommand(0.0, rawCommand)
+
# Sound --------------------------------------------------------------------
# --------------------------------------------------------------------------
|
|
From: remi <c2m...@c2...> - 2009-09-08 07:30:20
|
Author: remi Date: 2009-09-08 09:30:09 +0200 (Tue, 08 Sep 2009) New Revision: 5334 Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.so Log: * Added libtuxwifichannel.so library Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.so =================================================================== (Binary files differ) Property changes on: software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.so ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: remi <c2m...@c2...> - 2009-09-08 07:30:03
|
Author: remi Date: 2009-09-08 09:29:46 +0200 (Tue, 08 Sep 2009) New Revision: 5333 Modified: software_suite_v3/smart-core/smart-server/trunk/util/driver/libtuxdriver.dll software_suite_v3/smart-core/smart-server/trunk/util/driver/libtuxdriver.so Log: * updated libtuxdriver dll and so libraries Modified: software_suite_v3/smart-core/smart-server/trunk/util/driver/libtuxdriver.dll =================================================================== (Binary files differ) Modified: software_suite_v3/smart-core/smart-server/trunk/util/driver/libtuxdriver.so =================================================================== (Binary files differ) |
|
From: JDM <c2m...@c2...> - 2009-09-07 18:54:33
|
Author: JDM
Date: 2009-09-07 20:54:16 +0200 (Mon, 07 Sep 2009)
New Revision: 5332
Modified:
software_suite_v3/smart-core/smart-api/csharp/trunk/API/TuxAPI.cs
software_suite_v3/smart-core/smart-api/csharp/trunk/ControlTuxDroid/TuxAPIDemo/Form1.cs
Log:
* Fixed Speak() function now it work with TuxBox
* Fixed ControlTuxDroid for use the new Speak() function from the API
Modified: software_suite_v3/smart-core/smart-api/csharp/trunk/API/TuxAPI.cs
===================================================================
--- software_suite_v3/smart-core/smart-api/csharp/trunk/API/TuxAPI.cs 2009-09-04 11:45:26 UTC (rev 5331)
+++ software_suite_v3/smart-core/smart-api/csharp/trunk/API/TuxAPI.cs 2009-09-07 18:54:16 UTC (rev 5332)
@@ -85,6 +85,13 @@
namespace TuxAPI
{
+ public class TuxAPI_Locutor
+ {
+ public static readonly string Ryan = "Ryan";
+ public static readonly string Heather = "Heather";
+ public static readonly string Graham = "Graham";
+ }
+
public class TuxAPI
{
#region ENUMERATIONS
@@ -132,15 +139,6 @@
}
/// <summary>
- /// The TTS voice (TODO: Add others voices)
- /// </summary>
- public enum TuxAPI_SPEAK_LOCUTOR : byte
- {
- Bruno = 0,
- Julie = 1,
- }
-
- /// <summary>
/// 3 levels of luminosity intensity i've defined (value to check and modify !!)
/// </summary>
public enum TuxAPI_LEDS_INTENSITY_LEVEL
@@ -495,102 +493,21 @@
#endregion
#region TTS SPEECH CONTROL
- /// <summary>
- /// Allow to use the TTS Speech
- /// </summary>
- /// <param name="level">Access Level</param>
- /// <param name="Text">Text to read</param>
- private static void DoSpeak(TuxAPI_LEVEL level, string Text)
- {
- wc = new WebClient();
- string final_uri = string.Empty;
- //http://localhost:270/0/flippers/up?0 //permet de faire mettre les ailles en haut !
-
- final_uri = "http://" + TuxAPI_Host + ":" + TuxAPI_Port + "/" + (int)level + "/tts/speak?text=" + Text;
-
- wc.DownloadString(final_uri);
- }
-
/// <summary>
- /// Allow to use the TTS Speech with locutor choose
+ /// Allow to use the TTS Speach
/// </summary>
/// <param name="level">Access Level</param>
- /// <param name="locutor">Locutor from enum</param>
/// <param name="Text">Text to read</param>
- private static void DoSpeak(TuxAPI_LEVEL level, TuxAPI_SPEAK_LOCUTOR locutor, string Text)
- {
- wc = new WebClient();
- string start_uri = string.Empty;
- string final_url = string.Empty;
-
- start_uri = "http://" + TuxAPI_Host + ":" + TuxAPI_Port + "/" + (int)level + "/tts/";
-
- //1 - locutor choice
- //http://127.0.0.1:270/0/tts/locutor?name=Bruno
- final_url = start_uri + "locutor?name=" + (byte)locutor;
- wc.DownloadString(final_url);
-
- //2 - the text
- final_url = start_uri + "speak?text=" + Text;
-
- wc.DownloadString(final_url);
- }
-
- /// <summary>
- /// Allow to use the TTS Speech with pitch modification
- /// </summary>
- /// <param name="level">Access Level</param>
- /// <param name="pitch">pitch value 50 to 200</param>
- /// <param name="Text">Text to read</param>
- private static void DoSpeak(TuxAPI_LEVEL level, int pitch, string Text)
- {
- wc = new WebClient();
- string start_uri = string.Empty;
- string final_url = string.Empty;
-
- start_uri = "http://" + TuxAPI_Host + ":" + TuxAPI_Port + "/" + (int)level + "/tts/";
-
- //1 - pitch
- //http://127.0.0.1:270/0/tts/pitch?value=10
- final_url = start_uri + "pitch?value=" + pitch;
- wc.DownloadString(final_url);
-
- //2 - text
- final_url = start_uri + "speak?text=" + Text;
-
- wc.DownloadString(final_url);
- }
-
- /// <summary>
- /// Allow to use the TTS Speech with locutor choosse and pitch modification
- /// </summary>
- /// <param name="level">Access Level</param>
/// <param name="locutor">Locutor from enum</param>
- /// <param name="pitch">pitch value 50 to 200</param>
- /// <param name="Text">Text to read</param>
- private static void DoSpeak(TuxAPI_LEVEL level, TuxAPI_SPEAK_LOCUTOR locutor, int pitch, string Text)
+ /// <param name="pitch">Pitch value 50 to 200 (100=normal)</param>
+ private static void DoSpeak(TuxAPI_LEVEL level, string Text, string locutor, int pitch)
{
wc = new WebClient();
- string start_uri = string.Empty;
- string final_url = string.Empty;
+ string final_uri = "http://" + TuxAPI_Host + ":" + TuxAPI_Port + "/" + (int)level + "/tts/speak?text=" + Text + "&locutor=" + locutor + "&pitch=" + pitch;
+ http://127.0.0.1:270/0/tts/speak?text=test&locutor=Ryan&pitch=100
+ wc.DownloadString(final_uri);
- start_uri = "http://" + TuxAPI_Host + ":" + TuxAPI_Port + "/" + (int)level + "/tts/";
-
- //1 - l'interlocuteur
- //http://127.0.0.1:270/0/tts/locutor?name=Bruno
- final_url = start_uri + "locutor?name=" + (byte)locutor;
- wc.DownloadString(final_url);
-
- //2 - Le pitch
- //http://127.0.0.1:270/0/tts/pitch?value=10
- final_url = start_uri + "pitch?value=" + pitch;
- wc.DownloadString(final_url);
-
- //3 - le texte
- final_url = start_uri + "speak?text=" + Text;
-
- wc.DownloadString(final_url);
}
#endregion
@@ -677,21 +594,21 @@
#region TTS Speak
public static void Speak(string Text)
{
- DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, Text);
+ DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, Text, TuxAPI_Locutor.Ryan,100);
}
- public static void Speak(TuxAPI_SPEAK_LOCUTOR locutor, string Text)
+ public static void Speak(string locutor, string Text)
{
- DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, locutor, Text);
+ DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, Text, locutor, 100);
}
public static void Speak(int pitch, string Text)
{
- DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, pitch, Text);
+ DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, Text, TuxAPI_Locutor.Ryan, pitch);
}
- public static void Speak(TuxAPI_SPEAK_LOCUTOR locutor, int pitch, string Text)
+ public static void Speak(string locutor, int pitch, string Text)
{
- DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, locutor, pitch, Text);
+ DoSpeak(TuxAPI_LEVEL.CLIENT_LEVEL_FREE, Text, locutor, pitch);
}
#endregion
Modified: software_suite_v3/smart-core/smart-api/csharp/trunk/ControlTuxDroid/TuxAPIDemo/Form1.cs
===================================================================
--- software_suite_v3/smart-core/smart-api/csharp/trunk/ControlTuxDroid/TuxAPIDemo/Form1.cs 2009-09-04 11:45:26 UTC (rev 5331)
+++ software_suite_v3/smart-core/smart-api/csharp/trunk/ControlTuxDroid/TuxAPIDemo/Form1.cs 2009-09-07 18:54:16 UTC (rev 5332)
@@ -6,9 +6,9 @@
using System.Threading; //sleep
using System.IO; //
using System.Xml;
+using System.Xml.Linq;
using System.Net;
-
namespace TuxAPIDemo
{
using TuxAPI;
@@ -40,7 +40,7 @@
void TimeEventMgr_OnHourChange(object sender, TuxDateTimeEventArgs e)
{
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 100, "Il est " + DateTime.Now.Hour.ToString() + " heure et " + DateTime.Now.Minute.ToString() + " minutes");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 100, "Il est " + DateTime.Now.Hour.ToString() + " heure et " + DateTime.Now.Minute.ToString() + " minutes");
}
void buttonEvent_OnHeadButtonPressed(object sender, TuxButtonEventArgs e)
@@ -48,7 +48,7 @@
if (e.buttonPressed)
{
//MessageBox.Show("MA TETE !");
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 180, "Aille !");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 180, "Aille !");
}
}
@@ -57,7 +57,7 @@
if (e.buttonPressed)
{
//MessageBox.Show("Mon aille gauche !");
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 180, "Lache mon aile gauche !");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 180, "Lache mon aile gauche !");
}
}
@@ -66,7 +66,7 @@
if (e.buttonPressed)
{
//MessageBox.Show("Mon aile droite !");
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 180, "Lache mon aile droite !");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 180, "Lache mon aile droite !");
}
}
@@ -94,7 +94,7 @@
private void button5_Click(object sender, EventArgs e)
{
//TuxAPI.Speak("Bonjour");
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 100, "Bonjour"); //un petit test (qui fonctionne ^^)
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 100, "Bonjour"); //un petit test (qui fonctionne ^^)
}
private void button6_Click(object sender, EventArgs e)
@@ -263,7 +263,7 @@
double[] li_values = new double[4];
//Tux say to his master what he doing
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 100, "Je recherche le coin le plus lumineux");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 100, "Je recherche le coin le plus lumineux");
Thread.Sleep(1000);
li_values[0] = double.Parse(TuxAPI.getStatus(TuxAPI.TuxAPI_STATUS_REQUESTED.light_level).Replace(".", ","));
@@ -310,15 +310,15 @@
TuxAPI.Rotation_Left(1);
//saying to his master this is the most high level of luminosity
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 100, "Je pense que ce coin est le plus lumineux");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 100, "Je pense que ce coin est le plus lumineux");
}
private void button36_Click(object sender, EventArgs e)
{
if (int.Parse(DateTime.Now.Minute.ToString()) > 0)
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 120, "Il est " + DateTime.Now.Hour.ToString() + " heure et " + DateTime.Now.Minute.ToString() + " minutes");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 120, "Il est " + DateTime.Now.Hour.ToString() + " heure et " + DateTime.Now.Minute.ToString() + " minutes");
else
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 120, "Il est " + DateTime.Now.Hour.ToString() + " heure");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 120, "Il est " + DateTime.Now.Hour.ToString() + " heure");
}
private void button37_Click(object sender, EventArgs e)
@@ -353,7 +353,7 @@
break;
}
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 120, "Nous somme le " + DateTime.Now.Day.ToString() + " " + mois);
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 120, "Nous somme le " + DateTime.Now.Day.ToString() + " " + mois);
}
private void button38_Click(object sender, EventArgs e)
@@ -364,7 +364,7 @@
HttpWebRequest webRequest = (HttpWebRequest)HttpWebRequest.Create("http://www.google.com/ig/api?hl=fr&weather=paris");
webRequest.ReadWriteTimeout = 1000 * 60;
-
+
HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
Stream webStream = webResponse.GetResponseStream();
StreamReader webStreamReader = new StreamReader(webStream, System.Text.Encoding.Default);
@@ -374,13 +374,12 @@
XmlNode cnode = xmlWeather["xml_api_reply"]["weather"]["current_conditions"];
string condition = cnode["condition"].Attributes["data"].Value.ToString();
- string humidity = cnode["humidity"].Attributes["data"].Value.ToString().Replace("Humidité : ", ""); //
+ string humidity = cnode["humidity"].Attributes["data"].Value.ToString().Replace("Humidité : ",""); //
string temp_c = cnode["temp_c"].Attributes["data"].Value.ToString();
string temp_f = cnode["temp_f"].Attributes["data"].Value.ToString();
string vent = cnode["wind_condition"].Attributes["data"].Value.ToString();
- //La météo actuel a Paris est: " condition " avec une température de " " dégrès celcus. Le taux d'humidité est de " " pour cent
- TuxAPI.Speak(TuxAPI.TuxAPI_SPEAK_LOCUTOR.Bruno, 180, "La météo actuel à Paris est \"" + condition + "\" avec une température de " + temp_c + " degrés celcius; Le taux d'humidité est de " + humidity + " %.");
+ TuxAPI.Speak(TuxAPI_Locutor.Ryan, 180, "La météo actuel à Paris est \"" + condition + "\" avec une température de " + temp_c + " degrés celcius; Le taux d'humidité est de " + humidity + " %.");
}
}
}
|
|
From: remi <c2m...@c2...> - 2009-09-04 11:45:38
|
Author: remi Date: 2009-09-04 13:45:26 +0200 (Fri, 04 Sep 2009) New Revision: 5331 Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/ software_suite_v3/smart-core/smart-server/trunk/util/wifi/TuxWifiChannel.py software_suite_v3/smart-core/smart-server/trunk/util/wifi/__init__.py software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.dll Log: * Added wrapper to libtuxwifichannel library Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/TuxWifiChannel.py =================================================================== --- software_suite_v3/smart-core/smart-server/trunk/util/wifi/TuxWifiChannel.py (rev 0) +++ software_suite_v3/smart-core/smart-server/trunk/util/wifi/TuxWifiChannel.py 2009-09-04 11:45:26 UTC (rev 5331) @@ -0,0 +1,56 @@ +# Copyright (C) 2009 KYSOH Sa +# Remi Jocaille <rem...@ky...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +from ctypes import * +import os + +# ============================================================================== +# Public class +# ============================================================================== + +# ------------------------------------------------------------------------------ +# libtuxwifichannel wrapper class. +# ------------------------------------------------------------------------------ +class TuxWifiChannel(object): + """libtuxwifichannel wrapper class. + """ + + # -------------------------------------------------------------------------- + # Constructor. + # -------------------------------------------------------------------------- + def __init__(self, library_path = None): + """Constructor. + @param library_path: Path of libtuxwifichannel library. (Default None) + """ + if library_path == None: + mPath, mFile = os.path.split(__file__) + if os.name == 'nt': + library_path = os.path.join(mPath, "libtuxwifichannel.dll") + else: + library_path = os.path.join(mPath, "libtuxwifichannel.so") + self.tux_wifi_channel_lib = None + if os.path.isfile(library_path): + try: + self.tux_wifi_channel_lib = CDLL(library_path) + except: + self.tux_wifi_channel_lib = None + + # -------------------------------------------------------------------------- + # Get the currently used wifi channel. + # -------------------------------------------------------------------------- + def getCurrent(self, priorSSID = ""): + """Get the currently used wifi channel. + @param priorSSID: Network SSID to search in prior. + @return: An integer or None. + """ + if self.tux_wifi_channel_lib == None: + return None + try: + channel = self.tux_wifi_channel_lib.get_wifi_channel(c_char_p(priorSSID)) + if channel == -1: + channel = None + except: + channel = None + return channel Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/__init__.py =================================================================== Added: software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.dll =================================================================== (Binary files differ) Property changes on: software_suite_v3/smart-core/smart-server/trunk/util/wifi/libtuxwifichannel.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
1 message has been excluded from this view by a project administrator.
