tux-droid-svn Mailing List for Tux Droid CE (Page 219)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jaguarondi <c2m...@c2...> - 2007-10-01 09:12:34
|
Author: jaguarondi
Date: 2007-10-01 11:12:28 +0200 (Mon, 01 Oct 2007)
New Revision: 555
Removed:
firmware/fuxusb/trunk/usb_RFDongle.Opt
Log:
Removed the opt file which shouldn't be in versioning.
Deleted: firmware/fuxusb/trunk/usb_RFDongle.Opt
===================================================================
--- firmware/fuxusb/trunk/usb_RFDongle.Opt 2007-10-01 09:03:08 UTC (rev 554)
+++ firmware/fuxusb/trunk/usb_RFDongle.Opt 2007-10-01 09:12:28 UTC (rev 555)
@@ -1,80 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
- cExt (*.c)
- aExt (*.s*; *.src; *.a*)
- oExt (*.obj)
- lExt (*.lib)
- tExt (*.txt; *.h; *.inc)
- pExt (*.plm)
- CppX (*.cpp)
- DaveTm { 0,0,0,0,0,0,0,0 }
-
-Target (RF_Dongle), 0x0000 // Tools: 'MCS-51'
-GRPOPT 1,(system),1,0,0
-GRPOPT 2,(modules),1,0,0
-GRPOPT 3,(lib_board),0,0,0
-GRPOPT 4,(lib_mcu),1,0,0
-GRPOPT 5,(headers),1,0,0
-
-OPTFFF 1,1,1,318767105,0,53,76,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,0,0,0,0,0,0,0,0,13,5,0,0,131,1,0,0 }
-OPTFFF 1,2,1,1,0,1,1,0,<.\global.c><global.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,22,0,0,0,24,0,0,0,35,5,0,0,155,1,0,0 }
-OPTFFF 1,3,1,218103808,0,161,161,0,<.\modules\usb\usb_task.c><usb_task.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,180,0,0,0,77,0,0,0,192,4,0,0,215,1,0,0 }
-OPTFFF 1,4,1,0,0,0,0,0,<.\modules\spi\spi_task.c><spi_task.c>
-OPTFFF 1,5,1,352321536,0,0,0,0,<.\bootloading.c><bootloading.c>
-OPTFFF 1,6,1,0,0,0,0,0,<.\i2c.c><i2c.c>
-OPTFFF 2,7,1,0,0,0,0,0,<.\modules\timer_soft\timer_soft.c><timer_soft.c>
-OPTFFF 2,8,1,0,0,615,615,0,<.\modules\usb_enum\usb_enum.c><usb_enum.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,66,0,0,0,72,0,0,0,83,5,0,0,207,1,0,0 }
-OPTFFF 2,9,1,117440512,0,0,0,0,<.\modules\fifo\fifo_spk.c><fifo_spk.c>
-OPTFFF 2,10,1,150994944,0,0,0,0,<.\modules\fifo\fifo_mic.c><fifo_mic.c>
-OPTFFF 2,11,1,218103808,0,0,0,0,<.\modules\fifo\fifo.c><fifo.c>
-OPTFFF 2,12,1,0,0,0,0,0,<.\modules\fifo_stt\fifo_stt.c><fifo_stt.c>
-OPTFFF 4,13,1,0,0,0,0,0,<.\lib_mcu\usb\usb_drv.c><usb_drv.c>
-OPTFFF 4,14,1,721420288,0,0,0,0,<.\lib_mcu\uart\uart_lib.c><uart_lib.c>
-OPTFFF 4,15,1,0,0,0,0,0,<.\lib_mcu\spi\spi_lib.c><spi_lib.c>
-OPTFFF 4,16,1,0,0,0,0,0,<.\lib_mcu\fa-usb\flash_api.c><flash_api.c>
-OPTFFF 5,17,5,0,0,20,33,0,<.\config.h><config.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,176,0,0,0,192,0,0,0,103,5,0,0,168,2,0,0 }
-OPTFFF 5,18,5,0,0,0,0,0,<.\lib_board\c5131_evab.h><c5131_evab.h>
-OPTFFF 5,19,5,0,0,1,1,0,<.\lib_mcu\reg_5131.h><reg_5131.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,0,0,0,0,0,0,0,0,69,5,0,0,250,0,0,0 }
-OPTFFF 5,20,5,0,0,151,151,0,<.\lib_mcu\ext_5131.h><ext_5131.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,66,0,0,0,72,0,0,0,47,5,0,0,29,2,0,0 }
-OPTFFF 5,21,5,0,0,97,104,0,<.\lib_mcu\5131_drv.h><5131_drv.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,44,0,0,0,48,0,0,0,25,5,0,0,5,2,0,0 }
-OPTFFF 5,22,5,0,0,18,39,0,<.\lib_mcu\usb\usb_drv.h><usb_drv.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,154,0,0,0,168,0,0,0,113,5,0,0,138,2,0,0 }
-OPTFFF 5,23,5,0,0,80,81,0,<.\global.h><global.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,50,0,0,0,105,0,0,0,233,4,0,0,81,2,0,0 }
-OPTFFF 5,24,5,0,0,16,16,0,<.\bootloading.h><bootloading.h> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,88,0,0,0,96,0,0,0,135,5,0,0,163,1,0,0 }
-OPTFFF 5,25,5,0,0,0,0,0,<.\i2c.h><i2c.h>
-OPTFFF 5,26,5,0,0,0,0,0,<.\lib_mcu\twi\twi.h><twi.h>
-
-ExtF <.\config.h> 20,33,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,176,0,0,0,192,0,0,0,103,5,0,0,168,2,0,0 }
-ExtF <.\lib_mcu\reg_5131.h> 1,1,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,0,0,0,0,0,0,0,0,69,5,0,0,250,0,0,0 }
-ExtF <.\lib_mcu\ext_5131.h> 151,151,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,66,0,0,0,72,0,0,0,47,5,0,0,29,2,0,0 }
-ExtF <.\lib_mcu\5131_drv.h> 97,104,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,44,0,0,0,48,0,0,0,25,5,0,0,5,2,0,0 }
-ExtF <.\lib_mcu\usb\usb_drv.h> 18,39,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,154,0,0,0,168,0,0,0,113,5,0,0,138,2,0,0 }
-ExtF <.\global.h> 80,81,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,50,0,0,0,105,0,0,0,233,4,0,0,81,2,0,0 }
-ExtF <.\bootloading.h> 16,16,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,88,0,0,0,96,0,0,0,135,5,0,0,163,1,0,0 }
-ExtF <.\VERSION.H> 1,25,0,{ 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,231,255,255,255,44,0,0,0,48,0,0,0,61,5,0,0,183,1,0,0 }
-
-TARGOPT 1, (RF_Dongle)
- CLK51=24000000
- OPTTT 1,1,1,0
- OPTHX 0,65535,0,0,0
- OPTLX 120,65,8,<.\lst\>
- OPTOX 16
- OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
- OPTXL 1,1,1,1,1,1,1,0,0
- OPTFL 1,0,1
- OPTBL 0,(Add on databooks)<DATASHTS\ADDBOOKS.PDF>
- OPTBL 1,(Data Sheet)<DATASHTS\ATMEL\AT89C5131_DS.PDF>
- OPTBL 2,(Instruction Set Manual)<DATASHTS\ATMEL\AT_C51ISM.PDF>
- OPTDL (S8051.DLL)()(DP51.DLL)(-p5131)(S8051.DLL)()(TP51.DLL)(-p5131)
- OPTDBG 48126,-1,()()()()()()()()()() (BIN\MON51.DLL)()()()
- OPTKEY 0,(DLGDP51)((98=-1,-1,-1,-1,0)(82=-1,-1,-1,-1,0)(83=-1,-1,-1,-1,0)(84=-1,-1,-1,-1,0)(85=-1,-1,-1,-1,0)(5056=-1,-1,-1,-1,0)(5055=-1,-1,-1,-1,0)(91=-1,-1,-1,-1,0)(92=-1,-1,-1,-1,0)(94=-1,-1,-1,-1,0)(95=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(5008=-1,-1,-1,-1,0)(5057=-1,-1,-1,-1,0)(5003=-1,-1,-1,-1,0)(2003=-1,-1,-1,-1,0)(5061=-1,-1,-1,-1,0)(5113=-1,-1,-1,-1,0))
- OPTKEY 0,(MON51)(-S3 -B9600 -O31)
- OPTKEY 0,(DLGTP51)((98=-1,-1,-1,-1,0)(82=-1,-1,-1,-1,0)(83=-1,-1,-1,-1,0)(84=-1,-1,-1,-1,0)(85=-1,-1,-1,-1,0)(5056=-1,-1,-1,-1,0)(5055=-1,-1,-1,-1,0)(91=-1,-1,-1,-1,0)(92=-1,-1,-1,-1,0)(94=-1,-1,-1,-1,0)(95=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(5008=-1,-1,-1,-1,0)(5057=-1,-1,-1,-1,0)(5003=-1,-1,-1,-1,0)(2003=-1,-1,-1,-1,0)(5061=-1,-1,-1,-1,0)(5113=-1,-1,-1,-1,0))
- OPTKEY 0,(Biceps)(E:\Professionnel\Projects\TxBt\USB - SPI Bridge\AT89C5131\RFDONGLE\c5131-usb-RFDgle-Work\BicDll.bopt)
- OPTMM 1,0,(C:000)
- OPTMM 2,0,(X:00)
- OPTDF 0x80
- OPTLE <>
- OPTLC <>
-EndOpt
-
|
|
From: remi <c2m...@c2...> - 2007-10-01 09:03:14
|
Author: remi Date: 2007-10-01 11:03:08 +0200 (Mon, 01 Oct 2007) New Revision: 554 Added: software/tux_framework/SDK/ software/tux_framework/SDK/doc/ software/tux_framework/SDK/doc/GdgObject.pdf software/tux_framework/SDK/doc/TGF Specifications.pdf software/tux_framework/SDK/doc/TGFParser.pdf software/tux_framework/SDK/doc/python_api-0.2.2.pdf software/tux_framework/SDK/gadget_maker/ software/tux_framework/SDK/gadget_maker/config.py software/tux_framework/SDK/gadget_maker/maker.png software/tux_framework/SDK/gadget_maker/tuxgagdetmaker.glade software/tux_framework/SDK/gadget_maker/tuxgagdetmaker.py software/tux_framework/TFW.py software/tux_framework/libs/ software/tux_framework/libs/C2MEDoc.py software/tux_framework/libs/FWObject.py software/tux_framework/libs/GdgObject.py software/tux_framework/libs/SimpleGladeApp.py software/tux_framework/libs/TGFCanvas.py software/tux_framework/libs/TGFParser.py software/tux_framework/libs/TGFXml.py software/tux_framework/libs/TGFormat.py software/tux_framework/libs/keyboard.py software/tux_framework/libs/menu.py software/tux_framework/libs/t9.py software/tux_framework/libs/tdrss.py software/tux_framework/libs/voice_cb.py software/tux_framework/version.py Log: ADD: tux_framework : initial commit Added: software/tux_framework/SDK/doc/GdgObject.pdf =================================================================== (Binary files differ) Property changes on: software/tux_framework/SDK/doc/GdgObject.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/tux_framework/SDK/doc/TGF Specifications.pdf =================================================================== (Binary files differ) Property changes on: software/tux_framework/SDK/doc/TGF Specifications.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/tux_framework/SDK/doc/TGFParser.pdf =================================================================== (Binary files differ) Property changes on: software/tux_framework/SDK/doc/TGFParser.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/tux_framework/SDK/doc/python_api-0.2.2.pdf =================================================================== (Binary files differ) Property changes on: software/tux_framework/SDK/doc/python_api-0.2.2.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/tux_framework/SDK/gadget_maker/config.py =================================================================== --- software/tux_framework/SDK/gadget_maker/config.py (rev 0) +++ software/tux_framework/SDK/gadget_maker/config.py 2007-10-01 09:03:08 UTC (rev 554) @@ -0,0 +1,3 @@ +# editor command +# %s will be replaced by the filename +editor = "gedit %s" Added: software/tux_framework/SDK/gadget_maker/maker.png =================================================================== (Binary files differ) Property changes on: software/tux_framework/SDK/gadget_maker/maker.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/tux_framework/SDK/gadget_maker/tuxgagdetmaker.glade =================================================================== --- software/tux_framework/SDK/gadget_maker/tuxgagdetmaker.glade (rev 0) +++ software/tux_framework/SDK/gadget_maker/tuxgagdetmaker.glade 2007-10-01 09:03:08 UTC (rev 554) @@ -0,0 +1,2348 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="height_request">540</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Tux Gadget Maker</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">True</property> + <property name="destroy_with_parent">False</property> + <property name="icon">maker.png</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="Sun, 23 Sep 2007 18:12:12 GMT"/> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkMenuBar" id="menubar1"> + <property name="visible">True</property> + <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property> + <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property> + + <child> + <widget class="GtkMenuItem" id="menuitem4"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Files</property> + <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="menuitem4_menu"> + + <child> + <widget class="GtkImageMenuItem" id="nouveau1"> + <property name="visible">True</property> + <property name="label" translatable="yes">New TGF file</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_nouveau1_activate" last_modification_time="Mon, 10 Sep 2007 05:47:06 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image44"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="ouvrir1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Open a TGF file</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_ouvrir1_activate" last_modification_time="Mon, 10 Sep 2007 05:37:09 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image45"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="ouvrir2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Open a TGF directory</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_ouvrir2_activate" last_modification_time="Mon, 10 Sep 2007 05:48:51 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image46"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="enregistrer1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Save as TGF file</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_enregistrer1_activate" last_modification_time="Sun, 23 Sep 2007 16:44:55 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image47"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="enregistrer2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Save as TGF directory</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_enregistrer2_activate" last_modification_time="Mon, 10 Sep 2007 05:51:51 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image48"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="execute1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Execute</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_execute1_activate" last_modification_time="Sun, 23 Sep 2007 18:09:15 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image49"> + <property name="visible">True</property> + <property name="stock">gtk-execute</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="séparateur1"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="quitter1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Quit</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_quitter1_activate" last_modification_time="Sun, 23 Sep 2007 16:44:55 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image50"> + <property name="visible">True</property> + <property name="stock">gtk-quit</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="about"> + <property name="visible">True</property> + <property name="label" translatable="yes">About</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_about_activate" last_modification_time="Mon, 10 Sep 2007 05:57:08 GMT"/> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <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="vbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame3"> + <property name="border_width">2</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="GtkFixed" id="fixed3"> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="about_name_entry"> + <property name="width_request">304</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">24</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label25"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Author :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">56</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="about_author_entry"> + <property name="width_request">304</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">72</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label26"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Version :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">104</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="about_version_entry"> + <property name="width_request">304</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">120</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label27"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Description :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">152</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label24"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Name :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="about_modify_button"> + <property name="width_request">80</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_about_modify_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:10 GMT"/> + </widget> + <packing> + <property name="x">104</property> + <property name="y">336</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="width_request">304</property> + <property name="height_request">160</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="about_description_textview"> + <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">168</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>About</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="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">About</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="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame1"> + <property name="border_width">2</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="width_request">500</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="general_name_entry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="general_value_entry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">64</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Name :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Value :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="general_modify_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_general_modify_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:09:31 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">96</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="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>General</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="border_width">2</property> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="width_request">500</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed2"> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="params_name_entry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="params_value_entry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">64</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label21"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Name :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label22"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Value :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="params_modify_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_params_modify_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:09:42 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">96</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="params_add_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Add</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_params_add_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:09:48 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">128</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="params_delete_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Delete</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_params_delete_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:09:55 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">160</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="label16"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Parameters</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="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">Settings</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="vbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame5"> + <property name="border_width">2</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow4"> + <property name="width_request">500</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed5"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="strings_lg_add_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Add</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_strings_lg_add_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:20 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="strings_lg_delete_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Delete</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_strings_lg_delete_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:25 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">80</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label31"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Lang list :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkComboBoxEntry" id="strings_lang_comboboxentry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="items" translatable="yes"><ar_ALL> Arabian +<da_ALL> Danish +<nl_BE> Dutch Belgian +<nl_NL> Dutch Netherland +<en_GB> English Great Britain +<en_US> English United States +<fr_ALL> French +<de_ALL> German +<it_ALL> Italian +<no_ALL> Norwegian +<pt_ALL> Portuguese +<es_ALL> Spanish +<sv_ALL> Swedish</property> + <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">16</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="label29"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Languages</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="frame6"> + <property name="border_width">2</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="width_request">500</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed6"> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="strings_st_name_entry"> + <property name="width_request">160</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">•</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">16</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label32"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Name :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label33"> + <property name="width_request">160</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Value :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="strings_st_add_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Add</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_strings_st_add_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:42 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">280</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="strings_st_delete_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Delete</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_strings_st_delete_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:38 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">248</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="strings_st_modify_button"> + <property name="width_request">160</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_strings_st_modify_button_clicked" last_modification_time="Sun, 23 Sep 2007 18:10:33 GMT"/> + </widget> + <packing> + <property name="x">8</property> + <property name="y">216</property> + </packing> + </child> + + <child> + <wi... [truncated message content] |
|
From: remi <c2m...@c2...> - 2007-10-01 09:02:23
|
Author: remi Date: 2007-10-01 11:02:22 +0200 (Mon, 01 Oct 2007) New Revision: 553 Added: software/tux_framework/ Log: ADD: tux_framework : initial commit |
|
From: remi <c2m...@c2...> - 2007-10-01 08:58:19
|
Author: remi
Date: 2007-10-01 10:57:40 +0200 (Mon, 01 Oct 2007)
New Revision: 552
Modified:
api/python/trunk/tuxapi_class.py
Log:
ADD: Monitoring class
UPD: tux.sys.delete_time_event
Modified: api/python/trunk/tuxapi_class.py
===================================================================
--- api/python/trunk/tuxapi_class.py 2007-09-28 14:52:17 UTC (rev 551)
+++ api/python/trunk/tuxapi_class.py 2007-10-01 08:57:40 UTC (rev 552)
@@ -106,6 +106,7 @@
self.hw=TUXhw(self)
self.tts=TUXtts(self)
self.misc=TUXmisc(self)
+ self.monitoring = TUXmonitoring(self)
self.connected=False #deprecated
t=threading.Thread(target=self.daemon._loop_auto_connect)
t.setName('daemon._loop_auto_connect')
@@ -454,6 +455,8 @@
#on status
if self.event.on_status!=None:
self.event.on_status(data)
+ #on monitoring
+ self.monitoring.check_events(data)
#--------------------------------------------------------------------------
@@ -742,6 +745,7 @@
tux.sys.add_time_event
tux.sys.clear_time_events
tux.sys.delayed_function
+ tux.sys.delete_time_event
tux.sys.looped_function
tux.sys.shell
tux.sys.shell_free
@@ -756,8 +760,9 @@
"""
Constructor of class
"""
- self.parent=parent
- self.events_list=[[0,'NONE',9999,99,99,99,99,99]]
+ self.parent = parent
+ self.events_list = [[0,'NONE',9999,99,99,99,99,99]]
+ self.__time_event_mutex = threading.Lock()
#--------------------------------------------------------------------------
# Get the current time in seconds
@@ -839,8 +844,10 @@
Example:
>>> tux.sys.add_time_event(CT_SHELL,'xmms',9999,99,99,8,5,0)
"""
+ self.__time_event_mutex.acquire()
self.events_list.append([cmd_type,cmd,year,month,day,hour, \
minute,second])
+ self.__time_event_mutex.release()
#--------------------------------------------------------------------------
# Clear the time events of the time event handler
@@ -852,8 +859,44 @@
Example:
>>> tux.sys.clear_time_events()
"""
+ self.__time_event_mutex.acquire()
self.events_list=[[0,'NONE',9999,99,99,99,99,99]]
+ self.__time_event_mutex.release()
+
+ #--------------------------------------------------------------------------
+ # Delete a time event from the time event handler
+ #--------------------------------------------------------------------------
+ def delete_time_event(self, cmd_type,cmd,year,month,day,hour,minute,second):
+ """
+ Delete a time event from the time event handler
+
+ Parameters:
+ "cmd_type" as number : Command type (CT_SHELL|CT_FUNCTION)
+ "cmd" as string : Command to execute
+ "year" as integer : (ex : 2006) (9999 : parameter ignored)
+ "month" as integer : (ex : 12) (99 : parameter ignored)
+ "day" as integer : (ex : 23) (99 : parameter ignored)
+ "hour" as integer : (ex : 08) (99 : parameter ignored)
+ "minute" as integer : (ex : 55) (99 : parameter ignored)
+ "second" as integer : (ex : 30) (99 : parameter ignored)
+ Example:
+ >>> tux.sys.delete_time_event(CT_SHELL,'xmms',9999,99,99,8,5,0)
+ """
+ self.__time_event_mutex.acquire()
+ event_to_remove = [cmd_type,cmd,year,month,day,hour,minute,second]
+ for i, event in enumerate(self.events_list):
+ matched = True
+ for j, p in enumerate(event):
+ if event_to_remove[j] != p:
+ matched = False
+ if matched:
+ self.events_list.pop(i)
+ self.__time_event_mutex.release()
+ return True
+ self.__time_event_mutex.release()
+ return False
+
#--------------------------------------------------------------------------
# Not a user function
#--------------------------------------------------------------------------
@@ -871,7 +914,10 @@
and event[7] in [now[5], 99]
while self.parent.daemon.connected:
- for event in self.events_list:
+ self.__time_event_mutex.acquire()
+ events_list = self.events_list
+ self.__time_event_mutex.release()
+ for event in events_list:
if event[0]!=0 and event_due(event):
if event[0]==CT_SHELL:
self.shell_free(event[1])
@@ -938,7 +984,49 @@
t.setName('sys.temporized_function')
t.start()
self.parent.main_thread_list.append(t)
+
+#==============================================================================
+# TUXTCPCommunicator - monitoring - class
+#==============================================================================
+class TUXmonitoring(object):
+ def __init__(self, parent):
+ self.parent = parent
+ self._event_mutex = threading.Lock()
+ self._event_list = []
+
+ def insert(self, status, function):
+ self._event_mutex.acquire()
+ self._event_list.append([status, function])
+ self._event_mutex.release()
+ return len(self._event_list) - 1
+
+ def remove(self, event_id):
+ self._event_mutex.acquire()
+ self._event_list.pop(event_id)
+ self._event_mutex.release()
+
+ def check_events(self, frame):
+ self._event_mutex.acquire()
+ events = self._event_list
+ self._event_mutex.release()
+
+ def __load_funct_async(idx, funct, args):
+ try:
+ funct(args)
+ except:
+ self.remove(idx)
+
+ for i, event in enumerate(events):
+ if event[0] == ord(frame[4]):
+ frame = frame[5:]
+ ord_frame = []
+ for val in frame:
+ ord_frame.append(ord(val))
+ args = tuple(ord_frame)
+ thread.start_new_thread(__load_funct_async, (i, event[1], args))
+
+
#==============================================================================
# TUXTCPCommunicator - event - class
#==============================================================================
|
|
From: Paul_R <c2m...@c2...> - 2007-09-28 14:52:19
|
Author: Paul_R
Date: 2007-09-28 16:52:17 +0200 (Fri, 28 Sep 2007)
New Revision: 551
Modified:
software/gadgets/light_monitor/trunk/Light_monitor.tgf
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py
software/gadgets/light_monitor/trunk/Light_monitor/about.xml
software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
Log:
* Added the light level treatments (Threshold and change).
The notifications aren't implemented yet.
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-09-28 13:32:51 UTC (rev 550)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-09-28 14:52:17 UTC (rev 551)
@@ -11,12 +11,14 @@
Constructor
"""
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
- self.measure = _me.get_param('measure')
+
+
def new(self):
"""
On new window
"""
+ self.measure = _me.get_param('measure')
self.updates_commons()
self.updates_specifics()
self.make_viewtree()
@@ -195,15 +197,15 @@
if self.get_widget('txt_conf_value').get_text() in ('', '0', '0.0', 'None'):
self.get_widget('txt_conf_value').set_text('1.0')
-
- value = ((length + 1),
+ value = []
+ value = [(length + 1),
self.get_widget('cbb_conf_event').get_active(),
self.get_widget('cbb_conf_type').get_active(),
float(self.get_widget('txt_conf_value').get_text()),
float(self.get_widget('txt_conf_time').get_text()),
self.get_widget('chk_conf_notified').get_active(),
self.get_widget('conf_behavior').get_filename(),
- False)
+ False]
self.measure.event_tab = _me.get_param('config')
self.measure.event_tab[int(index)-1] = value
_me.set_param('config', self.measure.event_tab)
@@ -230,14 +232,15 @@
if self.get_widget('txt_conf_value').get_text() in ('', '0', '0.0', 'None'):
self.get_widget('txt_conf_value').set_text('1.0')
-
- value = ((length + 1), self.get_widget('cbb_conf_event').get_active(),
+ value = []
+ value = [(length + 1),
+ self.get_widget('cbb_conf_event').get_active(),
self.get_widget('cbb_conf_type').get_active(),
float(self.get_widget('txt_conf_value').get_text()),
float(self.get_widget('txt_conf_time').get_text()),
self.get_widget('chk_conf_notified').get_active(),
self.get_widget('conf_behavior').get_filename(),
- False)
+ False]
self.measure.event_tab = _me.get_param('config')
self.measure.event_tab.append(value)
@@ -293,15 +296,15 @@
self.get_widget('cbb_conf_type').remove_text(0)
self.get_widget('cbb_conf_type').append_text('Drop')
self.get_widget('cbb_conf_type').append_text('Raise')
- self.get_widget('cbb_conf_type').append_text('Drop and raise')
- self.get_widget('cbb_conf_type').append_text('Raise and drop')
+ self.get_widget('cbb_conf_type').append_text('Drop and raise')
+ self.get_widget('cbb_conf_type').append_text('Raise and drop')
self.get_widget('cbb_conf_type').set_active(0)
else:
for i in range (4):
self.get_widget('cbb_conf_type').remove_text(0)
+ self.get_widget('cbb_conf_type').append_text('Increase')
+ self.get_widget('cbb_conf_type').append_text('Decrease')
self.get_widget('cbb_conf_type').append_text('Both direction')
- self.get_widget('cbb_conf_type').append_text('Decrease')
- self.get_widget('cbb_conf_type').append_text('Increase')
self.get_widget('cbb_conf_type').set_active(0)
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py 2007-09-28 13:32:51 UTC (rev 550)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py 2007-09-28 14:52:17 UTC (rev 551)
@@ -137,33 +137,72 @@
###########################################################
def event_control(self):
- #Decreasing threshold control
- if self.decrease:
- self.Decrease_control(self.val_threshold)
- #Increasing threshold control
- if self.increase:
- self.Increase_control(self.val_threshold)
- #Both direction theshold control
- if self.both:
- self.Both_control(self.val_threshold)
+ for i in range (len(self.event_tab)):
+ if self.event_tab[i][1] == 1:
+ if self.event_tab[i][7] == False:
+
+ if self.event_tab[i][2] == 0:
+ #Increasing threshold control
+ if self.Increase_control(self.event_tab[i][3]) == True:
+ self.event_tab[i][7] = True
+
+ elif self.event_tab[i][2] == 1:
+ #Decreasing threshold control
+ if self.Decrease_control(self.event_tab[i][3]) == True:
+ self.event_tab[i][7] = True
+
+ elif self.event_tab[i][2] == 2:
+ #Both direction theshold control
+ if self.Both_control(self.event_tab[i][3]) == True:
+ self.event_tab[i][7] = True
- #Changements control
- if self.change_event == False:
- # Drop change part :
- if self.drop == True and self.val_drop_time > 0.0:
- self.Drop_control(self.val_drop_time, self.val_drop)
- # Raise change part
- if self.raising == True and self.val_raise_time > 0.0:
- self.Raise_control(self.val_raise_time, self.val_raise)
- # Drop and Raise change
- if self.changeD == True and self.val_changeD_time > 0.0:
- self.ChangeD_control(self.val_changeD_time, self.val_changeD)
- # Raise and Drop change
- if self.changeU == True and self.val_changeU_time > 0.0:
- self.ChangeU_control(self.val_changeU_time, self.val_changeU)
-
+ #Changements control
+ else:
+ if self.event_tab[i][7] != True:
+ # Drop change part :
+ if self.event_tab[i][2] == 0:
+ if self.Drop_control(self.event_tab[i][3], self.event_tab[i][4]) == True:
+ self.event_tab[i][7] = True
+ # Raise change part
+ if self.event_tab[i][2] == 1:
+ if self.Raise_control(self.event_tab[i][3], self.event_tab[i][4]) == True:
+ self.event_tab[i][7] = True
+ # Drop and Raise change
+ if self.event_tab[i][2] == 2:
+ if self.ChangeD_control(self.event_tab[i][3], self.event_tab[i][4]) == True:
+ self.event_tab[i][7] = True
+ # Raise and Drop change
+ if self.event_tab[i][2] == 3:
+ if self.ChangeU_control(self.event_tab[i][3], self.event_tab[i][4]) == True:
+ self.event_tab[i][7] = True
+
#Gadget or test notifications
if self.GUI_on:
+ #Decrease threshold control
+ if self.decrease:
+ self.threshold_event = self.Decrease_control(self.val_threshold)
+ #Increasing threshold control
+ if self.increase:
+ self.threshold_event = self.Increase_control(self.val_threshold)
+ #Both direction theshold control
+ if self.both:
+ self.threshold_event = self.Both_control(self.val_threshold)
+
+ #Changements control
+ if self.change_event == False:
+ # Drop change part :
+ if self.drop == True and self.val_drop_time > 0.0:
+ self.Drop_control(self.val_drop_time, self.val_drop)
+ # Raise change part
+ if self.raising == True and self.val_raise_time > 0.0:
+ self.Raise_control(self.val_raise_time, self.val_raise)
+ # Drop and Raise change
+ if self.changeD == True and self.val_changeD_time > 0.0:
+ self.ChangeD_control(self.val_changeD_time, self.val_changeD)
+ # Raise and Drop change
+ if self.changeU == True and self.val_changeU_time > 0.0:
+ self.ChangeU_control(self.val_changeU_time, self.val_changeU)
+
#disable gadget notifications
self.notify = False
#goto test notification
@@ -208,21 +247,22 @@
val_act = (self.val_table[len(self.val_table)-1]*100) / 1124.0
val_prev = (self.val_table[len(self.val_table)-2]*100) / 1124.0
if val_prev <= value and val_act > value:
- self.threshold_event = True
+ return True
+
def Decrease_control(self, val):
val_act = (self.val_table[len(self.val_table)-1]*100) / 1124.0
val_prev = (self.val_table[len(self.val_table)-2]*100) / 1124.0
if val_prev >= val and val_act < val:
- self.threshold_event = True
-
+ return True
+
def Both_control(self, val):
val_act = (self.val_table[int(len(self.val_table)-1)]*100) / 1124.0
val_prev = (self.val_table[int(len(self.val_table)-2)]*100) / 1124.0
if val_prev <= val and val_act > val or val_prev >= val and val_act < val:
- self.threshold_event = True
+ return True
+
-
###########################################################
#
# Changes control
@@ -234,8 +274,9 @@
init_val = len(self.val_table) - 1 - int(time) + self.timeout
maximum = max(self.val_table[init_val:len(self.val_table)-1])
if maximum >= self.val_table[len(self.val_table)-1] + ((val/100)*1124):
- self.change_event = True
self.timeout = int(time)
+ return True
+
def Raise_control(self, time, val):
if self.timeout != 0:
@@ -243,8 +284,8 @@
init_val = len(self.val_table) - 1 - int(time) + self.timeout
minimum = min(self.val_table[init_val:(len(self.val_table)-1)])
if minimum <= self.val_table[len(self.val_table)-1] - ((val/100)*1124):
- self.change_event = True
self.timeout = int(time)
+ return True
def ChangeD_control(self, time, val):
if self.timeout != 0:
@@ -254,9 +295,10 @@
if self.val_table[int(len(self.val_table)-1-i)] <= self.val_table[len(self.val_table) - 1] - ((val/100)*1124):
maximum = max(self.val_table[init_val:len(self.val_table) - i])
if maximum >= self.val_table[len(self.val_table) - 1 - i] + val:
- self.change_event = True
self.timeout = int(time)
+ return True
break
+
def ChangeU_control(self, time, val):
if self.timeout != 0:
@@ -266,8 +308,8 @@
if self.val_table[int(len(self.val_table)-1-i)] >= self.val_table[len(self.val_table) - 1] + ((val/100)*1124):
minimum = min(self.val_table[init_val:len(self.val_table)-i])
if minimum <= self.val_table[len(self.val_table) - 1 - i] - val:
- self.change_event = True
self.timeout = int(time)
+ return True
break
###########################################################
Modified: software/gadgets/light_monitor/trunk/Light_monitor/about.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-09-28 13:32:51 UTC (rev 550)
+++ software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-09-28 14:52:17 UTC (rev 551)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
+ <gadget_author type='str'>Paul Rathgeb</gadget_author>
+ <gadget_version type='str'>0.0.1</gadget_version>
<gadget_description type='str'>Light monitor for tux droid</gadget_description>
- <gadget_author type='str'>Paul Rathgeb</gadget_author>
<gadget_name type='str'>light_monitor</gadget_name>
- <gadget_version type='str'>0.0.1</gadget_version>
</about>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-09-28 13:32:51 UTC (rev 550)
+++ software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-09-28 14:52:17 UTC (rev 551)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<settings>
<parameters>
- <drop type='str'>10</drop>
+ <drop_rad type='bool'>False</drop_rad>
<increase_rad type='bool'>True</increase_rad>
<changeU_time type='str'>0</changeU_time>
<changeD_rad type='bool'>True</changeD_rad>
@@ -17,7 +17,7 @@
<drop_time type='str'>10</drop_time>
<changeU type='str'>0</changeU>
<raise_time type='str'>10</raise_time>
- <drop_rad type='bool'>False</drop_rad>
+ <drop type='str'>10</drop>
<Sample type='str'>500</Sample>
<threshold_chk type='bool'>True</threshold_chk>
<Rate type='str'>0.1</Rate>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-09-28 13:32:51 UTC (rev 550)
+++ software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-09-28 14:52:17 UTC (rev 551)
@@ -4,7 +4,6 @@
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<widget_lblControl type='str'>Control</widget_lblControl>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
- <speaker_name type='str'>Ryan8k</speaker_name>
<help_text type='str'>Bla bla bla bla</help_text>
<widget_lblBtnApply type='str'>Apply changes</widget_lblBtnApply>
<widget_lblChangeU type='str'>Raise and drop</widget_lblChangeU>
@@ -12,20 +11,21 @@
<gui_conf_update_title type='str'>Update</gui_conf_update_title>
<widget_lblEvent type='str'>Event</widget_lblEvent>
<gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
- <widget_lblBoth type='str'>Both direction</widget_lblBoth>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
+ <widget_lblValue type='str'>Value (%)</widget_lblValue>
<widget_lblChange type='str'>Change</widget_lblChange>
<widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
<widget_lblDrop type='str'>Drop</widget_lblDrop>
<widget_lblIncrease type='str'>Increasing</widget_lblIncrease>
<widget_lblRaise type='str'>Raise</widget_lblRaise>
+ <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
<widget_lblDecrease type='str'>Decreasing</widget_lblDecrease>
<gui_conf_sample_lb type='str'>Sample :</gui_conf_sample_lb>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
- <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
- <widget_lblValue type='str'>Value (%)</widget_lblValue>
+ <widget_lblBoth type='str'>Both direction</widget_lblBoth>
+ <speaker_name type='str'>Ryan8k</speaker_name>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<name_to_read type='str'>Light monitor</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf
===================================================================
(Binary files differ)
|
|
From: Paul_R <c2m...@c2...> - 2007-09-28 13:33:01
|
Author: Paul_R
Date: 2007-09-28 15:32:51 +0200 (Fri, 28 Sep 2007)
New Revision: 550
Modified:
software/gadgets/light_monitor/trunk/Light_monitor.tgf
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp
software/gadgets/light_monitor/trunk/Light_monitor/about.xml
software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
Log:
* Added the sample and rate config in the settings window.
These settings are linked with the sample and rate in the widget window
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade 2007-09-28 13:32:51 UTC (rev 550)
@@ -182,7 +182,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -469,8 +469,38 @@
<property name="y">32</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="GtkFixed" id="fixed8">
+ <property name="height_request">68</property>
+ <property name="visible">True</property>
+
<child>
+ <widget class="GtkButton" id="btn_conf_remove">
+ <property name="width_request">62</property>
+ <property name="height_request">29</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Remove</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_btn_conf_remove_clicked"/>
+ </widget>
+ <packing>
+ <property name="x">96</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btn_conf_add">
<property name="width_request">62</property>
<property name="height_request">29</property>
@@ -483,10 +513,28 @@
<signal name="clicked" handler="on_btn_conf_add_clicked"/>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">32</property>
+ <property name="x">16</property>
+ <property name="y">8</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkButton" id="btn_conf_modify">
+ <property name="width_request">62</property>
+ <property name="height_request">29</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Modify</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_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">176</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -496,45 +544,101 @@
</child>
<child>
- <widget class="GtkFixed" id="fixed8">
- <property name="height_request">68</property>
+ <widget class="GtkFixed" id="fixed9">
+ <property name="height_request">60</property>
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="btn_conf_modify">
- <property name="width_request">62</property>
- <property name="height_request">29</property>
+ <widget class="GtkLabel" id="lbl_conf_sample">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
<property name="visible">True</property>
+ <property name="label" translatable="yes">Sample :</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="x">24</property>
+ <property name="y">16</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="txt_conf_sample">
+ <property name="width_request">72</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Modify</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_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">35</property>
+ <property name="x">136</property>
+ <property name="y">14</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="btn_conf_remove">
- <property name="width_request">62</property>
- <property name="height_request">29</property>
+ <widget class="GtkEntry" id="txt_conf_rate">
+ <property name="width_request">72</property>
+ <property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remove</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_btn_conf_remove_clicked"/>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">False</property>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">0</property>
+ <property name="x">318</property>
+ <property name="y">14</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="lbl_conf_rate">
+ <property name="width_request">100</property>
+ <property name="height_request">20</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Rate :</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="x">232</property>
+ <property name="y">16</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak 2007-09-28 13:32:51 UTC (rev 550)
@@ -182,7 +182,7 @@
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -469,70 +469,70 @@
<property name="y">32</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="GtkFixed" id="fixed8">
+ <property name="height_request">68</property>
+ <property name="visible">True</property>
+
<child>
- <widget class="GtkButton" id="btn_conf_add">
+ <widget class="GtkButton" id="btn_conf_remove">
<property name="width_request">62</property>
<property name="height_request">29</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Add</property>
+ <property name="label" translatable="yes">Remove</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_btn_conf_add_clicked"/>
+ <signal name="clicked" handler="on_btn_conf_remove_clicked"/>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">32</property>
+ <property name="x">96</property>
+ <property name="y">8</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="GtkFixed" id="fixed8">
- <property name="height_request">68</property>
- <property name="visible">True</property>
-
<child>
- <widget class="GtkButton" id="btn_conf_modify">
+ <widget class="GtkButton" id="btn_conf_add">
<property name="width_request">62</property>
<property name="height_request">29</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Modify</property>
+ <property name="label" translatable="yes">Add</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_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/>
+ <signal name="clicked" handler="on_btn_conf_add_clicked"/>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">35</property>
+ <property name="x">16</property>
+ <property name="y">8</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="btn_conf_remove">
+ <widget class="GtkButton" id="btn_conf_modify">
<property name="width_request">62</property>
<property name="height_request">29</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remove</property>
+ <property name="label" translatable="yes">Modify</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_btn_conf_remove_clicked"/>
+ <signal name="clicked" handler="on_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/>
</widget>
<packing>
- <property name="x">640</property>
- <property name="y">0</property>
+ <property name="x">176</property>
+ <property name="y">8</property>
</packing>
</child>
</widget>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp 2007-09-28 13:32:51 UTC (rev 550)
@@ -11,6 +11,7 @@
Constructor
"""
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
+ self.measure = _me.get_param('measure')
def new(self):
"""
@@ -61,6 +62,9 @@
txt = _me.string('gui_conf_accept_bt')
self.get_widget("label5").set_text(txt)
+
+ self.get_widget('txt_conf_rate').set_text(_me.get_param('Rate'))
+ self.get_widget('txt_conf_sample').set_text(_me.get_param('Sample'))
def updates_specifics(self):
@@ -72,7 +76,6 @@
#
###########################################################
def make_viewtree(self):
- self.measure = _me.get_param('measure')
self.index_column = gtk.TreeViewColumn('Index')
self.index_column.set_min_width(50)
self.index_cell = gtk.CellRendererText()
@@ -309,6 +312,11 @@
"""
On button 'accept' clicked
"""
+ _me.set_param('Rate', float(self.get_widget('txt_conf_rate').get_text()))
+ _me.set_param('Sample',float(self.get_widget('txt_conf_sample').get_text()))
+ self.measure.rate = _me.get_param('Rate')
+ self.measure.sample = _me.get_param('Sample')
+
_me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value()))
self.get_widget("window1").destroy()
Modified: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp 2007-09-28 13:32:51 UTC (rev 550)
@@ -42,6 +42,7 @@
measure.threshold_behavior = _me.get_param('behavior_file_threshold')
measure.change_behavior = _me.get_param('behavior_file_change')
+measure.event_tab = _me.get_param('config')
tux.monitoring.insert(0x1B, measure.on_light_level)
Modified: software/gadgets/light_monitor/trunk/Light_monitor/about.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/about.xml 2007-09-28 13:32:51 UTC (rev 550)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
+ <gadget_description type='str'>Light monitor for tux droid</gadget_description>
<gadget_author type='str'>Paul Rathgeb</gadget_author>
+ <gadget_name type='str'>light_monitor</gadget_name>
<gadget_version type='str'>0.0.1</gadget_version>
- <gadget_name type='str'>light_monitor</gadget_name>
- <gadget_description type='str'>Light monitor for tux droid</gadget_description>
</about>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/settings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/settings.xml 2007-09-28 13:32:51 UTC (rev 550)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<settings>
<parameters>
- <drop_rad type='bool'>False</drop_rad>
+ <drop type='str'>10</drop>
<increase_rad type='bool'>True</increase_rad>
<changeU_time type='str'>0</changeU_time>
<changeD_rad type='bool'>True</changeD_rad>
@@ -17,7 +17,7 @@
<drop_time type='str'>10</drop_time>
<changeU type='str'>0</changeU>
<raise_time type='str'>10</raise_time>
- <drop type='str'>10</drop>
+ <drop_rad type='bool'>False</drop_rad>
<Sample type='str'>500</Sample>
<threshold_chk type='bool'>True</threshold_chk>
<Rate type='str'>0.1</Rate>
Modified: software/gadgets/light_monitor/trunk/Light_monitor/strings.xml
===================================================================
--- software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-09-28 13:10:23 UTC (rev 549)
+++ software/gadgets/light_monitor/trunk/Light_monitor/strings.xml 2007-09-28 13:32:51 UTC (rev 550)
@@ -4,6 +4,7 @@
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<widget_lblControl type='str'>Control</widget_lblControl>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
+ <speaker_name type='str'>Ryan8k</speaker_name>
<help_text type='str'>Bla bla bla bla</help_text>
<widget_lblBtnApply type='str'>Apply changes</widget_lblBtnApply>
<widget_lblChangeU type='str'>Raise and drop</widget_lblChangeU>
@@ -11,21 +12,20 @@
<gui_conf_update_title type='str'>Update</gui_conf_update_title>
<widget_lblEvent type='str'>Event</widget_lblEvent>
<gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
+ <widget_lblBoth type='str'>Both direction</widget_lblBoth>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
- <widget_lblValue type='str'>Value (%)</widget_lblValue>
<widget_lblChange type='str'>Change</widget_lblChange>
<widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
<widget_lblDrop type='str'>Drop</widget_lblDrop>
<widget_lblIncrease type='str'>Increasing</widget_lblIncrease>
<widget_lblRaise type='str'>Raise</widget_lblRaise>
- <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
<widget_lblDecrease type='str'>Decreasing</widget_lblDecrease>
<gui_conf_sample_lb type='str'>Sample :</gui_conf_sample_lb>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
- <widget_lblBoth type='str'>Both direction</widget_lblBoth>
- <speaker_name type='str'>Ryan8k</speaker_name>
+ <gui_conf_rate_lb type='str'>Refresh rate :</gui_conf_rate_lb>
+ <widget_lblValue type='str'>Value (%)</widget_lblValue>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<name_to_read type='str'>Light monitor</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf
===================================================================
(Binary files differ)
|
|
From: Paul_R <c2m...@c2...> - 2007-09-28 13:10:57
|
Author: Paul_R Date: 2007-09-28 15:10:23 +0200 (Fri, 28 Sep 2007) New Revision: 549 Added: software/gadgets/light_monitor/trunk/Light_monitor/ software/gadgets/light_monitor/trunk/Light_monitor/Pictures/ software/gadgets/light_monitor/trunk/Light_monitor/Pictures/Icons/ software/gadgets/light_monitor/trunk/Light_monitor/Pictures/Icons/gadget.png software/gadgets/light_monitor/trunk/Light_monitor/Scripts/ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.gladep software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.gladep.bak software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.glade.bak software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.gladep software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.gladep.bak software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/widget/other.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/init.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/lightGraph_class.py software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/main.pyp software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/notify.pyp software/gadgets/light_monitor/trunk/Light_monitor/Strings/ software/gadgets/light_monitor/trunk/Light_monitor/Strings/fr_ALL.xml software/gadgets/light_monitor/trunk/Light_monitor/about.xml software/gadgets/light_monitor/trunk/Light_monitor/parts.xml software/gadgets/light_monitor/trunk/Light_monitor/settings.xml software/gadgets/light_monitor/trunk/Light_monitor/strings.xml Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Created the setting window Event set in the setting window are not yet notified.. * Added the uncompressed TGF directory to show diff under different versions. This folder cannot be compressed in TGF before removing .SVN folders. Added: software/gadgets/light_monitor/trunk/Light_monitor/Pictures/Icons/gadget.png =================================================================== (Binary files differ) Property changes on: software/gadgets/light_monitor/trunk/Light_monitor/Pictures/Icons/gadget.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade 2007-09-28 13:10:23 UTC (rev 549) @@ -0,0 +1,858 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Parameters</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> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame3"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="fixed4"> + <property name="height_request">70</property> + <property name="visible">True</property> + + <child> + <widget class="GtkLabel" id="label_version"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Version :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_description"> + <property name="width_request">312</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Description :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_author"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Authors :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">32</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>About</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="Frame6"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed7"> + <property name="width_request">719</property> + <property name="height_request">68</property> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="txt_conf_value"> + <property name="width_request">80</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">208</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="txt_conf_time"> + <property name="width_request">80</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">296</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_event"> + <property name="width_request">88</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Event</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">16</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_type"> + <property name="width_request">88</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Type</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">112</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_value"> + <property name="width_request">80</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Value</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">208</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_time"> + <property name="width_request">80</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Time</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">296</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_notified"> + <property name="width_request">96</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Notified?</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">376</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_behavior"> + <property name="width_request">144</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Behavior script</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">480</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkFileChooserButton" id="conf_behavior"> + <property name="width_request">144</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Select A File</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="width_chars">-1</property> + </widget> + <packing> + <property name="x">480</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="chk_conf_notified"> + <property name="width_request">24</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="x">416</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="cbb_conf_type"> + <property name="width_request">88</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">112</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="cbb_conf_event"> + <property name="width_request">88</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="items" translatable="yes">Change +Threshold</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_cbb_conf_event_changed" last_modification_time="Thu, 27 Sep 2007 16:15:13 GMT"/> + </widget> + <packing> + <property name="x">16</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="btn_conf_add"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Add</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_btn_conf_add_clicked"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">32</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="GtkFixed" id="fixed8"> + <property name="height_request">68</property> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="btn_conf_modify"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="btn_conf_remove"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Remove</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_btn_conf_remove_clicked"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">0</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="lblControlFrame"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Control</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="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + + <child> + <widget class="GtkAlignment" id="alignment8"> + <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="height_request">29</property> + <property name="visible">True</property> + + <child> + <widget class="GtkSpinButton" id="delay_spinbutton"> + <property name="width_request">120</property> + <property name="height_request">24</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 1 3600 1 10 10</property> + </widget> + <packing> + <property name="x">88</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label13"> + <property name="width_request">336</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Delay (sec) :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Updates</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="GtkFixed" id="fixed3"> + <property name="height_request">44</property> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="width_request">96</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_accept_clicked"/> + + <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">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="label" translatable="yes">Accept</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="x">16</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button3"> + <property name="width_request">96</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_cancel_clicked"/> + + <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">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</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">2</property> + + <child> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Cancel</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="x">144</property> + <property name="y">8</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> + +</glade-interface> Added: software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor/Scripts/Python/GUI/conf/other.glade.bak 2007-09-28 13:10:23 UTC (rev 549) @@ -0,0 +1,858 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="visible">True</property> + <property name="title" translatable="yes">Parameters</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> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame3"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="fixed4"> + <property name="height_request">70</property> + <property name="visible">True</property> + + <child> + <widget class="GtkLabel" id="label_version"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Version :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_description"> + <property name="width_request">312</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Description :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_author"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Authors :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">32</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>About</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="Frame6"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed7"> + <property name="width_request">719</property> + <property name="height_request">68</property> + <property name="visible">True</property> + + <child> + <widget class="GtkEntry" id="txt_conf_value"> + <property name="width_request">80</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">208</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="txt_conf_time"> + <property name="width_request">80</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="x">296</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_event"> + <property name="width_request">88</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Event</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">16</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_type"> + <property name="width_request">88</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Type</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">112</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_value"> + <property name="width_request">80</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Value</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">208</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_time"> + <property name="width_request">80</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Time</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">296</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_notified"> + <property name="width_request">96</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Notified?</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">376</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="lbl_conf_behavior"> + <property name="width_request">144</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Behavior script</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">480</property> + <property name="y">8</property> + </packing> + </child> + + <child> + <widget class="GtkFileChooserButton" id="conf_behavior"> + <property name="width_request">144</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Select A File</property> + <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property> + <property name="local_only">True</property> + <property name="show_hidden">False</property> + <property name="do_overwrite_confirmation">False</property> + <property name="width_chars">-1</property> + </widget> + <packing> + <property name="x">480</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="chk_conf_notified"> + <property name="width_request">24</property> + <property name="height_request">24</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="x">416</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="cbb_conf_type"> + <property name="width_request">88</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">112</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="cbb_conf_event"> + <property name="width_request">88</property> + <property name="height_request">30</property> + <property name="visible">True</property> + <property name="items" translatable="yes">Change +Threshold</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_cbb_conf_event_changed" last_modification_time="Thu, 27 Sep 2007 16:15:13 GMT"/> + </widget> + <packing> + <property name="x">16</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="btn_conf_add"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Add</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_btn_conf_add_clicked"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">32</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="GtkFixed" id="fixed8"> + <property name="height_request">68</property> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="btn_conf_modify"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Modify</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_btn_conf_modify_clicked" last_modification_time="Fri, 28 Sep 2007 09:09:13 GMT"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">35</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="btn_conf_remove"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Remove</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_btn_conf_remove_clicked"/> + </widget> + <packing> + <property name="x">640</property> + <property name="y">0</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="lblControlFrame"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Control</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">Fa... [truncated message content] |
|
From: jaguarondi <c2m...@c2...> - 2007-09-28 11:10:18
|
Author: jaguarondi
Date: 2007-09-28 13:10:18 +0200 (Fri, 28 Sep 2007)
New Revision: 548
Modified:
firmware/tuxcore/trunk/led.c
Log:
* BUG: all PORTC was affected by the refresh function, now correctly masked.
Modified: firmware/tuxcore/trunk/led.c
===================================================================
--- firmware/tuxcore/trunk/led.c 2007-09-28 10:02:28 UTC (rev 547)
+++ firmware/tuxcore/trunk/led.c 2007-09-28 11:10:18 UTC (rev 548)
@@ -28,7 +28,7 @@
/** Buffer the leds values before being applied on the I/O port.
* \ingroup led */
-uint8_t leds_buffer;
+uint8_t leds_buffer = 0;
/** Counter for the delay between 2 toggles of the leds. */
static uint8_t led_delay;
/** Delay between 2 toggles of the leds when blinking them. */
@@ -66,7 +66,7 @@
*/
void refresh_leds(void)
{
- LED_PT &= leds_buffer;
+ LED_PT &= ~(leds_buffer ^ LED_MK);
LED_PT |= leds_buffer;
}
|
|
From: jaguarondi <c2m...@c2...> - 2007-09-28 10:02:28
|
Author: jaguarondi
Date: 2007-09-28 12:02:28 +0200 (Fri, 28 Sep 2007)
New Revision: 547
Modified:
firmware/tuxaudio/trunk/CHANGES
firmware/tuxcore/trunk/CHANGES
Log:
* Updated CHANGES for the upcoming 0.3.1 release of tuxaudio and tuxcore.
Modified: firmware/tuxaudio/trunk/CHANGES
===================================================================
--- firmware/tuxaudio/trunk/CHANGES 2007-09-28 09:54:08 UTC (rev 546)
+++ firmware/tuxaudio/trunk/CHANGES 2007-09-28 10:02:28 UTC (rev 547)
@@ -7,14 +7,13 @@
----------------------------------------------------------------------
Current:
- * Code cleanup.
+Version 0.3.1:
- * BUG: when the sounds stored in the audio flash are too long, we don't block
- anymore in the programming function. The extra sound is simply not stored
- in the flash.
+ * Refactored the audio flash module and the flash functions are now moved to
+ their own module (AT26F004), many bug fixes.
- * BUG: there was an uncomplete 'if' before the powering of the microphone,
- it's now fixed and the bursts have been limited to 20.
+ * Imroved the powering of the microphone, the sounds that were heard at
+ startup should now be gone.
* Added the basis for the sleep functions although they are unfinished and
untested.
@@ -22,6 +21,8 @@
* Added programming directives in the Makefile for tuxup, stk500 and jtagice
mkii.
+ * Some cleanup.
+
* Fixed #1 with the patches given by Philippe Teuwen, this now
fixes the location of the version, revision and author structures with a
linker script in the .version section otherwise gcc is free to change the
Modified: firmware/tuxcore/trunk/CHANGES
===================================================================
--- firmware/tuxcore/trunk/CHANGES 2007-09-28 09:54:08 UTC (rev 546)
+++ firmware/tuxcore/trunk/CHANGES 2007-09-28 10:02:28 UTC (rev 547)
@@ -7,10 +7,16 @@
----------------------------------------------------------------------
Current:
+Version 0.3.1:
+
* Added doxygen configuration file.
- * Cleanup and commenting.
+ * Light measurement is now correctly processed in the daemon to have a
+ somehow linear curve from the 2 different types of measurements (different
+ resisotr values). Thresholds for changing the resistor have been updated.
+ * Major cleanup and commenting. Motor and led modules are considered clean.
+
* Fixed #6 nd #9 about the leds that were not updated when the eyes were
closed.
|
|
From: jaguarondi <c2m...@c2...> - 2007-09-28 09:54:17
|
Author: jaguarondi
Date: 2007-09-28 11:54:08 +0200 (Fri, 28 Sep 2007)
New Revision: 546
Added:
firmware/tuxaudio/trunk/AT26F004.c
firmware/tuxaudio/trunk/AT26F004.h
firmware/tuxaudio/trunk/PC_communication.c
firmware/tuxaudio/trunk/PC_communication.h
firmware/tuxaudio/trunk/doc/
firmware/tuxaudio/trunk/doc/Doxyfile
firmware/tuxaudio/trunk/doc/builddoc.sh
firmware/tuxaudio/trunk/hardware.h
Removed:
firmware/tuxaudio/trunk/doc/Doxyfile
firmware/tuxaudio/trunk/doc/builddoc.sh
Modified:
firmware/tuxaudio/trunk/Makefile
firmware/tuxaudio/trunk/flash.c
firmware/tuxaudio/trunk/flash.h
firmware/tuxaudio/trunk/init.c
firmware/tuxaudio/trunk/main.c
firmware/tuxaudio/trunk/spi.c
firmware/tuxaudio/trunk/spi.h
Log:
* Merged changes made in the audio_cleanup branch up to now.
Copied: firmware/tuxaudio/trunk/AT26F004.c (from rev 545, firmware/tuxaudio/branches/audio_cleanup/AT26F004.c)
===================================================================
--- firmware/tuxaudio/trunk/AT26F004.c (rev 0)
+++ firmware/tuxaudio/trunk/AT26F004.c 2007-09-28 09:54:08 UTC (rev 546)
@@ -0,0 +1,184 @@
+/*
+ * TUXAUDIO - Firmware for the 'audio' CPU of tuxdroid
+ * Copyright (C) 2007 C2ME S.A. <tux...@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 of the License, 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: $ */
+
+#include <avr/io.h>
+#include "AT26F004.h"
+#include "hardware.h"
+#include "spi.h"
+
+/**
+ * \ingroup at26f004
+ * \brief initialize a table with the sectors adresses values
+ */
+static uint8_t sector_adress[11][3] = {
+ {SECTOR0},
+ {SECTOR1},
+ {SECTOR2},
+ {SECTOR3},
+ {SECTOR4},
+ {SECTOR5},
+ {SECTOR6},
+ {SECTOR7},
+ {SECTOR8},
+ {SECTOR9},
+ {SECTOR10}
+};
+
+/**
+ * \ingroup at26f004
+
+ \brief This function set the write enable flag of the flash memory.
+ */
+uint8_t read_status(void)
+{
+ uint8_t status;
+
+ FLASH_CS_ON;
+ spiSend(READ_STATUS_REG); /* Send Read Status Command */
+ status = spiSend(NOP); /* Read status on spi */
+ FLASH_CS_OFF;
+ return status;
+}
+/**
+ * \ingroup at26f004
+
+ \brief This function set the write enable flag of the flash memory.
+ */
+void write_enable(void)
+{
+ FLASH_CS_ON;
+ spiSend(WRITE_EN); /* Send Write Enable Command */
+ FLASH_CS_OFF;
+}
+/**
+ * \ingroup at26f004
+
+ \brief This function clear the write enable flag of the flash memory.
+ */
+void write_disable(void)
+{
+ FLASH_CS_ON;
+ spiSend(WRITE_DIS); /* Send Write Disable Command */
+ FLASH_CS_OFF;
+}
+
+/**
+ * \ingroup at26f004
+
+ \brief This function write into the flash memory status register.
+ */
+void write_status(uint8_t const status)
+{
+ FLASH_CS_ON;
+ spiSend(WRITE_STATUS_REG); /* Send Write Status Command */
+ spiSend(status); /* Send status */
+ FLASH_CS_OFF;
+}
+/**
+ * \ingroup at26f004
+ \param ad2 high address part
+ \param ad1 medium adress part
+ \param ad0 lower adress part
+
+ \brief This function unprotect a sector.
+ */
+void unprotect_sector(uint8_t const ad2, uint8_t const ad1, uint8_t const ad0)
+{
+ FLASH_CS_ON;
+ spiSend(UNPROTECT_SECTOR); /* Send unprotect sector command */
+ /* Send Adress */
+ spiSend(ad2);
+ spiSend(ad1);
+ spiSend(ad0);
+ FLASH_CS_OFF;
+}
+/**
+ * \ingroup at26f004
+
+ \brief This function erase the entire memory.
+ */
+void erase_flash(void)
+{
+ uint8_t i;
+ write_status(0x00); /* Disable sector protection register */
+ for (i=0; i<=10; i++)
+ {
+ write_enable(); /* Enable the writing */
+ unprotect_sector(sector_adress[i][0], sector_adress[i][1],sector_adress[i][2]);
+ }
+
+ write_enable(); /* Enable the writing */
+
+ FLASH_CS_ON;
+ spiSend(CHIP_ERASE); /* Send Erase Bulk command */
+ FLASH_CS_OFF;
+}
+
+/**
+ * \ingroup at26f004
+ \param ad2 high address part
+ \param ad1 medium adress part
+ \param ad0 lower adress part
+
+ \brief This function write a byte in the flash memory.
+ */
+void program_flash(uint8_t const ad2, uint8_t const ad1, uint8_t const ad0,
+ uint8_t const data)
+{
+ while (read_status() & BUSY) ; /* Wait Page Program Cycle */
+
+ write_enable();
+ FLASH_CS_ON;
+ spiSend(BYTE_PROGRAM); /* Send Page Byte Command */
+ /* Send adress */
+ spiSend(ad2);
+ spiSend(ad1);
+ spiSend(ad0);
+ spiSend(data); /* Write data in flash */
+ FLASH_CS_OFF;
+}
+
+/**
+ * \ingroup at26f004
+ \param ad2 high address part
+ \param ad1 medium adress part
+ \param ad0 lower adress part
+ \return Data read
+ \brief This function read a single byte in the flash memory.
+ */
+uint8_t read_data(uint8_t const ad2, uint8_t const ad1, uint8_t const ad0)
+{
+ uint8_t data1;
+
+ FLASH_CS_ON;
+ spiSend(READ_ARRAY_LOW_F); /* Send Read Page Command */
+ /* Send address */
+ spiSend(ad2);
+ spiSend(ad1);
+ spiSend(ad0);
+ data1 = spiSend(NOP); /* Wait response */
+ FLASH_CS_OFF;
+
+ return data1;
+}
+
+
+
Copied: firmware/tuxaudio/trunk/AT26F004.h (from rev 545, firmware/tuxaudio/branches/audio_cleanup/AT26F004.h)
===================================================================
--- firmware/tuxaudio/trunk/AT26F004.h (rev 0)
+++ firmware/tuxaudio/trunk/AT26F004.h 2007-09-28 09:54:08 UTC (rev 546)
@@ -0,0 +1,151 @@
+/*
+ * TUXAUDIO - Firmware for the 'audio' CPU of tuxdroid
+ * Copyright (C) 2007 C2ME S.A. <tux...@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 of the License, 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
+ */
+
+/** \defgroup at26f004 AT26F004 flash memory
+ \ingroup at26f004
+
+ This module contains all specific definitions and functions to access the flash memory.
+ */
+
+/** \file AT26F004.h
+ \ingroup at26f004
+ \brief AT26F004 flash memory header
+ */
+
+#ifndef AT26F004_H
+#define AT26F004_H
+
+#include "hardware.h"
+
+/** \file AT26F004.c
+ \ingroup at26f004
+ \brief AT26F004 functions
+ */
+
+
+/**
+ * \name Read opcodes
+ @{ */
+#define READ_ARRAY 0x0B
+#define READ_ARRAY_LOW_F 0x03
+/* @} */
+/** \name Erase opcodes
+ *@{ */
+#define BLOCK_ERASE_4K 0x20
+#define BLOCK_ERASE_32K 0x52
+#define BLOCK_ERASE_64K 0xD8
+#define CHIP_ERASE 0x60
+/* @} */
+
+/** \name Program opcodes
+ * @{ */
+#define BYTE_PROGRAM 0x02
+#define SEQU_PROGRAM 0xAF
+/* @} */
+
+/** \name Sectors managment opcodes
+ * @{ */
+#define WRITE_EN 0x06
+#define WRITE_DIS 0x04
+#define PROTECT_SECTOR 0x36
+#define UNPROTECT_SECTOR 0x39
+#define READ_SECT_PROTECT 0x3C
+/* @} */
+/** \name Status command
+ * @{ */
+#define READ_STATUS_REG 0x05
+#define WRITE_STATUS_REG 0x01
+/* @} */
+/** \name Misc. opcodes
+ * @{ */
+#define READ_MANUFACT 0x9F
+#define DEEP_POWER_MODE 0xB9
+#define RESUME_DEEP_MODE 0xAB
+
+#define NOP 0x00
+/* @} */
+
+/**
+ * \name AT26F004 status register masks
+ *
+ * @{ */
+#define BUSY 0x01
+#define WEL 0X02
+#define SWP 0x0C
+#define WPP 0x10
+#define RES 0x20
+#define SPM 0x40
+#define SPRL 0x80
+/*! @} */
+
+/** \name Flash sector adresses
+ * @{ */
+#define SECTOR0 0x00, 0x00, 0x00
+#define SECTOR1 0x01, 0x00, 0x00
+#define SECTOR2 0x02, 0x00, 0x00
+#define SECTOR3 0x03, 0x00, 0X00
+#define SECTOR4 0x04, 0x00, 0x00
+#define SECTOR5 0x05, 0x00, 0x00
+#define SECTOR6 0x06, 0X00, 0x00
+#define SECTOR7 0x07, 0x00, 0x00
+#define SECTOR8 0x07, 0x80, 0x00
+#define SECTOR9 0x07, 0xA0, 0x00
+#define SECTOR10 0x07, 0xC0, 0x00
+
+/* @} */
+
+
+/**
+ * \name Flash TOP address
+ * The flash memory address range is 0x000000 - [TOP_A2 TOP_A1 TOP_A0]
+ * The AT26F004 has an address range of 0x000000 - 0x7FFFFF
+ * @{ */
+
+/** High byte of the TOP address. */
+#define TOP_A2 0x07
+/** Middle byte of the TOP address. */
+#define TOP_A1 0xFF
+/** Low byte of the TOP address. */
+#define TOP_A0 0xFF
+/*! @} */
+
+/** \name Status access functions
+ * @{ */
+extern uint8_t read_status(void);
+extern void write_status(uint8_t const status);
+/* @} */
+/** \name Writing functions
+ * @{ */
+extern void write_enable(void);
+extern void write_disable(void);
+extern void program_flash(uint8_t const ad2, uint8_t const ad1, uint8_t const ad0,
+ uint8_t const data);
+/* @} */
+/** \name Reading function
+ * @{ */
+extern uint8_t read_data(uint8_t const ad2, uint8_t const ad1, uint8_t const ad0);
+/* @} */
+/** \name Misc. functions
+ * @{ */
+extern void erase_flash(void);
+extern void unprotect_sector(uint8_t const ad2, uint8_t const ad1,
+ uint8_t const ad0);
+/* @} */
+
+#endif
Modified: firmware/tuxaudio/trunk/Makefile
===================================================================
--- firmware/tuxaudio/trunk/Makefile 2007-09-28 07:40:32 UTC (rev 545)
+++ firmware/tuxaudio/trunk/Makefile 2007-09-28 09:54:08 UTC (rev 546)
@@ -69,7 +69,7 @@
## Objects that must be built in order to link
-OBJECTS = init.o main.o varis.o fifo.o spi.o flash.o communication.o i2c.o config.o
+OBJECTS = init.o main.o varis.o fifo.o spi.o AT26F004.o flash.o communication.o PC_communication.o i2c.o config.o
## Objects explicitly added by the user
LINKONLYOBJECTS =
@@ -94,12 +94,18 @@
spi.o: spi.c
$(CC) $(INCLUDES) $(CFLAGS) -c $<
+AT26F004.o: AT26F004.c
+ $(CC) $(INCLUDES) $(CFLAGS) -c $<
+
flash.o: flash.c
$(CC) $(INCLUDES) $(CFLAGS) -c $<
communication.o: communication.c
$(CC) $(INCLUDES) $(CFLAGS) -c $<
+PC_communication.o: PC_communication.c
+ $(CC) $(INCLUDES) $(CFLAGS) -c $<
+
i2c.o: i2c.c
$(CC) $(INCLUDES) $(CFLAGS) -c $<
@@ -109,6 +115,9 @@
bootloader.o: bootloader.c
$(CC) $(INCLUDES) $(CFLAGS) -c $<
+
+
+
##Link
$(TARGET): $(OBJECTS)
$(CC) $(LDFLAGS) $(OBJECTS) $(LINKONLYOBJECTS) $(LIBDIRS) $(LIBS) -o $(TARGET)
@@ -142,8 +151,9 @@
endif
## Generate SVN info
-.PHONY: svnrev.h
-svnrev.h:
+# We need to change the status each time a file changes, thus so many
+# dependencies
+svnrev.h: $(CSOURCE) $(HEADERS)
ifdef windir
SubWCRev . svnrev.tmpl.h svnrev.h
else
@@ -159,6 +169,16 @@
## Other dependencies
-include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*)
+## Generate doxygen documentation
+.PHONY: doc
+doc: svnrev.h
+ifdef windir
+ # XXX add windows version
+else
+ @./doc/builddoc.sh
+endif
+
+
# Programming
prog: $(PROJECT).hex
tuxup $(PROJECT).hex $(PROJECT).eep
Copied: firmware/tuxaudio/trunk/PC_communication.c (from rev 545, firmware/tuxaudio/branches/audio_cleanup/PC_communication.c)
===================================================================
--- firmware/tuxaudio/trunk/PC_communication.c (rev 0)
+++ firmware/tuxaudio/trunk/PC_communication.c 2007-09-28 09:54:08 UTC (rev 546)
@@ -0,0 +1,180 @@
+/*
+ * TUXAUDIO - Firmware for the 'audio' CPU of tuxdroid
+ * Copyright (C) 2007 C2ME S.A. <tux...@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 of the License, 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: */
+
+#include <avr/io.h>
+#include <avr/interrupt.h>
+
+#include "varis.h"
+#include "fifo.h"
+#include "PC_communication.h"
+#include "communication.h"
+#include "spi.h"
+#include "hardware.h"
+
+void spiTransaction(void)
+{
+ if ((spi_start) && (spi_enable)) // Wait start
+ {
+ spi_start = 0; // Reset the spi start flag
+ spi_enable = 0; // Communication in progress
+ spi_count = 0; // Reset spi counter
+ spi_slave = HEADERS; // Set state machine
+ spi_master = HEADERM;
+ if (programmingFlash)
+ HOLD_ON;
+ // Reset SPI to fix strange bug on the spi
+ SPCR = 0x50;
+ SPSR = 0x00;
+ asm volatile /* Clear the SPI interrupt flag */
+ ("in __tmp_reg__, %0" "\n\t" "in __tmp_reg__, %1" "\n\t"::
+ "I" (_SFR_IO_ADDR(SPSR)), "I"(_SFR_IO_ADDR(SPDR)));
+
+ PORTB &= ~0x04; // Chip select
+ while (1)
+ {
+ if (spi_ready)
+ {
+ spi_ready = 0;
+ if (spi_slave == HEADERS)
+ {
+ /* Sound */
+ if (fifoLength(&ADCFifo) >= 17)
+ spi_headerb = 0x02; /* frame will contain sound */
+ else
+ spi_headerb = 0x00; /* no sound in frame */
+
+ /* Status */
+ if ((rf_data_sent_ack == RF_DATA_SENT_NACKED)
+ || (rf_data_sent_ack == RF_DATA_SENT_DROPPED))
+ {
+ spi_headerb |= 0x08; /* resend the previous status if nacked */
+ cli();
+ sei();
+ }
+ else if (rf_data_sent_ack != RF_DATA_SENT_BUSY) /* wait the end of transmission */
+ if (!popStatus(spi_commandTX)) /* fetch the next status */
+ spi_headerb |= 0x08; /* indicate that the frame contains status */
+
+ SPDR = spi_headerb; // Header byte
+ spi_slave = GET_SOUND_FIFO; // Next state
+ }
+ else if (spi_slave == GET_SOUND_FIFO)
+ {
+ if (spi_count == 17)
+ spi_slave = PUT_COMMAND; // Next state
+ if (spi_headerb & 0x02)
+ {
+ cli();
+ SPDR = pullFifo(&ADCFifo); // Get data from FIFO
+ sei();
+ }
+ else
+ SPDR = 0x00; // No data to transmit
+ }
+ else if (spi_slave == PUT_COMMAND)
+ {
+ if (spi_count == 21)
+ spi_slave = DUMMY; // Next state
+ if (spi_headerb & 0x08)
+ {
+ SPDR = spi_commandTX[spi_count - 18]; // Get command from buffer
+ }
+ else
+ SPDR = 0x00; // No command to transmit
+ }
+ else if (spi_slave == DUMMY)
+ {
+ SPDR = 0x00; // Dummy byte in case of big frame
+ }
+
+ while ((SPSR & 0x80) == 0) ; // Wait SPI response
+
+ spi_count++;
+ if (spi_master == HEADERM)
+ {
+ spi_master_config = SPDR; // Save header config byte
+ if (spi_master_config & 0x08) // Command
+ commandRX = 1; // Flag to send command on I2C
+ if (spi_master_config & 0x80) // Double frame
+ spi_lenght_data = 34;
+ else
+ spi_lenght_data = 17;
+ spi_master = PUT_SOUND_FIFO; // Go to the next state
+
+ if (!programmingFlash) // XXX code must be review it's very strange .....
+ {
+ if (!(spi_master_config & 0x02))
+ {
+ if (!lockAdaptFifo)
+ {
+ cli();
+ adaptFifo(&PWMFifo); // Adaptative FIFO
+ sei();
+ lockAdaptFifo = 1;
+ }
+ else
+ resetFifo(&PWMFifo);
+ }
+ else
+ {
+ lockAdaptFifo = 0;
+ }
+ }
+
+ }
+ else if (spi_master == PUT_SOUND_FIFO)
+ {
+ if (spi_master_config & 0x02)
+ {
+ cli();
+ pushFifo(&PWMFifo, SPDR); // Put into the FIFO
+ sei();
+ }
+ if (spi_count == (spi_lenght_data + 1))
+ spi_master = READ_COMMAND; // Go to the next state
+ }
+ else if (spi_master == READ_COMMAND)
+ {
+ if (spi_master_config & 0x08)
+ {
+ if (spi_master_config & 0x80)
+ spi_commandRX[spi_count - 36] = SPDR; // Put command into the buffer
+ else
+ spi_commandRX[spi_count - 19] = SPDR; // Put command into the buffer
+ }
+ if (spi_count == spi_lenght_data + 6)
+ {
+ /* Check the acknowledge from the rf */
+ if (spi_headerb & 0x08) /* if data was sent in the current SPI transaction, mark buffer as full and drop the received status */
+ rf_data_sent_ack = RF_DATA_SENT_BUSY; /* status buffer of the rf filled */
+ else
+ rf_data_sent_ack = spi_commandRX[4]; /* get the acknowledge of the previous sent data */
+
+ PORTB |= 0x04; // Chip deselect
+ spi_enable = 1;
+ break;
+ }
+ }
+ }
+ }
+ }
+}
+
Copied: firmware/tuxaudio/trunk/PC_communication.h (from rev 545, firmware/tuxaudio/branches/audio_cleanup/PC_communication.h)
===================================================================
--- firmware/tuxaudio/trunk/PC_communication.h (rev 0)
+++ firmware/tuxaudio/trunk/PC_communication.h 2007-09-28 09:54:08 UTC (rev 546)
@@ -0,0 +1,27 @@
+/*
+ * TUXAUDIO - Firmware for the 'audio' CPU of tuxdroid
+ * Copyright (C) 2007 C2ME S.A. <tux...@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 of the License, 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: $ */
+
+#ifndef PC_COMMUNICATION_H
+#define PC_COMMUNICATION_H
+
+extern void spiTransaction(void);
+
+#endif
Copied: firmware/tuxaudio/trunk/doc (from rev 545, firmware/tuxaudio/branches/audio_cleanup/doc)
Deleted: firmware/tuxaudio/trunk/doc/Doxyfile
===================================================================
--- firmware/tuxaudio/branches/audio_cleanup/doc/Doxyfile 2007-09-28 07:40:32 UTC (rev 545)
+++ firmware/tuxaudio/trunk/doc/Doxyfile 2007-09-28 09:54:08 UTC (rev 546)
@@ -1,1277 +0,0 @@
-# Doxyfile 1.5.2 - Doxygen configuration file for TUXCORE
-#
-# TUXCORE - Firmware for the 'core' CPU of tuxdroid
-# Copyright (C) 2007 C2ME S.A. <tux...@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 of the License, 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: Doxyfile 494 2007-09-06 15:23:54Z jaguarondi $
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = tuxaudio
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER = $(VERSION)
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT =
-
-# This tag can be used to specify the character encoding of the source files that
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
-
-FILE_PATTERNS =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = */.svn/* */dep/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the output.
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH = doc
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#----------------------------------------------------...
[truncated message content] |
|
From: remi <c2m...@c2...> - 2007-09-28 07:40:35
|
Author: remi
Date: 2007-09-28 09:40:32 +0200 (Fri, 28 Sep 2007)
New Revision: 545
Added:
software/tuxgi/trunk/sounds/17.wav
Modified:
software/tuxgi/trunk/tuxgi.py
Log:
ADD: New sound
Added: software/tuxgi/trunk/sounds/17.wav
===================================================================
(Binary files differ)
Property changes on: software/tuxgi/trunk/sounds/17.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: software/tuxgi/trunk/tuxgi.py
===================================================================
--- software/tuxgi/trunk/tuxgi.py 2007-09-27 15:07:06 UTC (rev 544)
+++ software/tuxgi/trunk/tuxgi.py 2007-09-28 07:40:32 UTC (rev 545)
@@ -564,13 +564,13 @@
if widget.get_active():
wavs.wav_paths=[]
wavs.wav_sizes=[]
- for i in range(9):
+ for i in range(17):
wavs.add_wav_path('/opt/tuxdroid/apps/tuxgi/sounds/%d.wav'%(i+1))
for path in st_wav_paths:
wavs.add_wav_path(path)
else:
- if len(st_wav_paths) > 9:
- for i in range(9):
+ if len(st_wav_paths) > 17:
+ for i in range(17):
wavs.wav_sizes.pop(0)
wavs.wav_paths.pop(0)
else:
|
|
From: jaguarondi <c2m...@c2...> - 2007-09-27 15:07:37
|
Author: jaguarondi
Date: 2007-09-27 17:07:06 +0200 (Thu, 27 Sep 2007)
New Revision: 544
Modified:
firmware/fuxusb/trunk/global.c
firmware/fuxusb/trunk/global.h
firmware/fuxusb/trunk/modules/usb/usb_task.c
firmware/fuxusb/trunk/modules/usb_enum/usb_enum.c
Log:
* Corrected a couple of bugs when sending the status to the computer. Now sending data is a bit more consistent but there's still a lot of cleaning to do, starting from applying 'indent' to the code then splitting that huge usb_task file into modules.
Modified: firmware/fuxusb/trunk/global.c
===================================================================
--- firmware/fuxusb/trunk/global.c 2007-09-26 14:53:18 UTC (rev 543)
+++ firmware/fuxusb/trunk/global.c 2007-09-27 15:07:06 UTC (rev 544)
@@ -39,8 +39,6 @@
char CMD_IN_Bank_Nb;
bit USB_ParserProcess_Permit_Flag;
-bit USB_StatusProcess_Permit_Flag;
-bit USB_Status_NewCmd_Flag;
//-------------------------------------------------------
// I2C Controler
Modified: firmware/fuxusb/trunk/global.h
===================================================================
--- firmware/fuxusb/trunk/global.h 2007-09-26 14:53:18 UTC (rev 543)
+++ firmware/fuxusb/trunk/global.h 2007-09-27 15:07:06 UTC (rev 544)
@@ -49,8 +49,6 @@
extern char CMD_IN_Bank_Nb;
extern bit USB_ParserProcess_Permit_Flag;
-extern bit USB_StatusProcess_Permit_Flag;
-extern bit USB_Status_NewCmd_Flag;
//-------------------------------------------------------
// I2C Controler
Modified: firmware/fuxusb/trunk/modules/usb/usb_task.c
===================================================================
--- firmware/fuxusb/trunk/modules/usb/usb_task.c 2007-09-26 14:53:18 UTC (rev 543)
+++ firmware/fuxusb/trunk/modules/usb/usb_task.c 2007-09-27 15:07:06 UTC (rev 544)
@@ -30,11 +30,15 @@
unsigned char pong_received; /* value of the pong received from the sound cpu */
unsigned char pong_missed; /* counting the pong missed on the SPI */
#endif
+
+/** Flag set when the computer sent a status request.
+ * Used to flush the status buffer on the USB. */
+bit status_requested;
+
bit CMDIN_ToSend_Flag = 0;
bit EP_AUDIOIN_Loaded = 0;
bit i2c_bootloading_Flag = 0; /* bootloader mode */
-bit ReadStatus_USBRequest_Flag = 0;
bit Cpu_reset = 0;
bit Speaker_TTS_Select_Flag = 0;
@@ -80,7 +84,6 @@
Led_0_off();
- ReadStatus_USBRequest_Flag = 0;
P0_0 = 0;
P1_0 = 0;
@@ -90,8 +93,7 @@
RF_OFFLine_Back = 0;
Speaker_TTS_Select_Flag = 0;
USB_ParserProcess_Permit_Flag = TRUE;
- USB_StatusProcess_Permit_Flag = TRUE;
- USB_Status_NewCmd_Flag = FALSE;
+ status_requested = FALSE;
}
@@ -115,44 +117,37 @@
{
data Uchar i;
- if((USB_Status_NewCmd_Flag)&&(USB_StatusProcess_Permit_Flag)&&(!(spi_master_config & RF_2FRAMES_HDR)) )
+ if (status_requested && FifoIn_STT_Idx && !CMDIN_ToSend_Flag)
{
- if(CMD_IN_Bank_Nb<=2)
- {
- //Led_0_off();
- Usb_select_ep(EP_CMD_IN);
- Usb_write_byte(0);
-
- if(RF_OFFLINE)
- Usb_write_byte(0);
- else
- Usb_write_byte(1);
+ //Led_0_off();
+ Usb_select_ep(EP_CMD_IN);
+ Usb_write_byte(0);
- Usb_write_byte(RF_Status);
+ if(RF_OFFLINE)
+ Usb_write_byte(0);
+ else
+ Usb_write_byte(1);
- Usb_write_byte((FifoIn_STT_Idx/4));
+ Usb_write_byte(RF_Status);
- //printf ("USB Request::Read Status from RF :: Sent\n");
-
- for(i=0;i<FifoIn_STT_Idx;i++)
- Usb_write_byte(FIFO_STT_get());
-
- if(FifoIn_STT_Idx!=60)
- for(i=FifoIn_STT_Idx;i<60;i++)
- Usb_write_byte(0);
-
- CMDIN_ToSend_Flag = 1; // Synchronize the Sending command With USB
- ReadStatus_USBRequest_Flag = 0;
- FIFO_STT_flush();
- RF_Status = 0;
- CMD_IN_Bank_Nb ++;
- //Led_0_on();
- USB_Status_NewCmd_Flag = FALSE;
- }
+ Usb_write_byte((FifoIn_STT_Idx/4));
- }
+ //printf ("USB Request::Read Status from RF :: Sent\n");
+ for(i=0;i<FifoIn_STT_Idx;i++)
+ Usb_write_byte(FIFO_STT_get());
+ /* XXX stuffing here is probably not necessary. */
+ if(FifoIn_STT_Idx!=60)
+ for(i=FifoIn_STT_Idx;i<60;i++)
+ Usb_write_byte(0);
+
+ CMDIN_ToSend_Flag = 1; // Synchronize the Sending command With USB
+ FIFO_STT_flush();
+ RF_Status = 0;
+ //Led_0_on();
+ status_requested = FALSE;
+ }
}
@@ -226,12 +221,10 @@
//--------------------------------------
if (USBCommand_ForDongle[1] == 0x03)
{
- Usb_select_ep(EP_CMD_IN);
-
- FIFO_STT_flush();
FIFO_STT_put(0xC6);
FIFO_STT_put(Tux_ID[0]);
FIFO_STT_put(Tux_ID[1]);
+ FIFO_STT_put(0);
#ifdef USB_CMD_DEBUG
printf(" CMD REQUESTING Tux ID Dongle \n");
#endif
@@ -311,7 +304,7 @@
if(USBCommand_ForDongle[3] == 0x00)
{
//DEBUG_2 = 1;
- USB_Status_NewCmd_Flag = TRUE;
+ status_requested = TRUE;
//DEBUG_2 = 0;
}
@@ -358,36 +351,28 @@
//
//--------------------------------------------------------------------------
- else if (USBCommand_ForDongle[0] == INFO_FUXUSB_CMD) //
+ else if (USBCommand_ForDongle[0] == INFO_FUXUSB_CMD)
{
- Usb_select_ep(EP_CMD_IN);
-
// VERSION_CMD
//-------------------------------------
- Usb_write_byte(info_version.version_cmd);
- Usb_write_byte(info_version.cpu_ver_maj);
- Usb_write_byte(info_version.ver_minor);
- Usb_write_byte(info_version.ver_update);
+ FIFO_STT_put(info_version.version_cmd);
+ FIFO_STT_put(info_version.cpu_ver_maj);
+ FIFO_STT_put(info_version.ver_minor);
+ FIFO_STT_put(info_version.ver_update);
// REVISION_CMD
//-------------------------------------
- Usb_write_byte(info_revision.revision_cmd);
- Usb_write_byte((info_revision.revision&0xFF00)>>8);
- Usb_write_byte((info_revision.revision&0x00FF));
- Usb_write_byte(info_revision._undefined_);
+ FIFO_STT_put(info_revision.revision_cmd);
+ FIFO_STT_put((info_revision.revision&0xFF00)>>8);
+ FIFO_STT_put((info_revision.revision&0x00FF));
+ FIFO_STT_put(info_revision._undefined_);
// AUTHOR_CMD
//-------------------------------------
- Usb_write_byte(info_author.author_cmd);
- Usb_write_byte((info_author.author_id&0xFF00)>>8);
- Usb_write_byte((info_author.author_id&0x00FF));
- Usb_write_byte(info_author._undefined_);
-
-
- CMDIN_ToSend_Flag = 1; // Synchronize the Sending command With USB
- ReadStatus_USBRequest_Flag = 0;
- CMD_IN_Bank_Nb ++;
-
+ FIFO_STT_put(info_author.author_cmd);
+ FIFO_STT_put((info_author.author_id&0xFF00)>>8);
+ FIFO_STT_put((info_author.author_id&0x00FF));
+ FIFO_STT_put(info_author._undefined_);
}
}
/*F**************************************************************************
@@ -492,29 +477,18 @@
//
//--------------------------------------------------------------------------
if (Usb_sof())
- {
- Usb_clear_sof();
- usb_sof_counter ++; // == 0xFF == 250ms
+ {
+ Usb_clear_sof();
+ usb_sof_counter ++; // == 0xFF == 250ms
-
if ((CMDIN_ToSend_Flag == 1))
{
- if(CMD_IN_Bank_Nb<=2)
- {
#ifdef USB_TASK_DEBUG
- printf ("SOF:: CMD_IN_Bank_Nb::%BX Usb_set_tx_ready \n",CMD_IN_Bank_Nb);
printf ("HIDCommand Sent \n");
#endif
Usb_select_ep(EP_CMD_IN);
Usb_set_tx_ready();
-
- CMDIN_ToSend_Flag = 0;
- }
-#ifdef USB_TASK_DEBUG
- else
- printf ("CMD_IN_Bank_Nb %B Full \n",CMD_IN_Bank_Nb);
-#endif
}
if(spi_watchdog_ctr)
@@ -631,7 +605,6 @@
//--------------------------------------------------------------------------
if(Usb_endpoint_interrupt())
{
- // printf ("RF:: CMD_IN_Bank_Nb::%BX RFCommand : %BX %BX %BX %BX %BX ",CMD_IN_Bank_Nb,RFCommand[1],RFCommand[2], RFCommand[3], RFCommand[4],RFCommand[5]);
//--------------------------------------------------------------------------
//
// Event on EP_CMD_IN LIBUSB EndPoint
@@ -646,11 +619,7 @@
if(Usb_tx_complete())
{
Usb_clear_tx_complete();
- // printf ("LIBUSB EP:: clear_tx:: CMD_IN_Bank_Nb::%BX ",CMD_IN_Bank_Nb);
- CMD_IN_Bank_Nb--;
- if (CMD_IN_Bank_Nb<0) CMD_IN_Bank_Nb = 0;
- // printf ("Dec CMD_IN_Bank_Nb => %BX \n",CMD_IN_Bank_Nb);
- // CMDIN_ToSend_Flag = 0;
+ CMDIN_ToSend_Flag = 0;
//Led_1_off();
}
}
@@ -1120,7 +1089,6 @@
SPI_CSn = 0; // Chip select
spi_Start_Flag = 1;
USB_ParserProcess_Permit_Flag = FALSE;
- USB_StatusProcess_Permit_Flag = FALSE;
}
//--------------------------------------------------------------------------
@@ -1272,7 +1240,6 @@
{
USB_ParserProcess_Permit_Flag = TRUE;
- USB_StatusProcess_Permit_Flag = TRUE;
spi_Start_Flag = 0;
SPI_CSn = 1; // Chip deselect
spi_enable = 1;
Modified: firmware/fuxusb/trunk/modules/usb_enum/usb_enum.c
===================================================================
--- firmware/fuxusb/trunk/modules/usb_enum/usb_enum.c 2007-09-26 14:53:18 UTC (rev 543)
+++ firmware/fuxusb/trunk/modules/usb_enum/usb_enum.c 2007-09-27 15:07:06 UTC (rev 544)
@@ -1000,8 +1000,7 @@
FIFO_SPK_init(); // Modif de test
FIFO_STT_init();
RF_Connection_Status = RF_DISCONNECTED;
- printf(" Set Config: Finished \n");
- printf(" RF_Connection_Status = RF_DISCONNECTED; \n");
+
}
}
|
|
From: Paul_R <c2m...@c2...> - 2007-09-26 14:53:53
|
Author: Paul_R Date: 2007-09-26 16:53:18 +0200 (Wed, 26 Sep 2007) New Revision: 543 Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Changed the values treatment and make some separates functions for all possible events. Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) |
|
From: Paul_R <c2m...@c2...> - 2007-09-25 15:24:19
|
Author: Paul_R Date: 2007-09-25 17:24:16 +0200 (Tue, 25 Sep 2007) New Revision: 542 Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Added notifications Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) |
|
From: Paul_R <c2m...@c2...> - 2007-09-25 12:38:14
|
Author: Paul_R Date: 2007-09-25 14:37:45 +0200 (Tue, 25 Sep 2007) New Revision: 541 Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Split the lightGraph class in two classes : - lightGraph to draw the curve when the GUI is active - lightMeasure to control the event and acquire the light's status Light measure is activated when the manager starts Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) |
|
From: jaguarondi <c2m...@c2...> - 2007-09-24 17:05:08
|
Author: jaguarondi Date: 2007-09-24 19:05:06 +0200 (Mon, 24 Sep 2007) New Revision: 540 Modified: firmware/tuxcore/trunk/bootloader.c Log: * Fixed the missing dependency on hardware.h. Modified: firmware/tuxcore/trunk/bootloader.c =================================================================== --- firmware/tuxcore/trunk/bootloader.c 2007-09-24 11:48:07 UTC (rev 539) +++ firmware/tuxcore/trunk/bootloader.c 2007-09-24 17:05:06 UTC (rev 540) @@ -24,7 +24,7 @@ #include <avr/pgmspace.h> #include <util/twi.h> #include <avr/eeprom.h> -#include "global.h" +#include "hardware.h" #include "common/commands.h" typedef union |
|
From: jaguarondi <c2m...@c2...> - 2007-09-24 11:48:33
|
Author: jaguarondi
Date: 2007-09-24 13:48:07 +0200 (Mon, 24 Sep 2007)
New Revision: 539
Modified:
firmware/tuxcore/trunk/led.c
Log:
* Avoid glitches when refreshing the blue leds as this disturbs the IR receiver.
Modified: firmware/tuxcore/trunk/led.c
===================================================================
--- firmware/tuxcore/trunk/led.c 2007-09-24 06:53:33 UTC (rev 538)
+++ firmware/tuxcore/trunk/led.c 2007-09-24 11:48:07 UTC (rev 539)
@@ -66,7 +66,7 @@
*/
void refresh_leds(void)
{
- LED_PT &= ~LED_MK;
+ LED_PT &= leds_buffer;
LED_PT |= leds_buffer;
}
|
|
From: Paul_R <c2m...@c2...> - 2007-09-24 06:54:09
|
Author: Paul_R Date: 2007-09-24 08:53:33 +0200 (Mon, 24 Sep 2007) New Revision: 538 Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Added the light curve control (drop, raise, ...) * Added the french translation Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) |
|
From: Paul_R <c2m...@c2...> - 2007-09-21 14:33:57
|
Author: Paul_R Date: 2007-09-21 16:33:24 +0200 (Fri, 21 Sep 2007) New Revision: 537 Removed: software/gadgets/light_monitor/trunk/Light_monitor_svn/ Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * light monitor with GUI and event. * Removed the tgf folder and all uncompressed files. To recompress the TGF files, .svn folders and files must be deleted. So, it's more easy to decompress the .tgf file. Modified: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) |
|
From: Paul_R <c2m...@c2...> - 2007-09-20 10:06:47
|
Author: Paul_R Date: 2007-09-20 12:06:12 +0200 (Thu, 20 Sep 2007) New Revision: 536 Added: software/gadgets/light_monitor/trunk/Light_monitor.tgf Log: * Added the TGF file Added: software/gadgets/light_monitor/trunk/Light_monitor.tgf =================================================================== (Binary files differ) Property changes on: software/gadgets/light_monitor/trunk/Light_monitor.tgf ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream |
|
From: Paul_R <c2m...@c2...> - 2007-09-20 09:30:50
|
Author: Paul_R Date: 2007-09-20 11:30:45 +0200 (Thu, 20 Sep 2007) New Revision: 535 Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Data/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/GUI/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/Icons/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/Icons/gadget.png software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.glade software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.pyp software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade.bak software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep.bak software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.pyp software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/init.pyp software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/lightGraph_class.py software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/main.pyp software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/notify.pyp software/gadgets/light_monitor/trunk/Light_monitor_svn/Sounds/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Strings/ software/gadgets/light_monitor/trunk/Light_monitor_svn/Strings/fr_ALL.xml software/gadgets/light_monitor/trunk/Light_monitor_svn/about.xml software/gadgets/light_monitor/trunk/Light_monitor_svn/parts.xml software/gadgets/light_monitor/trunk/Light_monitor_svn/settings.xml software/gadgets/light_monitor/trunk/Light_monitor_svn/strings.xml Log: * Add the TGF directories of the light_monitor gadget Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/Icons/gadget.png =================================================================== (Binary files differ) Property changes on: software/gadgets/light_monitor/trunk/Light_monitor_svn/Pictures/Icons/gadget.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.glade =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.glade (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.glade 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,545 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Parameters</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">True</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> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkFrame" id="frame3"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</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="fixed4"> + <property name="visible">True</property> + + <child> + <widget class="GtkLabel" id="label_author"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Authors :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">32</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_version"> + <property name="width_request">320</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Version :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">48</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_description"> + <property name="width_request">312</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Description :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>About</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="frame4"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + + <child> + <widget class="GtkAlignment" id="alignment7"> + <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="GtkLabel" id="label_remote"> + <property name="width_request">336</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Current : None</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_remote"> + <property name="width_request">62</property> + <property name="height_request">27</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Set</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_button_remote_clicked" last_modification_time="Sat, 22 Sep 2007 00:55:36 GMT"/> + </widget> + <packing> + <property name="x">256</property> + <property name="y">0</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Remote</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="border_width">5</property> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + + <child> + <widget class="GtkAlignment" id="alignment8"> + <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="GtkSpinButton" id="delay_spinbutton"> + <property name="width_request">120</property> + <property name="height_request">24</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 1 3600 1 10 10</property> + </widget> + <packing> + <property name="x">88</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label13"> + <property name="width_request">336</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Delay (sec) :</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Updates</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="GtkFixed" id="fixed3"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="width_request">96</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_accept_clicked" last_modification_time="Wed, 11 Jul 2007 19:53:32 GMT"/> + + <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">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="label" translatable="yes">Accept</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="x">256</property> + <property name="y">0</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button3"> + <property name="width_request">96</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_cancel_clicked" last_modification_time="Thu, 09 Aug 2007 13:50:03 GMT"/> + + <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">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</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">2</property> + + <child> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-cancel</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">Cancel</property> + <property name="use_underline">True</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="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="x">152</property> + <property name="y">0</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> + +</glade-interface> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.pyp (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/conf/other.pyp 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,102 @@ +bindtextdomain("params", "") + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/conf/other.glade', + root="window1", + domain="params", **kwargs): + """ + Constructor + """ + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + """ + On new window + """ + self.updates_commons() + self.updates_specifics() + + def updates_commons(self): + """ + Updates common widgets + """ + # Window title + txt = "%s : %s" % (_me.string('name_to_read'), + _me.string('gui_conf_window_title')) + self.get_widget("window1").set_title(txt) + + # About labels + txt = _me.string('gui_conf_about_title') + self.get_widget("label7").set_text(txt) + + txt = "%s : %s" % (_me.string('gui_conf_description_lb'), + _me.get_description()) + self.get_widget("label_description").set_text(txt) + + txt = "%s : %s" % (_me.string('gui_conf_author_lb'), + _me.get_author()) + self.get_widget("label_author").set_text(txt) + + txt = "%s : %s" % (_me.string('gui_conf_version_lb'), + _me.get_version()) + self.get_widget("label_version").set_text(txt) + + # Remote Frame + txt = _me.string('gui_conf_remote_title') + self.get_widget("label11").set_text(txt) + + txt = "%s : None" % _me.string('gui_conf_current_bind_lb') + self.get_widget("label_remote").set_text(txt) + + txt = _me.string('gui_conf_remote_set_bt') + self.get_widget("button_remote").set_label(txt) + + # Update Frame + txt = _me.string('gui_conf_update_title') + self.get_widget("label12").set_text(txt) + + txt = "%s : " % _me.string('gui_conf_delay_lb') + self.get_widget("label13").set_text(txt) + + value = _me.get_var('notify_delay') + self.get_widget("delay_spinbutton").set_value(value) + + # Bottom buttons + txt = _me.string('gui_conf_cancel_bt') + self.get_widget("label6").set_text(txt) + + txt = _me.string('gui_conf_accept_bt') + self.get_widget("label5").set_text(txt) + + def updates_specifics(self): + """ + Updates specific widgets + """ + pass + + def on_button_remote_clicked(self, widget, *args): + """ + On button 'set' remote clicked + """ + def remote_set_caption(): + tux.sys.wait(0.1) + gadgets['Manager'].gui('remote').window.set_captions(gadgets[_me.get_name()]) + if gadgets.has_key('Manager'): + if not gadgets['Manager'].gui('remote').showed(): + gadgets['Manager'].gui('remote').show() + thread.start_new_thread(remote_set_caption, ()) + + def on_accept_clicked(self, widget, *args): + """ + On button 'accept' clicked + """ + _me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value())) + self.get_widget("window1").destroy() + + def on_cancel_clicked(self, widget, *args): + """ + On button 'cancel' clicked + """ + self.get_widget("window1").destroy() Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,107 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="width_request">600</property> + <property name="height_request">500</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</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">True</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="Thu, 20 Sep 2007 08:43:41 GMT"/> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">button1</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">8</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="GtkFixed" id="fixed2"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">button2</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</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> + +</glade-interface> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade.bak =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade.bak (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.glade.bak 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,107 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window1"> + <property name="width_request">600</property> + <property name="height_request">500</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Widget</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">True</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="Thu, 20 Sep 2007 08:43:41 GMT"/> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFixed" id="fixed1"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button1"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">button1</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">8</property> + <property name="y">8</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="GtkFixed" id="fixed2"> + <property name="visible">True</property> + + <child> + <widget class="GtkButton" id="button2"> + <property name="width_request">62</property> + <property name="height_request">29</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">button2</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</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> + +</glade-interface> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,8 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> + +<glade-project> + <name></name> + <program_name></program_name> + <gnome_support>FALSE</gnome_support> +</glade-project> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep.bak =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep.bak (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.gladep.bak 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,8 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> + +<glade-project> + <name></name> + <program_name></program_name> + <gnome_support>FALSE</gnome_support> +</glade-project> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.pyp (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/GUI/widget/other.pyp 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,33 @@ +bindtextdomain("params", "") +sys.path.append(_me.get_path('root') + '/Scripts/Python') +try: + from lightGraph_class import lightGraph +except: + print sys.exc_info() + +class Window(SimpleGladeApp): + + def __init__(self, + path=_me.get_path('root') + '/Scripts/Python/GUI/widget/other.glade', + root="window1", + domain="params", **kwargs): + SimpleGladeApp.__init__(self, path, root, domain, **kwargs) + + def new(self): + self.get_widget("window1").set_title(_me.string('name_to_read')) + thread.start_new_thread(self.update, ()) + + def on_window1_destroy(self, widget, *args): + tux.monitoring.remove(self.monitor_id) + + + def update(self): + _me.update_informations() + gtk.gdk.threads_enter() + self.light_graph = lightGraph(400, 0.1) + self.light_graph.set_size_request(500, 300) + layout = self.get_widget('vbox2') + layout.add(self.light_graph) + layout.show_all() + gtk.gdk.threads_leave() + self.monitor_id = tux.monitoring.insert(0x1B, self.light_graph.on_light_level) Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/init.pyp =================================================================== Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/lightGraph_class.py =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/lightGraph_class.py (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/lightGraph_class.py 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,107 @@ +import gtk +import sys + +class lightGraph(gtk.DrawingArea): + def __init__(self, spl, rate): + super(lightGraph, self).__init__() + self.connect("expose_event", self.expose) + self.context = None + self.sample = float(spl) + self.val_table = [0] * spl + self.rate = rate + self.tick = 0 + + def expose(self, widget, event): + #when an event occur, update the context + self.context = widget.window.cairo_create() + self.context.rectangle(event.area.x, event.area.y, + event.area.width, event.area.height) + self.context.clip() + self.draw(self.context) + return False + + def refresh(self): + if self.window: + width,height = self.window.get_size() + self.window.invalidate_rect(gtk.gdk.Rectangle(0,0,width,height),False) + + def draw(self, context): + rect = self.get_allocation() + #draw axes + #draw a rectangle in the window area + context.rectangle(rect.x, rect.y, rect.width, rect.height) + #set a white background + context.set_source_rgb(1, 1, 1) + context.fill_preserve() + #draw a black border + context.set_source_rgb(0, 0, 0) + context.set_line_width(1) + context.stroke() + + #draw horizontal grid with 10 div. and 10 sub-div + for i in range(20): + y = (rect.height / 20) * i + #place correctly the vector + context.move_to(rect.width, y) + if i % 2 == 1: + #Minor div: no text + context.set_source_rgb(0.2, 0.2, 0.2) + context.set_line_width(0.4) + context.line_to(rect.x, y) + else: + #Major div: place text + context.set_source_rgb(0, 0, 0) + context.set_line_width(0.6) + context.line_to(rect.x, y) + context.show_text(str((10-(i/2))*10)+"%") + context.stroke() + + #draw vertical division + #create a tab with the wanted divisions + temp_tab = [0.25, 0.5, 0.75] + for i in range(3): + context.set_source_rgb(0.2, 0.2, 0.2) + context.set_line_width(0.6) + #place correctly the vector + context.move_to(rect.width * temp_tab[i], 0) + #trace a line + context.line_to(rect.width * temp_tab[i], rect.height) + #replace the vector to draw text + context.move_to(rect.width * temp_tab[i], rect.height - 5) + #determine the time labels + context.show_text(str((self.rate * self.sample) - ((self.rate) * + self.sample * temp_tab[i])) + " sec.") + context.stroke() + + #display sample and rate + #move the vector in the bottom + context.move_to(10, rect.height - 10) + #display the rate + context.show_text("rate = "+str(self.rate)+" sec.") + context.move_to(10, rect.height - 20) + #and the samples + context.show_text("samples = "+str(self.sample)) + context.stroke() + + #determine the coefficients to adjust the curve in the window space + coeff_y = float(rect.height / 1124.00) + coeff_x = float(rect.width / self.sample) + + #trace the curve + context.move_to(rect.x, rect.height) + for i, val in enumerate(self.val_table): + context.set_source_rgb(1.0, 0, 0) + context.line_to(rect.x + (i * coeff_x), rect.height - (val * coeff_y)) + context.stroke() + + def on_light_level(self, args): + if self.context != None: + if self.tick == 0: + val = (args[0] * 256) + args[1] + self.val_table.append(val) + self.val_table.pop(0) + self.refresh() + self.tick = int(self.rate * 10) + else: + self.tick -= 1 + Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/main.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/main.pyp (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/main.pyp 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,2 @@ +def update_informations(): + pass Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/notify.pyp =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/notify.pyp (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Scripts/Python/notify.pyp 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,5 @@ +def notify_checker(): + return False + +def notify_actuator(): + pass Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/Strings/fr_ALL.xml =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/Strings/fr_ALL.xml (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/Strings/fr_ALL.xml 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='UTF-8'?> +<strings> + <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt> + <gui_conf_about_title type='str'>A propos</gui_conf_about_title> + <gui_conf_version_lb type='str'>Version</gui_conf_version_lb> + <gui_conf_update_title type='str'>Mise à jour</gui_conf_update_title> + <gui_conf_remote_title type='str'>Télécommande</gui_conf_remote_title> + <gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt> + <gui_conf_window_title type='str'>Paramètres</gui_conf_window_title> + <gui_conf_description_lb type='str'>Description</gui_conf_description_lb> + <gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb> + <gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb> + <gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb> + <gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt> + <name_to_read type='str'>Moniteur de lumière</name_to_read> + <speaker_name type='str'>Bruno8k</speaker_name> +</strings> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/about.xml =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/about.xml (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/about.xml 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8'?> +<about> + <gadget_description type='str'>Empty gadget for Tux Droid.</gadget_description> + <gadget_author type='str'>Kysoh</gadget_author> + <gadget_name type='str'>Empty</gadget_name> + <gadget_version type='str'>0.0.0</gadget_version> +</about> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/parts.xml =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/parts.xml (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/parts.xml 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?> +<parts> + <notifications type='bool'>True</notifications> + <parameters_GUI type='bool'>True</parameters_GUI> + <widget_GUI type='bool'>True</widget_GUI> +</parts> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/settings.xml =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/settings.xml (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/settings.xml 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8'?> +<settings> + <parameters/> + <general> + <gui_state> + <widget> + <visible type='bool'>False</visible> + </widget> + <conf> + <visible type='bool'>False</visible> + </conf> + </gui_state> + <language type='str'>en_US</language> + <notified type='bool'>True</notified> + <notify_delay type='int'>60</notify_delay> + <menu_active type='bool'>True</menu_active> + <speaker type='int'>3</speaker> + <pitch type='int'>100</pitch> + </general> +</settings> Added: software/gadgets/light_monitor/trunk/Light_monitor_svn/strings.xml =================================================================== --- software/gadgets/light_monitor/trunk/Light_monitor_svn/strings.xml (rev 0) +++ software/gadgets/light_monitor/trunk/Light_monitor_svn/strings.xml 2007-09-20 09:30:45 UTC (rev 535) @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='UTF-8'?> +<strings> + <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt> + <gui_conf_about_title type='str'>About</gui_conf_about_title> + <gui_conf_version_lb type='str'>Version</gui_conf_version_lb> + <gui_conf_update_title type='str'>Update</gui_conf_update_title> + <gui_conf_remote_title type='str'>Remote</gui_conf_remote_title> + <gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt> + <gui_conf_window_title type='str'>Parameters</gui_conf_window_title> + <gui_conf_description_lb type='str'>Description</gui_conf_description_lb> + <gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb> + <gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb> + <gui_conf_author_lb type='str'>Author</gui_conf_author_lb> + <gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt> + <name_to_read type='str'>Light monitoring</name_to_read> + <speaker_name type='str'>Ryan8k</speaker_name> +</strings> |
|
From: Paul_R <c2m...@c2...> - 2007-09-20 07:48:54
|
Author: Paul_R
Date: 2007-09-20 09:48:54 +0200 (Thu, 20 Sep 2007)
New Revision: 534
Added:
software/gadgets/light_monitor/
software/gadgets/light_monitor/branches/
software/gadgets/light_monitor/tags/
software/gadgets/light_monitor/trunk/
software/gadgets/light_monitor/trunk/lightGraph_class.py
Log:
* Added a new gadget : light_monitor
Added: software/gadgets/light_monitor/trunk/lightGraph_class.py
===================================================================
--- software/gadgets/light_monitor/trunk/lightGraph_class.py (rev 0)
+++ software/gadgets/light_monitor/trunk/lightGraph_class.py 2007-09-20 07:48:54 UTC (rev 534)
@@ -0,0 +1,104 @@
+class lightGraph(gtk.DrawingArea):
+ def __init__(self, spl, rate):
+ super(lightGraph, self).__init__()
+ self.connect("expose_event", self.expose)
+ self.context = None
+ self.sample = float(spl)
+ self.val_table = [0] * spl
+ self.rate = rate
+ self.tick = 0
+
+ def expose(self, widget, event):
+ #when an event occur, update the context
+ self.context = widget.window.cairo_create()
+ self.context.rectangle(event.area.x, event.area.y,
+ event.area.width, event.area.height)
+ self.context.clip()
+ self.draw(self.context)
+ return False
+
+ def refresh(self):
+ if self.window:
+ width,height = self.window.get_size()
+ self.window.invalidate_rect(gtk.gdk.Rectangle(0,0,width,height),False)
+
+ def draw(self, context):
+ rect = self.get_allocation()
+ #draw axes
+ #draw a rectangle in the window area
+ context.rectangle(rect.x, rect.y, rect.width, rect.height)
+ #set a white background
+ context.set_source_rgb(1, 1, 1)
+ context.fill_preserve()
+ #draw a black border
+ context.set_source_rgb(0, 0, 0)
+ context.set_line_width(1)
+ context.stroke()
+
+ #draw horizontal grid with 10 div. and 10 sub-div
+ for i in range(20):
+ y = (rect.height / 20) * i
+ #place correctly the vector
+ context.move_to(rect.width, y)
+ if i % 2 == 1:
+ #Minor div: no text
+ context.set_source_rgb(0.2, 0.2, 0.2)
+ context.set_line_width(0.4)
+ context.line_to(rect.x, y)
+ else:
+ #Major div: place text
+ context.set_source_rgb(0, 0, 0)
+ context.set_line_width(0.6)
+ context.line_to(rect.x, y)
+ context.show_text(str((10-(i/2))*10)+"%")
+ context.stroke()
+
+ #draw vertical division
+ #create a tab with the wanted divisions
+ temp_tab = [0.25, 0.5, 0.75]
+ for i in range(3):
+ context.set_source_rgb(0.2, 0.2, 0.2)
+ context.set_line_width(0.6)
+ #place correctly the vector
+ context.move_to(rect.width * temp_tab[i], 0)
+ #trace a line
+ context.line_to(rect.width * temp_tab[i], rect.height)
+ #replace the vector to draw text
+ context.move_to(rect.width * temp_tab[i], rect.height - 5)
+ #determine the time labels
+ context.show_text(str((self.rate * self.sample) - ((self.rate) *
+ self.sample * temp_tab[i])) + " sec.")
+ context.stroke()
+
+ #display sample and rate
+ #move the vector in the bottom
+ context.move_to(10, rect.height - 10)
+ #display the rate
+ context.show_text("rate = "+str(self.rate)+" sec.")
+ context.move_to(10, rect.height - 20)
+ #and the samples
+ context.show_text("samples = "+str(self.sample))
+ context.stroke()
+
+ #determine the coefficients to adjust the curve in the window space
+ coeff_y = float(rect.height / 1124.00)
+ coeff_x = float(rect.width / self.sample)
+
+ #trace the curve
+ context.move_to(rect.x, rect.height)
+ for i, val in enumerate(self.val_table):
+ context.set_source_rgb(1.0, 0, 0)
+ context.line_to(rect.x + (i * coeff_x), rect.height - (val * coeff_y))
+ context.stroke()
+
+ def on_light_level(self, args):
+ if self.context != None:
+ if self.tick == 0:
+ val = (args[0] * 256) + args[1]
+ self.val_table.append(val)
+ self.val_table.pop(0)
+ self.refresh()
+ self.tick = int(self.rate * 10)
+ else:
+ self.tick -= 1
+
|
|
From: jaguarondi <c2m...@c2...> - 2007-09-20 07:43:18
|
Author: jaguarondi Date: 2007-09-20 09:42:46 +0200 (Thu, 20 Sep 2007) New Revision: 533 Added: software/gadgets/ Log: * Added a new folder for developing gadgets. |
|
From: jaguarondi <c2m...@c2...> - 2007-09-19 10:57:23
|
Author: jaguarondi
Date: 2007-09-19 12:57:20 +0200 (Wed, 19 Sep 2007)
New Revision: 532
Modified:
firmware/tuxcore/trunk/motors.c
firmware/tuxcore/trunk/motors.h
Log:
* Set parameters of functions as const in the motor module.
Modified: firmware/tuxcore/trunk/motors.c
===================================================================
--- firmware/tuxcore/trunk/motors.c 2007-09-19 10:45:56 UTC (rev 531)
+++ firmware/tuxcore/trunk/motors.c 2007-09-19 10:57:20 UTC (rev 532)
@@ -208,7 +208,7 @@
is raising or lowering the eyelids. 'cnt' can be up to 256. If 'cnt' is
null, waving will run indefinitely.
*/
-void blink_eyes(uint8_t cnt)
+void blink_eyes(uint8_t const cnt)
{
eyes_move_counter = cnt;
eyes_stop_delay = 0;
@@ -365,7 +365,7 @@
is raising or lowering the eyelids. 'cnt' can be up to 256. If 'cnt' is
null, waving will run indefinitely.
*/
-void move_mouth(uint8_t cnt)
+void move_mouth(uint8_t const cnt)
{
mouth_move_counter = cnt;
mouth_stop_delay = 0;
@@ -485,7 +485,7 @@
motor. It's possible that the smallest PWM values won't deliver enough power
to even start the motor.
*/
-void wave_flippers(uint8_t cnt, uint8_t pwm)
+void wave_flippers(uint8_t const cnt, uint8_t const pwm)
{
flippers_move_counter = cnt;
flippers_PWM = pwm;
@@ -645,16 +645,16 @@
\param pwm PWM value assigned to the spinning.
\ingroup spin
*/
-void spin_left(uint8_t angle, uint8_t pwm)
+void spin_left(uint8_t const angle, uint8_t const pwm)
{
+ spin_direction = LEFT;
+ spin_move_counter = angle;
/* If the rotation direction is changing and we are not stopped exactly on
* the switch (position switch not pressed), we need to increment the angle
* value to prevent counting the first switch detection that will happen as
* soon as the rotation starts. */
if ((spin_direction == RIGHT) && (PSW_SPIN_PIN & PSW_SPIN_MK))
- angle++;
- spin_direction = LEFT;
- spin_move_counter = angle;
+ spin_move_counter++;
spin_PWM = pwm;
spin_PWM_mask &= ~MOT_SPIN_R_MK;
spin_PWM_mask |= MOT_SPIN_L_MK;
@@ -666,16 +666,16 @@
\param pwm PWM value assigned to the spinning.
\ingroup spin
*/
-void spin_right(uint8_t angle, uint8_t pwm)
+void spin_right(uint8_t const angle, uint8_t const pwm)
{
+ spin_direction = RIGHT;
+ spin_move_counter = angle;
/* If the rotation direction is changing and we are not stopped exactly on
* the switch (position switch not pressed), we need to increment the angle
* value to prevent counting the first switch detection that will happen as
* soon as the rotation starts. */
if ((spin_direction == LEFT) && (PSW_SPIN_PIN & PSW_SPIN_MK))
- angle++;
- spin_direction = RIGHT;
- spin_move_counter = angle;
+ spin_move_counter++;
spin_PWM = pwm;
spin_PWM_mask &= ~MOT_SPIN_L_MK;
spin_PWM_mask |= MOT_SPIN_R_MK;
Modified: firmware/tuxcore/trunk/motors.h
===================================================================
--- firmware/tuxcore/trunk/motors.h 2007-09-19 10:45:56 UTC (rev 531)
+++ firmware/tuxcore/trunk/motors.h 2007-09-19 10:57:20 UTC (rev 532)
@@ -79,21 +79,21 @@
* Movements
*/
extern void stop_eyes(void);
-extern void blink_eyes(uint8_t cnt);
+extern void blink_eyes(uint8_t const cnt);
extern void close_eyes(void);
extern void open_eyes(void);
extern void stop_mouth(void);
-extern void move_mouth(uint8_t cnt);
+extern void move_mouth(uint8_t const cnt);
extern void open_mouth(void);
extern void close_mouth(void);
extern void stop_flippers(void);
extern void reset_flippers(void);
-extern void wave_flippers(uint8_t cnt, uint8_t pwm);
+extern void wave_flippers(uint8_t const cnt, uint8_t const pwm);
extern void lower_flippers(void);
extern void raise_flippers(void);
extern void stop_spinning(void);
-extern void spin_left(uint8_t angle, uint8_t pwm);
-extern void spin_right(uint8_t angle, uint8_t pwm);
+extern void spin_left(uint8_t const angle, uint8_t const pwm);
+extern void spin_right(uint8_t const angle, uint8_t const pwm);
/*
* Control
|
|
From: jaguarondi <c2m...@c2...> - 2007-09-19 10:46:29
|
Author: jaguarondi
Date: 2007-09-19 12:45:56 +0200 (Wed, 19 Sep 2007)
New Revision: 531
Modified:
firmware/tuxcore/trunk/main.c
Log:
* Declared local functions of main.c as static.
Modified: firmware/tuxcore/trunk/main.c
===================================================================
--- firmware/tuxcore/trunk/main.c 2007-09-19 08:16:13 UTC (rev 530)
+++ firmware/tuxcore/trunk/main.c 2007-09-19 10:45:56 UTC (rev 531)
@@ -80,10 +80,9 @@
static uint8_t t100ms_cnt;
/*! @} */
-void initIO(void);
-void closeIO(void);
-void updateStatus(void);
-void sleep(void);
+static void initIO(void);
+static void updateStatus(void);
+static void sleep(void);
/*
* External variables
@@ -104,7 +103,7 @@
*/
/** Compare value of the main tick timer. */
#define MAIN_TICK_COMPARE 125
-void main_tick_init(void)
+static void main_tick_init(void)
{
TCCR2A = _BV(WGM21);
TCCR2B = _BV(CS22) | _BV(CS21);
@@ -232,7 +231,7 @@
* I/O initialisation
*
*/
-void initIO(void)
+static void initIO(void)
{
/* Set charger inhibit line as output */
CHARGER_INH_DDR |= CHARGER_INH_MK;
@@ -259,7 +258,7 @@
*
* CHARGER_INH and IR stay configured, they're just turned off.
*/
-void closeIO(void)
+static void closeIO(void)
{
PCICR = 0;
EIMSK = 0;
@@ -269,7 +268,7 @@
}
#define STATUS_BYTE_SIZE 20
-void updateStatus(void)
+static void updateStatus(void)
{
if (FifoLength(statusFifo) >= (STATUS_BUF_SIZE - STATUS_BYTE_SIZE))
return; /* if there's not enough place, we dont save. */
@@ -326,7 +325,7 @@
* restore the configuration to continue normal operation.
*/
-void sleep(void)
+static void sleep(void)
{
uint8_t PRR_bak;
|
1 message has been excluded from this view by a project administrator.
