jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-29 11:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ads integration after 0.113 (#38402)

Browse Source
This commit is contained in:
Stefan Lehmann 2020-07-31 13:59:32 +02:00 committed by GitHub
parent 79055487ed
commit 0136c565eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/ads/__init__.py
View File

@ -230,7 +230,13 @@ class AdsHub:
hnotify = int(contents.hNotification) hnotify = int(contents.hNotification)
_LOGGER.debug("Received notification %d", hnotify) _LOGGER.debug("Received notification %d", hnotify)
data = contents.data
# get dynamically sized data array
data_size = contents.cbSampleSize
data = (ctypes.c_ubyte * data_size).from_address(
ctypes.addressof(contents)
+ pyads.structs.SAdsNotificationHeader.data.offset
)
try: try:
with self._lock: with self._lock:
@ -241,17 +247,17 @@ class AdsHub:
# Parse data to desired datatype # Parse data to desired datatype
if notification_item.plc_datatype == self.PLCTYPE_BOOL: if notification_item.plc_datatype == self.PLCTYPE_BOOL:
value = bool(struct.unpack("<?", bytearray(data)[:1])[0]) value = bool(struct.unpack("<?", bytearray(data))[0])
elif notification_item.plc_datatype == self.PLCTYPE_INT: elif notification_item.plc_datatype == self.PLCTYPE_INT:
value = struct.unpack("<h", bytearray(data)[:2])[0] value = struct.unpack("<h", bytearray(data))[0]
elif notification_item.plc_datatype == self.PLCTYPE_BYTE: elif notification_item.plc_datatype == self.PLCTYPE_BYTE:
value = struct.unpack("<B", bytearray(data)[:1])[0] value = struct.unpack("<B", bytearray(data))[0]
elif notification_item.plc_datatype == self.PLCTYPE_UINT: elif notification_item.plc_datatype == self.PLCTYPE_UINT:
value = struct.unpack("<H", bytearray(data)[:2])[0] value = struct.unpack("<H", bytearray(data))[0]
elif notification_item.plc_datatype == self.PLCTYPE_DINT: elif notification_item.plc_datatype == self.PLCTYPE_DINT:
value = struct.unpack("<i", bytearray(data)[:4])[0] value = struct.unpack("<i", bytearray(data))[0]
elif notification_item.plc_datatype == self.PLCTYPE_UDINT: elif notification_item.plc_datatype == self.PLCTYPE_UDINT:
value = struct.unpack("<I", bytearray(data)[:4])[0] value = struct.unpack("<I", bytearray(data))[0]
else: else:
value = bytearray(data) value = bytearray(data)
_LOGGER.warning("No callback available for this datatype") _LOGGER.warning("No callback available for this datatype")

2
homeassistant/components/ads/manifest.json
View File

@ -2,6 +2,6 @@
"domain": "ads", "domain": "ads",
"name": "ADS", "name": "ADS",
"documentation": "https://www.home-assistant.io/integrations/ads", "documentation": "https://www.home-assistant.io/integrations/ads",
"requirements": ["pyads==3.1.3"], "requirements": ["pyads==3.2.1"],
"codeowners": [] "codeowners": []
} }

2
requirements_all.txt
View File

@ -1202,7 +1202,7 @@ py_nextbusnext==0.1.4
# py_noaa==0.3.0 # py_noaa==0.3.0
# homeassistant.components.ads # homeassistant.components.ads
pyads==3.1.3 pyads==3.2.1
# homeassistant.components.hisense_aehw4a1 # homeassistant.components.hisense_aehw4a1
pyaehw4a1==0.3.5 pyaehw4a1==0.3.5