## along with this program; if not, see <http://www.gnu.org/licenses/>.
##
-from common.srdhelper import bitpack
+from common.srdhelper import bitpack_lsb
from .lists import ADDRESSES
import sigrokdecode as srd
tolerance = expected * 0.30
return (expected - tolerance) < microseconds < (expected + tolerance)
- def wait_wrap(self, conds, timeout=None):
- conds = list(conds)
+ def wait_wrap(self, conds, timeout):
if timeout is not None:
to = int(timeout * self.snum_per_us)
conds.append({'skip': to})
def read_pulse(self, high, time):
e = 'f' if high else 'r'
max_time = int(time * 1.30)
- pins, ss, es, (edge, timeout) = self.wait_wrap([{0: e}], max_time)
+ (ir,), ss, es, (edge, timeout) = self.wait_wrap([{0: e}], max_time)
if timeout or not self.tolerance(ss, es, time):
raise SIRCError('Timeout')
- return pins, ss, es, (edge, timeout)
+ return ir, ss, es, (edge, timeout)
def read_bit(self):
e = 'f' if self.active else 'r'
raise SIRCError('incorrect bits count {}'.format(len(bits)))
break
- command_num = bitpack([b[0] for b in command])
- address_num = bitpack([b[0] for b in address])
+ command_num = bitpack_lsb(command, 0)
+ address_num = bitpack_lsb(address, 0)
command_str = '0x{:02X}'.format(command_num)
address_str = '0x{:02X}'.format(address_num)
self.putg(command[0][1], command[-1][2], Ann.CMD, [
])
extended_num = None
if extended:
- extended_num = bitpack([b[0] for b in extended])
+ extended_num = bitpack_lsb(extended, 0)
extended_str = '0x{:02X}'.format(extended_num)
self.putg(extended[0][1], extended[-1][2], Ann.EXT, [
'Extended: {}'.format(extended_str),
unknown = (['Unknown Device: ', 'UNK: '], {})
while True:
e = 'h' if self.active else 'l'
- _, ss, es, _ = self.wait_wrap([{0: e}], None)
+ _, _, frame_ss, _ = self.wait_wrap([{0: e}], None)
try:
addr, cmd, ext, payload_ss, payload_es = self.read_signal()
names, cmds = ADDRESSES.get((addr, ext), unknown)
text = cmds.get(cmd, 'Unknown')
- self.putg(es, payload_es, Ann.REMOTE, [n + text for n in names])
+ self.putg(frame_ss, payload_es, Ann.REMOTE, [
+ n + text for n in names
+ ])
except SIRCErrorSilent as e:
- continue
+ pass
except SIRCError as e:
- self.putg(es, self.samplenum, Ann.WARN, [
+ self.putg(frame_ss, self.samplenum, Ann.WARN, [
'Error: {}'.format(e),
'Error',
'E',
])
- continue