maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #149 from deel77/master

Browse source 
Default support for python3 in get_energy() for SP2
This commit is contained in:
Daniel Høyer Iversen 2018-03-10 15:30:42 +01:00 • committed by GitHub
commit 00cc79daee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
broadlink/__init__.py
View file

@ -407,7 +407,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