tux-droid-svn Mailing List for Tux Droid CE (Page 233)
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: jaguarondi <c2m...@c2...> - 2007-03-23 02:09:17
|
Author: jaguarondi
Date: 2007-03-23 03:08:57 +0100 (Fri, 23 Mar 2007)
New Revision: 207
Modified:
firmware/tuxup/trunk/bootloader.c
Log:
- BUG: fixed bug #1 Segfault when a hex file contained a line of data that ended exactly at the end of a segment. The segmnt was never sent to the USB in this case. I'm not sure I didn't created a new bug by changing this, needs more testing.
Modified: firmware/tuxup/trunk/bootloader.c
===================================================================
--- firmware/tuxup/trunk/bootloader.c 2007-03-23 02:05:48 UTC (rev 206)
+++ firmware/tuxup/trunk/bootloader.c 2007-03-23 02:08:57 UTC (rev 207)
@@ -334,7 +334,9 @@
/* Last segment, fill with '0xFF', send and return */
if (lastSeg)
{
- //printf("--last segment --\n");
+#if (PRINT_DATA)
+ printf("--last segment --\n");
+#endif
while (parser->currAddr < (parser->segAddr + parser->segLen)) /* fill with '0' until the end of segment */
{
fillSegment(parser, 0xFF);
@@ -346,7 +348,9 @@
/* resynchronise currAddr and addr */
while(parser->currAddr != parsedData->addr)
{
- //printf("--synchronisation--\n");
+#if (PRINT_DATA)
+ printf("--synchronisation--\n");
+#endif
if (!parser->inSeg)
{
parser->currAddr = parsedData->addr & ~(parser->segLen - 1); /* set current address at the segment start by zeroing lower bits */
@@ -364,24 +368,28 @@
while(parser->currAddr < (parsedData->addr + parsedData->dataLen))
{
- //printf("--loop--");
+#if (PRINT_DATA)
+ printf("--loop--");
+#endif
if (!parser->inSeg) /* start a new segment if needed */
{
- //printf("--new segment--\n");
+#if (PRINT_DATA)
+ printf("--new segment--\n");
+#endif
parser->inSeg = TRUE;
parser->segAddr = parser->currAddr; /* set address of the segment start */
startSegment(parser);
}
+ /* store data in segmentData */
+ fillSegment(parser, parsedData->data[dataIdx]);
+ dataIdx++;
if (parser->currAddr == (parser->segAddr + parser->segLen)) /* end of segment */
{
- //printf("--end segment--");
+#if (PRINT_DATA)
+ printf("--end segment--");
+#endif
finishSegment(parser);
}
- else /* store data in segmentData */
- {
- fillSegment(parser, parsedData->data[dataIdx]);
- dataIdx++;
- }
}
return TRUE;
|
|
From: jaguarondi <c2m...@c2...> - 2007-03-23 02:06:06
|
Author: jaguarondi
Date: 2007-03-23 03:05:48 +0100 (Fri, 23 Mar 2007)
New Revision: 206
Modified:
firmware/tuxup/trunk/Makefile
firmware/tuxup/trunk/main.c
firmware/tuxup/trunk/usb-connection.c
firmware/tuxup/trunk/usb-connection.h
Log:
- UPD: forgot to use the CFLAGS in the Makefile, cleaned the code by removing unused variables and avoid any warning.
Modified: firmware/tuxup/trunk/Makefile
===================================================================
--- firmware/tuxup/trunk/Makefile 2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/Makefile 2007-03-23 02:05:48 UTC (rev 206)
@@ -18,7 +18,7 @@
## Compile and link
tuxup: main.c bootloader.c bootloader.h usb-connection.c usb-connection.h tux-api.h version.h common/commands.h
- ${CC} ${LIB} -o tuxup main.c bootloader.c usb-connection.c
+ ${CC} ${LIB} ${CFLAGS} -o tuxup main.c bootloader.c usb-connection.c
clean :
-rm -f $(TARGET) *.o
Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c 2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/main.c 2007-03-23 02:05:48 UTC (rev 206)
@@ -147,7 +147,6 @@
FILE *fs = NULL;
char word[80];
char hex_nr[3];
- int cpu_nbr, ver_major, ver_minor, ver_update;
hex_nr[2]=(char)'\0';
if ((fs = fopen(filename, "r")) == NULL)
@@ -271,7 +270,7 @@
int prog_usb(char *filename)
{
- char send_data[5] = {0x01, 0x01, 0x00, 0x00, 0xFF}; /* XXX include those as defines in commands.h */
+ uint8_t send_data[5] = {0x01, 0x01, 0x00, 0x00, 0xFF}; /* XXX include those as defines in commands.h */
char tmp_string[90];
int ret;
printf("Programming %s in USB CPU\n", filename);
@@ -398,9 +397,7 @@
*/
int main(int argc,char *argv[])
{
- char path[90], tmp_string[90];
- char *filename;
- int arg;
+ char path[90];
enum program_modes_t program_mode = NONE;
time_t start_time, end_time;
@@ -487,10 +484,12 @@
if (optind < argc) /* Input files have been given. */
{
if (program_mode != INPUTFILES)
+ {
if (argc == optind + 1)
strcpy(path, argv[optind]);
else
usage (stderr, 1);
+ }
}
else /* No arguments given. */
usage (stderr, 1);
Modified: firmware/tuxup/trunk/usb-connection.c
===================================================================
--- firmware/tuxup/trunk/usb-connection.c 2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/usb-connection.c 2007-03-23 02:05:48 UTC (rev 206)
@@ -118,10 +118,10 @@
* \todo Need to define the format of the data array to send and pass it as parameter
* \todo Need to add some doc or links about what this status is really
*/
-int usb_send_commands(usb_dev_handle *dev_h, char *send_data, int size)
+int usb_send_commands(usb_dev_handle *dev_h, uint8_t *send_data, int size)
{
int status;
- if((status = usb_interrupt_write(dev_h, USB_W_ENDPOINT, send_data, size, USB_W_TIMEOUT)) < 0)
+ if((status = usb_interrupt_write(dev_h, USB_W_ENDPOINT, (char*)send_data, size, USB_W_TIMEOUT)) < 0)
/* error on usb_interrupt_write() */
{
fprintf(stderr, "usb_interrupt_write error: status = %d :: %s \n", status, usb_strerror());
@@ -147,7 +147,7 @@
{
int status;
- if((status = usb_interrupt_read(dev_h, USB_R_ENDPOINT, receive_data, size, USB_R_TIMEOUT)) < 0)
+ if((status = usb_interrupt_read(dev_h, USB_R_ENDPOINT, (char*)receive_data, size, USB_R_TIMEOUT)) < 0)
{
fprintf(stderr, "usb_interrupt_read error: status = %d :: %s \n", status, usb_strerror());
}
Modified: firmware/tuxup/trunk/usb-connection.h
===================================================================
--- firmware/tuxup/trunk/usb-connection.h 2007-03-23 02:01:47 UTC (rev 205)
+++ firmware/tuxup/trunk/usb-connection.h 2007-03-23 02:05:48 UTC (rev 206)
@@ -65,7 +65,7 @@
usb_dev_handle * usb_open_tux(struct usb_device* dev);
struct usb_device* usb_find_tux();
int usb_check_tux_status(usb_dev_handle *dev_h);
-int usb_send_commands(usb_dev_handle *dev_h, char *send_data, int size);
+int usb_send_commands(usb_dev_handle *dev_h, uint8_t *send_data, int size);
int usb_get_commands(usb_dev_handle *dev_h, uint8_t *receive_data, int size);
#endif /* USB_CONNECTION_H */
|
|
From: jaguarondi <c2m...@c2...> - 2007-03-23 02:02:00
|
Author: jaguarondi
Date: 2007-03-23 03:01:47 +0100 (Fri, 23 Mar 2007)
New Revision: 205
Modified:
firmware/tuxup/trunk/main.c
Log:
- BUG: segfault when the given filename didn't have an extension
Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c 2007-03-23 01:57:24 UTC (rev 204)
+++ firmware/tuxup/trunk/main.c 2007-03-23 02:01:47 UTC (rev 205)
@@ -347,42 +347,45 @@
filename = filenamepath;
}
if (verbose) printf ("Processing: %s\n", filename);
+
extension = strrchr(filename, '.');
-
- /* Check which program function to start. */
- if (!strcmp(extension, ".hex"))
+ if (extension) /* check that an extension has been given */
{
- int i, usb = 0;
- /* Check for 'fuxusb' hex file. */
- len = strlen(filename);
- for (i=0; i< len-7; i++)
+ /* Check which program function to start. */
+ if (!strcmp(extension, ".hex"))
{
- if (!strncmp(filename+i, "fuxusb", 6))
+ int i, usb = 0;
+ /* Check for 'fuxusb' hex file. */
+ len = strlen(filename);
+ for (i=0; i< len-7; i++)
{
- ret = prog_usb(filename);
- usb = 1;
- break;
+ if (!strncmp(filename+i, "fuxusb", 6))
+ {
+ ret = prog_usb(filename);
+ usb = 1;
+ break;
+ }
}
+ if (!usb) /* AVR hex file. */
+ ret = prog_flash(filename);
}
- if (!usb) /* AVR hex file. */
- ret = prog_flash(filename);
- }
- else if (!strcmp(extension, ".eep"))
- {
- int i;
- len = strlen(filename);
- for (i=0; i< len-7; i++)
+ else if (!strcmp(extension, ".eep"))
{
- if (!strncmp(filename+i, "tuxcore", 7))
+ int i;
+ len = strlen(filename);
+ for (i=0; i< len-7; i++)
{
- ret = prog_eeprom(TUXCORE_CPU_NUM, filename);
- break;
+ if (!strncmp(filename+i, "tuxcore", 7))
+ {
+ ret = prog_eeprom(TUXCORE_CPU_NUM, filename);
+ break;
+ }
+ else if (!strncmp(filename+i, "tuxaudio", 7))
+ {
+ ret = prog_eeprom(TUXAUDIO_CPU_NUM, filename);
+ break;
+ }
}
- else if (!strncmp(filename+i, "tuxaudio", 7))
- {
- ret = prog_eeprom(TUXAUDIO_CPU_NUM, filename);
- break;
- }
}
}
if (ret == -1) fprintf(stderr, "%s is not a valid programming file.\n", filename);
|
|
From: jaguarondi <c2m...@c2...> - 2007-03-23 01:57:40
|
Author: jaguarondi
Date: 2007-03-23 02:57:24 +0100 (Fri, 23 Mar 2007)
New Revision: 204
Modified:
firmware/tuxup/trunk/main.c
Log:
- UPD: usage updated with the connection procedure
Modified: firmware/tuxup/trunk/main.c
===================================================================
--- firmware/tuxup/trunk/main.c 2007-03-22 16:19:41 UTC (rev 203)
+++ firmware/tuxup/trunk/main.c 2007-03-23 01:57:24 UTC (rev 204)
@@ -69,10 +69,17 @@
" -v --verbose Print verbose messages.\n"
" -V --version Print the version number.\n"
"\n"
- "'-a' and -'m' options can't be used simultaneously.\n"
- "Inputfiles can be specified only if the -a or -m options are not selected.\n"
- "Any .hex or .eep files compiled for Tux Droid can be used.\n"
- "The eeprom file names should contain 'tuxcore' or 'tuxaudio' in order to be identified, the usb hex file should contain 'fuxusb'.\n"
+ "Connection: connect the dongle alone, then press on tux's head\n"
+ " button while switching it on, finally connect the white cable\n"
+ " between tux and the dongle\n"
+ "\n"
+ "Notes: '-a' and -'m' options can't be used simultaneously.\n"
+ " Inputfiles can be specified only if the -a or -m options are\n"
+ " not selected.\n"
+ " Any .hex or .eep files compiled for Tux Droid can be used.\n"
+ " The eeprom file names should contain 'tuxcore' or 'tuxaudio'\n"
+ " in order to be identified, the usb hex file should contain\n"
+ " 'fuxusb'.\n"
);
exit (exit_code);
}
|
|
From: srikanta <c2m...@c2...> - 2007-03-22 16:19:55
|
Author: srikanta Date: 2007-03-22 17:19:41 +0100 (Thu, 22 Mar 2007) New Revision: 203 Added: daemon/branches/CPPDaemon/Makefile Log: Initial TCP Communication framework Added: daemon/branches/CPPDaemon/Makefile |
|
From: srikanta <c2m...@c2...> - 2007-03-22 16:16:23
|
Author: srikanta Date: 2007-03-22 17:16:00 +0100 (Thu, 22 Mar 2007) New Revision: 202 Added: daemon/branches/CPPDaemon/README daemon/branches/CPPDaemon/Socket.cpp daemon/branches/CPPDaemon/Socket.h daemon/branches/CPPDaemon/TCP.cpp daemon/branches/CPPDaemon/TCP.h daemon/branches/CPPDaemon/main.cpp Log: Initial TCP Communication framework Added: daemon/branches/CPPDaemon/README Added: daemon/branches/CPPDaemon/Socket.cpp Added: daemon/branches/CPPDaemon/Socket.h Added: daemon/branches/CPPDaemon/TCP.cpp Added: daemon/branches/CPPDaemon/TCP.h Added: daemon/branches/CPPDaemon/main.cpp |
|
From: remi <c2m...@c2...> - 2007-03-22 15:44:33
|
Author: remi Date: 2007-03-22 16:44:15 +0100 (Thu, 22 Mar 2007) New Revision: 201 Modified: software/gtdi/trunk/version.py Log: bump to release (0.2.1) Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-03-22 15:42:48 UTC (rev 200) +++ software/gtdi/trunk/version.py 2007-03-22 15:44:15 UTC (rev 201) @@ -1 +1 @@ -app_version="0.2.0" +app_version="0.2.1 (SVN/UNRELEASED)" |
|
From: remi <c2m...@c2...> - 2007-03-22 15:43:03
|
Author: remi Date: 2007-03-22 16:42:48 +0100 (Thu, 22 Mar 2007) New Revision: 200 Added: software/gtdi/tags/0.2.0/ Log: tag release (0.2.0) Copied: software/gtdi/tags/0.2.0 (from rev 199, software/gtdi/trunk) |
|
From: remi <c2m...@c2...> - 2007-03-22 15:41:44
|
Author: remi Date: 2007-03-22 16:41:29 +0100 (Thu, 22 Mar 2007) New Revision: 199 Modified: software/gtdi/trunk/version.py Log: preparing for release Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-03-22 15:32:06 UTC (rev 198) +++ software/gtdi/trunk/version.py 2007-03-22 15:41:29 UTC (rev 199) @@ -1 +1 @@ -app_version="0.2.0 (SVN/UNRELEASED)" +app_version="0.2.0" |
|
From: remi <c2m...@c2...> - 2007-03-22 15:32:22
|
Author: remi Date: 2007-03-22 16:32:06 +0100 (Thu, 22 Mar 2007) New Revision: 198 Modified: software/email_alert/trunk/version.py Log: bump to release (0.0.4) Modified: software/email_alert/trunk/version.py =================================================================== --- software/email_alert/trunk/version.py 2007-03-22 15:26:40 UTC (rev 197) +++ software/email_alert/trunk/version.py 2007-03-22 15:32:06 UTC (rev 198) @@ -1 +1 @@ -app_version="0.0.3" +app_version="0.0.4 (SVN/UNRELEASED)" |
|
From: remi <c2m...@c2...> - 2007-03-22 15:27:04
|
Author: remi Date: 2007-03-22 16:26:40 +0100 (Thu, 22 Mar 2007) New Revision: 197 Added: software/email_alert/tags/0.0.3/ Log: tag release (0.0.3) Copied: software/email_alert/tags/0.0.3 (from rev 196, software/email_alert/trunk) |
|
From: remi <c2m...@c2...> - 2007-03-22 15:26:25
|
Author: remi Date: 2007-03-22 16:24:38 +0100 (Thu, 22 Mar 2007) New Revision: 196 Modified: software/email_alert/trunk/version.py Log: preparing for release Modified: software/email_alert/trunk/version.py =================================================================== --- software/email_alert/trunk/version.py 2007-03-22 15:17:30 UTC (rev 195) +++ software/email_alert/trunk/version.py 2007-03-22 15:24:38 UTC (rev 196) @@ -1 +1 @@ -app_version="0.0.3 (SVN/UNRELEASED" +app_version="0.0.3" |
|
From: remi <c2m...@c2...> - 2007-03-22 15:17:44
|
Author: remi Date: 2007-03-22 16:17:30 +0100 (Thu, 22 Mar 2007) New Revision: 195 Modified: software/alarm_clock/trunk/version.py Log: bump to release (0.0.4) Modified: software/alarm_clock/trunk/version.py =================================================================== --- software/alarm_clock/trunk/version.py 2007-03-22 15:14:08 UTC (rev 194) +++ software/alarm_clock/trunk/version.py 2007-03-22 15:17:30 UTC (rev 195) @@ -1 +1 @@ -app_version="0.0.3" +app_version="0.0.4 (SVN/UNRELEASED)" |
|
From: remi <c2m...@c2...> - 2007-03-22 15:14:26
|
Author: remi Date: 2007-03-22 16:14:08 +0100 (Thu, 22 Mar 2007) New Revision: 194 Added: software/alarm_clock/tags/0.0.3/ Log: tag release (0.0.3) of alarm_clock python software Copied: software/alarm_clock/tags/0.0.3 (from rev 193, software/alarm_clock/trunk) |
|
From: remi <c2m...@c2...> - 2007-03-22 15:10:30
|
Author: remi Date: 2007-03-22 16:10:10 +0100 (Thu, 22 Mar 2007) New Revision: 193 Modified: software/alarm_clock/trunk/version.py Log: preparing for release Modified: software/alarm_clock/trunk/version.py =================================================================== --- software/alarm_clock/trunk/version.py 2007-03-22 14:25:37 UTC (rev 192) +++ software/alarm_clock/trunk/version.py 2007-03-22 15:10:10 UTC (rev 193) @@ -1 +1 @@ -app_version="0.0.3 (SVN/UNRELEASED)" +app_version="0.0.3" |
|
From: remi <c2m...@c2...> - 2007-03-22 14:25:51
|
Author: remi Date: 2007-03-22 15:25:37 +0100 (Thu, 22 Mar 2007) New Revision: 192 Modified: api/python/trunk/tuxapi_class.py Log: bump to release (0.1.3) Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-22 14:23:41 UTC (rev 191) +++ api/python/trunk/tuxapi_class.py 2007-03-22 14:25:37 UTC (rev 192) @@ -33,7 +33,7 @@ # Constants #============================================================================== -api_version ="0.1.2" +api_version ="0.1.3 (SVN/UNRELEASED)" HEAD_BT =1 LEFT_WING_BT =2 |
|
From: remi <c2m...@c2...> - 2007-03-22 14:23:57
|
Author: remi Date: 2007-03-22 15:23:41 +0100 (Thu, 22 Mar 2007) New Revision: 191 Added: api/python/tags/0.1.2/ Log: tag release (0.1.2) of the python API Copied: api/python/tags/0.1.2 (from rev 190, api/python/trunk) |
|
From: remi <c2m...@c2...> - 2007-03-22 14:21:37
|
Author: remi Date: 2007-03-22 15:21:22 +0100 (Thu, 22 Mar 2007) New Revision: 190 Modified: api/python/trunk/AUTHORS api/python/trunk/CHANGES Log: preparing for release Modified: api/python/trunk/AUTHORS =================================================================== --- api/python/trunk/AUTHORS 2007-03-22 14:16:22 UTC (rev 189) +++ api/python/trunk/AUTHORS 2007-03-22 14:21:22 UTC (rev 190) @@ -1,6 +1,6 @@ $Id: $ -TUXCORE was written by: +Tux python API was written by: R Jocaille <rem...@c2...> Modified: api/python/trunk/CHANGES =================================================================== --- api/python/trunk/CHANGES 2007-03-22 14:16:22 UTC (rev 189) +++ api/python/trunk/CHANGES 2007-03-22 14:21:22 UTC (rev 190) @@ -7,6 +7,15 @@ ---------------------------------------------------------------------- Current: +Version 0.1.2: + + * Alsa tux card device name is now constructed by the api for example, + it is used for playing a sound with "aplay" + * Fixed a typo in api/python/trunk/tuxapi_class.py + * New boolean variable "print_warnings" has been added for print or not + of the warning messages. + * print_api_version() command has been moved. + Version 0.1.1: * Added a limitation of the wav file to store the sounds in the local flash to 70 seconds. |
|
From: remi <c2m...@c2...> - 2007-03-22 14:16:47
|
Author: remi Date: 2007-03-22 15:16:22 +0100 (Thu, 22 Mar 2007) New Revision: 189 Modified: api/python/trunk/tuxapi_class.py Log: preparing for release Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-22 14:14:11 UTC (rev 188) +++ api/python/trunk/tuxapi_class.py 2007-03-22 14:16:22 UTC (rev 189) @@ -33,7 +33,7 @@ # Constants #============================================================================== -api_version ="0.1.2 (SVN/UNRELEASED)" +api_version ="0.1.2" HEAD_BT =1 LEFT_WING_BT =2 |
|
From: remi <c2m...@c2...> - 2007-03-22 13:52:10
|
Author: remi Date: 2007-03-22 14:51:27 +0100 (Thu, 22 Mar 2007) New Revision: 187 Modified: daemon/trunk/version.txt Log: UPD : Bump version to 0.3.0 Modified: daemon/trunk/version.txt =================================================================== --- daemon/trunk/version.txt 2007-03-22 13:48:51 UTC (rev 186) +++ daemon/trunk/version.txt 2007-03-22 13:51:27 UTC (rev 187) @@ -1 +1 @@ -0.2.0 +0.3.0 (SVN/UNRELEASED) |
|
From: remi <c2m...@c2...> - 2007-03-22 13:49:05
|
Author: remi Date: 2007-03-22 14:48:51 +0100 (Thu, 22 Mar 2007) New Revision: 186 Added: daemon/tags/0.2.0/ Log: Tag 0.2.0 release of tuxdaemon Copied: daemon/tags/0.2.0 (from rev 185, daemon/trunk) |
|
From: remi <c2m...@c2...> - 2007-03-22 13:39:09
|
Author: remi Date: 2007-03-22 14:38:27 +0100 (Thu, 22 Mar 2007) New Revision: 185 Modified: daemon/trunk/version.txt Log: UPD: preparing tag release (0.2.0) Modified: daemon/trunk/version.txt =================================================================== --- daemon/trunk/version.txt 2007-03-21 17:12:29 UTC (rev 184) +++ daemon/trunk/version.txt 2007-03-22 13:38:27 UTC (rev 185) @@ -1 +1 @@ -0.2.0 (SVN/UNRELEASED) +0.2.0 |
|
From: srikanta <c2m...@c2...> - 2007-03-21 17:12:55
|
Author: srikanta Date: 2007-03-21 18:12:29 +0100 (Wed, 21 Mar 2007) New Revision: 184 Added: daemon/branches/CPPDaemon/ Log: - Initial version of proposed c++ daemon - Contains only basic framework for TCP communication |
|
From: remi <c2m...@c2...> - 2007-03-21 09:56:48
|
Author: remi
Date: 2007-03-21 10:56:41 +0100 (Wed, 21 Mar 2007)
New Revision: 183
Modified:
software/alarm_clock/trunk/tdac.py
Log:
UPD :
- Tux sound card is self selected.
Modified: software/alarm_clock/trunk/tdac.py
===================================================================
--- software/alarm_clock/trunk/tdac.py 2007-03-21 09:56:21 UTC (rev 182)
+++ software/alarm_clock/trunk/tdac.py 2007-03-21 09:56:41 UTC (rev 183)
@@ -50,6 +50,7 @@
locale_dir = ""
bindtextdomain(app_name, locale_dir)
+soundcard = tux.hw.alsa_device
#------------------------------------------------------------------------------
@@ -153,7 +154,7 @@
def on_alarm(self):
if self.get_widget("radiobutton1").get_active():
if self.wav_filename!="None":
- tux.sys.shell_free("aplay -D hw:1 "+self.wav_filename)
+ tux.sys.shell_free("aplay -D %s %s "%(soundcard,self.wav_filename))
else:
voice_cb=self.get_widget("comboboxentry1")
pitch_sb=self.get_widget("spinbutton2")
|
|
From: remi <c2m...@c2...> - 2007-03-21 09:56:35
|
Author: remi
Date: 2007-03-21 10:56:21 +0100 (Wed, 21 Mar 2007)
New Revision: 182
Modified:
software/email_alert/trunk/tdema.py
Log:
UPD :
- Tux sound card is self selected.
Modified: software/email_alert/trunk/tdema.py
===================================================================
--- software/email_alert/trunk/tdema.py 2007-03-21 09:55:39 UTC (rev 181)
+++ software/email_alert/trunk/tdema.py 2007-03-21 09:56:21 UTC (rev 182)
@@ -58,6 +58,7 @@
locale_dir = ""
bindtextdomain(app_name, locale_dir)
+soundcard = tux.hw.alsa_device
#------------------------------------------------------------------------------
# Window class
@@ -149,7 +150,7 @@
tux.sys.shell_free("python "+self.py_filename)
if self.get_widget("rb_wav").get_active():
if self.wav_filename!="None":
- tux.sys.shell_free("aplay -D hw:1 "+self.wav_filename)
+ tux.sys.shell_free("aplay -D %s %s"%(soundcard,self.wav_filename))
else:
voice_cb=self.get_widget("cbbe_voice")
pitch_sb=self.get_widget("sb_pitch")
|
1 message has been excluded from this view by a project administrator.
