tux-droid-svn Mailing List for Tux Droid CE (Page 230)
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: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-22 17:48:42
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 283
Modified:
daemon/trunk/libs/USBDaemon_command_tux.c
daemon/trunk/libs/USBDaemon_command_tux.h
daemon/trunk/libs/USBDaemon_globals.h
daemon/trunk/libs/USBDaemon_pidfile.c
daemon/trunk/libs/USBDaemon_pidfile.h
daemon/trunk/libs/USBDaemon_status_table.c
daemon/trunk/libs/USBDaemon_status_table.h
daemon/trunk/libs/USBDaemon_tcp_server.c
daemon/trunk/libs/USBDaemon_tcp_server.h
daemon/trunk/libs/USBDaemon_usb_enum.c
daemon/trunk/libs/USBDaemon_usb_enum.h
daemon/trunk/libs/USBDaemon_usb_readWrite.c
daemon/trunk/libs/USBDaemon_usb_readWrite.h
daemon/trunk/main.c
Log:
doegox
2007-04-22 19:47:57 +0200 (Sun, 22 Apr 2007)
152
Reindent with:
indent -nut -i4 -bad -bap -bbb -sob -sc -bl -bli0 -cli0 -cbi4 -nce -ncdw -ss -bls -npsl -ncs -npcs -nprs -saf -sai -saw -nbfda -nhnl -l80
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -29,24 +31,25 @@
#include "../tuxdefs/commands.h"
#include "USBDaemon_tcp_server.h"
#include "USBDaemon_pidfile.h"
+
/*_____________________ F U N C T I O N S __________________________________*/
/************************************************************************** */
+
/* COMMANDS FROM CLIENTS DISPATCHER */
+
/************************************************************************** */
-void commands_dispatcher(
- unsigned char client_id, /* Client source */
- tcp_frame_t src_frame) /* Source frame */
+void commands_dispatcher(unsigned char client_id, /* Client source */
+ tcp_frame_t src_frame) /* Source frame */
{
unsigned char ACK_DP; /* daemon processing ack */
unsigned char data[12]; /* data part of source frame */
unsigned char result[12]; /* result data to return */
- tcp_frame_t tcp_frame; /* tcp frame to send */
+ tcp_frame_t tcp_frame; /* tcp frame to send */
tcp_frame_t ack_dp_frame;
int i;
unsigned char no_ack;
-
no_ack = 0;
/* Cut data part of source frame */
for (i = 0; i < sizeof(tcp_frame_t) - 4; i++)
@@ -56,143 +59,144 @@
}
/* Make source header */
- tcp_frame[0] = src_frame[0]; /* return source */
- tcp_frame[1] = src_frame[1]; /* return sub source */
+ tcp_frame[0] = src_frame[0]; /* return source */
+ tcp_frame[1] = src_frame[1]; /* return sub source */
/*--------------------Frame and data processing---------------------- */
- ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */
+ ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */
/* B1----: Destination */
- switch(src_frame[0])
+ switch (src_frame[0])
{
/* To Master Daemon---------------------------------------------- */
- case DEST_MASTER_DAEMON:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
+ case DEST_MASTER_DAEMON:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* To Sub Daemon------------------------------------------------- */
+ case DEST_SUB_DAEMON:
+ /* B3----Data Type */
+ switch (src_frame[2])
+ {
+ /* Data type command */
+ case DATA_TP_CMD:
+ /* B4----Command type */
+ tcp_frame[2] = DATA_TP_ACK_CMD;
+ tcp_frame[3] = src_frame[3];
+ switch (src_frame[3])
+ {
+ /* Command type raw */
+ case SUBDATA_TP_RAW:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Command type structured */
+ case SUBDATA_TP_STRUCT:
+ sub_daemon_cmd_struct(data, result, client_id);
+ if (result[0] == ACK_CMD_NO_ACK)
+ no_ack = 1;
+ break;
+ /* Unknowed command type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
+ }
break;
- /* To Sub Daemon------------------------------------------------- */
- case DEST_SUB_DAEMON:
- /* B3----Data Type */
- switch(src_frame[2])
+ /* Data type request */
+ case DATA_TP_REQ:
+ tcp_frame[2] = DATA_TP_RSP;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Request type */
+ switch (src_frame[3])
{
- /* Data type command */
- case DATA_TP_CMD:
- /* B4----Command type */
- tcp_frame[2] = DATA_TP_ACK_CMD;
- tcp_frame[3] = src_frame[3];
- switch(src_frame[3])
- {
- /* Command type raw */
- case SUBDATA_TP_RAW:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Command type structured */
- case SUBDATA_TP_STRUCT:
- sub_daemon_cmd_struct(data, result, client_id);
- if(result[0] == ACK_CMD_NO_ACK) no_ack = 1;
- break;
- /* Unknowed command type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Data type request */
- case DATA_TP_REQ:
- tcp_frame[2] = DATA_TP_RSP;
- tcp_frame[3] = src_frame[3];
- /* B4----Request type */
- switch(src_frame[3])
- {
- /* Request type status */
- case SUBDATA_TP_STATUS:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Request type information */
- case SUBDATA_TP_INFO:
- sub_daemon_req_info(data, result, client_id);
- break;
- /* Unknowed request type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Unknowed data type */
- default:
- ACK_DP = ACK_DP_UKN_DATA_TP;
- break;
+ /* Request type status */
+ case SUBDATA_TP_STATUS:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Request type information */
+ case SUBDATA_TP_INFO:
+ sub_daemon_req_info(data, result, client_id);
+ break;
+ /* Unknowed request type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
}
break;
- /* To Tux-------------------------------------------------------- */
- case DEST_TUX:
- /* TODO sub destinations */
- /* B3----Data Type */
- switch(src_frame[2])
+ /* Unknowed data type */
+ default:
+ ACK_DP = ACK_DP_UKN_DATA_TP;
+ break;
+ }
+ break;
+ /* To Tux-------------------------------------------------------- */
+ case DEST_TUX:
+ /* TODO sub destinations */
+ /* B3----Data Type */
+ switch (src_frame[2])
+ {
+ /* Data type command */
+ case DATA_TP_CMD:
+ tcp_frame[2] = DATA_TP_ACK_CMD;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Command type */
+ switch (src_frame[3])
{
- /* Data type command */
- case DATA_TP_CMD:
- tcp_frame[2] = DATA_TP_ACK_CMD;
- tcp_frame[3] = src_frame[3];
- /* B4----Command type */
- switch(src_frame[3])
- {
- /* Command type raw */
- case SUBDATA_TP_RAW:
- tux_cmd_raw(data, result);
- break;
- /* Command type structured */
- case SUBDATA_TP_STRUCT:
- tux_cmd_struct(data, result);
- break;
- /* Unknowed command type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Data type request */
- case DATA_TP_REQ:
- tcp_frame[2] = DATA_TP_RSP;
- tcp_frame[3] = src_frame[3];
- /* B4----Request type */
- switch(src_frame[3])
- {
- /* Request type status */
- case SUBDATA_TP_STATUS:
- tux_req_status(data, result);
- break;
- /* Request type information */
- case SUBDATA_TP_INFO:
- tux_req_info(data, result);
- break;
- /* Unknowed request type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Unknowed data type */
- default:
- ACK_DP = ACK_DP_UKN_DATA_TP;
- break;
+ /* Command type raw */
+ case SUBDATA_TP_RAW:
+ tux_cmd_raw(data, result);
+ break;
+ /* Command type structured */
+ case SUBDATA_TP_STRUCT:
+ tux_cmd_struct(data, result);
+ break;
+ /* Unknowed command type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
}
break;
- /* To Resource--------------------------------------------------- */
- case DEST_RESOURCE:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
+ /* Data type request */
+ case DATA_TP_REQ:
+ tcp_frame[2] = DATA_TP_RSP;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Request type */
+ switch (src_frame[3])
+ {
+ /* Request type status */
+ case SUBDATA_TP_STATUS:
+ tux_req_status(data, result);
+ break;
+ /* Request type information */
+ case SUBDATA_TP_INFO:
+ tux_req_info(data, result);
+ break;
+ /* Unknowed request type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
+ }
break;
- /* To Client----------------------------------------------------- */
- case DEST_CLIENT:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Unknowed destination------------------------------------------ */
+ /* Unknowed data type */
default:
- ACK_DP = ACK_DP_UKN_DEST;
+ ACK_DP = ACK_DP_UKN_DATA_TP;
break;
+ }
+ break;
+ /* To Resource--------------------------------------------------- */
+ case DEST_RESOURCE:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* To Client----------------------------------------------------- */
+ case DEST_CLIENT:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Unknowed destination------------------------------------------ */
+ default:
+ ACK_DP = ACK_DP_UKN_DEST;
+ break;
}
/* Paste result treatement into tcp frame */
@@ -213,7 +217,7 @@
{
tcp_server_send_raw_to_client(client_id, ack_dp_frame);
/* Send tcp frame to client */
- if(ACK_DP == ACK_DP_OK)
+ if (ACK_DP == ACK_DP_OK)
{
tcp_server_send_raw_to_client(client_id, tcp_frame);
}
@@ -221,401 +225,567 @@
}
/************************************************************************ */
+
/* FOR Sub daemon */
+
/************************************************************************ */
/******************************************************************** */
+
/* sub_daemon_cmd_struct() */
+
/******************************************************************** */
void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[],
int id_client)
{
switch (data[0])
{
- case SUB_D_CMD_STRUC_DISCONNECT_CLIENT:
- pthread_mutex_lock(&tcp_mutex);
- /* Byte 2 equal id client to disconnect */
- if (tcp_clients_handle[data[1]] >= 0)
- {
- tcp_remove_client(data[1]);
- result[0] = ACK_CMD_OK;
- }
- else
- { /* Bad id client */
- result[0] = ACK_CMD_KO;
- }
- pthread_mutex_unlock(&tcp_mutex);
- break;
- case SUB_D_CMD_STRUC_DISCONNECT_CLIENT_ME:
- pthread_mutex_lock(&tcp_mutex);
- tcp_remove_client(id_client);
- result[0] = ACK_CMD_NO_ACK;
- pthread_mutex_unlock(&tcp_mutex);
- break;
- case SUB_D_CMD_STRUC_KILL_DAEMON:
- printf("WARNING : daemon killed by user\n");
- send_daemon_disconnected();
+ case SUB_D_CMD_STRUC_DISCONNECT_CLIENT:
+ pthread_mutex_lock(&tcp_mutex);
+ /* Byte 2 equal id client to disconnect */
+ if (tcp_clients_handle[data[1]] >= 0)
+ {
+ tcp_remove_client(data[1]);
result[0] = ACK_CMD_OK;
- terminate(0);
- break;
- case SUB_D_CMD_STRUC_DEFINE_CLIENT_NAME:
- {
- int i;
- for (i = 0; i < 11; i++)
- tcp_clients_name[id_client][i] = data[i + 1];
- result[0] = ACK_CMD_OK;
- printf("Name of client %d is %s\n", id_client,
- tcp_clients_name[id_client]);
- }
- break;
+ }
+ else
+ { /* Bad id client */
+ result[0] = ACK_CMD_KO;
+ }
+ pthread_mutex_unlock(&tcp_mutex);
+ break;
+ case SUB_D_CMD_STRUC_DISCONNECT_CLIENT_ME:
+ pthread_mutex_lock(&tcp_mutex);
+ tcp_remove_client(id_client);
+ result[0] = ACK_CMD_NO_ACK;
+ pthread_mutex_unlock(&tcp_mutex);
+ break;
+ case SUB_D_CMD_STRUC_KILL_DAEMON:
+ printf("WARNING : daemon killed by user\n");
+ send_daemon_disconnected();
+ result[0] = ACK_CMD_OK;
+ terminate(0);
+ break;
+ case SUB_D_CMD_STRUC_DEFINE_CLIENT_NAME:
+ {
+ int i;
+
+ for (i = 0; i < 11; i++)
+ tcp_clients_name[id_client][i] = data[i + 1];
+ result[0] = ACK_CMD_OK;
+ printf("Name of client %d is %s\n", id_client,
+ tcp_clients_name[id_client]);
+ }
+ break;
}
}
/************************************************************************ */
+
/* sub_daemon_req_info() */
+
/************************************************************************ */
-void sub_daemon_req_info(
- unsigned char data[],
- unsigned char result[],
- int id_client
- )
+void sub_daemon_req_info(unsigned char data[], unsigned char result[],
+ int id_client)
{
unsigned char i;
result[0] = data[0];
- switch(data[0])
+ switch (data[0])
{
- case SUB_D_REQ_INFO_VERSION:
- result[1] = version.major;
- result[2] = version.minor;
- result[3] = version.release;
- break;
- case SUB_D_REQ_INFO_CLIENT_COUNT:
- result[1] = tcp_clients_count;
- break;
- case SUB_D_REQ_INFO_CLIENT_NAME:
- for(i = 0; i < 11; i++)
- result[i + 1] = tcp_clients_name[data[1]][i];
- break;
- case SUB_D_REQ_INFO_MY_CLIENT_ID:
- result[1] = id_client;
- break;
- case SUB_D_REQ_INFO_PID:
- result[1] = (daemon_pid & 0xFF00)>>8;
- result[2] = (daemon_pid & 0x00FF);
- break;
+ case SUB_D_REQ_INFO_VERSION:
+ result[1] = version.major;
+ result[2] = version.minor;
+ result[3] = version.release;
+ break;
+ case SUB_D_REQ_INFO_CLIENT_COUNT:
+ result[1] = tcp_clients_count;
+ break;
+ case SUB_D_REQ_INFO_CLIENT_NAME:
+ for (i = 0; i < 11; i++)
+ result[i + 1] = tcp_clients_name[data[1]][i];
+ break;
+ case SUB_D_REQ_INFO_MY_CLIENT_ID:
+ result[1] = id_client;
+ break;
+ case SUB_D_REQ_INFO_PID:
+ result[1] = (daemon_pid & 0xFF00) >> 8;
+ result[2] = (daemon_pid & 0x00FF);
+ break;
}
}
/************************************************************************** */
+
/* FOR Tux droid */
+
/************************************************************************** */
/************************************************************************ */
+
/* tux_cmd_raw() */
+
/************************************************************************ */
-void tux_cmd_raw(
- unsigned char data[],
- unsigned char result[]
- )
+void tux_cmd_raw(unsigned char data[], unsigned char result[])
{
unsigned char usb_send[5];
unsigned char i;
usb_send[0] = 0;
- for(i = 1; i < 5; i++)
+ for (i = 1; i < 5; i++)
usb_send[i] = data[i - 1];
result[0] = usb_write_TuxDroid(usb_send);
}
/************************************************************************ */
+
/* tux_cmd_struct() */
+
/************************************************************************ */
-void tux_cmd_struct(
- unsigned char data[],
- unsigned char result[]
- )
+void tux_cmd_struct(unsigned char data[], unsigned char result[])
{
unsigned char ACK;
/* Command type */
- switch(data[0])
+ switch (data[0])
{
- case TUX_CMD_STRUCT_EYES:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(BLINK_EYES_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_EYES_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_EYES:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(BLINK_EYES_CMD, data[2], 0, 0);
break;
- case TUX_CMD_STRUCT_MOUTH:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(MOVE_MOUTH_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_MOUTH_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_EYES_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_WINGS:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(WAVE_WINGS_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_WINGS_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_MOUTH:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(MOVE_MOUTH_CMD, data[2], 0, 0);
break;
- case TUX_CMD_STRUCT_SPINL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(SPIN_LEFT_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_MOUTH_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_SPINR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(SPIN_RIGHT_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_WINGS:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(WAVE_WINGS_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_IR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(TURN_IR_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(TURN_IR_OFF_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_SEND:
- ACK = send_usb_tux_cmd(IR_SEND_RC5_CMD, data[2], data[3], 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_WINGS_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_LEDS:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_OFF_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_BLINK:
- ACK = send_usb_tux_cmd(LED_BLINK_CMD, data[2], data[3], 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_SPINL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(SPIN_LEFT_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_LEDL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_L_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_L_OFF_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_LEDR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_R_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_R_OFF_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_SPINR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(SPIN_RIGHT_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_SOUND:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_PLAY:
- ACK = send_usb_tux_cmd(PLAY_SOUND_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_STORING:
- ACK = send_usb_tux_cmd(STORE_SOUND_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_STORE_INDEX:
- ACK = send_usb_tux_cmd(STORE_INDEX_CMD, data[2], data[3], data[4]);
- break;
- case TUX_CMD_STRUCT_SUB_TEST:
- ACK = send_usb_tux_cmd(TEST_SOUND_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_PING:
- pong_received = 0;
- ACK = send_usb_tux_cmd(PING_CMD, data[2], 0, 0);
+ }
+ break;
+ case TUX_CMD_STRUCT_IR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(TURN_IR_ON_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_SLEEP:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(0x20, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(0x21, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(TURN_IR_OFF_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_AUDIO_CHANNEL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_CH_GENERAL:
- if(current_audio_channel != 0)
- {
- ACK = send_usb_dongle_cmd(0x02, 0, 0, 0);
- current_audio_channel = 0;
- }
- else
- ACK = ACK_CMD_OK;
- break;
- case TUX_CMD_STRUCT_SUB_CH_TTS:
- if(current_audio_channel != 1)
- {
- ACK = send_usb_dongle_cmd(0x02, 1, 0, 0);
- current_audio_channel = 1;
- }
- else
- ACK = ACK_CMD_OK;
- break;
- }
+ case TUX_CMD_STRUCT_SUB_SEND:
+ ACK = send_usb_tux_cmd(IR_SEND_RC5_CMD, data[2], data[3], 0);
break;
- }
- result[0] = ACK;
-}
-
-/************************************************************************ */
-/* tux_req_status() */
-/************************************************************************ */
-void tux_req_status(
- unsigned char data[],
- unsigned char result[]
- )
-{
- result[0] = data[0];
- switch(data[0])
- {
- case DATA_STATUS_WINGS_MOTOR_BACKWARD:
- if (portb.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDS:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_MOTOR_BACKWARD:
- if (portb.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_MOTOR_FORWARD:
- if (portb.bits.PB2){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_BLINK:
+ ACK = send_usb_tux_cmd(LED_BLINK_CMD, data[2], data[3], 0);
break;
- case DATA_STATUS_MOUTH_OPEN_POSITION:
- if (portb.bits.PB3){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_L_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_MOUTH_CLOSED_POSITION:
- if (portb.bits.PB4){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_L_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_HEAD_PUSH_POSITION:
- if (portb.bits.PB5){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_R_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_CHARGER_INHIBIT_SIGNAL:
- result[0] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
- if (portb.bits.PB6){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_R_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_WINGS_POSITION_SWITCH:
- if (portc.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_SOUND:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_PLAY:
+ ACK = send_usb_tux_cmd(PLAY_SOUND_CMD, data[2], data[3], 0);
break;
- case DATA_STATUS_MOTOR_FOR_WINGS:
- if (portc.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_STORING:
+ ACK = send_usb_tux_cmd(STORE_SOUND_CMD, data[2], 0, 0);
break;
- case DATA_STATUS_LEFT_BLUE_LED:
- if (portc.bits.PB2){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_STORE_INDEX:
+ ACK = send_usb_tux_cmd(STORE_INDEX_CMD, data[2], data[3], data[4]);
break;
- case DATA_STATUS_HEAD_MOTOR_FOR_MOUTH:
- if (portd.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_TEST:
+ ACK = send_usb_tux_cmd(TEST_SOUND_CMD, 0, 0, 0);
break;
- case DATA_STATUS_HEAD_MOTOR_FOR_EYES:
- result[0] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
- if (portd.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_PING:
+ pong_received = 0;
+ ACK = send_usb_tux_cmd(PING_CMD, data[2], 0, 0);
+ break;
+ case TUX_CMD_STRUCT_SLEEP:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(0x20, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_POSITION_SWITCH:
- if (portd.bits.PB3){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(0x21, 0, 0, 0);
break;
- case DATA_STATUS_WINGS_MOTOR_FORWARD:
- result[0] = DATA_STATUS_WINGS_MOTOR_FORWARD;
- if (portd.bits.PB4){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_AUDIO_CHANNEL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_CH_GENERAL:
+ if (current_audio_channel != 0)
+ {
+ ACK = send_usb_dongle_cmd(0x02, 0, 0, 0);
+ current_audio_channel = 0;
+ }
+ else
+ ACK = ACK_CMD_OK;
break;
- case DATA_STATUS_IR_LED:
- if (portd.bits.PB5){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_CH_TTS:
+ if (current_audio_channel != 1)
+ {
+ ACK = send_usb_dongle_cmd(0x02, 1, 0, 0);
+ current_audio_channel = 1;
+ }
+ else
+ ACK = ACK_CMD_OK;
break;
- case DATA_STATUS_EYES_OPEN_POSITION_SWITCH:
- if (portd.bits.PB6){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_EYES_CLOSED_POSITION_SWITCH:
- if (portd.bits.PB7){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_LEFT_WING_PUSH:
- if (sensors1.bits.PB0){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_RIGHT_WING_PUSH:
- if (sensors1.bits.PB1){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_POWER_PLUG_SWITCH:
- if (sensors1.bits.PB2){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_HEAD_PUSH_SWITCH:
- if (sensors1.bits.PB3){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_CHARGER_LED_STATUS:
- if (sensors1.bits.PB4){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_MUTE_STATUS:
- if (sensors1.bits.PB7){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_LIGHT_LEVEL:
- result[1] = sensors2.level_light_high.Byte;
- result[2] = sensors2.level_light_low.Byte;
- result[3] = sensors2.light_mode.Byte;
- break;
- case DATA_STATUS_EYES_POSITION_COUNTER:
- result[1] = position1.eyes_position.Byte;
- break;
- case DATA_STATUS_MOUTH_POSITION_COUNTER:
- result[1] = position1.mouth_position.Byte;
- break;
- case DATA_STATUS_WINGS_POSITION_COUNTER:
- result[1] = position1.wings_position.Byte;
- break;
- case DATA_STATUS_SPIN_POSITION_COUNTER:
- result[1] = position2.Byte;
- break;
- case DATA_STATUS_RF_CONNECTED:
- result[1] = RF_status;
- break;
- case DATA_STATUS_SOUND_COUNT:
- result[1] = sound_flash_count;
- break;
+ }
+ break;
}
+ result[0] = ACK;
}
/************************************************************************ */
+
+/* tux_req_status() */
+
+/************************************************************************ */
+void tux_req_status(unsigned char data[], unsigned char result[])
+{
+ result[0] = data[0];
+ switch (data[0])
+ {
+ case DATA_STATUS_WINGS_MOTOR_BACKWARD:
+ if (portb.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_MOTOR_BACKWARD:
+ if (portb.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_MOTOR_FORWARD:
+ if (portb.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOUTH_OPEN_POSITION:
+ if (portb.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOUTH_CLOSED_POSITION:
+ if (portb.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_PUSH_POSITION:
+ if (portb.bits.PB5)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_CHARGER_INHIBIT_SIGNAL:
+ result[0] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
+ if (portb.bits.PB6)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_WINGS_POSITION_SWITCH:
+ if (portc.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOTOR_FOR_WINGS:
+ if (portc.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LEFT_BLUE_LED:
+ if (portc.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_MOTOR_FOR_MOUTH:
+ if (portd.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_MOTOR_FOR_EYES:
+ result[0] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
+ if (portd.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_POSITION_SWITCH:
+ if (portd.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_WINGS_MOTOR_FORWARD:
+ result[0] = DATA_STATUS_WINGS_MOTOR_FORWARD;
+ if (portd.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_IR_LED:
+ if (portd.bits.PB5)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_EYES_OPEN_POSITION_SWITCH:
+ if (portd.bits.PB6)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_EYES_CLOSED_POSITION_SWITCH:
+ if (portd.bits.PB7)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LEFT_WING_PUSH:
+ if (sensors1.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_RIGHT_WING_PUSH:
+ if (sensors1.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_POWER_PLUG_SWITCH:
+ if (sensors1.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_PUSH_SWITCH:
+ if (sensors1.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_CHARGER_LED_STATUS:
+ if (sensors1.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MUTE_STATUS:
+ if (sensors1.bits.PB7)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LIGHT_LEVEL:
+ result[1] = sensors2.level_light_high.Byte;
+ result[2] = sensors2.level_light_low.Byte;
+ result[3] = sensors2.light_mode.Byte;
+ break;
+ case DATA_STATUS_EYES_POSITION_COUNTER:
+ result[1] = position1.eyes_position.Byte;
+ break;
+ case DATA_STATUS_MOUTH_POSITION_COUNTER:
+ result[1] = position1.mouth_position.Byte;
+ break;
+ case DATA_STATUS_WINGS_POSITION_COUNTER:
+ result[1] = position1.wings_position.Byte;
+ break;
+ case DATA_STATUS_SPIN_POSITION_COUNTER:
+ result[1] = position2.Byte;
+ break;
+ case DATA_STATUS_RF_CONNECTED:
+ result[1] = RF_status;
+ break;
+ case DATA_STATUS_SOUND_COUNT:
+ result[1] = sound_flash_count;
+ break;
+ }
+}
+
+/************************************************************************ */
+
/* tux_req_info() */
+
/************************************************************************ */
void tux_req_info(unsigned char data[], unsigned char result[])
{
@@ -638,40 +808,43 @@
}
/************************************************************************** */
+
/* TUX USB */
+
/************************************************************************** */
+
/************************************************************************ */
+
/* send_usb_tuxcmd() */
+
/************************************************************************ */
-unsigned char send_usb_tux_cmd(
- unsigned char cmd,
- unsigned char param1,
- unsigned char param2,
- unsigned char param3
- )
+unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2, unsigned char param3)
{
unsigned char usb_frame[TUX_SEND_LENGTH];
usb_frame[0] = 0;
usb_frame[1] = cmd;
- usb_frame[2] = param1; usb_frame[3] = param2; usb_frame[4] = param3;
+ usb_frame[2] = param1;
+ usb_frame[3] = param2;
+ usb_frame[4] = param3;
return usb_write_TuxDroid(usb_frame);
}
/************************************************************************ */
+
/* send_usb_donglecmd() */
+
/************************************************************************ */
-unsigned char send_usb_dongle_cmd(
- unsigned char cmd,
- unsigned char param1,
- unsigned char param2,
- unsigned char param3
- )
+unsigned char send_usb_dongle_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2, unsigned char param3)
{
unsigned char usb_frame[TUX_SEND_LENGTH];
usb_frame[0] = 1;
usb_frame[1] = cmd;
- usb_frame[2] = param1; usb_frame[3] = param2; usb_frame[4] = param3;
+ usb_frame[2] = param1;
+ usb_frame[3] = param2;
+ usb_frame[4] = param3;
return usb_write_TuxDroid(usb_frame);
}
Modified: daemon/trunk/libs/USBDaemon_command_tux.h
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_command_tux.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,22 +18,35 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
+
/*_____________________ D E F I N E S ______________________________________*/
+
/*_____________________ F U N C T I O N S __________________________________*/
+
/* COMMANDS FROM CLIENTS DISPATCHER */
-extern void commands_dispatcher(unsigned char client_id, unsigned char src_frame[16]);
-extern void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[], int id_client);
-extern void sub_daemon_req_info(unsigned char data[], unsigned char result[], int id_client);
+extern void commands_dispatcher(unsigned char client_id,
+ unsigned char src_frame[16]);
+extern void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[],
+ int id_client);
+extern void sub_daemon_req_info(unsigned char data[], unsigned char result[],
+ int id_client);
extern void tux_cmd_raw(unsigned char data[], unsigned char result[]);
extern void tux_cmd_struct(unsigned char data[], unsigned char result[]);
extern void tux_req_status(unsigned char data[], unsigned char result[]);
extern void tux_req_info(unsigned char data[], unsigned char result[]);
+
/* TUX PHYSICAL CHANGES */
-extern unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1, unsigned char param2, unsigned char param3);
-extern unsigned char send_usb_dongle_cmd(unsigned char cmd, unsigned char param1, unsigned char param2, unsigned char param3);
+extern unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2,
+ unsigned char param3);
+extern unsigned char send_usb_dongle_cmd(unsigned char cmd,
+ unsigned char param1,
+ unsigned char param2,
+ unsigned char param3);
extern unsigned char send_wave_wings(unsigned char count, unsigned char speed);
extern unsigned char send_stop_wings();
extern unsigned char send_blink_eyes(unsigned char count);
@@ -50,5 +64,7 @@
extern unsigned char send_led_r_off();
extern unsigned char send_play_sound(unsigned char index, unsigned char volume);
extern unsigned char send_store_sound(unsigned char number);
-extern unsigned char send_store_index(unsigned char lower_add, unsigned char middle_add, unsigned char higher_add);
+extern unsigned char send_store_index(unsigned char lower_add,
+ unsigned char middle_add,
+ unsigned char higher_add);
extern unsigned char send_test_sound();
Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_globals.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,11 +18,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
#include <usb.h>
#include <pthread.h>
+
/*_____________________ D E F I N E S ______________________________________*/
#define TUX_PID 0xFF07
#define TUX_VID 0x03EB
@@ -35,6 +38,7 @@
#define LIBUSB_DEBUG_LEVEL 1
#define NEWUID 65534
#define NEWGID 65534
+
/*_____________________ G L O B A L S _ V A R I A B L E S _______________________*/
extern unsigned char show_frames;
extern unsigned char show_raw_status;
Modified: daemon/trunk/libs/USBDaemon_pidfile.c
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id: main.c 242 2007-04-13 08:48:33Z remi $ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -33,9 +35,11 @@
#define PIDFILE "/var/run/tuxdaemon.pid"
/************************************************************************ */
+
/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
+
/************************************************************************ */
/* read_pid
@@ -95,14 +99,14 @@
int fd;
int pid;
- if ((fd = open(PIDFILE, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1
+ if ((fd = open(PIDFILE, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1
|| (f = fdopen(fd, "r+")) == NULL)
{
fprintf(stderr, "Can't open or create %s: %m\n", PIDFILE);
return 0;
}
- if (flock(fd, LOCK_EX|LOCK_NB) == -1)
+ if (flock(fd, LOCK_EX | LOCK_NB) == -1)
{
fscanf(f, "%d", &pid);
fclose(f);
@@ -111,7 +115,7 @@
}
pid = getpid();
- if (!fprintf(f,"%d\n", pid))
+ if (!fprintf(f, "%d\n", pid))
{
fprintf(stderr, "Can't write pid: %m.\n");
close(fd);
@@ -143,7 +147,9 @@
}
/************************************************************************ */
+
/* Terminate */
+
/************************************************************************ */
void terminate(int ret)
{
Modified: daemon/trunk/libs/USBDaemon_pidfile.h
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,12 +18,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id: main.c 242 2007-04-13 08:48:33Z remi $ */
/************************************************************************ */
+
/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
+
/************************************************************************ */
/* read_pid
Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_status_table.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -51,79 +53,83 @@
/*_____________________ F U N C T I O N S __________________________________*/
/************************************************************************ */
+
/* update_raw_status_table() */
+
/************************************************************************ */
void update_raw_status_table(unsigned char new_status[TUX_RECV_LENGTH])
{
switch (new_status[0])
{
- case STATUS_PORTS_CMD:
- if (portb.Byte != new_status[1])
- portb_changed(new_status[1]);
- if (portc.Byte != new_status[2])
- portc_changed(new_status[2]);
- if (portd.Byte != new_status[3])
- portd_changed(new_status[3]);
- break;
+ case STATUS_PORTS_CMD:
+ if (portb.Byte != new_status[1])
+ portb_changed(new_status[1]);
+ if (portc.Byte != new_status[2])
+ portc_changed(new_status[2]);
+ if (portd.Byte != new_status[3])
+ portd_changed(new_status[3]);
+ break;
- case STATUS_SENSORS1_CMD:
- if (sensors1.Byte != new_status[1])
- sensors1_changed(new_status[1]);
- break;
+ case STATUS_SENSORS1_CMD:
+ if (sensors1.Byte != new_status[1])
+ sensors1_changed(new_status[1]);
+ break;
- case STATUS_LIGHT_CMD:
- if (sensors2.level_light_high.Byte != new_status[1]
- || sensors2.level_light_low.Byte != new_status[2])
- sensors2_changed(new_status[1], new_status[2], new_status[3]);
- break;
+ case STATUS_LIGHT_CMD:
+ if (sensors2.level_light_high.Byte != new_status[1]
+ || sensors2.level_light_low.Byte != new_status[2])
+ sensors2_changed(new_status[1], new_status[2], new_status[3]);
+ break;
- case STATUS_POSITION1_CMD:
- if (position1.eyes_position.Byte != new_status[1]
- || position1.mouth_position.Byte != new_status[2]
- || position1.wings_position.Byte != new_status[3])
- position1_changed(new_status[1], new_status[2], new_status[3]);
- break;
+ case STATUS_POSITION1_CMD:
+ if (position1.eyes_position.Byte != new_status[1]
+ || position1.mouth_position.Byte != new_status[2]
+ || position1.wings_position.Byte != new_status[3])
+ position1_changed(new_status[1], new_status[2], new_status[3]);
+ break;
- case STATUS_POSITION2_CMD:
- if (position2.Byte != new_status[1])
- position2_changed(new_status[1]);
- break;
+ case STATUS_POSITION2_CMD:
+ if (position2.Byte != new_status[1])
+ position2_changed(new_status[1]);
+ break;
- case PONG_CMD:
- pong_received++;
- pong_event(new_status[1], pong_received);
- break;
+ case PONG_CMD:
+ pong_received++;
+ pong_event(new_status[1], pong_received);
+ break;
- case VERSION_CMD:
- update_version_table(new_status);
- break;
+ case VERSION_CMD:
+ update_version_table(new_status);
+ break;
- case REVISION_CMD:
- update_revision_table(new_status);
- break;
+ case REVISION_CMD:
+ update_revision_table(new_status);
+ break;
- case AUTHOR_CMD:
- update_author_table(new_status);
- break;
+ case AUTHOR_CMD:
+ update_author_table(new_status);
+ break;
- case SOUND_VAR_CMD:
- update_sound_flash_count(new_status);
- break;
+ case SOUND_VAR_CMD:
+ update_sound_flash_count(new_status);
+ break;
- case STATUS_IR_CMD:
- update_ir(new_status);
- break;
+ case STATUS_IR_CMD:
+ update_ir(new_status);
+ break;
- default:
- if (show_invalid_raw)
- printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1],
- new_status[2], new_status[3]);
- break;
+ default:
+ if (show_invalid_raw)
+ printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1],
+ new_status[2], new_status[3]);
+ break;
}
}
/************************************************************************ */
+
/* update_system_status_table() */
+
/************************************************************************ */
void update_system_status_table(unsigned char new_status[4])
{
@@ -161,50 +167,61 @@
}
/************************************************************************ */
+
/* update_version_table() */
+
/************************************************************************ */
void update_version_table(unsigned char new_status[4])
{
unsigned long tmp;
version_t *hw_ver;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_ver = (version_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_ver = (version_t *) & tmp;
last_cpu_ver = CPU_VER_MAJ(hw_ver->cpu_ver_maj);
hw_version[last_cpu_ver] = *hw_ver;
}
/************************************************************************ */
+
/* update_revision_table() */
+
/************************************************************************ */
void update_revision_table(unsigned char new_status[4])
{
unsigned long tmp;
revision_t *hw_rev;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_rev = (revision_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_rev = (revision_t *) & tmp;
hw_revision[last_cpu_ver] = *hw_rev;
}
/************************************************************************ */
+
/* update_author_table() */
+
/************************************************************************ */
void update_author_table(unsigned char new_status[4])
{
unsigned long tmp;
author_t *hw_aut;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_aut = (author_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_aut = (author_t *) & tmp;
hw_author[last_cpu_ver] = *hw_aut;
}
/************************************************************************ */
+
/* update_sound_flash_count() */
+
/************************************************************************ */
void update_sound_flash_count(unsigned char new_status[4])
{
@@ -212,7 +229,9 @@
}
/************************************************************************ */
+
/* update_ir() */
+
/************************************************************************ */
void update_ir(unsigned char new_status[4])
{
@@ -264,7 +283,9 @@
}
/************************************************************************ */
+
/* pong_event() */
+
/************************************************************************ */
void pong_event(unsigned char pong_number, unsigned char pong_received)
{
@@ -286,7 +307,9 @@
}
/************************************************************************ */
+
/* portb_changed() */
+
/************************************************************************ */
void portb_changed(unsigned char new_value)
{
@@ -409,7 +432,9 @@
}
/************************************************************************ */
+
/* portc_changed() */
+
/************************************************************************ */
void portc_changed(unsigned char new_value)
{
@@ -479,7 +504,9 @@
}
/************************************************************************ */
+
/* portd_changed() */
+
/************************************************************************ */
void portd_changed(unsigned char new_value)
{
@@ -597,7 +624,7 @@
}
/* eyes closed position switch */
- if((portd.Byte & 0x80) != (new_value & 0x80))
+ if ((portd.Byte & 0x80) != (new_value & 0x80))
{
tcp_frame[4] = DATA_STATUS_EYES_CLOSED_POSITION_SWITCH;
if (portd.bits.PB7)
@@ -617,7 +644,9 @@
}
/************************************************************************ */
+
/* sensors1_changed() */
+
/************************************************************************ */
void sensors1_changed(unsigned char new_value)
{
@@ -738,7 +767,9 @@
}
/************************************************************************ */
+
/* sensors2_changed() */
+
/************************************************************************ */
void sensors2_changed(unsigned char new_value_high, unsigned char new_value_low,
unsigned char new_light_mode)
@@ -765,7 +796,9 @@
}
/************************************************************************ */
+
/* position1_changed() */
+
/************************************************************************ */
void position1_changed(unsigned char eyes_position,
unsigned char mouth_position,
@@ -808,7 +841,9 @@
}
/************************************************************************ */
+
/* position2_changed() */
+
/************************************************************************ */
void position2_changed(unsigned char spin_position)
{
@@ -816,7 +851,7 @@
unsigned char i;
for (i = 0; i < sizeof(tcp_frame); i++)
- tcp_frame[i] = '\0';
+ tcp_frame[i] = '\0';
tcp_frame[0] = SOURCE_TUX;
tcp_frame[1] = SS_DEFAULT;
Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_status_table.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,44 +18...
[truncated message content] |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:07:20
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 282 Added: software/alarm_clock/tags/0.0.4/ Modified: Log: remi 2007-04-20 16:07:18 +0200 (Fri, 20 Apr 2007) 21 Tag to release 0.0.4 svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Copied: software/alarm_clock/tags/0.0.4 (from rev 281, software/alarm_clock/trunk) |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:06:35
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 281 Modified: software/alarm_clock/trunk/version.py Log: remi 2007-04-20 16:06:27 +0200 (Fri, 20 Apr 2007) 29 UPD Preparing for the release svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: software/alarm_clock/trunk/version.py =================================================================== --- software/alarm_clock/trunk/version.py 2007-04-20 14:06:14 UTC (rev 280) +++ software/alarm_clock/trunk/version.py 2007-04-20 14:06:27 UTC (rev 281) @@ -1 +1 @@ -app_version="0.0.4 (SVN/UNRELEASED)" +app_version="0.0.4" |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:06:34
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 280 Added: software/email_alert/tags/0.0.4/ Modified: Log: remi 2007-04-20 16:06:14 +0200 (Fri, 20 Apr 2007) 21 Tag to release 0.0.4 svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Copied: software/email_alert/tags/0.0.4 (from rev 279, software/email_alert/trunk) |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:05:19
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 279 Modified: software/email_alert/trunk/version.py Log: remi 2007-04-20 16:05:17 +0200 (Fri, 20 Apr 2007) 29 UPD Preparing for the release svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: software/email_alert/trunk/version.py =================================================================== --- software/email_alert/trunk/version.py 2007-04-20 14:05:02 UTC (rev 278) +++ software/email_alert/trunk/version.py 2007-04-20 14:05:17 UTC (rev 279) @@ -1 +1 @@ -app_version="0.0.4 (SVN/UNRELEASED)" +app_version="0.0.4" |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:05:04
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 278 Added: software/gtdi/tags/0.2.1/ Modified: Log: remi 2007-04-20 16:05:02 +0200 (Fri, 20 Apr 2007) 21 Tag to release 0.2.1 svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Copied: software/gtdi/tags/0.2.1 (from rev 277, software/gtdi/trunk) |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:03:15
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 277 Modified: software/gtdi/trunk/version.py Log: remi 2007-04-20 16:03:13 +0200 (Fri, 20 Apr 2007) 29 UPD Preparing for the release svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-04-20 14:03:01 UTC (rev 276) +++ software/gtdi/trunk/version.py 2007-04-20 14:03:13 UTC (rev 277) @@ -1 +1 @@ -app_version="0.2.1 (SVN/UNRELEASED)" +app_version="0.2.1" |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:03:03
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 276 Modified: software/gtdi/trunk/gtdi2.glade Log: remi 2007-04-20 16:03:01 +0200 (Fri, 20 Apr 2007) 27 UPD Minor change in the GUI svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: software/gtdi/trunk/gtdi2.glade =================================================================== --- software/gtdi/trunk/gtdi2.glade 2007-04-20 14:01:53 UTC (rev 275) +++ software/gtdi/trunk/gtdi2.glade 2007-04-20 14:03:01 UTC (rev 276) @@ -87,37 +87,47 @@ </child> <child> - <widget class="GtkLabel" id="label9"> - <property name="width_request">136</property> - <property name="height_request">20</property> + <widget class="GtkImage" id="image3"> + <property name="width_request">21</property> + <property name="height_request">21</property> <property name="visible">True</property> - <property name="label" translatable="yes">Tux Droid Daemon</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">4</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> </widget> <packing> - <property name="x">0</property> - <property name="y">0</property> + <property name="x">192</property> + <property name="y">24</property> </packing> </child> <child> + <widget class="GtkImage" id="image4"> + <property name="width_request">21</property> + <property name="height_request">21</property> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">192</property> + <property name="y">48</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="label27"> <property name="width_request">166</property> <property name="height_request">20</property> <property name="visible">True</property> - <property name="label" translatable="yes">RF state</property> + <property name="label" translatable="yes">Radio connection</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -139,20 +149,28 @@ </child> <child> - <widget class="GtkImage" id="image3"> - <property name="width_request">21</property> - <property name="height_request">21</property> + <widget class="GtkLabel" id="label9"> + <property name="width_request">136</property> + <property name="height_request">20</property> <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> + <property name="label" translatable="yes">Tux Droid daemon</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="x">192</property> - <property name="y">24</property> + <property name="x">0</property> + <property name="y">0</property> </packing> </child> @@ -161,7 +179,7 @@ <property name="width_request">166</property> <property name="height_request">20</property> <property name="visible">True</property> - <property name="label" translatable="yes">Text To Speech Daemon</property> + <property name="label" translatable="yes">Text To Speech daemon</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -181,24 +199,6 @@ <property name="y">24</property> </packing> </child> - - <child> - <widget class="GtkImage" id="image4"> - <property name="width_request">21</property> - <property name="height_request">21</property> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="x">192</property> - <property name="y">48</property> - </packing> - </child> </widget> </child> </widget> @@ -963,56 +963,56 @@ </child> <child> - <widget class="GtkButton" id="button7"> + <widget class="GtkButton" id="button11"> <property name="width_request">113</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Tux Droid Shell</property> + <property name="label" translatable="yes">Ping</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_tdshell_bt_clicked"/> + <signal name="clicked" handler="on_ping_bt_clicked"/> </widget> <packing> <property name="x">0</property> - <property name="y">4</property> + <property name="y">106</property> </packing> </child> <child> - <widget class="GtkButton" id="button11"> + <widget class="GtkButton" id="button9"> <property name="width_request">113</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Ping</property> + <property name="label" translatable="yes">Get light level</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_ping_bt_clicked"/> + <signal name="clicked" handler="on_cversion_bt_clicked"/> </widget> <packing> <property name="x">0</property> - <property name="y">106</property> + <property name="y">72</property> </packing> </child> <child> - <widget class="GtkButton" id="button9"> + <widget class="GtkButton" id="button7"> <property name="width_request">113</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Get light level</property> + <property name="label" translatable="yes">Tux Droid Shell</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_cversion_bt_clicked"/> + <signal name="clicked" handler="on_tdshell_bt_clicked"/> </widget> <packing> <property name="x">0</property> - <property name="y">72</property> + <property name="y">4</property> </packing> </child> </widget> @@ -1635,7 +1635,7 @@ <property name="width_request">200</property> <property name="height_request">27</property> <property name="visible">True</property> - <property name="title" translatable="yes">Sélectionner un fichier</property> + <property name="title" translatable="yes">Select wave file</property> <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> <property name="local_only">True</property> <property name="show_hidden">False</property> @@ -1780,25 +1780,6 @@ </child> <child> - <widget class="GtkFileChooserButton" id="filechooserbutton2"> - <property name="width_request">200</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Sélectionner un fichier</property> - <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> - <property name="local_only">True</property> - <property name="show_hidden">False</property> - <property name="do_overwrite_confirmation">False</property> - <property name="width_chars">-1</property> - <signal name="selection_changed" handler="on_wave_internal_changed"/> - </widget> - <packing> - <property name="x">392</property> - <property name="y">0</property> - </packing> - </child> - - <child> <widget class="GtkSpinButton" id="spinbutton8"> <property name="width_request">42</property> <property name="height_request">27</property> @@ -1856,8 +1837,27 @@ </child> <child> + <widget class="GtkFileChooserButton" id="filechooserbutton2"> + <property name="width_request">200</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Select wave file</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="width_chars">-1</property> + <signal name="selection_changed" handler="on_wave_internal_changed"/> + </widget> + <packing> + <property name="x">392</property> + <property name="y">0</property> + </packing> + </child> + + <child> <widget class="GtkCheckButton" id="checkbutton4"> - <property name="width_request">170</property> + <property name="width_request">124</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -2071,24 +2071,6 @@ </child> <child> - <widget class="GtkButton" id="button26"> - <property name="width_request">60</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">5</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_wave_internal_play5_clicked"/> - </widget> - <packing> - <property name="x">320</property> - <property name="y">2</property> - </packing> - </child> - - <child> <widget class="GtkButton" id="button27"> <property name="width_request">60</property> <property name="height_request">27</property> @@ -2177,6 +2159,24 @@ <property name="y">35</property> </packing> </child> + + <child> + <widget class="GtkButton" id="button26"> + <property name="width_request">60</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">5</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_wave_internal_play5_clicked"/> + </widget> + <packing> + <property name="x">320</property> + <property name="y">2</property> + </packing> + </child> </widget> </child> </widget> |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 14:01:54
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 275 Added: api/python/tags/0.2.1/ Modified: Log: remi 2007-04-20 16:01:53 +0200 (Fri, 20 Apr 2007) 21 Tag to release 0.2.1 svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Copied: api/python/tags/0.2.1 (from rev 274, api/python/trunk) |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 13:58:28
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 274 Modified: api/python/trunk/tuxapi_class.py Log: remi 2007-04-20 15:58:26 +0200 (Fri, 20 Apr 2007) 29 UPD Preparing for the release svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-04-20 13:14:28 UTC (rev 273) +++ api/python/trunk/tuxapi_class.py 2007-04-20 13:58:26 UTC (rev 274) @@ -35,7 +35,7 @@ # Constants #============================================================================== -api_version ="0.2.1 (SVN/UNRELEASED)" +api_version ="0.2.1" #============================================================================== # TUXTCPCommunicator class |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 13:14:30
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 273
Modified:
software/email_alert/trunk/sample_behavior_script.py
software/email_alert/trunk/tdema.glade
software/email_alert/trunk/tdema.py
Log:
remi
2007-04-20 15:14:28 +0200 (Fri, 20 Apr 2007)
30
UPD
Python api v 0.2.0 capable
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: software/email_alert/trunk/sample_behavior_script.py
===================================================================
--- software/email_alert/trunk/sample_behavior_script.py 2007-04-20 13:13:28 UTC (rev 272)
+++ software/email_alert/trunk/sample_behavior_script.py 2007-04-20 13:14:28 UTC (rev 273)
@@ -1,22 +1,18 @@
#!/usr/bin/python
# -*- coding: latin-1 -*-
-# -----------------------------------------------
-# Initalization of modules
-# uses objects "tux" and "tss"
-# -----------------------------------------------
import sys
sys.path.append('/opt/tuxdroid/api/python')
from tux import *
-# -----------------------------------------------
-# Your script
-# -----------------------------------------------
+# -----------------------------------------------------------------------------
+# Object "tux" is created by tux.py
+# Your script begins here
+# -----------------------------------------------------------------------------
tux.cmd.wings_on(4)
tux.cmd.eyes_on(4)
-# -----------------------------------------------
-# End of script
-# -----------------------------------------------
-tux.sys.wait(1)
-tux.disconnect_from_daemon()
+# -----------------------------------------------------------------------------
+# End of your script
+# -----------------------------------------------------------------------------
+tux.destroy()
Modified: software/email_alert/trunk/tdema.glade
===================================================================
--- software/email_alert/trunk/tdema.glade 2007-04-20 13:13:28 UTC (rev 272)
+++ software/email_alert/trunk/tdema.glade 2007-04-20 13:14:28 UTC (rev 273)
@@ -5,7 +5,7 @@
<requires lib="gnome"/>
<widget class="GtkWindow" id="window1">
- <property name="height_request">472</property>
+ <property name="height_request">480</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Tux Droid E-Mail Alert</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -20,7 +20,7 @@
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
- <signal name="destroy" handler="on_window1_destroy" last_modification_time="Sun, 18 Feb 2007 01:31:20 GMT"/>
+ <signal name="destroy" handler="on_window1_destroy"/>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -37,6 +37,7 @@
<child>
<widget class="GtkAlignment" id="alignment1">
+ <property name="border_width">2</property>
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -313,21 +314,21 @@
<property name="adjustment">1 1 100 1 10 10</property>
</widget>
<packing>
- <property name="x">152</property>
+ <property name="x">170</property>
<property name="y">0</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label9">
- <property name="width_request">152</property>
- <property name="height_request">16</property>
+ <property name="width_request">169</property>
+ <property name="height_request">20</property>
<property name="visible">True</property>
<property name="label" translatable="yes">Check for new mail every</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -346,8 +347,8 @@
<child>
<widget class="GtkLabel" id="label10">
- <property name="width_request">51</property>
- <property name="height_request">17</property>
+ <property name="width_request">52</property>
+ <property name="height_request">20</property>
<property name="visible">True</property>
<property name="label" translatable="yes">minutes.</property>
<property name="use_underline">False</property>
@@ -365,7 +366,7 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">211</property>
+ <property name="x">236</property>
<property name="y">4</property>
</packing>
</child>
@@ -420,6 +421,8 @@
<child>
<widget class="GtkAlignment" id="alignment2">
+ <property name="border_width">2</property>
+ <property name="height_request">126</property>
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -461,43 +464,43 @@
</child>
<child>
- <widget class="GtkCheckButton" id="cb_behavior">
- <property name="width_request">102</property>
+ <widget class="GtkRadioButton" id="rb_tts">
+ <property name="width_request">95</property>
<property name="height_request">22</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Behavior</property>
+ <property name="label" translatable="yes">TTS</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+ <property name="group">rb_wav</property>
</widget>
<packing>
<property name="x">0</property>
- <property name="y">66</property>
+ <property name="y">34</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="rb_tts">
- <property name="width_request">95</property>
+ <widget class="GtkCheckButton" id="cb_behavior">
+ <property name="width_request">102</property>
<property name="height_request">22</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">TTS</property>
+ <property name="label" translatable="yes">Behavior</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <property name="group">rb_wav</property>
</widget>
<packing>
<property name="x">0</property>
- <property name="y">34</property>
+ <property name="y">64</property>
</packing>
</child>
</widget>
@@ -510,6 +513,7 @@
<child>
<widget class="GtkFixed" id="fixed7">
+ <property name="height_request">116</property>
<property name="visible">True</property>
<child>
@@ -543,7 +547,7 @@
<property name="show_hidden">False</property>
<property name="do_overwrite_confirmation">False</property>
<property name="width_chars">-1</property>
- <signal name="selection_changed" handler="on_fcb_wav_selection_changed" last_modification_time="Sun, 18 Feb 2007 01:29:35 GMT"/>
+ <signal name="selection_changed" handler="on_fcb_wav_selection_changed"/>
</widget>
<packing>
<property name="x">0</property>
@@ -562,7 +566,7 @@
<property name="show_hidden">False</property>
<property name="do_overwrite_confirmation">False</property>
<property name="width_chars">-1</property>
- <signal name="selection_changed" handler="on_fcb_behavior_selection_changed" last_modification_time="Sun, 18 Feb 2007 01:29:48 GMT"/>
+ <signal name="selection_changed" handler="on_fcb_behavior_selection_changed"/>
</widget>
<packing>
<property name="x">0</property>
@@ -580,11 +584,11 @@
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_bt_test_clicked" last_modification_time="Sun, 18 Feb 2007 01:30:14 GMT"/>
+ <signal name="clicked" handler="on_bt_test_clicked"/>
</widget>
<packing>
- <property name="x">9</property>
- <property name="y">96</property>
+ <property name="x">0</property>
+ <property name="y">95</property>
</packing>
</child>
</widget>
@@ -631,6 +635,7 @@
<child>
<widget class="GtkFrame" id="frame3">
+ <property name="border_width">2</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
@@ -728,6 +733,7 @@
<child>
<widget class="GtkFrame" id="frame4">
+ <property name="border_width">2</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
@@ -757,14 +763,14 @@
<child>
<widget class="GtkLabel" id="label11">
- <property name="width_request">77</property>
+ <property name="width_request">85</property>
<property name="height_request">17</property>
<property name="visible">True</property>
<property name="label" translatable="yes">Select voice:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -783,14 +789,14 @@
<child>
<widget class="GtkLabel" id="label12">
- <property name="width_request">104</property>
+ <property name="width_request">114</property>
<property name="height_request">17</property>
<property name="visible">True</property>
<property name="label" translatable="yes">Select pitch level:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -850,6 +856,18 @@
<property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="comboboxentry-entry1">
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="x">0</property>
@@ -912,10 +930,10 @@
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_bt_cancel_clicked" last_modification_time="Sun, 18 Feb 2007 01:30:51 GMT"/>
+ <signal name="clicked" handler="on_bt_cancel_clicked"/>
</widget>
<packing>
- <property name="x">168</property>
+ <property name="x">277</property>
<property name="y">8</property>
</packing>
</child>
@@ -930,10 +948,10 @@
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_bt_accept_clicked" last_modification_time="Sun, 18 Feb 2007 01:30:57 GMT"/>
+ <signal name="clicked" handler="on_bt_accept_clicked"/>
</widget>
<packing>
- <property name="x">272</property>
+ <property name="x">167</property>
<property name="y">8</property>
</packing>
</child>
Modified: software/email_alert/trunk/tdema.py
===================================================================
--- software/email_alert/trunk/tdema.py 2007-04-20 13:13:28 UTC (rev 272)
+++ software/email_alert/trunk/tdema.py 2007-04-20 13:14:28 UTC (rev 273)
@@ -90,8 +90,7 @@
#--------------------------------------------------------------------------
def on_window1_destroy(self, widget, *args):
self.check_enabled=False
- tux.sys.wait(1)
- tux.disconnect_from_daemon()
+ tux.destroy()
sys.exit(0)
#--------------------------------------------------------------------------
@@ -129,8 +128,7 @@
#--------------------------------------------------------------------------
def on_bt_cancel_clicked(self, widget, *args):
self.check_enabled=False
- tux.sys.wait(1)
- tux.disconnect_from_daemon()
+ tux.destroy()
sys.exit(0)
#--------------------------------------------------------------------------
@@ -145,9 +143,6 @@
# On alert event
#--------------------------------------------------------------------------
def on_alert(self):
- if self.get_widget("cb_behavior").get_active():
- if self.py_filename!="None":
- 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 %s %s"%(soundcard,self.wav_filename))
@@ -157,6 +152,9 @@
text_e=self.get_widget("e_tts")
tux.tts.select_voice(voice_cb.get_active()+1,pitch_sb.get_value())
tux.tts.speak(text_e.get_text())
+ if self.get_widget("cb_behavior").get_active():
+ if self.py_filename!="None":
+ tux.sys.shell("python "+self.py_filename)
#--------------------------------------------------------------------------
# Check mail thread
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 13:13:33
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 272 Modified: software/alarm_clock/trunk/tdac.glade Log: remi 2007-04-20 15:13:28 +0200 (Fri, 20 Apr 2007) 30 UPD Python api v 0.2.0 capable svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Modified: software/alarm_clock/trunk/tdac.glade =================================================================== --- software/alarm_clock/trunk/tdac.glade 2007-04-20 13:12:01 UTC (rev 271) +++ software/alarm_clock/trunk/tdac.glade 2007-04-20 13:13:28 UTC (rev 272) @@ -2,10 +2,10 @@ <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> -<requires lib="gnome"/> <widget class="GtkWindow" id="window1"> - <property name="height_request">314</property> + <property name="width_request">365</property> + <property name="height_request">340</property> <property name="visible">True</property> <property name="title" translatable="yes">Tux Droid Alarm Clock</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> @@ -20,7 +20,7 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_window1_destroy" last_modification_time="Thu, 15 Feb 2007 04:14:01 GMT"/> + <signal name="destroy" handler="on_window1_destroy"/> <child> <widget class="GtkVBox" id="vbox1"> @@ -30,6 +30,8 @@ <child> <widget class="GtkFrame" id="frame1"> + <property name="border_width">2</property> + <property name="height_request">58</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -43,6 +45,7 @@ <child> <widget class="GtkFixed" id="fixed3"> + <property name="height_request">31</property> <property name="visible">True</property> <child> @@ -58,21 +61,21 @@ <property name="snap_to_ticks">False</property> <property name="wrap">True</property> <property name="adjustment">0 0 1439 1 60 24</property> - <signal name="value_changed" handler="on_spinbutton1_value_changed" last_modification_time="Thu, 15 Feb 2007 01:49:58 GMT"/> + <signal name="value_changed" handler="on_spinbutton1_value_changed"/> </widget> <packing> - <property name="x">168</property> + <property name="x">67</property> <property name="y">0</property> </packing> </child> <child> <widget class="GtkEntry" id="entry2"> - <property name="width_request">160</property> - <property name="height_request">27</property> + <property name="width_request">60</property> + <property name="height_request">26</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> + <property name="editable">False</property> <property name="visibility">True</property> <property name="max_length">0</property> <property name="text" translatable="yes"></property> @@ -81,7 +84,7 @@ <property name="activates_default">False</property> </widget> <packing> - <property name="x">8</property> + <property name="x">9</property> <property name="y">0</property> </packing> </child> @@ -121,7 +124,7 @@ <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_checkbutton1_toggled" last_modification_time="Thu, 15 Feb 2007 06:53:13 GMT"/> + <signal name="toggled" handler="on_checkbutton1_toggled"/> </widget> <packing> <property name="x">32</property> @@ -182,6 +185,8 @@ <child> <widget class="GtkFrame" id="frame2"> + <property name="border_width">2</property> + <property name="height_request">154</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -279,11 +284,12 @@ <child> <widget class="GtkFixed" id="fixed10"> + <property name="height_request">140</property> <property name="visible">True</property> <child> <widget class="GtkEntry" id="entry1"> - <property name="width_request">216</property> + <property name="width_request">217</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -302,6 +308,24 @@ </child> <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">104</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Test Alarm</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_button1_clicked"/> + </widget> + <packing> + <property name="x">0</property> + <property name="y">97</property> + </packing> + </child> + + <child> <widget class="GtkFileChooserButton" id="filechooserbutton2"> <property name="width_request">216</property> <property name="height_request">27</property> @@ -312,7 +336,7 @@ <property name="show_hidden">False</property> <property name="do_overwrite_confirmation">False</property> <property name="width_chars">-1</property> - <signal name="current_folder_changed" handler="on_filechooserbutton2_current_folder_changed" last_modification_time="Mon, 12 Feb 2007 05:32:40 GMT"/> + <signal name="current_folder_changed" handler="on_filechooserbutton2_current_folder_changed"/> </widget> <packing> <property name="x">0</property> @@ -331,31 +355,13 @@ <property name="show_hidden">False</property> <property name="do_overwrite_confirmation">False</property> <property name="width_chars">-1</property> - <signal name="selection_changed" handler="on_filechooserbutton1_selection_changed" last_modification_time="Mon, 12 Feb 2007 05:32:32 GMT"/> + <signal name="selection_changed" handler="on_filechooserbutton1_selection_changed"/> </widget> <packing> <property name="x">0</property> <property name="y">0</property> </packing> </child> - - <child> - <widget class="GtkButton" id="button1"> - <property name="width_request">104</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Test Alarm</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_button1_clicked" last_modification_time="Mon, 12 Feb 2007 05:31:49 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">96</property> - </packing> - </child> </widget> <packing> <property name="padding">0</property> @@ -402,6 +408,8 @@ <child> <widget class="GtkFrame" id="frame3"> + <property name="border_width">2</property> + <property name="height_request">88</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -427,18 +435,19 @@ <child> <widget class="GtkFixed" id="fixed13"> + <property name="height_request">60</property> <property name="visible">True</property> <child> <widget class="GtkLabel" id="label4"> - <property name="width_request">72</property> + <property name="width_request">100</property> <property name="height_request">16</property> <property name="visible">True</property> <property name="label" translatable="yes">Select voice</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -457,14 +466,14 @@ <child> <widget class="GtkLabel" id="label5"> - <property name="width_request">102</property> - <property name="height_request">16</property> + <property name="width_request">114</property> + <property name="height_request">20</property> <property name="visible">True</property> <property name="label" translatable="yes">Select pitch level </property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -490,6 +499,7 @@ <child> <widget class="GtkFixed" id="fixed14"> + <property name="height_request">183</property> <property name="visible">True</property> <child> @@ -524,6 +534,18 @@ <property name="add_tearoffs">False</property> <property name="has_frame">True</property> <property name="focus_on_click">True</property> + + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry1"> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + </child> </widget> <packing> <property name="x">0</property> @@ -580,40 +602,41 @@ <child> <widget class="GtkFixed" id="fixed12"> + <property name="height_request">54</property> <property name="visible">True</property> <child> - <widget class="GtkButton" id="button4"> + <widget class="GtkButton" id="button3"> <property name="width_request">96</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">OK</property> + <property name="label" translatable="yes">Cancel</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_button4_clicked" last_modification_time="Mon, 12 Feb 2007 05:32:02 GMT"/> + <signal name="clicked" handler="on_button3_clicked"/> </widget> <packing> - <property name="x">160</property> + <property name="x">266</property> <property name="y">8</property> </packing> </child> <child> - <widget class="GtkButton" id="button3"> + <widget class="GtkButton" id="button4"> <property name="width_request">96</property> <property name="height_request">27</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Cancel</property> + <property name="label" translatable="yes">Accept</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_button3_clicked" last_modification_time="Mon, 12 Feb 2007 05:32:13 GMT"/> + <signal name="clicked" handler="on_button4_clicked"/> </widget> <packing> - <property name="x">264</property> + <property name="x">160</property> <property name="y">8</property> </packing> </child> |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 13:12:03
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 271
Modified:
software/alarm_clock/trunk/sample_behavior_script.py
software/alarm_clock/trunk/tdac.py
Log:
remi
2007-04-20 15:12:01 +0200 (Fri, 20 Apr 2007)
30
UPD
Python api v 0.2.0 capable
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: software/alarm_clock/trunk/sample_behavior_script.py
===================================================================
--- software/alarm_clock/trunk/sample_behavior_script.py 2007-04-20 12:54:54 UTC (rev 270)
+++ software/alarm_clock/trunk/sample_behavior_script.py 2007-04-20 13:12:01 UTC (rev 271)
@@ -1,22 +1,18 @@
#!/usr/bin/python
# -*- coding: latin-1 -*-
-# -----------------------------------------------
-# Initalization of modules
-# uses objects "tux" and "tss"
-# -----------------------------------------------
import sys
sys.path.append('/opt/tuxdroid/api/python')
from tux import *
-# -----------------------------------------------
-# Your script
-# -----------------------------------------------
+# -----------------------------------------------------------------------------
+# Object "tux" is created by tux.py
+# Your script begins here
+# -----------------------------------------------------------------------------
tux.cmd.wings_on(4)
tux.cmd.eyes_on(4)
-# -----------------------------------------------
-# End of script
-# -----------------------------------------------
-tux.sys.wait(1)
-tux.disconnect_from_daemon()
+# -----------------------------------------------------------------------------
+# End of your script
+# -----------------------------------------------------------------------------
+tux.destroy()
Modified: software/alarm_clock/trunk/tdac.py
===================================================================
--- software/alarm_clock/trunk/tdac.py 2007-04-20 12:54:54 UTC (rev 270)
+++ software/alarm_clock/trunk/tdac.py 2007-04-20 13:12:01 UTC (rev 271)
@@ -83,8 +83,7 @@
# On destroy window
#--------------------------------------------------------------------------
def on_window1_destroy(self, widget, *args):
- tux.sys.wait(1)
- tux.disconnect_from_daemon()
+ tux.destroy()
sys.exit(0)
#--------------------------------------------------------------------------
@@ -135,8 +134,7 @@
# On "cancel" button clicked
#--------------------------------------------------------------------------
def on_button3_clicked(self, widget, *args):
- tux.sys.wait(1)
- tux.disconnect_from_daemon()
+ tux.destroy()
sys.exit(0)
#--------------------------------------------------------------------------
@@ -163,9 +161,8 @@
tux.tts.speak_free(text_e.get_text())
if self.get_widget("checkbutton2").get_active():
if self.py_filename!="None":
- tux.sys.shell_free("python "+self.py_filename)
+ tux.sys.shell("python "+self.py_filename)
-
#------------------------------------------------------------------------------
# Main
#------------------------------------------------------------------------------
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 12:55:22
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 270
Modified:
api/python/trunk/tux.py
Log:
remi
2007-04-20 14:54:54 +0200 (Fri, 20 Apr 2007)
57
UPD
sys.systemexit has been replaced by atexit.register()
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: api/python/trunk/tux.py
===================================================================
--- api/python/trunk/tux.py 2007-04-20 12:54:00 UTC (rev 269)
+++ api/python/trunk/tux.py 2007-04-20 12:54:54 UTC (rev 270)
@@ -6,6 +6,7 @@
import tuxapi_class
import tuxapi_wav_merger
import signal
+import atexit
global tux
tux=tuxapi_class.TUXTCPCommunicator()
@@ -19,12 +20,11 @@
tux.tts.auto_connect(True)
def exit(signum,frame):
- tux.destroy()
sys.exit(signum)
def my_exitfunct():
- exit(0,None)
+ tux.destroy()
signal.signal(signal.SIGTERM, exit)
signal.signal(signal.SIGINT, exit)
-sys.exitfunc=my_exitfunct
+atexit.register(my_exitfunct)
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 12:54:03
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 269 Added: software/gtdi/trunk/sounds/ software/gtdi/trunk/sounds/1.wav software/gtdi/trunk/sounds/2.wav software/gtdi/trunk/sounds/3.wav software/gtdi/trunk/sounds/4.wav software/gtdi/trunk/sounds/5.wav software/gtdi/trunk/sounds/6.wav software/gtdi/trunk/sounds/7.wav software/gtdi/trunk/sounds/8.wav software/gtdi/trunk/sounds/9.wav Modified: Log: remi 2007-04-20 14:54:00 +0200 (Fri, 20 Apr 2007) 55 UPD Adding of the original sounds for the memory flash. svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Added: software/gtdi/trunk/sounds/1.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/1.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/2.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/2.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/3.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/3.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/4.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/4.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/5.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/5.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/6.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/6.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/7.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/7.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/8.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/8.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gtdi/trunk/sounds/9.wav =================================================================== (Binary files differ) Property changes on: software/gtdi/trunk/sounds/9.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 12:26:15
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 267
Modified:
api/python/trunk/tuxapi_class.py
Log:
remi
2007-04-20 13:56:28 +0200 (Fri, 20 Apr 2007)
43
UPD
"print_warnings" bug has been corrected
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: api/python/trunk/tuxapi_class.py
===================================================================
--- api/python/trunk/tuxapi_class.py 2007-04-20 11:54:35 UTC (rev 266)
+++ api/python/trunk/tuxapi_class.py 2007-04-20 11:56:28 UTC (rev 267)
@@ -79,12 +79,13 @@
self.main_thread_list=[]
self.exit_flag=False
self.tcp_mutex=threading.Lock()
+ self.print_warnings_mutex=threading.Lock()
self.tcp_data=(' ')*6
self.datas_threated=True
self.tcp_data_for_event=(' ')*6
self.my_name="Tux client"
self.print_status=False
- self.print_warnings=False
+ self.print_warnings=True
self.print_debug_thread=False
self.event=TUXevent(self)
self.cmd=TUXcmd(self)
@@ -111,6 +112,7 @@
# Destructor of class
#--------------------------------------------------------------------------
def destroy(self):
+ if self.exit_flag: return
self.daemon.auto_connect(False)
self.tts.auto_connect(False)
self.daemon.disconnect()
@@ -2996,12 +2998,15 @@
while not self.parent.exit_flag:
if self.ac:
if not self.connected:
+ self.parent.print_warnings_mutex.acquire()
store=self.parent.print_warnings
self.parent.print_warnings=False
self.connect(self.ac_address,self.ac_port)
self.parent.print_warnings=store
+ self.parent.print_warnings_mutex.release()
if self.connected!=last_connect_status:
if self.connected:
+ self.parent.hw.alsa_devices_select(0)
if self.parent.print_warnings:
print "CONNECTED to tuxdaemon"
if self.parent.event.on_connected!=None:
@@ -3009,6 +3014,7 @@
else:
if self.parent.print_warnings:
print "DISCONNECTED from tuxdaemon"
+ self.parent.status.rf_connected = False
if self.parent.event.on_disconnected!=None:
self.parent.event.on_disconnected()
self._tcp_threads_join()
@@ -3683,10 +3689,12 @@
while not self.parent.exit_flag:
if self.ac:
if not self.connected:
+ self.parent.print_warnings_mutex.acquire()
store=self.parent.print_warnings
self.parent.print_warnings=False
self.connect(self.ac_address,self.ac_port)
self.parent.print_warnings=store
+ self.parent.print_warnings_mutex.release()
if self.connected!=last_connect_status:
if self.connected:
if self.parent.print_warnings:
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 12:17:56
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 268
Modified:
software/gtdi/trunk/gtdi.py
software/gtdi/trunk/gtdi2.glade
Log:
remi
2007-04-20 14:17:52 +0200 (Fri, 20 Apr 2007)
186
UPD
GUI has been modified.
(Un/)Pluging functionnality has been added.
A function for restoring the original memory soundbank has been added.
Realtime RF state has been added in the GUI
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: software/gtdi/trunk/gtdi.py
===================================================================
--- software/gtdi/trunk/gtdi.py 2007-04-20 11:56:28 UTC (rev 267)
+++ software/gtdi/trunk/gtdi.py 2007-04-20 12:17:52 UTC (rev 268)
@@ -163,11 +163,13 @@
def on_status(self):
global status_list_st
global status_list_changed
- status_list_changed=True
- status_list_st.append(tux.explicit_status())
- if len(status_list_st)==50:
- for i in range(1):
- status_list_st.pop(0)
+ explicite_status=tux.explicit_status()
+ if explicite_status.find("RF connected->") != 0:
+ status_list_changed=True
+ status_list_st.append(explicite_status)
+ if len(status_list_st)==50:
+ for i in range(1):
+ status_list_st.pop(0)
#--------------------------------------------------------------------------
# Status viewer refreshing thread
@@ -175,8 +177,11 @@
def status_viewer_thread(self):
global status_list_st
global status_list_changed
+ global onpause
+ global onplay
last_tuxdaemon_connect=False
last_tuxttsdaemon_connect=False
+ last_rf_state=False
while True:
if status_list_changed:
status_list_changed=False
@@ -193,6 +198,15 @@
if tux.daemon.connected!=last_tuxdaemon_connect:
last_tuxdaemon_connect=tux.daemon.connected
if tux.daemon.connected:
+ onpause=False
+ onplay=False
+ global toggled_by_event
+ toggled_by_event=True
+ global soundcard
+ tux.hw.alsa_devices_select(0)
+ soundcard = tux.hw.alsa_device
+ self.get_widget("togglebutton3").set_active(False)
+ toggled_by_event=False
self.get_widget("image2").set_from_stock(gtk.STOCK_APPLY\
,gtk.ICON_SIZE_BUTTON)
self.on_mouth_stop()
@@ -201,6 +215,7 @@
else:
self.get_widget("image2").set_from_stock(gtk.STOCK_CANCEL\
,gtk.ICON_SIZE_BUTTON)
+ tux.status.rf_connected = False
if tux.tts.connected!=last_tuxttsdaemon_connect:
last_tuxttsdaemon_connect=tux.tts.connected
if tux.tts.connected:
@@ -209,7 +224,15 @@
else:
self.get_widget("image3").set_from_stock(gtk.STOCK_CANCEL\
,gtk.ICON_SIZE_BUTTON)
- tux.sys.wait(0.2)
+ if tux.status.rf_state()!=last_rf_state:
+ last_rf_state = tux.status.rf_connected
+ if last_rf_state:
+ self.get_widget("image4").set_from_stock(gtk.STOCK_APPLY\
+ ,gtk.ICON_SIZE_BUTTON)
+ else:
+ self.get_widget("image4").set_from_stock(gtk.STOCK_CANCEL\
+ ,gtk.ICON_SIZE_BUTTON)
+ tux.sys.wait(0.5)
# -----------------------------------------------------------------------------
# Tab "main" events
# -----------------------------------------------------------------------------
@@ -240,8 +263,11 @@
# On flash leds button clicked
#--------------------------------------------------------------------------
def on_flash_bt_clicked(self, widget, *args):
- num_sb=self.get_widget("spinbutton1")
- tux.cmd.leds_blink(int(num_sb.get_value()),15)
+ def _funct():
+ num_sb=self.get_widget("spinbutton1")
+ tux.cmd.leds_blink(int(num_sb.get_value()),15)
+
+ thread.start_new_thread(_funct,())
#--------------------------------------------------------------------------
# On eyes open radiobutton toggled
@@ -297,29 +323,35 @@
# On flippers up radiobutton toggled
#--------------------------------------------------------------------------
def on_flippers_up_toggled(self, widget, *args):
- global toggled_by_event
- if toggled_by_event: return
- if widget.get_active():
- tux.cmd.raw(0x31,0,0,0)
- tux.event.wait_status(DATAS_STATUS_WINGS_POSITION_COUNTER,0,5)
- tux.cmd.wings_on(1)
+ def _funct():
+ global toggled_by_event
+ if toggled_by_event: return
+ if widget.get_active():
+ tux.cmd.raw(0x31,0,0,0)
+ tux.event.wait_status(DATAS_STATUS_WINGS_POSITION_COUNTER,0,5)
+ tux.cmd.wings_on(1)
+
+ thread.start_new_thread(_funct,())
#--------------------------------------------------------------------------
# On flippers down radiobutton toggled
#--------------------------------------------------------------------------
def on_flippers_down_toggled(self, widget, *args):
- global toggled_by_event
- if toggled_by_event: return
- if widget.get_active():
- tux.cmd.raw(0x31,0,0,0)
- tux.event.wait_status(DATAS_STATUS_WINGS_POSITION_COUNTER,0,5)
+ def _funct():
+ global toggled_by_event
+ if toggled_by_event: return
+ if widget.get_active():
+ tux.cmd.raw(0x31,0,0,0)
+ tux.event.wait_status(DATAS_STATUS_WINGS_POSITION_COUNTER,0,5)
+
+ thread.start_new_thread(_funct,())
#--------------------------------------------------------------------------
# On flippers flap button clicked
#--------------------------------------------------------------------------
def on_flippers_flap_bt_clicked(self, widget, *args):
num_sb=self.get_widget("spinbutton4")
- tux.cmd.wings_on_free(int(num_sb.get_value())*2)
+ tux.cmd.wings_on_free(int(num_sb.get_value()))
#--------------------------------------------------------------------------
# On rotation button clicked
@@ -348,13 +380,13 @@
# On "Get light level" button clicked
#--------------------------------------------------------------------------
def on_cversion_bt_clicked(self, widget, *args):
- tux.status.get_light_level()
+ thread.start_new_thread(tux.status.get_light_level,())
#--------------------------------------------------------------------------
# On "Ping" button clicked
#--------------------------------------------------------------------------
def on_ping_bt_clicked(self, widget, *args):
- tux.cmd.ping(200)
+ thread.start_new_thread(tux.cmd.ping,(200,))
# -----------------------------------------------------------------------------
# Tab "TTS" events
@@ -450,8 +482,30 @@
if str(self.get_widget("filechooserbutton1").get_filename())=="None": return
tux.sys.shell_free("aplay -D %s %s"% (soundcard,\
self.get_widget("filechooserbutton1").get_filename()))
-
+
#--------------------------------------------------------------------------
+ # On select original sounds
+ #--------------------------------------------------------------------------
+ def on_incl_orig_toggled(self, widget, *args):
+ st_wav_paths = wavs.wav_paths
+ if widget.get_active():
+ wavs.wav_paths=[]
+ wavs.wav_sizes=[]
+ for i in range(9):
+ wavs.add_wav_path('/opt/tuxdroid/apps/gtdi/sounds/%d.wav'%(i+1))
+ for path in st_wav_paths:
+ wavs.add_wav_path(path)
+ else:
+ if len(st_wav_paths) > 9:
+ for i in range(9):
+ wavs.wav_sizes.pop(0)
+ wavs.wav_paths.pop(0)
+ else:
+ wavs.wav_paths=[]
+ wavs.wav_sizes=[]
+ self.refresh_wav_list()
+
+ #--------------------------------------------------------------------------
# On select internal wave file event
#--------------------------------------------------------------------------
def on_wave_internal_changed(self, widget, *args):
@@ -497,6 +551,7 @@
def on_wave_internal_clist_bt_clicked(self, widget, *args):
wavs.wav_sizes=[]
wavs.wav_paths=[]
+ self.get_widget("checkbutton4").set_active(False)
self.refresh_wav_list()
#--------------------------------------------------------------------------
@@ -509,6 +564,7 @@
# Store sound function
#--------------------------------------------------------------------------
def sound_storing(self):
+ if tux.status.rf_state() == 0: return
if len(wavs.wav_sizes)==0: return
wav_te=self.get_widget("textview3")
wav_buffer=wav_te.get_buffer()
@@ -540,68 +596,71 @@
# On "play" flash sound button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play_bt_clicked(self, widget, *args):
- index=self.get_widget("spinbutton7").get_value()
- tux.cmd.sound_play(int(index),0)
+ def _funct():
+ index=self.get_widget("spinbutton7").get_value()
+ tux.cmd.sound_play(int(index),0)
+
+ thread.start_new_thread(_funct,())
#--------------------------------------------------------------------------
# On "play flash sound number 1" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play1_clicked(self, widget, *args):
- tux.cmd.sound_play(1,0)
+ thread.start_new_thread(tux.cmd.sound_play,(1,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 2" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play2_clicked(self, widget, *args):
- tux.cmd.sound_play(2,0)
+ thread.start_new_thread(tux.cmd.sound_play,(2,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 3" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play3_clicked(self, widget, *args):
- tux.cmd.sound_play(3,0)
+ thread.start_new_thread(tux.cmd.sound_play,(3,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 4" button clicked
#--------------------------------------------------------------------------
def on_wave_internat_play4_clicked(self, widget, *args):
- tux.cmd.sound_play(4,0)
+ thread.start_new_thread(tux.cmd.sound_play,(4,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 5" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play5_clicked(self, widget, *args):
- tux.cmd.sound_play(5,0)
+ thread.start_new_thread(tux.cmd.sound_play,(5,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 6" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play6_clicked(self, widget, *args):
- tux.cmd.sound_play(6,0)
+ thread.start_new_thread(tux.cmd.sound_play,(6,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 7" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play7_clicked(self, widget, *args):
- tux.cmd.sound_play(7,0)
+ thread.start_new_thread(tux.cmd.sound_play,(7,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 8" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play8_clicked(self, widget, *args):
- tux.cmd.sound_play(8,0)
+ thread.start_new_thread(tux.cmd.sound_play,(8,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 9" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play9_clicked(self, widget, *args):
- tux.cmd.sound_play(9,0)
+ thread.start_new_thread(tux.cmd.sound_play,(9,0,))
#--------------------------------------------------------------------------
# On "play flash sound number 10" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_play10_clicked(self, widget, *args):
- tux.cmd.sound_play(10,0)
+ thread.start_new_thread(tux.cmd.sound_play,(10,0,))
#--------------------------------------------------------------------------
# On "Play recorded wave file" button clicked
Modified: software/gtdi/trunk/gtdi2.glade
===================================================================
--- software/gtdi/trunk/gtdi2.glade 2007-04-20 11:56:28 UTC (rev 267)
+++ software/gtdi/trunk/gtdi2.glade 2007-04-20 12:17:52 UTC (rev 268)
@@ -69,11 +69,29 @@
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label10">
- <property name="width_request">166</property>
+ <widget class="GtkImage" id="image2">
+ <property name="width_request">21</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="stock">gtk-cancel</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="x">192</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="width_request">136</property>
<property name="height_request">20</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Text To Speech Daemon</property>
+ <property name="label" translatable="yes">Tux Droid Daemon</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -90,34 +108,42 @@
</widget>
<packing>
<property name="x">0</property>
- <property name="y">36</property>
+ <property name="y">0</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image3">
- <property name="width_request">21</property>
- <property name="height_request">21</property>
+ <widget class="GtkLabel" id="label27">
+ <property name="width_request">166</property>
+ <property name="height_request">20</property>
<property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
- <property name="icon_size">4</property>
+ <property name="label" translatable="yes">RF state</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="x">192</property>
- <property name="y">34</property>
+ <property name="x">0</property>
+ <property name="y">48</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image2">
+ <widget class="GtkImage" id="image3">
<property name="width_request">21</property>
<property name="height_request">21</property>
<property name="visible">True</property>
- <property name="stock">gtk-apply</property>
+ <property name="stock">gtk-cancel</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -126,16 +152,16 @@
</widget>
<packing>
<property name="x">192</property>
- <property name="y">0</property>
+ <property name="y">24</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
- <property name="width_request">136</property>
+ <widget class="GtkLabel" id="label10">
+ <property name="width_request">166</property>
<property name="height_request">20</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Tux Droid Daemon</property>
+ <property name="label" translatable="yes">Text To Speech Daemon</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -152,9 +178,27 @@
</widget>
<packing>
<property name="x">0</property>
- <property name="y">4</property>
+ <property name="y">24</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkImage" id="image4">
+ <property name="width_request">21</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="stock">gtk-cancel</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="x">192</property>
+ <property name="y">48</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -163,7 +207,7 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Daemon status</b></property>
+ <property name="label" translatable="yes"><b>Tuxdroid status</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -587,7 +631,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton1">
- <property name="width_request">56</property>
+ <property name="width_request">58</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -608,7 +652,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton2">
- <property name="width_request">57</property>
+ <property name="width_request">59</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -648,7 +692,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton3">
- <property name="width_request">56</property>
+ <property name="width_request">58</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -669,7 +713,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton4">
- <property name="width_request">57</property>
+ <property name="width_request">59</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -709,7 +753,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton5">
- <property name="width_request">41</property>
+ <property name="width_request">43</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -730,7 +774,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton6">
- <property name="width_request">57</property>
+ <property name="width_request">60</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -770,7 +814,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton8">
- <property name="width_request">61</property>
+ <property name="width_request">62</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -809,7 +853,7 @@
<child>
<widget class="GtkRadioButton" id="radiobutton7">
- <property name="width_request">46</property>
+ <property name="width_request">48</property>
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1581,14 +1625,14 @@
<signal name="clicked" handler="on_wave_external_play_bt_clicked"/>
</widget>
<packing>
- <property name="x">520</property>
+ <property name="x">289</property>
<property name="y">1</property>
</packing>
</child>
<child>
<widget class="GtkFileChooserButton" id="filechooserbutton1">
- <property name="width_request">440</property>
+ <property name="width_request">200</property>
<property name="height_request">27</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Sélectionner un fichier</property>
@@ -1810,6 +1854,27 @@
<property name="y">0</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton4">
+ <property name="width_request">170</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">include original</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_incl_orig_toggled" last_modification_time="Mon, 16 Apr 2007 10:51:02 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">476</property>
+ <property name="y">32</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-20 11:55:10
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 266
Modified:
api/python/trunk/tux.py
Log:
remi
2007-04-20 13:54:35 +0200 (Fri, 20 Apr 2007)
40
UPD
Handling of the "ctrl-d" exit event.
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: api/python/trunk/tux.py
===================================================================
--- api/python/trunk/tux.py 2007-04-18 08:42:50 UTC (rev 265)
+++ api/python/trunk/tux.py 2007-04-20 11:54:35 UTC (rev 266)
@@ -14,13 +14,17 @@
tux.daemon.connect()
tux.tts.connect()
tux.daemon.set_my_client_name("Py Client")
+tux.print_warnings=True
tux.daemon.auto_connect(True)
tux.tts.auto_connect(True)
-tux.print_warnings=True
def exit(signum,frame):
tux.destroy()
sys.exit(signum)
+
+def my_exitfunct():
+ exit(0,None)
signal.signal(signal.SIGTERM, exit)
signal.signal(signal.SIGINT, exit)
+sys.exitfunc=my_exitfunct
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-16 08:56:56
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 258 Modified: firmware/tuxup/tags/0.1.0/ firmware/tuxup/tags/0.1.1/ Log: jaguarondi 2007-04-16 10:56:51 +0200 (Mon, 16 Apr 2007) 75 Updated externals in order to fetch the revision corresponding to each tag svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct Property changes on: firmware/tuxup/tags/0.1.0 ___________________________________________________________________ Name: svn:externals - common http://svn.tuxisalive.com/firmware/tuxdefs + common -r210 http://svn.tuxisalive.com/firmware/tuxdefs Property changes on: firmware/tuxup/tags/0.1.1 ___________________________________________________________________ Name: svn:externals - common http://svn.tuxisalive.com/firmware/tuxdefs + common -r211 http://svn.tuxisalive.com/firmware/tuxdefs |
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-15 20:48:23
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 257
Modified:
daemon/trunk/libs/USBDaemon_command_tux.c
Log:
neimad
2007-04-15 22:47:44 +0200 (Sun, 15 Apr 2007)
140
* Fixed tux_req_info(): the cast to unsigned char was done before
the shift right operator was applied thus leading to a value of
zero.
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c 2007-04-14 15:20:14 UTC (rev 256)
+++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-04-15 20:47:44 UTC (rev 257)
@@ -617,23 +617,23 @@
/************************************************************************ */
/* tux_req_info() */
/************************************************************************ */
-void tux_req_info(
- unsigned char data[],
- unsigned char result[]
- )
+void tux_req_info(unsigned char data[], unsigned char result[])
{
result[0] = data[0];
- switch(data[0])
+
+ if (data[0] == TUX_REQ_INFO_VERSION)
{
- case TUX_REQ_INFO_VERSION:
- result[1] = CPU_VER_MAJ(hw_version[data[1]].cpu_ver_maj);
- result[2] = hw_version[data[1]].ver_minor;
- result[3] = hw_version[data[1]].ver_update;
- result[4] = (unsigned char)((hw_revision[data[1]].revision)&0xFF00)>>8;
- result[5] = (unsigned char)(hw_revision[data[1]].revision)&0x00FF;
- result[6] = (unsigned char)((hw_author[data[1]].author_id)&0xFF00)>>8;
- result[7] = (unsigned char)(hw_author[data[1]].author_id)&0x00FF;
- break;
+ version_t *ver = &hw_version[data[1]];
+ revision_t *rev = &hw_revision[data[1]];
+ author_t *auth = &hw_author[data[1]];
+
+ result[1] = CPU_VER_MAJ(ver->cpu_ver_maj);
+ result[2] = ver->ver_minor;
+ result[3] = ver->ver_update;
+ result[4] = (unsigned char)((rev->revision & 0xFF00) >> 8);
+ result[5] = (unsigned char)(rev->revision & 0x00FF);
+ result[6] = (unsigned char)((auth->author_id & 0xFF00) >> 8);
+ result[7] = (unsigned char)(auth->author_id & 0x00FF);
}
}
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-14 15:20:18
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 256
Modified:
daemon/trunk/libs/USBDaemon_status_table.c
daemon/trunk/libs/USBDaemon_status_table.h
Log:
neimad
2007-04-14 17:20:14 +0200 (Sat, 14 Apr 2007)
112
* Made USBDaemon_status_table.[ch] coding style compliant
and spaced things out a bit to improve readability.
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c 2007-04-14 15:00:15 UTC (rev 255)
+++ daemon/trunk/libs/USBDaemon_status_table.c 2007-04-14 15:20:14 UTC (rev 256)
@@ -25,6 +25,7 @@
#include "USBDaemon_globals.h"
#include "USBDaemon_tcp_server.h"
#include "../tuxdefs/commands.h"
+
/*_____________________ V A R I A B L E S __________________________________*/
_PORT_BYTE_ portb;
_PORT_BYTE_ portc;
@@ -46,6 +47,7 @@
unsigned char last_toggle_key = 0xFF;;
unsigned char sound_flash_count = 0;
unsigned char current_audio_channel = 0;
+
/*_____________________ F U N C T I O N S __________________________________*/
/************************************************************************ */
@@ -53,47 +55,69 @@
/************************************************************************ */
void update_raw_status_table(unsigned char new_status[TUX_RECV_LENGTH])
{
- switch(new_status[0])
+ switch (new_status[0])
{
case STATUS_PORTS_CMD:
- if(portb.Byte != new_status[1]) portb_changed(new_status[1]);
- if(portc.Byte != new_status[2]) portc_changed(new_status[2]);
- if(portd.Byte != new_status[3]) portd_changed(new_status[3]);
+ if (portb.Byte != new_status[1])
+ portb_changed(new_status[1]);
+ if (portc.Byte != new_status[2])
+ portc_changed(new_status[2]);
+ if (portd.Byte != new_status[3])
+ portd_changed(new_status[3]);
break;
+
case STATUS_SENSORS1_CMD:
- if(sensors1.Byte != new_status[1]) sensors1_changed(new_status[1]);
+ if (sensors1.Byte != new_status[1])
+ sensors1_changed(new_status[1]);
break;
+
case STATUS_LIGHT_CMD:
- if((sensors2.level_light_high.Byte != new_status[1]) || (sensors2.level_light_low.Byte != new_status[2]) ) sensors2_changed(new_status[1], new_status[2], new_status[3]);
+ if (sensors2.level_light_high.Byte != new_status[1]
+ || sensors2.level_light_low.Byte != new_status[2])
+ sensors2_changed(new_status[1], new_status[2], new_status[3]);
break;
+
case STATUS_POSITION1_CMD:
- if((position1.eyes_position.Byte != new_status[1])||(position1.mouth_position.Byte != new_status[2])||(position1.wings_position.Byte != new_status[3])) position1_changed(new_status[1], new_status[2], new_status[3]);
+ if (position1.eyes_position.Byte != new_status[1]
+ || position1.mouth_position.Byte != new_status[2]
+ || position1.wings_position.Byte != new_status[3])
+ position1_changed(new_status[1], new_status[2], new_status[3]);
break;
+
case STATUS_POSITION2_CMD:
- if(position2.Byte != new_status[1]) position2_changed(new_status[1]);
+ if (position2.Byte != new_status[1])
+ position2_changed(new_status[1]);
break;
+
case PONG_CMD:
pong_received++;
pong_event(new_status[1], pong_received);
break;
+
case VERSION_CMD:
update_version_table(new_status);
break;
+
case REVISION_CMD:
update_revision_table(new_status);
break;
+
case AUTHOR_CMD:
update_author_table(new_status);
break;
+
case SOUND_VAR_CMD:
update_sound_flash_count(new_status);
break;
+
case STATUS_IR_CMD:
update_ir(new_status);
break;
+
default:
if (show_invalid_raw)
- printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1], new_status[2], new_status[3]);
+ printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1],
+ new_status[2], new_status[3]);
break;
}
}
@@ -115,21 +139,24 @@
tcp_frame[3] = SUBDATA_TP_STATUS;
DONGLE_status = new_status[0];
+
/*RF status change */
- if(RF_status != new_status[1])
+ if (RF_status != new_status[1])
{
RF_status = new_status[1];
tcp_frame[4] = DATA_STATUS_RF_CONNECTED;
tcp_frame[5] = RF_status;
tcp_server_send_raw(tcp_frame);
}
+
/* Command status change */
- if(CMD_status != new_status[2])
+ if (CMD_status != new_status[2])
{
CMD_status = new_status[2];
- if((CMD_status == 2)||(CMD_status == 3))
+ if (CMD_status == 2 || CMD_status == 3)
cmd_status_flag = 0;
}
+
NUMBER_frames = new_status[3];
}
@@ -199,12 +226,11 @@
code = new_status[1] & 0x3F;
toggle = new_status[1] & 0x40;
check = new_status[1] & 0x80;
- if(last_remote_key == code)
+
+ if (last_remote_key == code)
{
- if(last_toggle_key == toggle)
- {
+ if (last_toggle_key == toggle)
new_code = 0;
- }
else
{
last_remote_key = code;
@@ -218,7 +244,8 @@
last_toggle_key = toggle;
new_code = 1;
}
- if(new_code)
+
+ if (new_code)
{
printf("Remote code : %.2x\n", code);
@@ -275,7 +302,7 @@
tcp_frame[3] = SUBDATA_TP_STATUS;
/* wings motor backward */
- if((portb.Byte & 0x01) != (new_value & 0x01))
+ if ((portb.Byte & 0x01) != (new_value & 0x01))
{
tcp_frame[4] = DATA_STATUS_WINGS_MOTOR_BACKWARD;
if (portb.bits.PB0)
@@ -290,8 +317,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* spin motor backward */
- if((portb.Byte & 0x02) != (new_value & 0x02))
+ if ((portb.Byte & 0x02) != (new_value & 0x02))
{
tcp_frame[4] = DATA_STATUS_SPIN_MOTOR_BACKWARD;
if (portb.bits.PB1)
@@ -306,8 +334,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* spin motor forward */
- if((portb.Byte & 0x04) != (new_value & 0x04))
+ if ((portb.Byte & 0x04) != (new_value & 0x04))
{
tcp_frame[4] = DATA_STATUS_SPIN_MOTOR_FORWARD;
if (portb.bits.PB2)
@@ -322,10 +351,11 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* mouth open position motor */
- if((portb.Byte & 0x08) != (new_value & 0x08))
+ if ((portb.Byte & 0x08) != (new_value & 0x08))
{
- tcp_frame[4] = DATA_STATUS_MOUTH_OPEN_POSITION ;
+ tcp_frame[4] = DATA_STATUS_MOUTH_OPEN_POSITION;
if (portb.bits.PB3)
{
/* Up */
@@ -340,8 +370,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* mouth close position motor */
- if((portb.Byte & 0x10) != (new_value & 0x10))
+ if ((portb.Byte & 0x10) != (new_value & 0x10))
{
tcp_frame[4] = DATA_STATUS_MOUTH_CLOSED_POSITION;
if (portb.bits.PB4)
@@ -356,10 +387,11 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* charger inhibit signal */
- if((portb.Byte & 0x40) != (new_value & 0x40))
+ if ((portb.Byte & 0x40) != (new_value & 0x40))
{
- tcp_frame[4] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL ;
+ tcp_frame[4] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
if (portb.bits.PB6)
{
printf("charger inhibit signal 0\n");
@@ -372,6 +404,7 @@
}
tcp_server_send_raw(tcp_frame);
}
+
portb.Byte = new_value;
}
@@ -392,7 +425,7 @@
tcp_frame[3] = SUBDATA_TP_STATUS;
/* wings position switch */
- if((portc.Byte & 0x02) != (new_value & 0x02))
+ if ((portc.Byte & 0x02) != (new_value & 0x02))
{
tcp_frame[4] = DATA_STATUS_WINGS_POSITION_SWITCH;
if (portc.bits.PB1)
@@ -407,8 +440,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* right blue led */
- if((portc.Byte & 0x04) != (new_value & 0x04))
+ if ((portc.Byte & 0x04) != (new_value & 0x04))
{
tcp_frame[4] = DATA_STATUS_RIGHT_BLUE_LED;
if (portc.bits.PB2)
@@ -423,8 +457,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* left blue led */
- if((portc.Byte & 0x08) != (new_value & 0x08))
+ if ((portc.Byte & 0x08) != (new_value & 0x08))
{
tcp_frame[4] = DATA_STATUS_LEFT_BLUE_LED;
if (portc.bits.PB3)
@@ -439,6 +474,7 @@
}
tcp_server_send_raw(tcp_frame);
}
+
portc.Byte = new_value;
}
@@ -459,7 +495,7 @@
tcp_frame[3] = SUBDATA_TP_STATUS;
/* head motor for eyes */
- if((portd.Byte & 0x01) != (new_value & 0x01))
+ if ((portd.Byte & 0x01) != (new_value & 0x01))
{
tcp_frame[4] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
if (portd.bits.PB0)
@@ -474,8 +510,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* head motor for mouth */
- if((portd.Byte & 0x02) != (new_value & 0x02))
+ if ((portd.Byte & 0x02) != (new_value & 0x02))
{
tcp_frame[4] = DATA_STATUS_HEAD_MOTOR_FOR_MOUTH;
if (portd.bits.PB1)
@@ -490,8 +527,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* spin position switch */
- if((portd.Byte & 0x08) != (new_value & 0x08))
+ if ((portd.Byte & 0x08) != (new_value & 0x08))
{
tcp_frame[4] = DATA_STATUS_SPIN_POSITION_SWITCH;
if (portd.bits.PB3)
@@ -506,8 +544,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* wings motor forward */
- if((portd.Byte & 0x10) != (new_value & 0x10))
+ if ((portd.Byte & 0x10) != (new_value & 0x10))
{
tcp_frame[4] = DATA_STATUS_WINGS_MOTOR_FORWARD;
if (portd.bits.PB4)
@@ -522,8 +561,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* IR led */
- if((portd.Byte & 0x20) != (new_value & 0x20))
+ if ((portd.Byte & 0x20) != (new_value & 0x20))
{
tcp_frame[4] = DATA_STATUS_IR_LED;
if (portd.bits.PB5)
@@ -538,8 +578,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* eyes open position switch */
- if((portd.Byte & 0x40) != (new_value & 0x40))
+ if ((portd.Byte & 0x40) != (new_value & 0x40))
{
tcp_frame[4] = DATA_STATUS_EYES_OPEN_POSITION_SWITCH;
if (portd.bits.PB6)
@@ -554,6 +595,7 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* eyes closed position switch */
if((portd.Byte & 0x80) != (new_value & 0x80))
{
@@ -570,6 +612,7 @@
}
tcp_server_send_raw(tcp_frame);
}
+
portd.Byte = new_value;
}
@@ -590,7 +633,7 @@
tcp_frame[3] = SUBDATA_TP_STATUS;
/* Left wing push */
- if((sensors1.Byte & 0x01) != (new_value & 0x01))
+ if ((sensors1.Byte & 0x01) != (new_value & 0x01))
{
tcp_frame[4] = DATA_STATUS_LEFT_WING_PUSH;
if (sensors1.bits.PB0)
@@ -605,8 +648,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* Right wing push */
- if((sensors1.Byte & 0x02) != (new_value & 0x02))
+ if ((sensors1.Byte & 0x02) != (new_value & 0x02))
{
tcp_frame[4] = DATA_STATUS_RIGHT_WING_PUSH;
if (sensors1.bits.PB1)
@@ -621,8 +665,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* power plug insertion switch */
- if((sensors1.Byte & 0x04) != (new_value & 0x04))
+ if ((sensors1.Byte & 0x04) != (new_value & 0x04))
{
tcp_frame[4] = DATA_STATUS_POWER_PLUG_SWITCH;
if (sensors1.bits.PB2)
@@ -637,8 +682,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* Head push */
- if((sensors1.Byte & 0x08) != (new_value & 0x08))
+ if ((sensors1.Byte & 0x08) != (new_value & 0x08))
{
tcp_frame[4] = DATA_STATUS_HEAD_PUSH_SWITCH;
if (sensors1.bits.PB3)
@@ -653,8 +699,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* Led charger */
- if((sensors1.Byte & 0x10) != (new_value & 0x10))
+ if ((sensors1.Byte & 0x10) != (new_value & 0x10))
{
tcp_frame[4] = DATA_STATUS_CHARGER_LED_STATUS;
if (sensors1.bits.PB4)
@@ -669,8 +716,9 @@
}
tcp_server_send_raw(tcp_frame);
}
+
/* mute status */
- if((sensors1.Byte & 0x80) != (new_value & 0x80))
+ if ((sensors1.Byte & 0x80) != (new_value & 0x80))
{
tcp_frame[4] = DATA_STATUS_MUTE_STATUS;
if (sensors1.bits.PB7)
@@ -685,16 +733,15 @@
}
tcp_server_send_raw(tcp_frame);
}
+
sensors1.Byte = new_value;
}
/************************************************************************ */
/* sensors2_changed() */
/************************************************************************ */
-void sensors2_changed(
- unsigned char new_value_high,
- unsigned char new_value_low,
- unsigned char new_light_mode)
+void sensors2_changed(unsigned char new_value_high, unsigned char new_value_low,
+ unsigned char new_light_mode)
{
tcp_frame_t tcp_frame;
unsigned char i;
@@ -720,10 +767,9 @@
/************************************************************************ */
/* position1_changed() */
/************************************************************************ */
-void position1_changed(
- unsigned char eyes_position,
- unsigned char mouth_position,
- unsigned char wings_position)
+void position1_changed(unsigned char eyes_position,
+ unsigned char mouth_position,
+ unsigned char wings_position)
{
tcp_frame_t tcp_frame;
unsigned char i;
@@ -736,21 +782,23 @@
tcp_frame[2] = DATA_TP_RSP;
tcp_frame[3] = SUBDATA_TP_STATUS;
- if(position1.eyes_position.Byte != eyes_position)
+ if (position1.eyes_position.Byte != eyes_position)
{
position1.eyes_position.Byte = eyes_position;
tcp_frame[4] = DATA_STATUS_EYES_POSITION_COUNTER;
tcp_frame[5] = eyes_position;
tcp_server_send_raw(tcp_frame);
}
- if(position1.mouth_position.Byte != mouth_position)
+
+ if (position1.mouth_position.Byte != mouth_position)
{
position1.mouth_position.Byte = mouth_position;
tcp_frame[4] = DATA_STATUS_MOUTH_POSITION_COUNTER;
tcp_frame[5] = mouth_position;
tcp_server_send_raw(tcp_frame);
}
- if(position1.wings_position.Byte != wings_position)
+
+ if (position1.wings_position.Byte != wings_position)
{
position1.wings_position.Byte = wings_position;
tcp_frame[4] = DATA_STATUS_WINGS_POSITION_COUNTER;
Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h 2007-04-14 15:00:15 UTC (rev 255)
+++ daemon/trunk/libs/USBDaemon_status_table.h 2007-04-14 15:20:14 UTC (rev 256)
@@ -210,19 +210,32 @@
extern author_t hw_author[4];
extern unsigned char sound_flash_count;
extern unsigned char current_audio_channel;
+
/*_____________________ F U N C T I O N S __________________________________*/
extern void update_raw_status_table(unsigned char new_status[]);
extern void update_system_status_table(unsigned char new_status[]);
+
extern void update_version_table(unsigned char new_status[4]);
extern void update_revision_table(unsigned char new_status[4]);
+
extern void update_author_table(unsigned char new_status[4]);
+
extern void update_sound_flash_count(unsigned char new_status[4]);
+
extern void update_ir(unsigned char new_status[4]);
+
extern void pong_event(unsigned char pong_number, unsigned char pong_received);
+
extern void portb_changed(unsigned char new_value);
extern void portc_changed(unsigned char new_value);
extern void portd_changed(unsigned char new_value);
+
extern void sensors1_changed(unsigned char new_value);
-extern void sensors2_changed(unsigned char new_value_high, unsigned char new_value_low, unsigned char new_light_mode);
-extern void position1_changed(unsigned char eyes_position, unsigned char mouth_position, unsigned char wings_position);
+extern void sensors2_changed(unsigned char new_value_high,
+ unsigned char new_value_low,
+ unsigned char new_light_mode);
+
+extern void position1_changed(unsigned char eyes_position,
+ unsigned char mouth_position,
+ unsigned char wings_position);
extern void position2_changed(unsigned char new_value);
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-14 15:00:22
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 255
Modified:
daemon/trunk/libs/USBDaemon_status_table.c
daemon/trunk/libs/USBDaemon_status_table.h
daemon/trunk/libs/USBDaemon_usb_enum.c
daemon/trunk/libs/USBDaemon_usb_readWrite.c
Log:
neimad
2007-04-14 17:00:15 +0200 (Sat, 14 Apr 2007)
108
* Renamed variable CMD_STATUS_FLAG to cmd_status_flag.
Let's keep the all uppercase naming for defines ;)
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c 2007-04-14 14:25:35 UTC (rev 254)
+++ daemon/trunk/libs/USBDaemon_status_table.c 2007-04-14 15:00:15 UTC (rev 255)
@@ -36,7 +36,7 @@
unsigned char CMD_status = 0;
unsigned char NUMBER_frames = 0;
unsigned char pong_received;
-unsigned char CMD_STATUS_FLAG;
+unsigned char cmd_status_flag;
unsigned char pong_received;
version_t hw_version[4];
revision_t hw_revision[4];
@@ -128,7 +128,7 @@
{
CMD_status = new_status[2];
if((CMD_status == 2)||(CMD_status == 3))
- CMD_STATUS_FLAG = 0;
+ cmd_status_flag = 0;
}
NUMBER_frames = new_status[3];
}
Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h 2007-04-14 14:25:35 UTC (rev 254)
+++ daemon/trunk/libs/USBDaemon_status_table.h 2007-04-14 15:00:15 UTC (rev 255)
@@ -202,7 +202,7 @@
extern unsigned char RF_status;
extern unsigned char CMD_status;
extern unsigned char NUMBER_frames;
-extern unsigned char CMD_STATUS_FLAG;
+extern unsigned char cmd_status_flag;
extern unsigned char pong_received;
extern version_t hw_version[4];
Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c 2007-04-14 14:25:35 UTC (rev 254)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c 2007-04-14 15:00:15 UTC (rev 255)
@@ -100,7 +100,7 @@
void usb_start_task()
{
unsigned char dongle_is_present_counter;
-
+
pthread_mutex_init(&usb_mutex, NULL);
/* Find Tux */
do
@@ -153,7 +153,7 @@
printf("Tux dongle is disconnected\n");
send_daemon_disconnected();
terminate(1);
- }
+ }
usb_get_status_TuxDroid();
usleep(50000);
}
Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-04-14 14:25:35 UTC (rev 254)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-04-14 15:00:15 UTC (rev 255)
@@ -150,18 +150,18 @@
}
/* Send data */
- CMD_STATUS_FLAG = 1;
+ cmd_status_flag = 1;
idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)data,
TUX_SEND_LENGTH, TUX_WRITE_TIMEOUT);
counter = 0;
- csf = CMD_STATUS_FLAG;
+ csf = cmd_status_flag;
pthread_mutex_unlock(&usb_mutex);
while (csf)
{
pthread_mutex_lock(&usb_mutex);
- csf = CMD_STATUS_FLAG;
+ csf = cmd_status_flag;
pthread_mutex_unlock(&usb_mutex);
counter++;
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-14 14:26:20
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 254
Modified:
software/gtdi/trunk/gtdi.py
Log:
doegox
2007-04-14 16:25:35 +0200 (Sat, 14 Apr 2007)
124
separate args of gnome-terminal, otherwise at least on my machine gnome-terminal complains about an "-etuxsh" unknown option
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: software/gtdi/trunk/gtdi.py
===================================================================
--- software/gtdi/trunk/gtdi.py 2007-04-14 08:56:06 UTC (rev 253)
+++ software/gtdi/trunk/gtdi.py 2007-04-14 14:25:35 UTC (rev 254)
@@ -342,7 +342,7 @@
# On "Tux Droid shell" button clicked
#--------------------------------------------------------------------------
def on_tdshell_bt_clicked(self, widget, *args):
- tux.sys.shell_free('gnome-terminal -e"tuxsh"')
+ tux.sys.shell_free('gnome-terminal -e "tuxsh"')
#--------------------------------------------------------------------------
# On "Get light level" button clicked
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-14 09:15:56
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 253
Modified:
daemon/trunk/libs/USBDaemon_pidfile.c
daemon/trunk/libs/USBDaemon_pidfile.h
Log:
neimad
2007-04-14 10:56:06 +0200 (Sat, 14 Apr 2007)
319
* Made PID handling code comply with the official coding style
(ie, 4 spaces indentation, opening curly brace on a line by itself,
no space between function name and arguments, etc).
* Constant PidFile renamed to PIDFILE to follow common practice.
* Didn't touch comments; these should follow doxygen formatting.
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_pidfile.c
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-14 07:53:22 UTC (rev 252)
+++ daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-14 08:56:06 UTC (rev 253)
@@ -30,10 +30,10 @@
#include <signal.h>
#include "USBDaemon_globals.h"
-#define PidFile "/var/run/tuxdaemon.pid"
+#define PIDFILE "/var/run/tuxdaemon.pid"
/************************************************************************ */
-/* Functions to deal with the pidfile
+/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
/************************************************************************ */
@@ -44,16 +44,18 @@
* 0 is returned if either there's no pidfile, it's empty
* or no pid can be read.
*/
-int read_pid (void)
+int read_pid(void)
{
- FILE *f;
- int pid;
+ FILE *f;
+ int pid;
- if (!(f=fopen(PidFile,"r")))
- return 0;
- fscanf(f,"%d", &pid);
- fclose(f);
- return pid;
+ if (!(f = fopen(PIDFILE, "r")))
+ return 0;
+
+ fscanf(f, "%d", &pid);
+ fclose(f);
+
+ return pid;
}
/* check_pid
@@ -62,24 +64,24 @@
* table (using /proc) to determine if the process already exists. If
* so 1 is returned, otherwise 0.
*/
-int check_pid (void)
+int check_pid(void)
{
- int pid = read_pid();
+ int pid = read_pid();
- /* Amazing ! _I_ am already holding the pid file... */
- if ((!pid) || (pid == getpid ()))
- return 0;
+ /* Amazing ! _I_ am already holding the pid file... */
+ if (!pid || pid == getpid())
+ return 0;
- /*
- * The 'standard' method of doing this is to try and do a 'fake' kill
- * of the process. If an ESRCH error is returned the process cannot
- * be found -- GW
- */
- /* But... errno is usually changed only on error.. */
- if (kill(pid, 0) && errno == ESRCH)
- return(0);
+ /*
+ * The 'standard' method of doing this is to try and do a 'fake' kill
+ * of the process. If an ESRCH error is returned the process cannot
+ * be found -- GW
+ */
+ /* But... errno is usually changed only on error.. */
+ if (kill(pid, 0) && errno == ESRCH)
+ return 0;
- return pid;
+ return pid;
}
/* write_pid
@@ -87,41 +89,47 @@
* Writes the pid to the specified file. If that fails 0 is
* returned, otherwise the pid.
*/
-int write_pid (void)
+int write_pid(void)
{
- FILE *f;
- int fd;
- int pid;
+ FILE *f;
+ int fd;
+ int pid;
- if ( ((fd = open(PidFile, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1)
- || ((f = fdopen(fd, "r+")) == NULL) ) {
- fprintf(stderr, "Can't open or create %s.\n", PidFile);
- return 0;
- }
+ if ((fd = open(PIDFILE, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1
+ || (f = fdopen(fd, "r+")) == NULL)
+ {
+ fprintf(stderr, "Can't open or create %s: %m\n", PIDFILE);
+ return 0;
+ }
- if (flock(fd, LOCK_EX|LOCK_NB) == -1) {
- fscanf(f, "%d", &pid);
- fclose(f);
- fprintf(stderr, "Can't lock, lock is held by pid %d.\n", pid);
- return 0;
- }
+ if (flock(fd, LOCK_EX|LOCK_NB) == -1)
+ {
+ fscanf(f, "%d", &pid);
+ fclose(f);
+ fprintf(stderr, "Can't lock, lock is held by pid %d.\n", pid);
+ return 0;
+ }
- pid = getpid();
- if (!fprintf(f,"%d\n", pid)) {
- fprintf(stderr, "Can't write pid , %s.\n", strerror(errno));
- close(fd);
- return 0;
- }
- fflush(f);
+ pid = getpid();
+ if (!fprintf(f,"%d\n", pid))
+ {
+ fprintf(stderr, "Can't write pid: %m.\n");
+ close(fd);
+ return 0;
+ }
+ fflush(f);
- if (flock(fd, LOCK_UN) == -1) {
- fprintf(stderr, "Can't unlock pidfile %s, %s.\n", PidFile, strerror(errno));
- close(fd);
- return 0;
- }
- close(fd);
- chown(PidFile, NEWUID, NEWGID);
- return pid;
+ if (flock(fd, LOCK_UN) == -1)
+ {
+ fprintf(stderr, "Can't unlock pidfile %s: %m.\n", PIDFILE);
+ close(fd);
+ return 0;
+ }
+
+ close(fd);
+ chown(PIDFILE, NEWUID, NEWGID);
+
+ return pid;
}
/* remove_pid
@@ -129,18 +137,18 @@
* Remove the the specified file. The result from unlink(2)
* is returned
*/
-int remove_pid (void)
+int remove_pid(void)
{
- return unlink (PidFile);
+ return unlink(PIDFILE);
}
-
+
/************************************************************************ */
/* Terminate */
/************************************************************************ */
void terminate(int ret)
{
- if (remove_pid()) {
- fprintf(stderr, "Could not delete PID file\n");
- }
+ if (remove_pid())
+ fprintf(stderr, "Could not delete PID file\n");
+
exit(ret);
}
Modified: daemon/trunk/libs/USBDaemon_pidfile.h
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-14 07:53:22 UTC (rev 252)
+++ daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-14 08:56:06 UTC (rev 253)
@@ -20,7 +20,7 @@
/* $Id: main.c 242 2007-04-13 08:48:33Z remi $ */
/************************************************************************ */
-/* Functions to deal with the pidfile
+/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
/************************************************************************ */
@@ -31,7 +31,7 @@
* 0 is returned if either there's no pidfile, it's empty
* or no pid can be read.
*/
-extern int read_pid (void);
+extern int read_pid(void);
/* check_pid
*
@@ -39,21 +39,21 @@
* table (using /proc) to determine if the process already exists. If
* so 1 is returned, otherwise 0.
*/
-extern int check_pid (void);
+extern int check_pid(void);
/* write_pid
*
* Writes the pid to the specified file. If that fails 0 is
* returned, otherwise the pid.
*/
-extern int write_pid (void);
+extern int write_pid(void);
/* remove_pid
*
* Remove the the specified file. The result from unlink(2)
* is returned
*/
-extern int remove_pid (void);
+extern int remove_pid(void);
/* terminate
*
|
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-14 07:53:25
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 252
Modified:
daemon/trunk/main.c
Log:
doegox
2007-04-14 09:53:22 +0200 (Sat, 14 Apr 2007)
68
fix bug: destroyed prematurely pidfile when running forked as daemon
svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c 2007-04-13 23:31:48 UTC (rev 251)
+++ daemon/trunk/main.c 2007-04-14 07:53:22 UTC (rev 252)
@@ -142,7 +142,7 @@
terminate(1);
break;
default :
- terminate(0);
+ exit(0);
}
umask(0);
|
1 message has been excluded from this view by a project administrator.
