[tuxdroid-svn] r640 - in software/gadgets/battery_monitor/trunk: . Battery_monitor_svn Battery_moni
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r640 - in software/gadgets/battery_monitor/trunk: . Battery_monitor_svn Battery_monitor_svn/Scripts/Python Battery_monitor_svn/Scripts/Python/GUI/conf Battery_monitor_svn/Strings
|
From: Paul_R <c2m...@c2...> - 2007-10-24 10:07:34
|
Author: Paul_R
Date: 2007-10-24 12:07:29 +0200 (Wed, 24 Oct 2007)
New Revision: 640
Modified:
software/gadgets/battery_monitor/trunk/Battery_monitor.tgf
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.glade
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/notify.pyp
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/settings.xml
software/gadgets/battery_monitor/trunk/Battery_monitor_svn/strings.xml
Log:
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor.tgf
===================================================================
(Binary files differ)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/Battery_class.py 2007-10-24 10:07:29 UTC (rev 640)
@@ -97,7 +97,7 @@
def draw_threshold(self):
coeff_y = float(self.rect.height / self.measure_graph.RANGE)
- y = self.measure_graph.convert_value([0, 1, 0, 4.75])
+ y = self.measure_graph.convert_value([0, 1, 0, self.measure_graph.low_threshold])
y = (y * 3.4)
self.context.set_source_rgb(0.8, 0, 0)
@@ -107,7 +107,7 @@
self.context.line_to(0, self.rect.height - y * coeff_y)
self.context.stroke()
- y = self.measure_graph.convert_value([0, 1, 0, 6.25])
+ y = self.measure_graph.convert_value([0, 1, 0, self.measure_graph.high_threshold])
y = (y * 3.4)
self.context.set_source_rgb(0, 0.8, 0)
self.context.set_line_width(1)
@@ -215,9 +215,13 @@
self.val_table_event = [-1] * int(self.sample)
self.charger_event_backup = 3
self.test_tab = [0]
- self.absolute_threshold_flag = False
- self.threshold_flag = False
+ self.absolute_threshold_low_flag = False
+ self.absolute_threshold_high_flag = False
+ self.low_threshold_flag = False
+ self.high_threshold_flag = False
+ self.end_of_charge_flag = False
self.chkMotors = False
+ self.disable_event = False
self.tick = time.time() + 1
@@ -227,6 +231,8 @@
self.start_flag = True
self.wait = time.time() + 2.0
self.RANGE = 340.0
+ self.low_threshold = 5.0
+ self.high_threshold = 6.0
self.__on_battery_mutex = threading.Lock()
self.__timeout_mutex = threading.Lock()
@@ -253,19 +259,13 @@
else:
self.event_tab = self.__tab
- self.threshold_flag = self.absolute_threshold()
-
-
- if self.GUI_on:
- #goto test notification every sec.
- if self.wait <= time.time():
- self.wait = time.time() + 2.0
- self.test_notification()
-
-
+ self.low_threshold_flag = self.absolute_threshold_low(self.low_threshold, self.low_threshold + 0.1)
+ self.high_threshold_flag = self.absolute_threshold_high(self.high_threshold, self.high_threshold - 0.1)
+
# To prevent notifications at startup
- if self.start_flag == True:
+ if self.start_flag == True or self.disable_event == True:
self.test_tab[0][7] = False
+ self.disable_event = False
self.start_flag = False
for i in range (len(self.event_tab)):
self.event_tab[i][7] = False
@@ -288,25 +288,37 @@
# Absolute threshold control
#
###########################################################
- def absolute_threshold(self):
-
- if self.absolute_threshold_flag == False:
- val = self.convert_value([0, 1, 0, 4.75])
- print ((val* self.RANGE) / 100)
+ def absolute_threshold_low(self, value, value_off):
+ if self.absolute_threshold_low_flag == False:
+ val = self.convert_value([0, 1, 0, value])
val_act = (self.val_table[len(self.val_table)-1]*100) / self.RANGE
val_prev = (self.val_table[len(self.val_table)-2]*100) / self.RANGE
if val_prev >= val and val_act < val:
- self.absolute_threshold_flag = True
+ self.absolute_threshold_low_flag = True
return True
else:
- val = self.convert_value([0, 1, 0, 4.9])
+ val = self.convert_value([0, 1, 0, value_off])
val_act = (self.val_table[len(self.val_table)-1]*100) / self.RANGE
val_prev = (self.val_table[len(self.val_table)-2]*100) / self.RANGE
if val_prev <= val and val_act > val:
- self.absolute_threshold_flag = False
+ self.absolute_threshold_low_flag = False
return False
-
+ def absolute_threshold_high(self, value, value_off):
+ if self.absolute_threshold_high_flag == False:
+ val = self.convert_value([0, 1, 0, value])
+ val_act = (self.val_table[len(self.val_table)-1]*100) / self.RANGE
+ val_prev = (self.val_table[len(self.val_table)-2]*100) / self.RANGE
+ if val_prev <= val and val_act > val:
+ self.absolute_threshold_high_flag = True
+ return True
+ else:
+ val = self.convert_value([0, 1, 0, value_off])
+ val_act = (self.val_table[len(self.val_table)-1]*100) / self.RANGE
+ val_prev = (self.val_table[len(self.val_table)-2]*100) / self.RANGE
+ if val_prev >= val and val_act < val:
+ self.absolute_threshold_high_flag = False
+ return False
###########################################################
@@ -470,6 +482,8 @@
if not (self.chkMotors == True and args[2] == 1):
self.average += (args[0] * 256) + args[1]
self.count += 1
+ else:
+ self.disable_event = True
# Refresh the sample and rate value
if self.sample_backup != self.sample:
@@ -492,7 +506,6 @@
else:
val = self.average / self.count
val = val - 530
- print val
charger_event = -1
#Event control
@@ -504,6 +517,9 @@
charger_event = 0
if self.charger_event_backup != charger_event:
+ # End of the charge cycle
+ if self.charger_event_backup == 2 and charger_event == 1:
+ self.end_of_charge_flag = True
self.charger_event_backup = charger_event
else:
charger_event = -1
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.glade
===================================================================
(Binary files differ)
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/GUI/conf/other.pyp 2007-10-24 10:07:29 UTC (rev 640)
@@ -60,6 +60,8 @@
self.get_widget('txt_conf_rate').set_text(str(_me.get_param('Rate')))
self.get_widget('txt_conf_sample').set_text(str(_me.get_param('Sample')))
+ self.get_widget('txtLowThreshold').set_text(str(_me.get_param('low_threshold')))
+ self.get_widget('txtHighThreshold').set_text(str(_me.get_param('high_threshold')))
###########################################################
@@ -159,6 +161,8 @@
self.get_widget("lbl_conf_rate").set_text(_me.string('conf_lblRate'))
self.get_widget("lblControlFrame").set_text(_me.string('conf_lblControl'))
self.get_widget("lblScript").set_text(_me.string('MainBehavior'))
+ self.get_widget("lblHighThreshold").set_label(_me.string('lblHighThreshold'))
+ self.get_widget("lblLowThreshold").set_label(_me.string('lblLowThreshold'))
###########################################################
@@ -168,6 +172,7 @@
###########################################################
def on_row_selected(self, obj):
path = obj.get_selected_rows()
+ print path
self.__iter = self.value_list.get_iter(path[1][0])
index = self.value_list.get_value(self.__iter, 0)
event = self.value_list.get_value(self.__iter, 1)
@@ -380,7 +385,34 @@
self.measure.chkMotors = self.get_widget('chkMotors').get_active()
self.measure.rate_backup = _me.get_param('Rate')
self.measure.sample_backup = _me.get_param('Sample')
+
+ try:
+ float(self.get_widget('txtLowThreshold').get_text())
+ except:
+ self.get_widget('txtLowThreshold').set_text('4.8')
+
+ if float(self.get_widget('txtLowThreshold').get_text()) < 4.0:
+ self.get_widget('txtLowThreshold').set_text('4.0')
+ if float(self.get_widget('txtLowThreshold').get_text()) > 6.3:
+ self.get_widget('txtLowThreshold').set_text('6.3')
+ self.measure.low_threshold = float(self.get_widget('txtLowThreshold').get_text())
+ _me.set_param('low_threshold', self.measure.low_threshold)
+
+ try:
+ float(self.get_widget('txtHighThreshold').get_text())
+ except:
+ self.get_widget('txtHighThreshold').set_text('4.8')
+
+ if float(self.get_widget('txtHighThreshold').get_text()) < self.measure.low_threshold:
+ self.get_widget('txtHighThreshold').set_text(str(self.measure.low_threshold + 0.1))
+ if float(self.get_widget('txtHighThreshold').get_text()) > 6.4:
+ self.get_widget('txtHighThreshold').set_text('6.4')
+
+ self.measure.high_threshold = float(self.get_widget('txtHighThreshold').get_text())
+ _me.set_param('high_threshold', self.measure.high_threshold)
+
+
_me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value()))
self.get_widget("window1").destroy()
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/init.pyp 2007-10-24 10:07:29 UTC (rev 640)
@@ -10,6 +10,8 @@
measure.rate_backup = measure.rate
measure.sample = float(_me.get_param('Sample'))
measure.sample_backup = measure.sample
+measure.low_threshold = _me.get_param('low_threshold')
+measure.high_threshold = _me.get_param('high_threshold')
measure.chkMotors = _me.get_param('chkMotors')
measure.event_tab = _me.get_param('config')
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/main.pyp 2007-10-24 10:07:29 UTC (rev 640)
@@ -4,22 +4,33 @@
def battery_level():
measure = _me.get_param('measure')
val = measure.val_table[len(measure.val_table)-1]
-
- if val <= 102:
- tux.cmd.mouth_open()
+ max_val = measure.convert_value([0, 1, 0, measure.high_threshold])
+ max_val = max_val * 3.4
+ min_val = measure.convert_value([0, 1, 0, measure.low_threshold])
+ min_val = min_val * 3.4
+
+ txt = ''
+ if val <= min_val:
txt = _me.string('low')
- tux.tts.speak(str(txt))
- tux.cmd.mouth_close()
+ #tux.tts.speak(str(txt))
- elif val >= 306:
- tux.cmd.mouth_open()
+ elif val >= max_val:
txt = _me.string('full')
- tux.tts.speak(str(txt))
- tux.cmd.mouth_close()
+ #tux.tts.speak(str(txt))
else:
- tux.cmd.mouth_open()
txt = _me.string('normal')
- tux.tts.speak(str(txt))
- tux.cmd.mouth_close()
+ #tux.tts.speak(str(txt))
+ txt = txt + ', '
+
+ if tux.status.charger_state():
+ txt = txt + _me.string('charge')
+ elif tux.status.power_plug():
+ txt = txt + _me.string('plug')
+ else:
+ txt = txt + _me.string('on_battery')
+ print txt
+ tux.cmd.mouth_open()
+ tux.tts.speak(str(txt))
+ tux.cmd.mouth_close()
battery_level()
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/notify.pyp
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/notify.pyp 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Scripts/Python/notify.pyp 2007-10-24 10:07:29 UTC (rev 640)
@@ -1,45 +1,73 @@
def notify_checker():
measure = _me.get_param('measure')
- if measure.threshold_flag == True:
+ if measure.low_threshold_flag == True or measure.high_threshold_flag == True:
return True
+
+ if measure.end_of_charge_flag == True:
+ return True
+
if measure.GUI_on == False:
for i in range(len(measure.event_tab)):
temp = measure.event_tab[i][7]
if temp == True:
return True
return False
+ elif measure.GUI_on == True:
+ for i in range(len(measure.test_tab)):
+ temp = measure.test_tab[i][7]
+ if temp == True:
+ return True
+ return False
else:
- return False
+ return False
def notify_actuator():
- event = _me.get_param('measure').event_tab
- if _me.get_param('measure').threshold_flag == True:
- _me.get_param('measure').threshold_flag = False
+ measure = _me.get_param('measure')
+ #event = _me.get_param('measure').event_tab
+ if _me.get_param('measure').low_threshold_flag == True:
+ _me.get_param('measure').low_threshold_flag = False
tux.cmd.mouth_open()
tux.tts.speak(_me.string('absolute_threshold'))
tux.cmd.mouth_close()
+
+ if _me.get_param('measure').high_threshold_flag == True:
+ _me.get_param('measure').high_threshold_flag = False
+ tux.cmd.mouth_open()
+ tux.tts.speak(_me.string('absolute_threshold_high'))
+ tux.cmd.mouth_close()
+
+ if measure.end_of_charge_flag == True:
+ measure.end_of_charge_flag = False
+ tux.cmd.mouth_open()
+ tux.tts.speak(_me.string('end_of_charge'))
+ tux.cmd.mouth_close()
- else:
+ else:
+ if measure.GUI_on:
+ event = measure.test_tab
+ else:
+ event = measure.event_tab
+
for i in range(len(event)):
#create text to speach for the default notification
if event[i][1] == 0:
if event[i][2] == 0:
- text = _me.string('conf_lblDrop')
+ text = _me.string('Drop')
elif event[i][2] == 1:
- text = _me.string('conf_lblRaise')
+ text = _me.string('Raise')
elif event[i][2] == 2:
- text = _me.string('conf_lblChangeD')
+ text = _me.string('ChangeD')
elif event[i][2] == 3:
- text = _me.string('conf_lblChangeU')
+ text = _me.string('ChangeU')
else:
if event[i][2] == 0:
- text = _me.string('conf_lblIncrease')
+ text = _me.string('Increase')
elif event[i][2] == 1:
- text = _me.string('conf_lblDecrease')
+ text = _me.string('Decrease')
elif event[i][2] == 2:
- text = _me.string('conf_lblBoth')
+ text = _me.string('Both')
if event[i][7]:
if event[i][5]:
@@ -47,7 +75,7 @@
path = path.replace('%20', ' ')
if os.path.isfile(path) and os.path.exists(path):
path = "'%s'" % path
- tux.sys.shell_free(path)
+ tux.sys.shell(path)
event[i][7] = False
else:
tux.cmd.mouth_open()
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/Strings/fr_ALL.xml 2007-10-24 10:07:29 UTC (rev 640)
@@ -9,8 +9,10 @@
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<conf_lblEvent type='str'>Evènement</conf_lblEvent>
<widget_lblControl type='str'>Contrôle</widget_lblControl>
+ <Increase type='str'>Le niveau de la batterie est passé en dessus du seuil</Increase>
<full type='str'>Les batteries sont pleines</full>
- <gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
+ <widget_lblChangeD type='str'>Changement inf.</widget_lblChangeD>
+ <lblLowThreshold type='str'>Limite inférieure</lblLowThreshold>
<help_text type='str'>-- Les évènements :
Deux grands types d'évènements peuvent avoir lieu, contenant chacun diverses options :
@@ -45,6 +47,7 @@
Cette fenêtre affiche le graphique de la batterie.
Lorsque cette fenêtre est affichée, les évènements enregistrés dans la fenêtre de configuration ne sont plus notifiés.
Cette fenêtre permet de tester diverses configurations et de les ajouter dans le tableau de configuration.</help_text>
+ <end_of_charge type='str'>La charge de la batterie est terminée</end_of_charge>
<conf_lblChange type='str'>Changement</conf_lblChange>
<conf_lblBoth type='str'>Deux directions</conf_lblBoth>
<widget_lblBtnApply type='str'>Appliquer</widget_lblBtnApply>
@@ -56,49 +59,61 @@
<gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
<widget_lblBoth type='str'>Deux directions</widget_lblBoth>
<gui_conf_rate_lb type='str'>Taux de rafraichissement :</gui_conf_rate_lb>
- <widget_lblValue type='str'>Valeur (V)</widget_lblValue>
+ <absolute_threshold_high type='str'>Batteries pleines</absolute_threshold_high>
<mainscript type='str'>J'ai trouvé la lumière !</mainscript>
<conf_btnRemove type='str'>Enlever</conf_btnRemove>
<gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb>
<plugged type='str'>Connecté</plugged>
+ <ChangeU type='str'>Le niveau de la batterie a augmenté puis chuté</ChangeU>
<conf_btnBehavior type='str'>Supprimer</conf_btnBehavior>
+ <charge type='str'>et les batteries sont en train d'être rechargée</charge>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
<conf_lblChangeD type='str'>Chute et augmente</conf_lblChangeD>
<low type='str'>Le niveau des batteries est faible</low>
+ <MainBehavior type='str'>Comportement principal</MainBehavior>
<speaker_name type='str'>Bruno8k</speaker_name>
<conf_lblSample type='str'>Points</conf_lblSample>
<conf_lblType type='str'>Type</conf_lblType>
- <widget_lblDisplayThreshold type='str'>Afficher le seuil sur le graph.</widget_lblDisplayThreshold>
+ <Change type='str'>Le niveau de la batterie a changé</Change>
+ <Both type='str'>Le niveau de la batterie a passé le seuil</Both>
<conf_btnModify type='str'>Modifier</conf_btnModify>
<widget_lblEvent type='str'>Evènement</widget_lblEvent>
<normal type='str'>Le niveau des batteries est bon</normal>
<widget_lblIncrease type='str'>Accroissement</widget_lblIncrease>
<widget_lblRaise type='str'>Augmentation</widget_lblRaise>
<conf_btnAdd type='str'>Ajouter</conf_btnAdd>
+ <on_battery type='str'>et tux est alimenté par les batteries</on_battery>
<widget_lblDecrease type='str'>Decroissance</widget_lblDecrease>
<gui_conf_sample_lb type='str'>Nombre de points :</gui_conf_sample_lb>
<gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb>
<conf_lblNotifiedBehavior type='str'>Notifié</conf_lblNotifiedBehavior>
<gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb>
<widget_lblDrop type='str'>Chute</widget_lblDrop>
- <MainBehavior type='str'>Comportement principal</MainBehavior>
+ <ChangeD type='str'>Le niveau de la batterie a chuté puis augmenté</ChangeD>
<absolute_threshold type='str'>Batteries faibles</absolute_threshold>
<lblMotors type='str'>Rejeter les mesures lorsque les moteurs fonctionnent</lblMotors>
<conf_lblDecrease type='str'>Diminue</conf_lblDecrease>
+ <lblHighThreshold type='str'>Limite supérieure</lblHighThreshold>
+ <widget_lblValue type='str'>Valeur (V)</widget_lblValue>
<conf_lblDefaultBehavior type='str'>Comportement pas défaut</conf_lblDefaultBehavior>
+ <widget_lblDisplayThreshold type='str'>Afficher le seuil sur le graph.</widget_lblDisplayThreshold>
<conf_lblBehavior type='str'>Comportement</conf_lblBehavior>
+ <plug type='str'>et l'alimentation est connectée</plug>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<widget_lblChange type='str'>Changement</widget_lblChange>
<name_to_read type='str'>Moniteur de batteries</name_to_read>
+ <gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
+ <Drop type='str'>Le niveau de la batterie a chuté</Drop>
+ <conf_lblDrop type='str'>Chute</conf_lblDrop>
<conf_lblNotNotified type='str'>Non notifié</conf_lblNotNotified>
- <conf_lblDrop type='str'>Chute</conf_lblDrop>
- <gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
+ <Raise type='str'>Le niveau de la batterie a augmenté</Raise>
<charging type='str'>En charge</charging>
<widget_lblSet type='str'>Ajouter a la config.</widget_lblSet>
+ <Decrease type='str'>Le niveau de la batterie est passé en dessous du seuil</Decrease>
<conf_lblValue type='str'>Valeur (V)</conf_lblValue>
<conf_lblRate type='str'>Taux de rafraichissement</conf_lblRate>
<widget_lblBehavior type='str'>Activer le script</widget_lblBehavior>
- <widget_lblChangeD type='str'>Changement inf.</widget_lblChangeD>
+ <gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
<conf_lblTime type='str'>Temps (sec.)</conf_lblTime>
<conf_lblControl type='str'>Contrôle</conf_lblControl>
<conf_lblNotified type='str'>Notifié ?</conf_lblNotified>
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/settings.xml
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/settings.xml 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/settings.xml 2007-10-24 10:07:29 UTC (rev 640)
@@ -3,22 +3,22 @@
<parameters>
<test_tab type='list'>[[1, 0, 0, 0.10000000000000001, 20.0, True, 'None', False, 0]]</test_tab>
<chkMotors type='bool'>True</chkMotors>
+ <low_threshold type='float'>4.8</low_threshold>
<MainScript type='str'>None</MainScript>
<Sample type='float'>600.0</Sample>
- <Rate type='float'>10.0</Rate>
+ <Rate type='float'>1.0</Rate>
+ <high_threshold type='float'>6.0</high_threshold>
<config type='list'>[]</config>
</parameters>
<general>
<gui_state>
<widget>
- <y type='int'>336</y>
+ <y type='int'>362</y>
<visible type='bool'>True</visible>
- <x type='int'>506</x>
+ <x type='int'>133</x>
</widget>
<conf>
- <y type='int'>49</y>
- <visible type='bool'>True</visible>
- <x type='int'>0</x>
+ <visible type='bool'>False</visible>
</conf>
</gui_state>
<language type='str'>en_US</language>
Modified: software/gadgets/battery_monitor/trunk/Battery_monitor_svn/strings.xml
===================================================================
--- software/gadgets/battery_monitor/trunk/Battery_monitor_svn/strings.xml 2007-10-22 15:14:24 UTC (rev 639)
+++ software/gadgets/battery_monitor/trunk/Battery_monitor_svn/strings.xml 2007-10-24 10:07:29 UTC (rev 640)
@@ -3,14 +3,18 @@
<conf_lblIncrease type='str'>Increase</conf_lblIncrease>
<conf_lblThreshold type='str'>Threshold</conf_lblThreshold>
<gui_conf_remote_title type='str'>Control</gui_conf_remote_title>
+ <conf_lblTime type='str'>Time (sec.)</conf_lblTime>
<battery type='str'>On battery</battery>
+ <gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
<conf_lblRaise type='str'>Raise</conf_lblRaise>
<widget_lblTest type='str'>Notifications</widget_lblTest>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<conf_lblEvent type='str'>Event</conf_lblEvent>
<widget_lblControl type='str'>Control</widget_lblControl>
+ <Increase type='str'>The battery level exceeded the threshold</Increase>
<conf_btnModify type='str'>Modify</conf_btnModify>
- <gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
+ <widget_lblChangeD type='str'>Drop and raise</widget_lblChangeD>
+ <lblLowThreshold type='str'>Lower limit</lblLowThreshold>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<lblMotors type='str'>Disable measure when the motors are running</lblMotors>
<help_text type='str'>-- The events:
@@ -48,35 +52,40 @@
This window display the battery voltage graph.
When this window is showed, the events recorded in the settings window are not notified.
This window makes it possible to try various configurations and to add them in the settings table.</help_text>
- <conf_lblBehavior type='str'>Behavior script</conf_lblBehavior>
+ <end_of_charge type='str'>The load of the battery is finished</end_of_charge>
<conf_lblChange type='str'>Change</conf_lblChange>
<conf_lblBoth type='str'>Both</conf_lblBoth>
<widget_lblBtnApply type='str'>Apply changes</widget_lblBtnApply>
<widget_lblChangeU type='str'>Raise and drop</widget_lblChangeU>
<widget_lblNotified type='str'>Notified</widget_lblNotified>
+ <conf_lblNotNotified type='str'>Not notified</conf_lblNotNotified>
<gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
<gui_conf_update_title type='str'>Update</gui_conf_update_title>
- <widget_lblValue type='str'>Value (V)</widget_lblValue>
+ <conf_lblChangeU type='str'>Raise and drop</conf_lblChangeU>
<gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
+ <absolute_threshold_high type='str'>The batteries are full</absolute_threshold_high>
<mainscript type='str'>I've found the light !</mainscript>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<plugged type='str'>Plugged</plugged>
<conf_btnBehavior type='str'>Clear path</conf_btnBehavior>
+ <charge type='str'>and the batteries are being charged</charge>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
<conf_lblChangeD type='str'>Drop and raise</conf_lblChangeD>
<low type='str'>The level of the batteries is weak</low>
<conf_btnAdd type='str'>Add</conf_btnAdd>
- <speaker_name type='str'>Ryan8k</speaker_name>
+ <conf_lblBehavior type='str'>Behavior script</conf_lblBehavior>
<conf_lblSample type='str'>Samples</conf_lblSample>
<conf_lblType type='str'>Type</conf_lblType>
- <widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
- <widget_lblChangeD type='str'>Drop and raise</widget_lblChangeD>
+ <Change type='str'>The battery level changed</Change>
+ <conf_lblValue type='str'>Value (V)</conf_lblValue>
+ <Both type='str'>The battery level reached the threshold</Both>
<full type='str'>The level of the batteries is full</full>
<widget_lblEvent type='str'>Event</widget_lblEvent>
<normal type='str'>The level of the batteries is good</normal>
<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>
+ <on_battery type='str'>and tux is fed by the batteries</on_battery>
<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>
@@ -86,21 +95,27 @@
<conf_lblNotified type='str'>Notified ?</conf_lblNotified>
<widget_lblBoth type='str'>Both direction</widget_lblBoth>
<conf_lblDecrease type='str'>Decrease</conf_lblDecrease>
+ <widget_lblValue type='str'>Value (V)</widget_lblValue>
<conf_lblDefaultBehavior type='str'>Default behavior</conf_lblDefaultBehavior>
- <conf_lblChangeU type='str'>Raise and drop</conf_lblChangeU>
+ <speaker_name type='str'>Ryan8k</speaker_name>
+ <plug type='str'>and the power supply is plugged</plug>
<absolute_threshold type='str'>Weak batteries </absolute_threshold>
<widget_lblChange type='str'>Change</widget_lblChange>
<name_to_read type='str'>Battery monitor</name_to_read>
- <conf_lblNotNotified type='str'>Not notified</conf_lblNotNotified>
+ <lblHighThreshold type='str'>Higher limit</lblHighThreshold>
+ <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
+ <Drop type='str'>The battery level dropped</Drop>
<conf_lblDrop type='str'>Drop</conf_lblDrop>
- <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
+ <ChangeD type='str'>The battery level dropped and raised</ChangeD>
+ <Raise type='str'>The battery level raised</Raise>
<charging type='str'>Charging</charging>
<widget_lblSet type='str'>Add to config</widget_lblSet>
- <conf_lblValue type='str'>Value (V)</conf_lblValue>
+ <Decrease type='str'>The battery level passed below the threshold</Decrease>
+ <widget_lblDisplayThreshold type='str'>Display threshold on graph</widget_lblDisplayThreshold>
<conf_lblRate type='str'>Refresh rate</conf_lblRate>
<widget_lblBehavior type='str'>Enable behavior script</widget_lblBehavior>
<MainBehavior type='str'>Main behavior</MainBehavior>
- <conf_lblTime type='str'>Time (sec.)</conf_lblTime>
+ <ChangeU type='str'>The battery level raised and dropped</ChangeU>
<conf_lblControl type='str'>Control</conf_lblControl>
<conf_btnRemove type='str'>Remove</conf_btnRemove>
<widget_lblThreshold type='str'>Threshold</widget_lblThreshold>
|
