Add 'tx' and 'rx' keyword args to UART.init() method.

dpgeorge · dpgeorge · commit 4a11a2373554 · 2016-04-17T11:23:43.000+01:00
These are intended to be used instead of the 'pins' argument, to set
the tx/rx pins for the UART.  Using tx/rx is much clearer than using
a pins tuple.

This also changes the UART default pins to the internal USB-serial
TX/RX pins, so that uart.init(115200) can restore the REPL.
diff --git a/inc/genhdr/qstrdefs.generated.h b/inc/genhdr/qstrdefs.generated.h
@@ -623,6 +623,8 @@ QDEF(MP_QSTR_baudrate, (const byte*)"\xf5\x08" "baudrate")
 QDEF(MP_QSTR_bits, (const byte*)"\x49\x04" "bits")
 QDEF(MP_QSTR_parity, (const byte*)"\x42\x06" "parity")
 QDEF(MP_QSTR_pins, (const byte*)"\x41\x04" "pins")
+QDEF(MP_QSTR_tx, (const byte*)"\x89\x02" "tx")
+QDEF(MP_QSTR_rx, (const byte*)"\xcf\x02" "rx")
 QDEF(MP_QSTR_readall, (const byte*)"\x76\x07" "readall")
 QDEF(MP_QSTR_readline, (const byte*)"\xf9\x08" "readline")
 QDEF(MP_QSTR_readinto, (const byte*)"\x4b\x08" "readinto")
diff --git a/inc/microbit/qstrdefsport.h b/inc/microbit/qstrdefsport.h
@@ -351,6 +351,8 @@ Q(bits)
 Q(parity)
 Q(stop)
 Q(pins)
+Q(tx)
+Q(rx)
 Q(any)
 Q(read)
 Q(readall)
diff --git a/source/microbit/microbituart.cpp b/source/microbit/microbituart.cpp
@@ -51,6 +51,8 @@ STATIC mp_obj_t microbit_uart_init(mp_uint_t n_args, const mp_obj_t *pos_args, m
         { MP_QSTR_parity,   MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_stop,     MP_ARG_INT, {.u_int = 1} },
         { MP_QSTR_pins,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
+        { MP_QSTR_tx,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
+        { MP_QSTR_rx,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
     };
 
     // parse args
@@ -65,8 +67,19 @@ STATIC mp_obj_t microbit_uart_init(mp_uint_t n_args, const mp_obj_t *pos_args, m
         parity = (SerialParity)mp_obj_get_int(args[2].u_obj);
     }
 
-    PinName p_tx = MICROBIT_PIN_P0;
-    PinName p_rx = MICROBIT_PIN_P1;
+    // default pins are the internal USB-UART pins
+    PinName p_tx = TGT_TX;
+    PinName p_rx = TGT_RX;
+
+    // set tx/rx pins if they are given
+    if (args[5].u_obj != mp_const_none) {
+        p_tx = microbit_obj_get_pin_name(args[5].u_obj);
+    }
+    if (args[6].u_obj != mp_const_none) {
+        p_rx = microbit_obj_get_pin_name(args[6].u_obj);
+    }
+
+    // support for legacy "pins" argument
     if (args[4].u_obj != mp_const_none) {
         mp_obj_t *pins;
         mp_obj_get_array_fixed_n(args[4].u_obj, 2, &pins);
