tux-droid-svn Mailing List for Tux Droid CE (Page 234)
Status: Beta
Brought to you by:
ks156
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: remi <c2m...@c2...> - 2007-03-21 09:56:24
|
Author: remi Date: 2007-03-21 10:55:39 +0100 (Wed, 21 Mar 2007) New Revision: 181 Modified: software/gtdi/trunk/gtdi.py software/gtdi/trunk/gtdi2.glade Log: UPD : - Tux sound card is self selected. - Daemons are loaded in "daemon" mode Modified: software/gtdi/trunk/gtdi.py =================================================================== --- software/gtdi/trunk/gtdi.py 2007-03-21 09:51:09 UTC (rev 180) +++ software/gtdi/trunk/gtdi.py 2007-03-21 09:55:39 UTC (rev 181) @@ -46,7 +46,7 @@ print "Graphical TuxDroid Interface " + app_version glade_dir = "" locale_dir = "" -soundcard = "hw:1,0" +soundcard = tux.hw.alsa_device bindtextdomain(app_name, locale_dir) @@ -255,7 +255,7 @@ if tux.connected: return # test daemon not present and client not connected if not tux.connected: - tux.sys.shell_free('gnome-terminal -e"tuxdaemon"') + tux.sys.shell_free('tuxdaemon -d') for i in range(10): tux.sys.wait(1) tux.connect_to_daemon() @@ -268,7 +268,6 @@ def on_tddaemon_bt_clicked(self, widget, *args): global toggled_by_event if toggled_by_event: return - thread.start_new_thread(self.connect_disconnect_tux_daemon,()) #-------------------------------------------------------------------------- @@ -281,7 +280,7 @@ if tux.tts.connected: return # test daemon not present and client not connected if not tux.tts.connected: - tux.sys.shell_free('gnome-terminal -e"tuxttsdaemon"') + tux.sys.shell_free('tuxttsdaemon -d') for i in range(10): tux.sys.wait(1) tux.tts.connect_to_daemon() @@ -612,7 +611,7 @@ tux.sys.wait(0.1) tux.cmd.sound_store_index((current_pos & 0xFF0000)>>16,\ (current_pos & 0x00FF00)>>8,current_pos & 0x0000FF) - wav_buffer.insert(wav_buffer.get_end_iter(),"Sound storing : Play\n") + wav_buffer.insert(wav_buffer.get_end_iter(),"Sound storing : Record\n") tux.sys.shell("aplay -D %s merged.wav"%soundcard) wav_buffer.insert(wav_buffer.get_end_iter(),\ "Sound storing : Storage done.\n") Modified: software/gtdi/trunk/gtdi2.glade =================================================================== --- software/gtdi/trunk/gtdi2.glade 2007-03-21 09:51:09 UTC (rev 180) +++ software/gtdi/trunk/gtdi2.glade 2007-03-21 09:55:39 UTC (rev 181) @@ -1,2388 +1,1505 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<!--*- mode: xml -*--> <glade-interface> - -<widget class="GtkWindow" id="window1"> - <property name="width_request">621</property> - <property name="height_request">403</property> - <property name="visible">True</property> - <property name="title" translatable="yes">Tux Droid Interface</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <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="Fri, 02 Mar 2007 14:09:31 GMT"/> - - <child> - <widget class="GtkNotebook" id="notebook1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkFrame" id="frame1"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkFixed" id="fixed1"> - <property name="visible">True</property> - - <child> - <widget class="GtkLabel" id="label9"> - <property name="width_request">110</property> - <property name="height_request">17</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">False</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">0</property> - <property name="y">4</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label10"> - <property name="width_request">147</property> - <property name="height_request">17</property> - <property name="visible">True</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> - <property name="wrap">False</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">0</property> - <property name="y">36</property> - </packing> - </child> - - <child> - <widget class="GtkToggleButton" id="togglebutton2"> - <property name="width_request">100</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Run</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> - <signal name="clicked" handler="on_ttsdaemon_bt_clicked" last_modification_time="Mon, 12 Mar 2007 14:05:51 GMT"/> - </widget> - <packing> - <property name="x">192</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <widget class="GtkToggleButton" id="togglebutton1"> - <property name="width_request">100</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Run</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> - <signal name="clicked" handler="on_tddaemon_bt_clicked" last_modification_time="Mon, 12 Mar 2007 14:05:18 GMT"/> - </widget> - <packing> - <property name="x">192</property> - <property name="y">0</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Daemons</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkFixed" id="fixed2"> - <property name="visible">True</property> - - <child> - <widget class="GtkSpinButton" id="spinbutton1"> - <property name="width_request">88</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">20 1 255 1 10 10</property> - </widget> - <packing> - <property name="x">0</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="checkbutton1"> - <property name="width_request">46</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Left</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_ledl_toggled" last_modification_time="Fri, 02 Mar 2007 14:12:19 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="checkbutton2"> - <property name="width_request">56</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Right</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_ledr_toggled" last_modification_time="Fri, 02 Mar 2007 14:12:32 GMT"/> - </widget> - <packing> - <property name="x">96</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button3"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Flash</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_flash_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:13:14 GMT"/> - </widget> - <packing> - <property name="x">96</property> - <property name="y">32</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>LED's</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame3"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkFixed" id="fixed3"> - <property name="visible">True</property> - - <child> - <widget class="GtkSpinButton" id="spinbutton2"> - <property name="width_request">56</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 255 1 10 10</property> - </widget> - <packing> - <property name="x">0</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkVSeparator" id="vseparator1"> - <property name="width_request">16</property> - <property name="height_request">88</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="x">136</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="spinbutton3"> - <property name="width_request">56</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 255 1 10 10</property> - </widget> - <packing> - <property name="x">152</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkVSeparator" id="vseparator2"> - <property name="width_request">16</property> - <property name="height_request">88</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="x">288</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="spinbutton4"> - <property name="width_request">56</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 255 1 10 10</property> - </widget> - <packing> - <property name="x">304</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkVSeparator" id="vseparator3"> - <property name="width_request">16</property> - <property name="height_request">88</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="x">440</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label13"> - <property name="width_request">136</property> - <property name="height_request">17</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Flippers</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="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">304</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label12"> - <property name="width_request">136</property> - <property name="height_request">17</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Beak</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="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">152</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label11"> - <property name="width_request">136</property> - <property name="height_request">16</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Eyes</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="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">0</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label14"> - <property name="width_request">136</property> - <property name="height_request">17</property> - <property name="visible">True</property> - <property name="label" translatable="yes">Rotation</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="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">456</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="spinbutton5"> - <property name="width_request">56</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - </widget> - <packing> - <property name="x">456</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton1"> - <property name="width_request">56</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Open</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_eyes_open_toggled" last_modification_time="Fri, 02 Mar 2007 14:14:21 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton2"> - <property name="width_request">57</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Close</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">radiobutton1</property> - <signal name="toggled" handler="on_eyes_close_toggled" last_modification_time="Fri, 02 Mar 2007 14:14:34 GMT"/> - </widget> - <packing> - <property name="x">64</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button4"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Blink</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_eyes_blink_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:14:53 GMT"/> - </widget> - <packing> - <property name="x">64</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton3"> - <property name="width_request">56</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Open</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_beak_open_toggled" last_modification_time="Fri, 02 Mar 2007 14:15:30 GMT"/> - </widget> - <packing> - <property name="x">152</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton4"> - <property name="width_request">57</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Close</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">radiobutton3</property> - <signal name="toggled" handler="on_rbeak_close_toggled" last_modification_time="Fri, 02 Mar 2007 14:15:44 GMT"/> - </widget> - <packing> - <property name="x">216</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button5"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Talk</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_beak_talk_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:16:51 GMT"/> - </widget> - <packing> - <property name="x">216</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton5"> - <property name="width_request">41</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Up</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_flippers_up_toggled" last_modification_time="Fri, 02 Mar 2007 14:17:23 GMT"/> - </widget> - <packing> - <property name="x">304</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton6"> - <property name="width_request">57</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Down</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">radiobutton5</property> - <signal name="toggled" handler="on_flippers_down_toggled" last_modification_time="Fri, 02 Mar 2007 14:17:38 GMT"/> - </widget> - <packing> - <property name="x">368</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button6"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Flap</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_flippers_flap_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:17:54 GMT"/> - </widget> - <packing> - <property name="x">368</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton8"> - <property name="width_request">61</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Right</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_rrotation_right_toggled" last_modification_time="Fri, 02 Mar 2007 14:21:55 GMT"/> - </widget> - <packing> - <property name="x">528</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button12"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Spin</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_rotation_spin_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:22:21 GMT"/> - </widget> - <packing> - <property name="x">520</property> - <property name="y">56</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton7"> - <property name="width_request">46</property> - <property name="height_request">24</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Left</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">radiobutton8</property> - <signal name="toggled" handler="on_rotation_left_toggled" last_modification_time="Fri, 02 Mar 2007 14:21:41 GMT"/> - </widget> - <packing> - <property name="x">456</property> - <property name="y">24</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Movements</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkFrame" id="frame4"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkFixed" id="fixed4"> - <property name="visible">True</property> - - <child> - <widget class="GtkButton" id="button8"> - <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">Send command</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_scommand_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:23:16 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <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">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_tdshell_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:22:57 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <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">Check version</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" last_modification_time="Fri, 02 Mar 2007 14:23:33 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">64</property> - </packing> - </child> - - <child> - <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">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_ping_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:24:04 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">96</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Tools</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame5"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment5"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkFixed" id="fixed5"> - <property name="visible">True</property> - - <child> - <widget class="GtkCheckButton" id="checkbutton3"> - <property name="width_request">74</property> - <property name="height_request">22</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Scrolling</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> - </widget> - <packing> - <property name="x">360</property> - <property name="y">0</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="width_request">432</property> - <property name="height_request">128</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTextView" id="textview1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="overwrite">False</property> - <property name="accepts_tab">True</property> - <property name="justification">GTK_JUSTIFY_LEFT</property> - <property name="wrap_mode">GTK_WRAP_NONE</property> - <property name="cursor_visible">True</property> - <property name="pixels_above_lines">0</property> - <property name="pixels_below_lines">0</property> - <property name="pixels_inside_wrap">0</property> - <property name="left_margin">0</property> - <property name="right_margin">0</property> - <property name="indent">0</property> - <property name="text" translatable="yes"></property> - </widget> - </child> - </widget> - <packing> - <property name="x">0</property> - <property name="y">24</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Status</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Main</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="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="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkFrame" id="frame6"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> - - <child> - <widget class="GtkAlignment" id="alignment6"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkFixed" id="fixed6"> - <property name="visible">True</property> - - <child> - <widget class="GtkLabel" id="label17"> - <property name="width_request">73</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="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">0</property> - <property name="y">4</property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="spinbutton6"> - <property name="width_request">56</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">100 100 250 1 10 10</property> - </widget> - <packing> - <property name="x">112</property> - <property name="y">32</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label18"> - <property name="width_request">101</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="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">0</property> - <property name="y">36</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button13"> - <property name="width_request">72</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Default</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_tts_default_bt_clicked" last_modification_time="Fri, 02 Mar 2007 14:24:33 GMT"/> - </widget> - <packing> - <property name="x">0</property> - <property name="y">64</property> - </packing> - </child> - - <child> - <widget class="GtkComboBoxEntry" id="comboboxentry1"> - <property name="width_request">187</property> - <property name="height_request">27</property> - <property name="visible">True</property> - <property name="items" translatable="yes">FR male + <widget class="GtkWindow" id="window1"> + <property name="width_request">621</property> + <property name="height_request">403</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Tux Droid Interface</property> + <property name="resizable">False</property> + <signal name="destroy" handler="on_window1_destroy"/> + <child> + <widget class="GtkNotebook" id="notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <child> + <widget class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="border_width">2</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + <property name="resize_mode">GTK_RESIZE_QUEUE</property> + <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">Tux Droid Daemon</property> + <property name="wrap">True</property> + </widget> + <packing> + <property name="y">4</property> + </packing> + </child> + <child> + <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">Text To Speech Daemon</property> + <property name="wrap">True</property> + </widget> + <packing> + <property name="y">36</property> + </packing> + </child> + <child> + <widget class="GtkToggleButton" id="togglebutton2"> + <property name="width_request">100</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Run</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_ttsdaemon_bt_clicked"/> + </widget> + <packing> + <property name="x">190</property> + <property name="y">32</property> + </packing> + </child> + <child> + <widget class="GtkToggleButton" id="togglebutton1"> + <property name="width_request">100</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name=... [truncated message content] |
From: remi <c2m...@c2...> - 2007-03-21 09:51:49
|
Author: remi Date: 2007-03-21 10:51:09 +0100 (Wed, 21 Mar 2007) New Revision: 180 Modified: daemon/trunk/Makefile Log: UPD : - The paths of the libs are been changed to absolute path Modified: daemon/trunk/Makefile =================================================================== --- daemon/trunk/Makefile 2007-03-20 10:18:59 UTC (rev 179) +++ daemon/trunk/Makefile 2007-03-21 09:51:09 UTC (rev 180) @@ -16,10 +16,10 @@ OBJ_DIR = Debug OUTPUT_DIR = . TARGET = tuxdaemon - C_INCLUDE_DIRS = -I"../../../../../../../usr/include/glib-2.0" -I"../../../../../../../usr/lib/glib-2.0/include" + C_INCLUDE_DIRS = -I"/usr/include/glib-2.0" -I"/usr/lib/glib-2.0/include" C_PREPROC = CFLAGS = -pipe -Wall -g2 -O0 -DUSB_DEBUG - LIB_DIRS = -L"../../../../../../../usr/include/glib-2.0" -L"../../../../../../../usr/lib/glib-2.0/include" + LIB_DIRS = -L"/usr/include/glib-2.0" -L"/usr/lib/glib-2.0/include" LIBS = -lglib-2.0 -lgthread-2.0 -lusb LDFLAGS = -pipe endif |
From: remi <c2m...@c2...> - 2007-03-20 10:19:14
|
Author: remi Date: 2007-03-20 11:18:59 +0100 (Tue, 20 Mar 2007) New Revision: 179 Modified: daemon/trunk/main.c Log: UPD : - Patch by Philippe Teuwen for the "Daemon eating CPU in daemon mode" has been applied Modified: daemon/trunk/main.c =================================================================== --- daemon/trunk/main.c 2007-03-19 17:08:56 UTC (rev 178) +++ daemon/trunk/main.c 2007-03-20 10:18:59 UTC (rev 179) @@ -84,6 +84,28 @@ } /************************************************************************ */ +/* Clean closing of STD IN-OUT FILENO*/ +/************************************************************************ */ +static int fd_nullify (int desired_fd) +{ + int fd; + int fd2; + int saved_errno; + + close (desired_fd); + fd = open ("/dev/null", O_WRONLY, S_IRUSR | S_IWUSR); + if (fd == desired_fd || fd < 0) + return fd; + else { + fd2 = fcntl (fd, F_DUPFD, desired_fd); + saved_errno = errno; + close (fd); + errno = saved_errno; + return fd2; + } +} + +/************************************************************************ */ /* Daemonizer */ /************************************************************************ */ void daemonize(unsigned char shell_view) @@ -114,13 +136,13 @@ exit(1); } DAEMON_PID = (unsigned short)getpid(); - printf("Daemon started : pid = %d\n", (int)getpid()); + printf("Tux USB Daemon started : pid = %d\n", (int)getpid()); /* No shell */ if (!shell_view) { - close(STDIN_FILENO); - close(STDOUT_FILENO); - close(STDERR_FILENO); + fd_nullify(STDIN_FILENO); + fd_nullify(STDOUT_FILENO); + fd_nullify(STDERR_FILENO); } } @@ -152,15 +174,6 @@ unsigned char shell_view = 0; unsigned char daemonized = 0; - /* Print daemon informations */ - print_info_daemon(); - -#ifdef USB_DEBUG - /* Set libusb debug level */ - usb_set_debug(LIBUSB_DEBUG_LEVEL); - usb_init(); -#endif - /* Program arguments */ if (argc > 1) { @@ -190,6 +203,14 @@ } if (daemonized) daemonize(shell_view); + /* Print daemon informations */ + print_info_daemon(); + +#ifdef USB_DEBUG + /* Set libusb debug level */ + usb_set_debug(LIBUSB_DEBUG_LEVEL); + usb_init(); +#endif /* On exiting */ signal(SIGINT, on_close_daemon); signal(SIGKILL, on_close_daemon); |
From: jaguarondi <c2m...@c2...> - 2007-03-19 17:09:42
|
Author: jaguarondi Date: 2007-03-19 18:08:56 +0100 (Mon, 19 Mar 2007) New Revision: 178 Modified: daemon/trunk/libs/USBDaemon_status_table.c Log: - UPD: language corrections Modified: daemon/trunk/libs/USBDaemon_status_table.c =================================================================== --- daemon/trunk/libs/USBDaemon_status_table.c 2007-03-19 15:58:19 UTC (rev 177) +++ daemon/trunk/libs/USBDaemon_status_table.c 2007-03-19 17:08:56 UTC (rev 178) @@ -580,12 +580,12 @@ tcp_frame[4] = DATA_STATUS_LEFT_WING_PUSH; if (sensors1.bits.PB0) { - printf("Left wing bouton Up\n"); + printf("Left wing button Up\n"); tcp_frame[5] = 0; } else { - printf("Left wing bouton Down\n"); + printf("Left wing button Down\n"); tcp_frame[5] = 1; } tcp_server_send_raw(tcp_frame, 16); @@ -596,12 +596,12 @@ tcp_frame[4] = DATA_STATUS_RIGHT_WING_PUSH; if (sensors1.bits.PB1) { - printf("Right wing bouton Up\n"); + printf("Right wing button Up\n"); tcp_frame[5] = 0; } else { - printf("Right wing bouton Down\n"); + printf("Right wing button Down\n"); tcp_frame[5] = 1; } tcp_server_send_raw(tcp_frame, 16); @@ -628,12 +628,12 @@ tcp_frame[4] = DATA_STATUS_HEAD_PUSH_SWITCH; if (sensors1.bits.PB3) { - printf("Head bouton Up\n"); + printf("Head button Up\n"); tcp_frame[5] = 0; } else { - printf("Head bouton Down\n"); + printf("Head button Down\n"); tcp_frame[5] = 1; } tcp_server_send_raw(tcp_frame, 16); |
From: jaguarondi <c2m...@c2...> - 2007-03-19 15:58:42
|
Author: jaguarondi Date: 2007-03-19 16:58:19 +0100 (Mon, 19 Mar 2007) New Revision: 177 Modified: daemon/trunk/libs/USBDaemon_tcp_server.c Log: - UPD: Patch proposed by Henrik Grindal Bakken to reuse the tcp socket, that fixes the binding error that we could get when restarting the daemon a lot. Modified: daemon/trunk/libs/USBDaemon_tcp_server.c =================================================================== --- daemon/trunk/libs/USBDaemon_tcp_server.c 2007-03-18 22:32:14 UTC (rev 176) +++ daemon/trunk/libs/USBDaemon_tcp_server.c 2007-03-19 15:58:19 UTC (rev 177) @@ -52,6 +52,7 @@ int i; int rt_read; int tmp_handle; + int val; pthread_mutex_init(&tcp_mutex, NULL); if ((tcp_server_handle = socket(AF_INET, SOCK_STREAM, 0)) < 0 ) @@ -59,6 +60,18 @@ printf("TCP socket : server error\n"); return; } + + val = 1; + if (setsockopt(tcp_server_handle, + SOL_SOCKET, + SO_REUSEADDR, + &val, + sizeof(val)) < 0) + { + /* Don't need to quit on this one. */ + printf("TCP socket : setsockopt error\n"); + } + bzero(&tcp_server_sockaddr, sizeof(tcp_server_sockaddr)); tcp_server_sockaddr.sin_family = AF_INET; tcp_server_sockaddr.sin_addr.s_addr = htonl(INADDR_ANY); |
From: jaguarondi <c2m...@c2...> - 2007-03-18 22:32:57
|
Author: jaguarondi Date: 2007-03-18 23:32:14 +0100 (Sun, 18 Mar 2007) New Revision: 176 Modified: api/python/trunk/tuxapi_class.py Log: - UPD: fixed a typo in api/python/trunk/tuxapi_class.py Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-16 12:36:53 UTC (rev 175) +++ api/python/trunk/tuxapi_class.py 2007-03-18 22:32:14 UTC (rev 176) @@ -724,7 +724,7 @@ #-------------------------------------------------------------------------- ## Wait until head button is released #-------------------------------------------------------------------------- - def wait_head_bt_relealed(self): + def wait_head_bt_released(self): return self.wait_status(DATAS_STATUS_HEAD_PUSH_SWITCH,0,9999) #-------------------------------------------------------------------------- |
From: srikanta <c2m...@c2...> - 2007-03-16 12:37:37
|
Author: srikanta Date: 2007-03-16 13:36:53 +0100 (Fri, 16 Mar 2007) New Revision: 175 Modified: daemon/trunk/libs/USBDaemon_command_tux.c Log: Fixed obvious typo: && instead of & Modified: daemon/trunk/libs/USBDaemon_command_tux.c =================================================================== --- daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-15 15:58:56 UTC (rev 174) +++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-16 12:36:53 UTC (rev 175) @@ -303,8 +303,8 @@ result[1] = id_client; break; case SUB_D_REQ_INFO_PID: - result[1] = (DAEMON_PID && 0xFF00)>>8; - result[2] = (DAEMON_PID && 0x00FF); + result[1] = (DAEMON_PID & 0xFF00)>>8; + result[2] = (DAEMON_PID & 0x00FF); break; } } |
From: remi <c2m...@c2...> - 2007-03-15 16:00:02
|
Author: remi Date: 2007-03-15 16:58:56 +0100 (Thu, 15 Mar 2007) New Revision: 174 Modified: api/python/trunk/tuxapi_class.py Log: UPD : - Alsa tux card device name is now constructed by the api for example, it is used for playing a sound with "aplay" Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-14 15:44:29 UTC (rev 173) +++ api/python/trunk/tuxapi_class.py 2007-03-15 15:58:56 UTC (rev 174) @@ -50,6 +50,7 @@ CT_SHELL =1 CT_FUNCTION =2 + #============================================================================== # TUXTCPCommunicator class #============================================================================== @@ -61,6 +62,7 @@ ## @param ipAddress : Tcp/IP Host address #-------------------------------------------------------------------------- def __init__(self,port,ipAddress): + self.print_api_version() self.Server_port=port self.Server_address=ipAddress self.connected=False @@ -79,7 +81,6 @@ self.tts=TUXtts(5500,"localhost",self) self.tts.connect_to_daemon() self.print_status=False - self.print_api_version() #-------------------------------------------------------------------------- ## Print versionning of API @@ -1436,6 +1437,10 @@ ## @param parent : TUXTCPCommunicator parent object def __init__(self,parent): self.parent=parent + self.TUX_devices=[] + self.TUX_devices_count=0 + self.alsa_device="default" + self.alsa_devices_select(0) ## Get versioning of a cpu ## @param cpu_num : cpu index @@ -1467,6 +1472,72 @@ ## Get version of dongle RF cpu def donglerf_get_version(self): return self.get_firmware_versioning(3) + + ## Get the alsa devices + def alsa_devices_enumerate(self): + self.TUX_devices=[] + self.TUX_devices_count=0 + try: + snd_dir=os.listdir("/dev/snd") + except OSError: + print "No alsa sound path found !" + return + last_card=255 + last_device=255 + for dinfo_name in snd_dir: + if ((dinfo_name.find('pcmC')==0)and(dinfo_name.find('D')>-1)): + card=int(dinfo_name[4:5]) + device=int(dinfo_name[6:7]) + if ((card!=last_card)or(device!=last_device)): + last_card=card + last_device=device + filename="/proc/asound/card%d/usbbus"%card + try: + fp=open(filename,'r') + except IOError: + break + tmp_tab=fp.read(7).split('/') + current_tux_device=["",0,0,0,0,0,0] + current_tux_device[1]=card + current_tux_device[2]=device + current_tux_device[3]=int(tmp_tab[0]) + current_tux_device[4]=int(tmp_tab[1]) + filename="/proc/asound/card%d/usbid"%card + try: + fp=open(filename,'r') + except IOError: + break + tmp_tab=fp.read(9).split(':') + current_tux_device[5]=int(tmp_tab[0],16) + current_tux_device[6]=int(tmp_tab[1],16) + if ((current_tux_device[5]==0x03eb)and(current_tux_device[6]==0xff07)): + self.TUX_devices.append(current_tux_device) + self.TUX_devices_count=self.TUX_devices_count+1 + + ## Return the number of tux alsa devices + def alsa_devices_count(self): + count=0 + for ctd in self.TUX_devices: + if ctd[2]==0: + count=count+1 + return count + + ## Get a tux alsa device + def alsa_devices_select(self,number): + self.alsa_devices_enumerate() + self.alsa_devices_count() + self.alsa_device="" + i=0 + if self.TUX_devices_count>0: + for ctd in self.TUX_devices: + if ctd[2]==0: + if i==number: + self.alsa_device="hw:%d,%d"%(ctd[1],ctd[2]) + return + i=i+1 + self.alsa_device="default" + else: + self.alsa_device="default" #============================================================================== # TUXTCPCommunicator - TTS - class |
From: jaguarondi <c2m...@c2...> - 2007-03-14 15:44:43
|
Author: jaguarondi Date: 2007-03-14 16:44:29 +0100 (Wed, 14 Mar 2007) New Revision: 173 Modified: daemon/trunk/version.txt Log: bumped to 0.2.0 Modified: daemon/trunk/version.txt =================================================================== --- daemon/trunk/version.txt 2007-03-14 15:39:01 UTC (rev 172) +++ daemon/trunk/version.txt 2007-03-14 15:44:29 UTC (rev 173) @@ -1 +1 @@ -0.2.0-alpha2 +0.2.0 (SVN/UNRELEASED) |
From: jaguarondi <c2m...@c2...> - 2007-03-14 15:39:13
|
Author: jaguarondi Date: 2007-03-14 16:39:01 +0100 (Wed, 14 Mar 2007) New Revision: 172 Added: daemon/tags/0.2.0-alpha2/ daemon/tags/0.2.0-alpha2/AUTHORS daemon/tags/0.2.0-alpha2/CHANGES daemon/tags/0.2.0-alpha2/README daemon/tags/0.2.0-alpha2/TODO daemon/tags/0.2.0-alpha2/version.txt Removed: daemon/tags/0.2.0-alpha2/AUTHORS daemon/tags/0.2.0-alpha2/CHANGES daemon/tags/0.2.0-alpha2/README daemon/tags/0.2.0-alpha2/TODO daemon/tags/0.2.0-alpha2/version.txt Log: - TAG: Release of Tux Daemon 0.2.0-alpha2 Copied: daemon/tags/0.2.0-alpha2 (from rev 170, daemon/trunk) Deleted: daemon/tags/0.2.0-alpha2/AUTHORS Copied: daemon/tags/0.2.0-alpha2/AUTHORS (from rev 171, daemon/trunk/AUTHORS) Deleted: daemon/tags/0.2.0-alpha2/CHANGES Copied: daemon/tags/0.2.0-alpha2/CHANGES (from rev 171, daemon/trunk/CHANGES) Deleted: daemon/tags/0.2.0-alpha2/README Copied: daemon/tags/0.2.0-alpha2/README (from rev 171, daemon/trunk/README) Deleted: daemon/tags/0.2.0-alpha2/TODO Copied: daemon/tags/0.2.0-alpha2/TODO (from rev 171, daemon/trunk/TODO) Deleted: daemon/tags/0.2.0-alpha2/version.txt Copied: daemon/tags/0.2.0-alpha2/version.txt (from rev 171, daemon/trunk/version.txt) |
From: jaguarondi <c2m...@c2...> - 2007-03-14 15:38:10
|
Author: jaguarondi Date: 2007-03-14 16:37:55 +0100 (Wed, 14 Mar 2007) New Revision: 171 Modified: daemon/trunk/AUTHORS daemon/trunk/CHANGES daemon/trunk/README daemon/trunk/TODO daemon/trunk/version.txt Log: preparing release Modified: daemon/trunk/AUTHORS =================================================================== --- daemon/trunk/AUTHORS 2007-03-14 15:28:52 UTC (rev 170) +++ daemon/trunk/AUTHORS 2007-03-14 15:37:55 UTC (rev 171) @@ -7,4 +7,6 @@ Contributors: Olivier Vandorpe <yasha-pgt-linux.org> + Srikanta Prasanna <sri...@gm...> + David Bourgeois <da...@ja...> Modified: daemon/trunk/CHANGES =================================================================== --- daemon/trunk/CHANGES 2007-03-14 15:28:52 UTC (rev 170) +++ daemon/trunk/CHANGES 2007-03-14 15:37:55 UTC (rev 171) @@ -6,9 +6,20 @@ ---------------------------------------------------------------------- Current: - * . +Version 0.2.0-alpha2: + + * USB communication now uses interrupt transfers. + * Raises an ERROR when connecting to the old firmware. + * Cleaned the code to follow the new guidelines at http://www.tuxisalive.com/documentation/how-to/guidelines-for-creating-and-packaging-an-application and improve readbility and debugging. + * Bug fixes. + +Version 0.2.0-alpha1: + + * Added licenses and mandatory files (README, TODO,...) + * Bug fixes. + Version 0.1.7: * Improved stability with mutexes. Modified: daemon/trunk/README =================================================================== --- daemon/trunk/README 2007-03-14 15:28:52 UTC (rev 170) +++ daemon/trunk/README 2007-03-14 15:37:55 UTC (rev 171) @@ -6,9 +6,9 @@ options: -d start in daemon mode -v view in shell ( for daemon mode ) - -st show the structure of the usb trames - -sr show all raw statutes - -si show only invalid raw statutes + -st show the structure of the usb frames + -sr show all raw status + -si show only invalid raw status -h show this usage list For all information about tuxdroid, please visit: Modified: daemon/trunk/TODO =================================================================== --- daemon/trunk/TODO 2007-03-14 15:28:52 UTC (rev 170) +++ daemon/trunk/TODO 2007-03-14 15:37:55 UTC (rev 171) @@ -1,6 +1,9 @@ $Id$ -- Add 'install' and 'uninstall' targets for make, or better use autotools if someone knows how that work. +- Add a decent logging functionality to the daemon. -- Add options to choose the debug level at start time +- Use the GNU Autotools framework to configure and compile the daemon. +- Support multiple dongles. + +- SNMP Support. Modified: daemon/trunk/version.txt =================================================================== --- daemon/trunk/version.txt 2007-03-14 15:28:52 UTC (rev 170) +++ daemon/trunk/version.txt 2007-03-14 15:37:55 UTC (rev 171) @@ -1 +1 @@ -0.2.0-alpha2 (SVN/UNRELEASED) +0.2.0-alpha2 |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:55:16
|
Author: jaguarondi Date: 2007-03-14 15:55:04 +0100 (Wed, 14 Mar 2007) New Revision: 169 Modified: software/gtdi/trunk/version.py Log: bumped to version 0.2.0 Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-03-14 14:54:07 UTC (rev 168) +++ software/gtdi/trunk/version.py 2007-03-14 14:55:04 UTC (rev 169) @@ -1 +1 @@ -app_version="0.1.0" +app_version="0.2.0 (SVN/UNRELEASED)" |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:54:19
|
Author: jaguarondi Date: 2007-03-14 15:54:07 +0100 (Wed, 14 Mar 2007) New Revision: 168 Added: software/gtdi/tags/0.1.0/ software/gtdi/tags/0.1.0/version.py Removed: software/gtdi/tags/0.1.0/version.py Log: - TAG: Release 0.1.0 of gtdi which has been completely reworked Copied: software/gtdi/tags/0.1.0 (from rev 159, software/gtdi/trunk) Deleted: software/gtdi/tags/0.1.0/version.py Copied: software/gtdi/tags/0.1.0/version.py (from rev 167, software/gtdi/trunk/version.py) |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:51:48
|
Author: jaguarondi Date: 2007-03-14 15:51:36 +0100 (Wed, 14 Mar 2007) New Revision: 167 Modified: software/gtdi/trunk/version.py Log: preparing for release Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-03-14 14:42:30 UTC (rev 166) +++ software/gtdi/trunk/version.py 2007-03-14 14:51:36 UTC (rev 167) @@ -1 +1 @@ -app_version="0.1.0 (SVN/UNRELEASED)" +app_version="0.1.0" |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:42:42
|
Author: jaguarondi Date: 2007-03-14 15:42:30 +0100 (Wed, 14 Mar 2007) New Revision: 166 Modified: api/python/trunk/tuxapi_class.py Log: Bumped to version 0.1.2 Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-14 14:38:48 UTC (rev 165) +++ api/python/trunk/tuxapi_class.py 2007-03-14 14:42:30 UTC (rev 166) @@ -33,7 +33,7 @@ # Constants #============================================================================== -api_version ="0.1.1" +api_version ="0.1.2 (SVN/UNRELEASED)" HEAD_BT =1 LEFT_WING_BT =2 |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:39:02
|
Author: jaguarondi Date: 2007-03-14 15:38:48 +0100 (Wed, 14 Mar 2007) New Revision: 165 Added: api/python/tags/0.1.1/ api/python/tags/0.1.1/CHANGES api/python/tags/0.1.1/TODO api/python/tags/0.1.1/tuxapi_class.py Removed: api/python/tags/0.1.1/CHANGES api/python/tags/0.1.1/TODO api/python/tags/0.1.1/tuxapi_class.py Log: - TAG: Python API release 0.1.1 * Added a limitation of the wav file to store the sounds in the local flash to 70 seconds. * New functions and events are added. * Minor modifications. Copied: api/python/tags/0.1.1 (from rev 159, api/python/trunk) Deleted: api/python/tags/0.1.1/CHANGES Copied: api/python/tags/0.1.1/CHANGES (from rev 164, api/python/trunk/CHANGES) Deleted: api/python/tags/0.1.1/TODO Copied: api/python/tags/0.1.1/TODO (from rev 164, api/python/trunk/TODO) Deleted: api/python/tags/0.1.1/tuxapi_class.py Copied: api/python/tags/0.1.1/tuxapi_class.py (from rev 164, api/python/trunk/tuxapi_class.py) |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:36:56
|
Author: jaguarondi Date: 2007-03-14 15:36:16 +0100 (Wed, 14 Mar 2007) New Revision: 164 Modified: api/python/trunk/CHANGES api/python/trunk/TODO api/python/trunk/tuxapi_class.py Log: preparing for release Modified: api/python/trunk/CHANGES =================================================================== --- api/python/trunk/CHANGES 2007-03-14 14:20:35 UTC (rev 163) +++ api/python/trunk/CHANGES 2007-03-14 14:36:16 UTC (rev 164) @@ -7,8 +7,12 @@ ---------------------------------------------------------------------- Current: - * . +Version 0.1.1: + * Added a limitation of the wav file to store the sounds in the local flash to 70 seconds. + * New functions and events are added. + * Minor modifications. + Version 0.1.0: * Initial public release. Modified: api/python/trunk/TODO =================================================================== --- api/python/trunk/TODO 2007-03-14 14:20:35 UTC (rev 163) +++ api/python/trunk/TODO 2007-03-14 14:36:16 UTC (rev 164) @@ -3,5 +3,4 @@ - Add documentation with Doxygen or something more adapted to python. - Create a regular python package/module out of this API. - them in the eeprom. Modified: api/python/trunk/tuxapi_class.py =================================================================== --- api/python/trunk/tuxapi_class.py 2007-03-14 14:20:35 UTC (rev 163) +++ api/python/trunk/tuxapi_class.py 2007-03-14 14:36:16 UTC (rev 164) @@ -33,7 +33,7 @@ # Constants #============================================================================== -api_version ="0.1.1 (SVN/UNRELEASED)" +api_version ="0.1.1" HEAD_BT =1 LEFT_WING_BT =2 |
From: jaguarondi <c2m...@c2...> - 2007-03-14 14:20:55
|
Author: jaguarondi Date: 2007-03-14 15:20:35 +0100 (Wed, 14 Mar 2007) New Revision: 163 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_status_table.c daemon/trunk/libs/USBDaemon_status_table.h daemon/trunk/libs/USBDaemon_usb_readWrite.c daemon/trunk/main.c Log: - CLN: Corrected some English mistakes Modified: daemon/trunk/libs/USBDaemon_command_tux.c =================================================================== --- daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-14 14:20:35 UTC (rev 163) @@ -35,32 +35,32 @@ /************************************************************************** */ void commands_dispatcher( unsigned char client_id, /* Client source */ - unsigned char src_trame[16]) /* Source trame */ + unsigned char src_frame[16]) /* Source frame */ { unsigned char ACK_DP; /* daemon processing ack */ - unsigned char data[12]; /* data part of source trame */ + unsigned char data[12]; /* data part of source frame */ unsigned char result[12]; /* result data to return */ - unsigned char tcp_trame[16];/* tcp trame to send */ - unsigned char ack_dp_trame[16]; + unsigned char tcp_frame[16];/* tcp frame to send */ + unsigned char ack_dp_frame[16]; unsigned char i; unsigned char no_ack; no_ack = 0; - /* Cut data part of source trame */ + /* Cut data part of source frame */ for(i = 0; i < 12; i++) { result[i] = 0; - data[i] = src_trame[i + 4]; + data[i] = src_frame[i + 4]; } /* Make source header */ - tcp_trame[0] = src_trame[0]; /* return source */ - tcp_trame[1] = src_trame[1]; /* return sub source */ + tcp_frame[0] = src_frame[0]; /* return source */ + tcp_frame[1] = src_frame[1]; /* return sub source */ - /*--------------------Data disencapsulation---------------------- // */ + /*--------------------Frame and data processing---------------------- */ ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */ /* B1----: Destination */ - switch(src_trame[0]) + switch(src_frame[0]) { /* To Master Daemon---------------------------------------------- */ case DEST_MASTER_DAEMON: @@ -70,14 +70,14 @@ /* To Sub Daemon------------------------------------------------- */ case DEST_SUB_DAEMON: /* B3----Data Type */ - switch(src_trame[2]) + switch(src_frame[2]) { /* Data type command */ case DATA_TP_CMD: /* B4----Command type */ - tcp_trame[2] = DATA_TP_ACK_CMD; - tcp_trame[3] = src_trame[3]; - switch(src_trame[3]) + tcp_frame[2] = DATA_TP_ACK_CMD; + tcp_frame[3] = src_frame[3]; + switch(src_frame[3]) { /* Command type raw */ case SUBDATA_TP_RAW: @@ -97,10 +97,10 @@ break; /* Data type request */ case DATA_TP_REQ: - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = src_trame[3]; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = src_frame[3]; /* B4----Request type */ - switch(src_trame[3]) + switch(src_frame[3]) { /* Request type status */ case SUBDATA_TP_STATUS: @@ -127,14 +127,14 @@ case DEST_TUX: /* TODO sub destinations */ /* B3----Data Type */ - switch(src_trame[2]) + switch(src_frame[2]) { /* Data type command */ case DATA_TP_CMD: - tcp_trame[2] = DATA_TP_ACK_CMD; - tcp_trame[3] = src_trame[3]; + tcp_frame[2] = DATA_TP_ACK_CMD; + tcp_frame[3] = src_frame[3]; /* B4----Command type */ - switch(src_trame[3]) + switch(src_frame[3]) { /* Command type raw */ case SUBDATA_TP_RAW: @@ -152,10 +152,10 @@ break; /* Data type request */ case DATA_TP_REQ: - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = src_trame[3]; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = src_frame[3]; /* B4----Request type */ - switch(src_trame[3]) + switch(src_frame[3]) { /* Request type status */ case SUBDATA_TP_STATUS: @@ -193,23 +193,23 @@ break; } - /* Paste result treatement into tcp trame */ + /* Paste result treatement into tcp frame */ for(i = 0; i < 12; i++) - tcp_trame[i + 4] = result[i]; + tcp_frame[i + 4] = result[i]; /* Send daemon processing ack to client */ - for(i = 0; i < 16; i++)ack_dp_trame[i] = 0; - ack_dp_trame[0] = src_trame[0]; - ack_dp_trame[1] = src_trame[1]; - ack_dp_trame[2] = DATA_TP_ACK_DP; - ack_dp_trame[3] = src_trame[3]; - ack_dp_trame[4] = ACK_DP; + for(i = 0; i < 16; i++)ack_dp_frame[i] = 0; + ack_dp_frame[0] = src_frame[0]; + ack_dp_frame[1] = src_frame[1]; + ack_dp_frame[2] = DATA_TP_ACK_DP; + ack_dp_frame[3] = src_frame[3]; + ack_dp_frame[4] = ACK_DP; if(!no_ack) { - tcp_server_send_raw_to_client(client_id, ack_dp_trame, 16); - /* Send tcp trame to client */ + tcp_server_send_raw_to_client(client_id, ack_dp_frame, 16); + /* Send tcp frame to client */ if(ACK_DP == ACK_DP_OK) { - tcp_server_send_raw_to_client(client_id, tcp_trame, 16); + tcp_server_send_raw_to_client(client_id, tcp_frame, 16); } } } @@ -652,12 +652,12 @@ unsigned char param3 ) { - unsigned char usb_trame[TUX_SEND_LENGTH]; + unsigned char usb_frame[TUX_SEND_LENGTH]; - usb_trame[0] = 0; - usb_trame[1] = cmd; - usb_trame[2] = param1; usb_trame[3] = param2; usb_trame[4] = param3; - return usb_write_TuxDroid(usb_trame); + usb_frame[0] = 0; + usb_frame[1] = cmd; + usb_frame[2] = param1; usb_frame[3] = param2; usb_frame[4] = param3; + return usb_write_TuxDroid(usb_frame); } /************************************************************************ */ @@ -670,10 +670,10 @@ unsigned char param3 ) { - unsigned char usb_trame[TUX_SEND_LENGTH]; + unsigned char usb_frame[TUX_SEND_LENGTH]; - usb_trame[0] = 1; - usb_trame[1] = cmd; - usb_trame[2] = param1; usb_trame[3] = param2; usb_trame[4] = param3; - return usb_write_TuxDroid(usb_trame); + usb_frame[0] = 1; + usb_frame[1] = cmd; + 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-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_command_tux.h 2007-03-14 14:20:35 UTC (rev 163) @@ -23,7 +23,7 @@ /*_____________________ D E F I N E S ______________________________________*/ /*_____________________ F U N C T I O N S __________________________________*/ /* COMMANDS FROM CLIENTS DISPATCHER */ -void commands_dispatcher(unsigned char client_id, unsigned char src_trame[16]); +void commands_dispatcher(unsigned char client_id, unsigned char src_frame[16]); void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[], int id_client); void sub_daemon_req_info(unsigned char data[], unsigned char result[], int id_client); void tux_cmd_raw(unsigned char data[], unsigned char result[]); Modified: daemon/trunk/libs/USBDaemon_globals.h =================================================================== --- daemon/trunk/libs/USBDaemon_globals.h 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_globals.h 2007-03-14 14:20:35 UTC (rev 163) @@ -35,7 +35,7 @@ #define LIBUSB_DEBUG_LEVEL 1 /*_____________________ G L O B A L S _ V A R I A B L E S _______________________*/ unsigned char CLOSE_DAEMON; -unsigned char SHOW_TRAMES; +unsigned char SHOW_FRAMES; unsigned char SHOW_RAW_STATUS; unsigned short DAEMON_PID; unsigned char SHOW_INVALID_RAW; Modified: daemon/trunk/libs/USBDaemon_status_table.c =================================================================== --- daemon/trunk/libs/USBDaemon_status_table.c 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_status_table.c 2007-03-14 14:20:35 UTC (rev 163) @@ -84,23 +84,23 @@ /************************************************************************ */ void update_system_status_table(unsigned char new_status[4]) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; DONGLE_status = new_status[0]; /*RF status change */ if(RF_status != new_status[1]) { RF_status = new_status[1]; - tcp_trame[4] = DATA_STATUS_RF_CONNECTED; - tcp_trame[5] = RF_status; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[4] = DATA_STATUS_RF_CONNECTED; + tcp_frame[5] = RF_status; + tcp_server_send_raw(tcp_frame, 16); } /* Command status change */ if(CMD_status != new_status[2]) @@ -109,7 +109,7 @@ if((CMD_status == 2)||(CMD_status == 3)) CMD_STATUS_FLAG = 0; } - NUMBER_trames = new_status[3]; + NUMBER_frames = new_status[3]; } /************************************************************************ */ @@ -172,7 +172,7 @@ unsigned char toggle; unsigned char check; unsigned char new_code; - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; code = new_status[1] & 0x3F; @@ -200,14 +200,14 @@ if(new_code) { printf("Remote code : %.2x\n", code); - for(i = 6;i < 16;i++)tcp_trame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; - tcp_trame[4] = DATA_STATUS_IR_CODE; - tcp_trame[5] = code; - tcp_server_send_raw(tcp_trame, 16); + for(i = 6;i < 16;i++)tcp_frame[i] = 0; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; + tcp_frame[4] = DATA_STATUS_IR_CODE; + tcp_frame[5] = code; + tcp_server_send_raw(tcp_frame, 16); } } @@ -216,19 +216,19 @@ /************************************************************************ */ void pong_event(unsigned char pong_number, unsigned char pong_received) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; - tcp_trame[4] = DATA_STATUS_PONG; - tcp_trame[5] = pong_number; - tcp_trame[6] = pong_received; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; + tcp_frame[4] = DATA_STATUS_PONG; + tcp_frame[5] = pong_number; + tcp_frame[6] = pong_received; + tcp_server_send_raw(tcp_frame, 16); } /************************************************************************ */ @@ -236,113 +236,113 @@ /************************************************************************ */ void portb_changed(unsigned char new_value) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; /* wings motor backward */ if((portb.Byte & 0x01) != (new_value & 0x01)) { - tcp_trame[4] = DATA_STATUS_WINGS_MOTOR_BACKWARD; + tcp_frame[4] = DATA_STATUS_WINGS_MOTOR_BACKWARD; if (portb.bits.PB0) { printf("wings motor backward 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("wings motor backward 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* spin motor backward */ if((portb.Byte & 0x02) != (new_value & 0x02)) { - tcp_trame[4] = DATA_STATUS_SPIN_MOTOR_BACKWARD; + tcp_frame[4] = DATA_STATUS_SPIN_MOTOR_BACKWARD; if (portb.bits.PB1) { printf("spin motor backward 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("spin motor backward 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* spin motor forward */ if((portb.Byte & 0x04) != (new_value & 0x04)) { - tcp_trame[4] = DATA_STATUS_SPIN_MOTOR_FORWARD; + tcp_frame[4] = DATA_STATUS_SPIN_MOTOR_FORWARD; if (portb.bits.PB2) { printf("spin motor forward 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("spin motor forward 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* mouth open position motor */ if((portb.Byte & 0x08) != (new_value & 0x08)) { - tcp_trame[4] = DATA_STATUS_MOUTH_OPEN_POSITION ; + tcp_frame[4] = DATA_STATUS_MOUTH_OPEN_POSITION ; if (portb.bits.PB3) { /* Up */ printf("mouth open position 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { /* Down */ printf("mouth open position 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* mouth close position motor */ if((portb.Byte & 0x10) != (new_value & 0x10)) { - tcp_trame[4] = DATA_STATUS_MOUTH_CLOSED_POSITION; + tcp_frame[4] = DATA_STATUS_MOUTH_CLOSED_POSITION; if (portb.bits.PB4) { printf("mouth close position 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("mouth close position 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* charger inhibit signal */ if((portb.Byte & 0x40) != (new_value & 0x40)) { - tcp_trame[4] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL ; + tcp_frame[4] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL ; if (portb.bits.PB6) { printf("charger inhibit signal 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("charger inhibit signal 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } portb.Byte = new_value; } @@ -352,62 +352,62 @@ /************************************************************************ */ void portc_changed(unsigned char new_value) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; /* wings position switch */ if((portc.Byte & 0x02) != (new_value & 0x02)) { - tcp_trame[4] = DATA_STATUS_WINGS_POSITION_SWITCH; + tcp_frame[4] = DATA_STATUS_WINGS_POSITION_SWITCH; if (portc.bits.PB1) { printf("wings position switch 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("wings position switch 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* right blue led */ if((portc.Byte & 0x04) != (new_value & 0x04)) { - tcp_trame[4] = DATA_STATUS_RIGHT_BLUE_LED; + tcp_frame[4] = DATA_STATUS_RIGHT_BLUE_LED; if (portc.bits.PB2) { printf("right blue led off\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("right blue led on\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* left blue led */ if((portc.Byte & 0x08) != (new_value & 0x08)) { - tcp_trame[4] = DATA_STATUS_LEFT_BLUE_LED; + tcp_frame[4] = DATA_STATUS_LEFT_BLUE_LED; if (portc.bits.PB3) { printf("left blue led off\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("left blue led on\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } portc.Byte = new_value; } @@ -417,126 +417,126 @@ /************************************************************************ */ void portd_changed(unsigned char new_value) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; /* head motor for eyes */ if((portd.Byte & 0x01) != (new_value & 0x01)) { - tcp_trame[4] = DATA_STATUS_HEAD_MOTOR_FOR_EYES; + tcp_frame[4] = DATA_STATUS_HEAD_MOTOR_FOR_EYES; if (portd.bits.PB0) { printf("head motor for eyes 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("head motor for eyes 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* head motor for mouth */ if((portd.Byte & 0x02) != (new_value & 0x02)) { - tcp_trame[4] = DATA_STATUS_HEAD_MOTOR_FOR_MOUTH; + tcp_frame[4] = DATA_STATUS_HEAD_MOTOR_FOR_MOUTH; if (portd.bits.PB1) { printf("head motor for mouth 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("head motor for mouth 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16);; + tcp_server_send_raw(tcp_frame, 16);; } /* spin position switch */ if((portd.Byte & 0x08) != (new_value & 0x08)) { - tcp_trame[4] = DATA_STATUS_SPIN_POSITION_SWITCH; + tcp_frame[4] = DATA_STATUS_SPIN_POSITION_SWITCH; if (portd.bits.PB3) { printf("spin position switch 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("spin position switch 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* wings motor forward */ if((portd.Byte & 0x10) != (new_value & 0x10)) { - tcp_trame[4] = DATA_STATUS_WINGS_MOTOR_FORWARD; + tcp_frame[4] = DATA_STATUS_WINGS_MOTOR_FORWARD; if (portd.bits.PB4) { printf("wings motor forward 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("wings motor forward 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* IR led */ if((portd.Byte & 0x20) != (new_value & 0x20)) { - tcp_trame[4] = DATA_STATUS_IR_LED; + tcp_frame[4] = DATA_STATUS_IR_LED; if (portd.bits.PB5) { printf("IR led 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("IR led 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* eyes open position switch */ if((portd.Byte & 0x40) != (new_value & 0x40)) { - tcp_trame[4] = DATA_STATUS_EYES_OPEN_POSITION_SWITCH; + tcp_frame[4] = DATA_STATUS_EYES_OPEN_POSITION_SWITCH; if (portd.bits.PB6) { printf("eyes open position switch 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("eyes open position switch 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* eyes closed position switch */ if((portd.Byte & 0x80) != (new_value & 0x80)) { - tcp_trame[4] = DATA_STATUS_EYES_CLOSED_POSITION_SWITCH; + tcp_frame[4] = DATA_STATUS_EYES_CLOSED_POSITION_SWITCH; if (portd.bits.PB7) { printf("eyes closed position switch 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("eyes closed position switch 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } portd.Byte = new_value; } @@ -546,110 +546,110 @@ /************************************************************************ */ void sensors1_changed(unsigned char new_value) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; /* Left wing push */ if((sensors1.Byte & 0x01) != (new_value & 0x01)) { - tcp_trame[4] = DATA_STATUS_LEFT_WING_PUSH; + tcp_frame[4] = DATA_STATUS_LEFT_WING_PUSH; if (sensors1.bits.PB0) { printf("Left wing bouton Up\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("Left wing bouton Down\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* Right wing push */ if((sensors1.Byte & 0x02) != (new_value & 0x02)) { - tcp_trame[4] = DATA_STATUS_RIGHT_WING_PUSH; + tcp_frame[4] = DATA_STATUS_RIGHT_WING_PUSH; if (sensors1.bits.PB1) { printf("Right wing bouton Up\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("Right wing bouton Down\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* power plug insertion switch */ if((sensors1.Byte & 0x04) != (new_value & 0x04)) { - tcp_trame[4] = DATA_STATUS_POWER_PLUG_SWITCH; + tcp_frame[4] = DATA_STATUS_POWER_PLUG_SWITCH; if (sensors1.bits.PB2) { printf("power plug insertion switch on\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("power plug insertion switch off\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* Head push */ if((sensors1.Byte & 0x08) != (new_value & 0x08)) { - tcp_trame[4] = DATA_STATUS_HEAD_PUSH_SWITCH; + tcp_frame[4] = DATA_STATUS_HEAD_PUSH_SWITCH; if (sensors1.bits.PB3) { printf("Head bouton Up\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("Head bouton Down\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* Led charger */ if((sensors1.Byte & 0x10) != (new_value & 0x10)) { - tcp_trame[4] = DATA_STATUS_CHARGER_LED_STATUS; + tcp_frame[4] = DATA_STATUS_CHARGER_LED_STATUS; if (sensors1.bits.PB4) { printf("Charger led 1\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } else { printf("Charger led 0\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } /* mute status */ if((sensors1.Byte & 0x80) != (new_value & 0x80)) { - tcp_trame[4] = DATA_STATUS_MUTE_STATUS; + tcp_frame[4] = DATA_STATUS_MUTE_STATUS; if (sensors1.bits.PB7) { printf("mute status off\n"); - tcp_trame[5] = 0; + tcp_frame[5] = 0; } else { printf("mute status on\n"); - tcp_trame[5] = 1; + tcp_frame[5] = 1; } - tcp_server_send_raw(tcp_trame, 16); + tcp_server_send_raw(tcp_frame, 16); } sensors1.Byte = new_value; } @@ -662,22 +662,22 @@ unsigned char new_value_low, unsigned char new_light_mode) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; - tcp_trame[4] = DATA_STATUS_LIGHT_LEVEL; + tcp_frame[4] = DATA_STATUS_LIGHT_LEVEL; sensors2.level_light_high.Byte = new_value_high; sensors2.level_light_low.Byte = new_value_low; sensors2.light_mode.Byte = new_light_mode; - tcp_trame[5] = new_value_high; - tcp_trame[6] = new_value_low; + tcp_frame[5] = new_value_high; + tcp_frame[6] = new_value_low; } /************************************************************************ */ @@ -688,36 +688,36 @@ unsigned char mouth_position, unsigned char wings_position) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0;i < 16;i++)tcp_trame[i] = 0; + for(i = 0;i < 16;i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; if(position1.eyes_position.Byte != eyes_position) { position1.eyes_position.Byte = eyes_position; - tcp_trame[4] = DATA_STATUS_EYES_POSITION_COUNTER; - tcp_trame[5] = eyes_position; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[4] = DATA_STATUS_EYES_POSITION_COUNTER; + tcp_frame[5] = eyes_position; + tcp_server_send_raw(tcp_frame, 16); } if(position1.mouth_position.Byte != mouth_position) { position1.mouth_position.Byte = mouth_position; - tcp_trame[4] = DATA_STATUS_MOUTH_POSITION_COUNTER; - tcp_trame[5] = mouth_position; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[4] = DATA_STATUS_MOUTH_POSITION_COUNTER; + tcp_frame[5] = mouth_position; + tcp_server_send_raw(tcp_frame, 16); } if(position1.wings_position.Byte != wings_position) { position1.wings_position.Byte = wings_position; - tcp_trame[4] = DATA_STATUS_WINGS_POSITION_COUNTER; - tcp_trame[5] = wings_position; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[4] = DATA_STATUS_WINGS_POSITION_COUNTER; + tcp_frame[5] = wings_position; + tcp_server_send_raw(tcp_frame, 16); } } @@ -726,18 +726,18 @@ /************************************************************************ */ void position2_changed(unsigned char spin_position) { - unsigned char tcp_trame[16]; + unsigned char tcp_frame[16]; unsigned char i; - for(i = 0; i < 16; i++)tcp_trame[i] = 0; + for(i = 0; i < 16; i++)tcp_frame[i] = 0; - tcp_trame[0] = SOURCE_TUX; - tcp_trame[1] = SS_DEFAULT; - tcp_trame[2] = DATA_TP_RSP; - tcp_trame[3] = SUBDATA_TP_STATUS; + tcp_frame[0] = SOURCE_TUX; + tcp_frame[1] = SS_DEFAULT; + tcp_frame[2] = DATA_TP_RSP; + tcp_frame[3] = SUBDATA_TP_STATUS; - tcp_trame[4] = DATA_STATUS_SPIN_POSITION_COUNTER; + tcp_frame[4] = DATA_STATUS_SPIN_POSITION_COUNTER; position2.Byte = spin_position; - tcp_trame[5] = spin_position; - tcp_server_send_raw(tcp_trame, 16); + tcp_frame[5] = spin_position; + tcp_server_send_raw(tcp_frame, 16); } Modified: daemon/trunk/libs/USBDaemon_status_table.h =================================================================== --- daemon/trunk/libs/USBDaemon_status_table.h 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_status_table.h 2007-03-14 14:20:35 UTC (rev 163) @@ -22,7 +22,7 @@ /*_____________________ I N C L U D E S____________________________________ */ #include "../tuxdefs/commands.h" /*_____________________ D E F I N E S ______________________________________*/ -/* ------------------ Trame encapsulation --------------------------------- // */ +/* ------------------ Frame structure --------------------------------- // */ /* ------ Destination header ------// */ /* Destinations */ #define DEST_MASTER_DAEMON 0x00 @@ -147,7 +147,7 @@ #define DATA_STATUS_IR_CODE 0x22 #define DATA_STATUS_SOUND_COUNT 0x23 #define DATA_STATUS_PONG 0x24 -/* ------------------ Daemon to Application encapsulation ----------------- // */ +/* ------------------ Daemon to Application, frame construction ----------------- */ /*_____________________ T Y P E _ D E F ____________________________________*/ @@ -202,7 +202,7 @@ unsigned char DONGLE_status; unsigned char RF_status; unsigned char CMD_status; -unsigned char NUMBER_trames; +unsigned char NUMBER_frames; unsigned char CMD_STATUS_FLAG; unsigned char pong_received; Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c =================================================================== --- daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-03-14 14:20:35 UTC (rev 163) @@ -93,11 +93,11 @@ cmd_dispatch[0] = data[0];cmd_dispatch[1] = data[1]; cmd_dispatch[2] = data[2];cmd_dispatch[3] = data[3]; update_system_status_table(cmd_dispatch); - if(SHOW_TRAMES) - printf("RF_st: %.2x CMD_st: %.2x NB_trames : %d idx : %d\n", RF_status, CMD_status, NUMBER_trames, idx); - if((NUMBER_trames > 0) && (NUMBER_trames < 16)) + if(SHOW_FRAMES) + printf("RF_st: %.2x CMD_st: %.2x NB_frames : %d idx : %d\n", RF_status, CMD_status, NUMBER_frames, idx); + if((NUMBER_frames > 0) && (NUMBER_frames < 16)) { - for(i = 0;i < NUMBER_trames;i++) + for(i = 0;i < NUMBER_frames;i++) { cmd_dispatch[0] = data[((i + 1)*4) + 0]; cmd_dispatch[1] = data[((i + 1)*4) + 1]; Modified: daemon/trunk/main.c =================================================================== --- daemon/trunk/main.c 2007-03-14 13:15:09 UTC (rev 162) +++ daemon/trunk/main.c 2007-03-14 14:20:35 UTC (rev 163) @@ -128,9 +128,9 @@ printf("options:\n"); printf(" -d start in daemon mode\n"); printf(" -v view in shell ( for daemon mode )\n"); - printf(" -st show the structure of the usb trames\n"); - printf(" -sr show all raw statutes\n"); - printf(" -si show only invalid raw statutes\n"); + printf(" -st show the structure of the usb frames\n"); + printf(" -sr show all raw status\n"); + printf(" -si show only invalid raw status\n"); printf(" -h show this usage list\n"); } @@ -159,7 +159,7 @@ /* Program arguments */ daemonized = 0; shell_view = 0; - SHOW_TRAMES = 0; + SHOW_FRAMES = 0; SHOW_RAW_STATUS = 0; SHOW_INVALID_RAW = 0; if (argc > 1) @@ -171,7 +171,7 @@ else if (!strcmp("-d", argv[i])) daemonized = 1; else if (!strcmp("-st", argv[i])) - SHOW_TRAMES = 1; + SHOW_FRAMES = 1; else if (!strcmp("-sr", argv[i])) SHOW_RAW_STATUS = 1; else if (!strcmp("-si", argv[i])) |
From: remi <c2m...@c2...> - 2007-03-14 13:15:24
|
Author: remi Date: 2007-03-14 14:15:09 +0100 (Wed, 14 Mar 2007) New Revision: 162 Modified: software/gtdi/trunk/gtdi.py Log: UPD : - Connection to the tuxdaemon and the tuxttsdaemon has been modified Modified: software/gtdi/trunk/gtdi.py =================================================================== --- software/gtdi/trunk/gtdi.py 2007-03-14 13:05:53 UTC (rev 161) +++ software/gtdi/trunk/gtdi.py 2007-03-14 13:15:09 UTC (rev 162) @@ -260,8 +260,9 @@ tux.sys.wait(1) tux.connect_to_daemon() if tux.connected: - break + return print "TUX daemon not found !" + self.on_tux_disconnected() else: tux.sdaemon.kill() def on_tddaemon_bt_clicked(self, widget, *args): @@ -285,8 +286,9 @@ tux.sys.wait(1) tux.tts.connect_to_daemon() if tux.tts.connected: - break + return print "TTS daemon not found !" + self.on_tts_disconnected() else: tux.tts.kill_daemon() def on_ttsdaemon_bt_clicked(self, widget, *args): |
From: remi <c2m...@c2...> - 2007-03-14 13:06:12
|
Author: remi Date: 2007-03-14 14:05:53 +0100 (Wed, 14 Mar 2007) New Revision: 161 Modified: software/gtdi/trunk/gtdi.py Log: UPD : - Connection to the tuxdaemon and the tuxttsdaemon has been modified Modified: software/gtdi/trunk/gtdi.py =================================================================== --- software/gtdi/trunk/gtdi.py 2007-03-14 13:02:47 UTC (rev 160) +++ software/gtdi/trunk/gtdi.py 2007-03-14 13:05:53 UTC (rev 161) @@ -256,14 +256,18 @@ # test daemon not present and client not connected if not tux.connected: tux.sys.shell_free('gnome-terminal -e"tuxdaemon"') - tux.sys.wait(4) - tux.connect_to_daemon() + for i in range(10): + tux.sys.wait(1) + tux.connect_to_daemon() + if tux.connected: + break + print "TUX daemon not found !" else: tux.sdaemon.kill() def on_tddaemon_bt_clicked(self, widget, *args): global toggled_by_event if toggled_by_event: return - print "Bt clicked by user" + thread.start_new_thread(self.connect_disconnect_tux_daemon,()) #-------------------------------------------------------------------------- @@ -277,14 +281,17 @@ # test daemon not present and client not connected if not tux.tts.connected: tux.sys.shell_free('gnome-terminal -e"tuxttsdaemon"') - tux.sys.wait(4) - tux.tts.connect_to_daemon() + for i in range(10): + tux.sys.wait(1) + tux.tts.connect_to_daemon() + if tux.tts.connected: + break + print "TTS daemon not found !" else: tux.tts.kill_daemon() def on_ttsdaemon_bt_clicked(self, widget, *args): global toggled_by_event if toggled_by_event: return - print "Bt clicked by user" thread.start_new_thread(self.connect_disconnect_tts_daemon,()) #-------------------------------------------------------------------------- |
From: jaguarondi <c2m...@c2...> - 2007-03-14 13:03:06
|
Author: jaguarondi Date: 2007-03-14 14:02:47 +0100 (Wed, 14 Mar 2007) New Revision: 160 Modified: daemon/trunk/libs/USBDaemon_usb_enum.c Log: An error has been introduced in the previous comment replace Modified: daemon/trunk/libs/USBDaemon_usb_enum.c =================================================================== --- daemon/trunk/libs/USBDaemon_usb_enum.c 2007-03-14 12:41:06 UTC (rev 159) +++ daemon/trunk/libs/USBDaemon_usb_enum.c 2007-03-14 13:02:47 UTC (rev 160) @@ -116,7 +116,7 @@ printf("\nERROR: Your dongle firmware is too old.\n"\ "This version is not compatible with this daemon, please update\n"\ "the firmware to version 1.00 or better.\n"\ - "Check http:/*www.tuxisalive.com/documentation/how-to/updating-the-firmware\n"\ */ + "Check http://www.tuxisalive.com/documentation/how-to/updating-the-firmware\n"\ "for details.\n"); exit(1); } |
From: remi <c2m...@c2...> - 2007-03-14 12:42:16
|
Author: remi Date: 2007-03-14 13:41:06 +0100 (Wed, 14 Mar 2007) New Revision: 159 Modified: software/gtdi/trunk/version.py Log: UPD : - Version is corrected Modified: software/gtdi/trunk/version.py =================================================================== --- software/gtdi/trunk/version.py 2007-03-14 12:38:21 UTC (rev 158) +++ software/gtdi/trunk/version.py 2007-03-14 12:41:06 UTC (rev 159) @@ -1 +1 @@ -app_version="2.0.1 (SVN/UNRELEASED)" +app_version="0.1.0 (SVN/UNRELEASED)" |
From: remi <c2m...@c2...> - 2007-03-14 12:38:40
|
Author: remi Date: 2007-03-14 13:38:21 +0100 (Wed, 14 Mar 2007) New Revision: 158 Added: software/gtdi/trunk/SimpleGladeApp.py software/gtdi/trunk/gtdi.py software/gtdi/trunk/gtdi2.glade software/gtdi/trunk/version.py Log: UPD : - New version completely remade - New files Added: software/gtdi/trunk/SimpleGladeApp.py Added: software/gtdi/trunk/gtdi.py Property changes on: software/gtdi/trunk/gtdi.py ___________________________________________________________________ Name: svn:executable + * Added: software/gtdi/trunk/gtdi2.glade Added: software/gtdi/trunk/version.py |
From: remi <c2m...@c2...> - 2007-03-14 12:37:58
|
Author: remi Date: 2007-03-14 13:37:42 +0100 (Wed, 14 Mar 2007) New Revision: 157 Removed: software/gtdi/trunk/SimpleGladeApp.py software/gtdi/trunk/gtdi.py software/gtdi/trunk/remotegui.glade software/gtdi/trunk/version.py Log: UPD : - New version completely remade - Old files has been deleted Deleted: software/gtdi/trunk/SimpleGladeApp.py Deleted: software/gtdi/trunk/gtdi.py Deleted: software/gtdi/trunk/remotegui.glade Deleted: software/gtdi/trunk/version.py |
From: remi <c2m...@c2...> - 2007-03-14 12:27:04
|
Author: remi Date: 2007-03-14 13:26:52 +0100 (Wed, 14 Mar 2007) New Revision: 156 Modified: api/python/trunk/tuxapi_wav_merger.py Log: UPD : - The licence is added in the header. - Limiting of the size of the merged wave file to 70 seconds Modified: api/python/trunk/tuxapi_wav_merger.py =================================================================== --- api/python/trunk/tuxapi_wav_merger.py 2007-03-14 12:24:21 UTC (rev 155) +++ api/python/trunk/tuxapi_wav_merger.py 2007-03-14 12:26:52 UTC (rev 156) @@ -1,24 +1,51 @@ -## @package TuxFlashUploader -# Class for uploading TUX flash memory +# ----------------------------------------------------------------------------- +# Tux Droid - API Wav merger +# Copyright (C) 2007 C2ME Sa <rem...@c2...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# ----------------------------------------------------------------------------- +# $Id$ +# ----------------------------------------------------------------------------- import tuxapi_class +#============================================================================== ## Class for uploading TUX flash memory +#============================================================================== class WavMerger(object): + # ------------------------------------------------------------------------- ## Constructor of object ## @param tux : TUXTCPCommunicator object + # ------------------------------------------------------------------------- def __init__(self,tux): self.wav_paths =[] self.wav_sizes =[] + # ------------------------------------------------------------------------- ## Add a wav path to wavs list ## @param path : Path of wav file + # ------------------------------------------------------------------------- def add_wav_path(self,path): self.wav_paths.append(path) self.add_wav_length(path) + # ------------------------------------------------------------------------- ## SYSTEM function + # ------------------------------------------------------------------------- def add_wav_length(self,path): f = open(path,'rb') wh = f.read(44) @@ -27,33 +54,41 @@ f.close() self.wav_sizes.append(wav_length) + # ------------------------------------------------------------------------- ## SYSTEM function + # ------------------------------------------------------------------------- def done_wavs_size(self): size = 0 for w_size in self.wav_sizes: size = size+w_size return size + # ------------------------------------------------------------------------- ## Merge all the wav files contained in the wavs list ## @param path : Path of output wav file merged + # ------------------------------------------------------------------------- def wavs_merging(self,path): - merged = open(path,'wb') - whfile = open(self.wav_paths[0],'rb') - header = whfile.read(40) - whfile.close() - merged.write(header) - full_size = self.done_wavs_size() + int(self.done_wavs_size() * 0.07) - st = chr(full_size & 0x000000FF) + \ - chr((full_size & 0x0000FF00) >> 8) + \ - chr((full_size & 0x00FF0000)>>16) + \ - chr((full_size & 0xFF000000)>>24) - merged.write(st) - for i, pathw in enumerate(self.wav_paths): - wwfile = open(pathw,'rb') - wwfile.seek(44) - stream = wwfile.read(self.wav_sizes[i]) - merged.write(stream) - wwfile.close() - while(merged.tell() < (full_size + 44) ): - merged.write(" ") - merged.close() + merged = open(path,'wb') + whfile = open(self.wav_paths[0],'rb') + header = whfile.read(40) + whfile.close() + merged.write(header) + full_size = self.done_wavs_size() + int(self.done_wavs_size() * 0.07) + if full_size>560000: + print "Wavs selection exceded 70 seconds !" + return False + st = chr(full_size & 0x000000FF) + \ + chr((full_size & 0x0000FF00) >> 8) + \ + chr((full_size & 0x00FF0000)>>16) + \ + chr((full_size & 0xFF000000)>>24) + merged.write(st) + for i, pathw in enumerate(self.wav_paths): + wwfile = open(pathw,'rb') + wwfile.seek(44) + stream = wwfile.read(self.wav_sizes[i]) + merged.write(stream) + wwfile.close() + while(merged.tell() < (full_size + 44) ): + merged.write(" ") + merged.close() + return True |