diff --git a/device_development.py b/device_development.py index 02b0e07..8a57a44 100644 --- a/device_development.py +++ b/device_development.py @@ -4,12 +4,19 @@ import readline import sys import report import logging -import devices +import smart_devices import json +report.app_logging_config() + + +def callback(*args, **kwargs): + print(args) + print(kwargs) + + if __name__ == "__main__": - report.stdoutLoggingConfigure([[config.APP_NAME, logging.INFO], ], fmt=report.SHORT_FMT) mc = mqtt.mqtt_client( host=config.MQTT_SERVER, port=config.MQTT_PORT, @@ -19,12 +26,11 @@ if __name__ == "__main__": ) # devicedict = {} - for device in [ - # devices.shelly_pro3(mc, "shellies/gfw/pro3"), - # devices.brennenstuhl_heatingvalve(mc, "zigbee_raspi/heatvlv"), - # devices.silvercrest_button(mc, "zigbee_raspi/button"), - devices.hue_sw_br_ct(mc, "zigbee_ffe/kitchen/main_light_1"), - ]: + device_list = [] + # define devices + device_list.append(smart_devices.shelly.shelly_rpc(mc, "unknown/topic")) + # create device_dict + for device in device_list: devicedict[device.topic.replace("/", "_")] = device # COMMANDS = ['quit', 'help', 'action'] diff --git a/devices/__init__.py b/devices/__init__.py index d2a13df..20f4c5f 100644 --- a/devices/__init__.py +++ b/devices/__init__.py @@ -1,47 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -""" -devices (DEVICES) -================= - -**Author:** - -* Dirk Alders - -**Description:** - - This Module supports smarthome devices - -**Submodules:** - -* :mod:`shelly` -* :mod:`silvercrest_powerplug` - -**Unittest:** - - See also the :download:`unittest ` documentation. - -**Module Documentation:** - -""" import logging -from devices.shelly import shelly as shelly_sw1 -from devices.shelly import shelly_rpc as shelly_pro3 -from devices.hue import hue_light as hue_sw_br_ct -from devices.tradfri import tradfri_light as tradfri_sw -from devices.tradfri import tradfri_light as tradfri_sw_br -from devices.tradfri import tradfri_light as tradfri_sw_br_ct -from devices.tradfri import tradfri_button as tradfri_button -from devices.tradfri import tradfri_light as livarno_sw_br_ct -from devices.brennenstuhl import brennenstuhl_heatingvalve -from devices.silvercrest import silvercrest_button -from devices.silvercrest import silvercrest_powerplug -from devices.silvercrest import silvercrest_motion_sensor -from devices.mydevices import powerplug as my_powerplug -from devices.mydevices import audio_status -from devices.mydevices import remote +from smart_devices.shelly import shelly as shelly_sw1 +from smart_devices.shelly import shelly_rpc as shelly_pro3 +from smart_devices.hue import hue_light as hue_sw_br_ct +from smart_devices.tradfri import tradfri_light as tradfri_sw +from smart_devices.tradfri import tradfri_light as tradfri_sw_br +from smart_devices.tradfri import tradfri_light as tradfri_sw_br_ct +from smart_devices.tradfri import tradfri_button as tradfri_button +from smart_devices.tradfri import tradfri_light as livarno_sw_br_ct +from smart_devices.brennenstuhl import brennenstuhl_heatingvalve +from smart_devices.silvercrest import silvercrest_button +from smart_devices.silvercrest import silvercrest_powerplug +from smart_devices.silvercrest import silvercrest_motion_sensor +from smart_devices.mydevices import powerplug as my_powerplug +from smart_devices.mydevices import audio_status +from smart_devices.mydevices import remote from function.videv import videv_switching as videv_sw from function.videv import videv_switch_brightness as videv_sw_br diff --git a/smart_devices/__init__.py b/smart_devices/__init__.py new file mode 100644 index 0000000..eb06e38 --- /dev/null +++ b/smart_devices/__init__.py @@ -0,0 +1,6 @@ +from . import brennenstuhl +from . import hue +from . import mydevices +from . import shelly +from . import silvercrest +from . import tradfri diff --git a/devices/base.py b/smart_devices/base.py similarity index 100% rename from devices/base.py rename to smart_devices/base.py diff --git a/devices/brennenstuhl.py b/smart_devices/brennenstuhl.py similarity index 99% rename from devices/brennenstuhl.py rename to smart_devices/brennenstuhl.py index c423b58..426aca8 100644 --- a/devices/brennenstuhl.py +++ b/smart_devices/brennenstuhl.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base +from .base import base import task import time diff --git a/devices/hue.py b/smart_devices/hue.py similarity index 98% rename from devices/hue.py rename to smart_devices/hue.py index 9fdba30..1ecfef8 100644 --- a/devices/hue.py +++ b/smart_devices/hue.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base, base_output +from .base import base, base_output import logging diff --git a/devices/mydevices.py b/smart_devices/mydevices.py similarity index 99% rename from devices/mydevices.py rename to smart_devices/mydevices.py index eb8b97a..f264bdf 100644 --- a/devices/mydevices.py +++ b/smart_devices/mydevices.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base, base_output +from .base import base, base_output import logging diff --git a/devices/shelly.py b/smart_devices/shelly.py similarity index 99% rename from devices/shelly.py rename to smart_devices/shelly.py index 0bdab1c..112c269 100644 --- a/devices/shelly.py +++ b/smart_devices/shelly.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base_output -from devices.base import base_rpc +from .base import base_output +from .base import base_rpc import task diff --git a/devices/silvercrest.py b/smart_devices/silvercrest.py similarity index 99% rename from devices/silvercrest.py rename to smart_devices/silvercrest.py index 99bc140..5af024b 100644 --- a/devices/silvercrest.py +++ b/smart_devices/silvercrest.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base, base_output +from .base import base, base_output import logging diff --git a/devices/tradfri.py b/smart_devices/tradfri.py similarity index 97% rename from devices/tradfri.py rename to smart_devices/tradfri.py index 3b5faf1..9426769 100644 --- a/devices/tradfri.py +++ b/smart_devices/tradfri.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -from devices.base import base, base_output +from .base import base, base_output import logging @@ -120,6 +120,7 @@ class tradfri_light(base_output): def set_color_temp(self, color_temp): """color_temp: [0, ..., 10]""" self.send_command(self.KEY_COLOR_TEMP, color_temp) + self.mqtt_client.send('/'.join([self.topic, self.TX_TOPIC]), '{"color_temp_startup": "previous"}') def set_color_temp_mcb(self, device, key, data): self.set_color_temp(data)