Fix merge conflicts.

[micorpython_ir.git] / ir_rx / test.py

diff --git a/ir_rx/test.py b/ir_rx/test.py
index 112db2ee9cc3291fe07a6d1b12981ea536fb81c5..c3c71602845986bc372b309c68b2c5e9fa746fc6 100644 (file)
--- a/ir_rx/test.py
+++ b/ir_rx/test.py
@@ -32,7 +32,7 @@ def cb(data, addr, ctrl):
     else:
         print('Data {:02x} Addr {:04x} Ctrl {:02x}'.format(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
     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