Skip to content
Snippets Groups Projects
Commit 615a00a6 authored by jkerdreu's avatar jkerdreu
Browse files

Switch from logger.info() to warning(). Warning is a default printf


git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@3067 b32b6428-25c9-4566-ad07-03861ab6144f
parent 35136871
Branches
No related tags found
No related merge requests found
......@@ -58,7 +58,7 @@ def button_remote(addr=None):
# -- Methods --
def default_get_buttons():
"""Return the list of buttons"""
logger.info("default_get_buttons()")
logger.warning("default_get_buttons()")
dev.add_method('get_buttons',default_get_buttons)
......@@ -73,7 +73,7 @@ def cache(addr=None):
# -- Methods --
def default_get_device_attributes(_device=None,_attributes=None):
"""Get attributes of a device in cache with last values and dates"""
logger.info("default_get_device_attributes(device=[%s],attributes=[%s],)" % (_device,_attributes))
logger.warning("default_get_device_attributes(device=[%s],attributes=[%s],)" % (_device,_attributes))
dev.add_method('get_device_attributes',default_get_device_attributes)
......@@ -114,11 +114,11 @@ def door(addr=None):
# -- Methods --
def default_open():
"""Open the door"""
logger.info("default_open()")
logger.warning("default_open()")
def default_close():
"""Close the door"""
logger.info("default_close()")
logger.warning("default_close()")
dev.add_method('open',default_open)
dev.add_method('close',default_close)
......@@ -180,11 +180,11 @@ def lamp(addr=None):
# -- Methods --
def default_turn_on():
"""Switch on the lamp"""
logger.info("default_turn_on()")
logger.warning("default_turn_on()")
def default_turn_off():
"""Switch off the lamp"""
logger.info("default_turn_off()")
logger.warning("default_turn_off()")
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -214,35 +214,35 @@ def lamp_color(addr=None):
# -- Methods --
def default_turn_on(_smooth=None):
"""Switch on the lamp"""
logger.info("default_turn_on(smooth=[%s],)" % (_smooth))
logger.warning("default_turn_on(smooth=[%s],)" % (_smooth))
def default_turn_off(_smooth=None):
"""Switch off the lamp"""
logger.info("default_turn_off(smooth=[%s],)" % (_smooth))
logger.warning("default_turn_off(smooth=[%s],)" % (_smooth))
def default_set_brightness(_brightness=None,_smooth=None):
"""Change the brightness of the lamp"""
logger.info("default_set_brightness(brightness=[%s],smooth=[%s],)" % (_brightness,_smooth))
logger.warning("default_set_brightness(brightness=[%s],smooth=[%s],)" % (_brightness,_smooth))
def default_set_white_temperature(_white_temperature=None):
"""Change the temperature of the white"""
logger.info("default_set_white_temperature(white_temperature=[%s],)" % (_white_temperature))
logger.warning("default_set_white_temperature(white_temperature=[%s],)" % (_white_temperature))
def default_set_hsv(_hsv=None,_smooth=None):
"""Change the color of the lamp"""
logger.info("default_set_hsv(hsv=[%s],smooth=[%s],)" % (_hsv,_smooth))
logger.warning("default_set_hsv(hsv=[%s],smooth=[%s],)" % (_hsv,_smooth))
def default_set_mode(_mode=None):
"""Change the mode of the lamp"""
logger.info("default_set_mode(mode=[%s],)" % (_mode))
logger.warning("default_set_mode(mode=[%s],)" % (_mode))
def default_set_scene(_scene=None,_options=None):
"""Change the scene played by the color-changing lamp"""
logger.info("default_set_scene(scene=[%s],options=[%s],)" % (_scene,_options))
logger.warning("default_set_scene(scene=[%s],options=[%s],)" % (_scene,_options))
def default_get_scenes():
"""Get scenes names supported by the lamp"""
logger.info("default_get_scenes()")
logger.warning("default_get_scenes()")
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -272,19 +272,19 @@ def lamp_dimmer(addr=None):
# -- Methods --
def default_turn_on(_smooth=None):
"""Switch on the lamp"""
logger.info("default_turn_on(smooth=[%s],)" % (_smooth))
logger.warning("default_turn_on(smooth=[%s],)" % (_smooth))
def default_turn_off(_smooth=None):
"""Switch off the lamp"""
logger.info("default_turn_off(smooth=[%s],)" % (_smooth))
logger.warning("default_turn_off(smooth=[%s],)" % (_smooth))
def default_set_brightness(_brightness=None,_smooth=None):
"""Change the brightness of the lamp"""
logger.info("default_set_brightness(brightness=[%s],smooth=[%s],)" % (_brightness,_smooth))
logger.warning("default_set_brightness(brightness=[%s],smooth=[%s],)" % (_brightness,_smooth))
def default_set_white_temperature(_white_temperature=None):
"""Change the temperature of the white"""
logger.info("default_set_white_temperature(white_temperature=[%s],)" % (_white_temperature))
logger.warning("default_set_white_temperature(white_temperature=[%s],)" % (_white_temperature))
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -306,15 +306,15 @@ def lamp_toggle(addr=None):
# -- Methods --
def default_turn_on():
"""Switch on the lamp"""
logger.info("default_turn_on()")
logger.warning("default_turn_on()")
def default_turn_off():
"""Switch off the lamp"""
logger.info("default_turn_off()")
logger.warning("default_turn_off()")
def default_toggle():
"""Toggle lamp state"""
logger.info("default_toggle()")
logger.warning("default_toggle()")
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -366,19 +366,19 @@ def metadatadb(addr=None):
# -- Methods --
def default_get_devices(_key=None,_value=None):
"""Get the list of known devices; possibly filtered by a key, a (non-null) value, or both"""
logger.info("default_get_devices(key=[%s],value=[%s],)" % (_key,_value))
logger.warning("default_get_devices(key=[%s],value=[%s],)" % (_key,_value))
def default_get_keys_values(_device=None,_keys=None):
"""Get the map of keys-values associated with a given device; possibly restricted to a list of wanted keys"""
logger.info("default_get_keys_values(device=[%s],keys=[%s],)" % (_device,_keys))
logger.warning("default_get_keys_values(device=[%s],keys=[%s],)" % (_device,_keys))
def default_get_value(_device=None,_key=None):
"""Get the value of a key of a device"""
logger.info("default_get_value(device=[%s],key=[%s],)" % (_device,_key))
logger.warning("default_get_value(device=[%s],key=[%s],)" % (_device,_key))
def default_update_keys_values(_device=None,_map=None):
"""Update keys-values on a device; non-existing keys are added; the null value deletes a key; a null map deletes all keys-values of a device; devices with no more key-value are withdrawn of the DB"""
logger.info("default_update_keys_values(device=[%s],map=[%s],)" % (_device,_map))
logger.warning("default_update_keys_values(device=[%s],map=[%s],)" % (_device,_map))
dev.add_method('get_devices',default_get_devices)
dev.add_method('get_keys_values',default_get_keys_values)
......@@ -426,11 +426,11 @@ def powerrelay(addr=None):
# -- Methods --
def default_turn_on():
"""Switch on the relay"""
logger.info("default_turn_on()")
logger.warning("default_turn_on()")
def default_turn_off():
"""Switch off the relay"""
logger.info("default_turn_off()")
logger.warning("default_turn_off()")
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -450,15 +450,15 @@ def powerrelay_toggle(addr=None):
# -- Methods --
def default_turn_on():
"""Switch on the relay"""
logger.info("default_turn_on()")
logger.warning("default_turn_on()")
def default_turn_off():
"""Switch off the relay"""
logger.info("default_turn_off()")
logger.warning("default_turn_off()")
def default_toggle():
"""Toggle relay state"""
logger.info("default_toggle()")
logger.warning("default_toggle()")
dev.add_method('turn_on',default_turn_on)
dev.add_method('turn_off',default_turn_off)
......@@ -505,19 +505,19 @@ def scenario(addr=None):
# -- Methods --
def default_enable():
"""Enable the scenario"""
logger.info("default_enable()")
logger.warning("default_enable()")
def default_disable():
"""Disable the scenario"""
logger.info("default_disable()")
logger.warning("default_disable()")
def default_run(_options=None):
"""Run the scenario (if enabled)"""
logger.info("default_run(options=[%s],)" % (_options))
logger.warning("default_run(options=[%s],)" % (_options))
def default_abort():
"""Abort the scenario (if running)"""
logger.info("default_abort()")
logger.warning("default_abort()")
dev.add_method('enable',default_enable)
dev.add_method('disable',default_disable)
......@@ -539,15 +539,15 @@ def shutter(addr=None):
# -- Methods --
def default_up():
"""Up the shutter"""
logger.info("default_up()")
logger.warning("default_up()")
def default_down():
"""Down the shutter"""
logger.info("default_down()")
logger.warning("default_down()")
def default_stop():
"""Stop ongoing action of the shutter"""
logger.info("default_stop()")
logger.warning("default_stop()")
dev.add_method('up',default_up)
dev.add_method('down',default_down)
......@@ -570,19 +570,19 @@ def shutter_position(addr=None):
# -- Methods --
def default_up():
"""Up the shutter"""
logger.info("default_up()")
logger.warning("default_up()")
def default_down():
"""Down the shutter"""
logger.info("default_down()")
logger.warning("default_down()")
def default_stop():
"""Stop ongoing action of the shutter"""
logger.info("default_stop()")
logger.warning("default_stop()")
def default_set_position(_position=None):
"""Change the position of the shutter"""
logger.info("default_set_position(position=[%s],)" % (_position))
logger.warning("default_set_position(position=[%s],)" % (_position))
dev.add_method('up',default_up)
dev.add_method('down',default_down)
......@@ -633,7 +633,7 @@ def tts(addr=None):
# -- Methods --
def default_say(_msg=None,_lang=None,_voice=None):
"""Say message"""
logger.info("default_say(msg=[%s],lang=[%s],voice=[%s],)" % (_msg,_lang,_voice))
logger.warning("default_say(msg=[%s],lang=[%s],voice=[%s],)" % (_msg,_lang,_voice))
dev.add_method('say',default_say)
......@@ -669,11 +669,11 @@ def window(addr=None):
# -- Methods --
def default_open():
"""Open the window"""
logger.info("default_open()")
logger.warning("default_open()")
def default_close():
"""Close the window"""
logger.info("default_close()")
logger.warning("default_close()")
dev.add_method('open',default_open)
dev.add_method('close',default_close)
......@@ -693,15 +693,15 @@ def worktop(addr=None):
# -- Methods --
def default_up():
"""Up the worktop"""
logger.info("default_up()")
logger.warning("default_up()")
def default_down():
"""Down the worktop"""
logger.info("default_down()")
logger.warning("default_down()")
def default_stop():
"""Stop ongoing action of the worktop"""
logger.info("default_stop()")
logger.warning("default_stop()")
dev.add_method('up',default_up)
dev.add_method('down',default_down)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment