mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rf_experiment' into rf_experiment_v0.9

Browse source 
# Conflicts:
#	README.md
#	broadlink/__init__.py
#	cli/broadlink_cli
This commit is contained in:
Sergey Prilukin 2018-11-26 00:21:37 +02:00
commit 2b4e6d91ff
No known key found for this signature in database
GPG key ID: 4918961AE5C05730
3 changed files with 135 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -43,6 +43,27 @@ Enter learning mode:
devices[0].enter_learning()
```
Sweep RF frequencies:
```
devices[0].sweep_frequency()
```
Cancel sweep RF frequencies:
```
devices[0].cancel_sweep_frequency()
```
Check whether a frequency has been found:
```
found = devices[0].check_frequency()
```
(This will return True if the RM has locked onto a frequency, False otherwise)
Attempt to learn an RF packet:
```
found = devices[0].find_rf_packet()
```
(This will return True if a packet has been found, False otherwise)
Obtain an IR or RF packet while in learning mode:
```
ir_packet = devices[0].check_data()

32
broadlink/__init__.py
View file

@ -545,6 +545,38 @@ class rm(device):
packet[0] = 3
self.send_packet(0x6a, packet)
def sweep_frequency(self):
packet = bytearray(16)
packet[0] = 0x19
self.send_packet(0x6a, packet)
def cancel_sweep_frequency(self):
packet = bytearray(16)
packet[0] = 0x1e
self.send_packet(0x6a, packet)
def check_frequency(self):
packet = bytearray(16)
packet[0] = 0x1a
response = self.send_packet(0x6a, packet)
err = response[0x22] | (response[0x23] << 8)
if err == 0:
payload = self.decrypt(bytes(response[0x38:]))
if payload[0x04] == 1:
return True
return False
def find_rf_packet(self):
packet = bytearray(16)
packet[0] = 0x1b
response = self.send_packet(0x6a, packet)
err = response[0x22] | (response[0x23] << 8)
if err == 0:
payload = self.decrypt(bytes(response[0x38:]))
if payload[0x04] == 1:
return True
return False
def check_temperature(self):
packet = bytearray(16)
packet[0] = 1

96
cli/broadlink_cli
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import broadlink
import sys
@ -79,7 +79,8 @@ parser.add_argument("--switch", action="store_true", help="switch state from on
parser.add_argument("--send", action="store_true", help="send command")
parser.add_argument("--sensors", action="store_true", help="check all sensors")
parser.add_argument("--learn", action="store_true", help="learn command")
parser.add_argument("--learnfile", help="learn command and save to specified file")
parser.add_argument("--rfscanlearn", action="store_true", help="rf scan learning")
parser.add_argument("--learnfile", help="save learned command to a specified file")
parser.add_argument("--durations", action="store_true", help="use durations in micro seconds instead of the Broadlink format")
parser.add_argument("--convert", action="store_true", help="convert input data to durations")
parser.add_argument("data", nargs='*', help="Data to send or convert")
@ -102,11 +103,11 @@ if args.host or args.device:
if args.convert:
data = bytearray.fromhex(''.join(args.data))
durations = to_microseconds(data)
print format_durations(durations)
print(format_durations(durations))
if args.temperature:
print dev.check_temperature()
print(dev.check_temperature())
if args.energy:
print dev.get_energy()
print(dev.get_energy())
if args.sensors:
try:
data = dev.check_sensors()
@ -114,15 +115,15 @@ if args.sensors:
data = {}
data['temperature'] = dev.check_temperature()
for key in data:
print "{} {}".format(key, data[key])
print("{} {}".format(key, data[key]))
if args.send:
data = durations_to_broadlink(parse_durations(' '.join(args.data))) \
if args.durations else bytearray.fromhex(''.join(args.data))
dev.send_data(data)
if args.learn or args.learnfile:
if args.learn:
dev.enter_learning()
data = None
print "Learning..."
print("Learning...")
timeout = 30
while (data is None) and (timeout > 0):
time.sleep(2)
@ -133,51 +134,96 @@ if args.learn or args.learnfile:
if args.durations \
else ''.join(format(x, '02x') for x in bytearray(data))
if args.learn:
print learned
print(learned)
if args.learnfile:
print "Saving to {}".format(args.learnfile)
print("Saving to {}".format(args.learnfile))
with open(args.learnfile, "w") as text_file:
text_file.write(learned)
else:
print "No data received..."
print("No data received...")
if args.check:
if dev.check_power():
print '* ON *'
print('* ON *')
else:
print '* OFF *'
print('* OFF *')
if args.checknl:
if dev.check_nightlight():
print '* ON *'
print('* ON *')
else:
print '* OFF *'
print('* OFF *')
if args.turnon:
dev.set_power(True)
if dev.check_power():
print '== Turned * ON * =='
print('== Turned * ON * ==')
else:
print '!! Still OFF !!'
print('!! Still OFF !!')
if args.turnoff:
dev.set_power(False)
if dev.check_power():
print '!! Still ON !!'
print('!! Still ON !!')
else:
print '== Turned * OFF * =='
print('== Turned * OFF * ==')
if args.turnnlon:
dev.set_nightlight(True)
if dev.check_nightlight():
print '== Turned * ON * =='
print('== Turned * ON * ==')
else:
print '!! Still OFF !!'
print('!! Still OFF !!')
if args.turnnloff:
dev.set_nightlight(False)
if dev.check_nightlight():
print '!! Still ON !!'
print('!! Still ON !!')
else:
print '== Turned * OFF * =='
print('== Turned * OFF * ==')
if args.switch:
if dev.check_power():
dev.set_power(False)
print '* Switch to OFF *'
print('* Switch to OFF *')
else:
dev.set_power(True)
print '* Switch to ON *'
print('* Switch to ON *')
if args.rfscanlearn:
dev.sweep_frequency()
print("Learning RF Frequency, press and hold the button to learn...")
timeout = 20
while (not dev.check_frequency()) and (timeout > 0):
time.sleep(1)
timeout -= 1
if timeout <= 0:
print("RF Frequency not found")
dev.cancel_sweep_frequency()
exit(1)
print("Found RF Frequency - 1 of 2!")
print("You can now let go of the button")
input("Press enter to continue...")
print("To complete learning, single press the button you want to learn")
dev.find_rf_packet()
data = None
timeout = 20
while (data is None) and (timeout > 0):
time.sleep(1)
timeout -= 1
data = dev.check_data()
if data:
print("Found RF Frequency - 2 of 2!")
learned = format_durations(to_microseconds(bytearray(data))) \
if args.durations \
else ''.join(format(x, '02x') for x in bytearray(data))
if args.learnfile is None:
print(learned)
if args.learnfile is not None:
print("Saving to {}".format(args.learnfile))
with open(args.learnfile, "w") as text_file:
text_file.write(learned)
else:
print("No data received...")