From: Peter Hinch <peter@hinch.me.uk>
Date: Tue, 10 Mar 2020 13:30:54 +0000 (+0000)
Subject: Fix merge conflicts.
X-Git-Url: https://vault307.fbx.one/gitweb/micorpython_ir.git/commitdiff_plain/a1bee40ddc3835dce155541c295e3fcfb49ddcc9?ds=sidebyside;hp=-c

Fix merge conflicts.
---

a1bee40ddc3835dce155541c295e3fcfb49ddcc9
diff --combined ir_rx/test.py
index 354a656,112db2e..c3c7160
--- a/ir_rx/test.py
+++ b/ir_rx/test.py
@@@ -32,7 -32,7 +32,7 @@@ def cb(data, addr, ctrl)
      else:
          print('Data {:02x} Addr {:04x} Ctrl {:02x}'.format(data, addr, ctrl))
  
 -def test(proto=0):
 +def run(proto=0):
      classes = (NEC_8, NEC_16, SONY_12, SONY_15, SONY_20, RC5_IR, RC6_M0)
      ir = classes[proto](p, cb)  # Instantiate receiver
      ir.error_function(print_error)  # Show debug information
@@@ -46,13 -46,13 +46,13 @@@
  # **** DISPLAY GREETING ****
  s = '''Test for IR receiver. Run:
  from ir_rx import test
- test.run() for NEC 8 bit protocol,
- test.run(1) for NEC 16 bit,
- test.run(2) for Sony SIRC 12 bit,
- test.run(3) for Sony SIRC 15 bit,
- test.run(4) for Sony SIRC 20 bit,
- test.run(5) for Philips RC-5 protocol,
- test.run(6) for RC6 mode 0.
+ test() for NEC 8 bit protocol,
+ test(1) for NEC 16 bit,
+ test(2) for Sony SIRC 12 bit,
+ test(3) for Sony SIRC 15 bit,
+ test(4) for Sony SIRC 20 bit,
+ test(5) for Philips RC-5 protocol,
+ test(6) for RC6 mode 0.
  
  Hit ctrl-c to stop, then ctrl-d to soft reset.'''