1
0
mirror of https://github.com/mjg59/python-broadlink.git synced 2024-11-11 02:10:12 +01:00

modified get_energy() to support python3

This commit is contained in:
Dominik Lakatoš 2018-02-08 13:47:28 +01:00
parent dd0e908317
commit 51ff890c7c
No known key found for this signature in database
GPG Key ID: 56AA695D2C053D5F

View File

@ -397,7 +397,10 @@ class sp2(device):
err = response[0x22] | (response[0x23] << 8) err = response[0x22] | (response[0x23] << 8)
if err == 0: if err == 0:
payload = self.decrypt(bytes(response[0x38:])) payload = self.decrypt(bytes(response[0x38:]))
energy = int(hex(ord(payload[7]) * 256 + ord(payload[6]))[2:]) + int(hex(ord(payload[5]))[2:])/100.0 if type(payload[0x07]) == int:
energy = int(hex(payload[0x07] * 256 + payload[0x06])[2:]) + int(hex(payload[0x05])[2:])/100.0
else:
energy = int(hex(ord(payload[0x07]) * 256 + ord(payload[0x06]))[2:]) + int(hex(ord(payload[0x05]))[2:])/100.0
return energy return energy