Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rename_remote_value…
Browse files Browse the repository at this point in the history
…_to_group
  • Loading branch information
Julius2342 committed Nov 9, 2017
2 parents 503722b + 055d8ec commit bcdb337
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 19 deletions.
6 changes: 4 additions & 2 deletions xknx/devices/binary_sensor.py
Expand Up @@ -8,11 +8,13 @@
A BinarySensor may also have Actions attached which are executed after state was changed.
"""
import time
import asyncio
import time
from enum import Enum
from xknx.knx import Address

from xknx.exceptions import CouldNotParseTelegram
from xknx.knx import Address

from .action import Action
from .device import Device

Expand Down
8 changes: 5 additions & 3 deletions xknx/devices/climate.py
Expand Up @@ -5,11 +5,13 @@
* Manages and sends the desired setpoint to KNX bus.
"""
import asyncio
from xknx.knx import Address, DPTBinary, DPTArray, \
HVACOperationMode, DPTControllerStatus, DPTHVACMode

from xknx.exceptions import CouldNotParseTelegram, DeviceIllegalValue
from xknx.knx import (Address, DPTArray, DPTBinary, DPTControllerStatus,
DPTHVACMode, HVACOperationMode)

from .device import Device
from .group import GroupTemp, Group1Count
from .group import Group1Count, GroupTemp


class Climate(Device):
Expand Down
5 changes: 3 additions & 2 deletions xknx/devices/cover.py
Expand Up @@ -8,10 +8,11 @@
* Cover will also predict the current position.
"""
import asyncio

from .device import Device
from .group import (GroupScaling5001, GroupStep1007,
GroupUpDown1008)
from .travelcalculator import TravelCalculator
from .group import GroupScaling5001, GroupUpDown1008, \
GroupStep1007


class Cover(Device):
Expand Down
1 change: 1 addition & 0 deletions xknx/devices/device.py
Expand Up @@ -4,6 +4,7 @@
It provides basis functionality for reading the state from the KNX bus.
"""
import asyncio

from xknx.knx import Telegram


Expand Down
1 change: 1 addition & 0 deletions xknx/devices/devices.py
Expand Up @@ -4,6 +4,7 @@
More or less an array with devices. Adds some search functionality to find devices.
"""
import asyncio

from .device import Device


Expand Down
12 changes: 6 additions & 6 deletions xknx/devices/group.py
Expand Up @@ -2,19 +2,19 @@
Module for managing a KNX group.
Group can either be a group address for reading
and and one group address wor writing a KNX value
and and one group address for writing a KNX value
or a group address for both.
"""
import asyncio
from enum import Enum
from xknx.knx import Address, DPTBinary, DPTArray
from xknx.exceptions import CouldNotParseTelegram, ConversionError
from xknx.knx import Telegram, DPTScaling, DPTValue1Count, \
DPTTemperature

from xknx.exceptions import ConversionError, CouldNotParseTelegram
from xknx.knx import (Address, DPTArray, DPTBinary, DPTScaling, DPTTemperature,
DPTValue1Count, Telegram)


class Group():
"""Class for managing remlte knx value."""
"""Class for managing a KNX group."""

def __init__(self,
xknx,
Expand Down
4 changes: 3 additions & 1 deletion xknx/devices/light.py
Expand Up @@ -8,8 +8,10 @@
* reading the current state from KNX bus.
"""
import asyncio
from xknx.knx import Address, DPTArray

from xknx.exceptions import CouldNotParseTelegram
from xknx.knx import Address, DPTArray

from .device import Device
from .group import GroupSwitch1001

Expand Down
4 changes: 3 additions & 1 deletion xknx/devices/notification.py
@@ -1,7 +1,9 @@
"""Module for managing a notification via KNX."""
import asyncio
from xknx.knx import Address, DPTString, DPTArray

from xknx.exceptions import CouldNotParseTelegram
from xknx.knx import Address, DPTArray, DPTString

from .device import Device


Expand Down
7 changes: 4 additions & 3 deletions xknx/devices/sensor.py
Expand Up @@ -7,9 +7,10 @@
* watching for state updates from KNX bus.
"""
import asyncio
from xknx.knx import Address, DPTBinary, DPTArray, \
DPTScaling, DPTTemperature, DPTLux, DPTWsp, DPTUElCurrentmA, \
DPTHumidity

from xknx.knx import (Address, DPTArray, DPTBinary, DPTHumidity, DPTLux,
DPTScaling, DPTTemperature, DPTUElCurrentmA, DPTWsp)

from .device import Device


Expand Down
1 change: 1 addition & 0 deletions xknx/devices/switch.py
Expand Up @@ -7,6 +7,7 @@
* reading the current state from KNX bus.
"""
import asyncio

from .device import Device
from .group import GroupSwitch1001

Expand Down
2 changes: 2 additions & 0 deletions xknx/devices/time.py
Expand Up @@ -7,7 +7,9 @@
"""

import asyncio

from xknx.knx import Address, DPTArray, DPTTime

from .device import Device


Expand Down
2 changes: 1 addition & 1 deletion xknx/devices/travelcalculator.py
Expand Up @@ -9,8 +9,8 @@
* At time 20 TravelCalculator will return position 70 (final position not reached).
* At time 30 TravelCalculator will return position 60 (final position reached).
"""
from enum import Enum
import time
from enum import Enum


class PositionType(Enum):
Expand Down

0 comments on commit bcdb337

Please sign in to comment.