Fix UART pins setting (#2098) (#2141)

esp8266 · Jun 20, 2016 · 79883e9 · 79883e9
1 parent 1640cc3
commit 79883e9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cores/esp8266/uart.c b/cores/esp8266/uart.c
@@ -162,19 +162,19 @@ uart_t* uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin)
         uart->rx_enabled = (mode != UART_TX_ONLY);
         uart->tx_enabled = (mode != UART_RX_ONLY);
         uart->rx_pin = (uart->rx_enabled)?3:255;
-        if(uart->rx_enabled) {
+        if(uart->tx_enabled) {
             if (tx_pin == 2) {
                 uart->tx_pin = 2;
-                pinMode(uart->rx_pin, FUNCTION_4);
+                pinMode(uart->tx_pin, FUNCTION_4);
             } else {
                 uart->tx_pin = 1;
-                pinMode(uart->rx_pin, SPECIAL);
+                pinMode(uart->tx_pin, FUNCTION_0);
             }
         } else {
             uart->tx_pin = 255;
         }
-        if(uart->tx_enabled) {
-            pinMode(uart->tx_pin, SPECIAL);
+        if(uart->rx_enabled) {
+            pinMode(uart->rx_pin, SPECIAL);
         }
         IOSWAP &= ~(1 << IOSWAPU0);
         break;