Skip to content

Commit 9cda686

Browse files
committed
Handle storage error
1 parent 1dfdb06 commit 9cda686

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

cli/broadlink_cli

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import codecs
66
import time
77

88
import broadlink
9-
from broadlink.exceptions import ReadError
9+
from broadlink.exceptions import ReadError, StorageError
1010

1111
TICK = 32.84
1212
TIMEOUT = 30
@@ -131,10 +131,11 @@ if args.send:
131131
if args.learn or (args.learnfile and not args.rfscanlearn):
132132
dev.enter_learning()
133133
print("Learning...")
134-
for second in range(TIMEOUT):
134+
start = time.time()
135+
while time.time() - start < TIMEOUT:
135136
try:
136137
data = dev.check_data()
137-
except ReadError:
138+
except (ReadError, StorageError):
138139
time.sleep(1)
139140
else:
140141
break
@@ -198,7 +199,8 @@ if args.rfscanlearn:
198199
dev.sweep_frequency()
199200
print("Learning RF Frequency, press and hold the button to learn...")
200201

201-
for second in range(TIMEOUT):
202+
start = time.time()
203+
while time.time() - start < TIMEOUT:
202204
time.sleep(1)
203205
if dev.check_frequency():
204206
break
@@ -216,10 +218,11 @@ if args.rfscanlearn:
216218

217219
dev.find_rf_packet()
218220

219-
for second in range(TIMEOUT):
221+
start = time.time()
222+
while time.time() - start < TIMEOUT:
220223
try:
221224
data = dev.check_data()
222-
except ReadError:
225+
except (ReadError, StorageError):
223226
time.sleep(1)
224227
else:
225228
break

0 commit comments

Comments
 (0)