Переглянути джерело
T4 SerialX More support including formats
More support put in. Now support for different formats of output. So far I have tried 8N1, 8N2, 7E1, 7O1...teensy4-core
Kurt Eckhardt
6 роки тому
2 змінених файлів з 145 додано та 97 видалено
+ 74
- 19
teensy4/HardwareSerial.cpp
Переглянути файл
| @@ -1,3 +1,32 @@ | |||
| /* Teensyduino Core Library | |||
| * http://www.pjrc.com/teensy/ | |||
| * Copyright (c) 2017 PJRC.COM, LLC. | |||
| * | |||
| * Permission is hereby granted, free of charge, to any person obtaining | |||
| * a copy of this software and associated documentation files (the | |||
| * "Software"), to deal in the Software without restriction, including | |||
| * without limitation the rights to use, copy, modify, merge, publish, | |||
| * distribute, sublicense, and/or sell copies of the Software, and to | |||
| * permit persons to whom the Software is furnished to do so, subject to | |||
| * the following conditions: | |||
| * | |||
| * 1. The above copyright notice and this permission notice shall be | |||
| * included in all copies or substantial portions of the Software. | |||
| * | |||
| * 2. If the Software is incorporated into a build system that allows | |||
| * selection among a list of target devices, then similar target | |||
| * devices manufactured by PJRC.COM must be included in the list of | |||
| * target devices and selectable in the same manner. | |||
| * | |||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | |||
| * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | |||
| * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |||
| * SOFTWARE. | |||
| */ | |||
| #include "HardwareSerial.h" | |||
| #include "core_pins.h" | |||
| @@ -114,7 +143,7 @@ int nvic_execution_priority(void) | |||
| } | |||
| void HardwareSerial::begin(uint32_t baud, uint8_t format) | |||
| void HardwareSerial::begin(uint32_t baud, uint16_t format) | |||
| { | |||
| //printf("HardwareSerial begin\n"); | |||
| float base = (float)UART_CLOCK / (float)baud; | |||
| @@ -175,7 +204,36 @@ void HardwareSerial::begin(uint32_t baud, uint8_t format) | |||
| */ | |||
| port->WATER = LPUART_WATER_RXWATER(rx_water) | LPUART_WATER_TXWATER(tx_water); | |||
| port->FIFO |= LPUART_FIFO_TXFE | LPUART_FIFO_RXFE; | |||
| port->CTRL = CTRL_TX_INACTIVE; | |||
| // lets configure up our CTRL register value | |||
| uint32_t ctrl = CTRL_TX_INACTIVE; | |||
| // Now process the bits in the Format value passed in | |||
| // Bits 0-2 - Parity plus 9 bit. | |||
| ctrl |= (format & (LPUART_CTRL_PT | LPUART_CTRL_PE) ); // configure parity - turn off PT, PE, M and configure PT, PE | |||
| if (format & 0x04) ctrl |= LPUART_CTRL_M; // 9 bits (might include parity) | |||
| if ((format & 0x0F) == 0x04) ctrl |= LPUART_CTRL_R9T8; // 8N2 is 9 bit with 9th bit always 1 | |||
| // Bit 5 TXINVERT | |||
| if (format & 0x20) ctrl |= LPUART_CTRL_TXINV; // tx invert | |||
| // write out computed CTRL | |||
| port->CTRL = ctrl; | |||
| // Bit 3 10 bit - Will assume that begin already cleared it. | |||
| // process some other bits which change other registers. | |||
| if (format & 0x08) port->BAUD |= LPUART_BAUD_M10; | |||
| // Bit 4 RXINVERT | |||
| uint32_t c = port->STAT & ~LPUART_STAT_RXINV; | |||
| if (format & 0x10) c |= LPUART_STAT_RXINV; // rx invert | |||
| port->STAT = c; | |||
| // bit 8 can turn on 2 stop bit mote | |||
| if ( format & 0x100) port->BAUD |= LPUART_BAUD_SBNS; | |||
| //Serial.printf(" stat:%x ctrl:%x fifo:%x water:%x\n", port->STAT, port->CTRL, port->FIFO, port->WATER ); | |||
| }; | |||
| @@ -237,6 +295,8 @@ bool HardwareSerial::attachCts(uint8_t pin) | |||
| { | |||
| if (!(hardware->ccm_register & hardware->ccm_value)) return false; | |||
| if ((pin != 0xff) && (pin == hardware->cts_pin)) { | |||
| // Setup the IO pin as weak PULL down. | |||
| *(portControlRegister(pin)) = IOMUXC_PAD_DSE(7) | IOMUXC_PAD_PKE | IOMUXC_PAD_PUE | IOMUXC_PAD_PUS(0) | IOMUXC_PAD_HYS; | |||
| *(portConfigRegister(hardware->cts_pin)) = hardware->cts_mux_val; | |||
| port->MODIR |= LPUART_MODIR_TXCTSE; | |||
| return true; | |||
| @@ -263,11 +323,6 @@ int HardwareSerial::availableForWrite(void) | |||
| return tail - head - 1; | |||
| } | |||
| size_t HardwareSerial::write9bit(uint32_t c) | |||
| { | |||
| return 0; | |||
| } | |||
| @@ -350,6 +405,12 @@ void HardwareSerial::flush(void) | |||
| } | |||
| size_t HardwareSerial::write(uint8_t c) | |||
| { | |||
| // use the 9 bit version (maybe 10 bit) do do the work. | |||
| return write9bit(c); | |||
| } | |||
| size_t HardwareSerial::write9bit(uint32_t c) | |||
| { | |||
| uint32_t head, n; | |||
| //digitalWrite(3, HIGH); | |||
| @@ -409,15 +470,7 @@ void HardwareSerial::IRQHandler() | |||
| head = rx_buffer_head_; | |||
| tail = rx_buffer_tail_; | |||
| do { | |||
| #if 1 | |||
| n = port->DATA; // get the byte... | |||
| #else | |||
| if (use9Bits_ && (port().C3 & 0x80)) { | |||
| n = port().D | 0x100; | |||
| } else { | |||
| n = port().D; | |||
| } | |||
| #endif | |||
| n = port->DATA & 0x3ff; // Use only up to 10 bits of data | |||
| newhead = head + 1; | |||
| if (newhead >= rx_buffer_total_size_) newhead = 0; | |||
| @@ -463,11 +516,13 @@ void HardwareSerial::IRQHandler() | |||
| } else { | |||
| n = tx_buffer_storage_[tail-tx_buffer_size_]; | |||
| } | |||
| //if (use9Bits_) port().C3 = (port().C3 & ~0x40) | ((n & 0x100) >> 2); | |||
| port->DATA = n; | |||
| } while (((port->WATER >> 8) & 0x7) < 4); // need to computer properly | |||
| tx_buffer_tail_ = tail; | |||
| if (head == tail) port->CTRL = CTRL_TX_COMPLETING; | |||
| if (head == tail) { | |||
| port->CTRL &= ~LPUART_CTRL_TIE; | |||
| port->CTRL |= LPUART_CTRL_TCIE; // Actually wondering if we can just leave this one on... | |||
| } | |||
| //digitalWrite(3, LOW); | |||
| } | |||
| @@ -476,7 +531,7 @@ void HardwareSerial::IRQHandler() | |||
| transmitting_ = 0; | |||
| if (transmit_pin_baseReg_) DIRECT_WRITE_LOW(transmit_pin_baseReg_, transmit_pin_bitmask_); | |||
| port->CTRL = CTRL_TX_INACTIVE; | |||
| port->CTRL &= ~LPUART_CTRL_TCIE; | |||
| } | |||
| //digitalWrite(4, LOW); | |||
| } | |||
+ 71
- 78
teensy4/HardwareSerial.h
Переглянути файл
| @@ -1,6 +1,6 @@ | |||
| /* Teensyduino Core Library | |||
| * http://www.pjrc.com/teensy/ | |||
| * Copyright (c) 2017 PJRC.COM, LLC. | |||
| * Copyright (c) 2019 PJRC.COM, LLC. | |||
| * | |||
| * Permission is hereby granted, free of charge, to any person obtaining | |||
| * a copy of this software and associated documentation files (the | |||
| @@ -33,6 +33,75 @@ | |||
| #include "imxrt.h" | |||
| // Uncomment to enable 9 bit formats. These are default disabled to save memory. | |||
| //#define SERIAL_9BIT_SUPPORT | |||
| // | |||
| // On Windows & Linux, this file is in Arduino's hardware/teensy/avr/cores/teensy3 | |||
| // folder. The Windows installer puts Arduino in C:\Program Files (x86)\Arduino | |||
| // On Macintosh, you must control-click Arduino and select "Show Package Contents", then | |||
| // look in Contents/Java/hardware/teensy/avr/cores/teensy3 to find this file. | |||
| // | |||
| // Teensy 4.x boards support 9 bit mode on all their serial ports | |||
| #define SERIAL_7E1 0x02 | |||
| #define SERIAL_7O1 0x03 | |||
| #define SERIAL_8N1 0x00 | |||
| #define SERIAL_8E1 0x06 | |||
| #define SERIAL_8O1 0x07 | |||
| #define SERIAL_7E1_RXINV 0x12 | |||
| #define SERIAL_7O1_RXINV 0x13 | |||
| #define SERIAL_8N1_RXINV 0x10 | |||
| #define SERIAL_8E1_RXINV 0x16 | |||
| #define SERIAL_8O1_RXINV 0x17 | |||
| #define SERIAL_7E1_TXINV 0x22 | |||
| #define SERIAL_7O1_TXINV 0x23 | |||
| #define SERIAL_8N1_TXINV 0x20 | |||
| #define SERIAL_8E1_TXINV 0x26 | |||
| #define SERIAL_8O1_TXINV 0x27 | |||
| #define SERIAL_7E1_RXINV_TXINV 0x32 | |||
| #define SERIAL_7O1_RXINV_TXINV 0x33 | |||
| #define SERIAL_8N1_RXINV_TXINV 0x30 | |||
| #define SERIAL_8E1_RXINV_TXINV 0x36 | |||
| #define SERIAL_8O1_RXINV_TXINV 0x37 | |||
| #ifdef SERIAL_9BIT_SUPPORT | |||
| #define SERIAL_9N1 0x84 | |||
| #define SERIAL_9E1 0x8E | |||
| #define SERIAL_9O1 0x8F | |||
| #define SERIAL_9N1_RXINV 0x94 | |||
| #define SERIAL_9E1_RXINV 0x9E | |||
| #define SERIAL_9O1_RXINV 0x9F | |||
| #define SERIAL_9N1_TXINV 0xA4 | |||
| #define SERIAL_9E1_TXINV 0xAE | |||
| #define SERIAL_9O1_TXINV 0xAF | |||
| #define SERIAL_9N1_RXINV_TXINV 0xB4 | |||
| #define SERIAL_9E1_RXINV_TXINV 0xBE | |||
| #define SERIAL_9O1_RXINV_TXINV 0xBF | |||
| #endif | |||
| // We have 1/2 bit stop setting | |||
| #define SERIAL_2STOP_BITS 0x100 | |||
| #define SERIAL_8E2 (SERIAL_8E1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2 (SERIAL_8O1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_RXINV (SERIAL_8E1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_RXINV (SERIAL_8O1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_TXINV (SERIAL_8E1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_TXINV (SERIAL_8O1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_RXINV_TXINV (SERIAL_8E1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_RXINV_TXINV (SERIAL_8O1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2 (SERIAL_8N1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_RXINV (SERIAL_8N1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_TXINV (SERIAL_8N1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_RXINV_TXINV (SERIAL_8N1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| // bit0: parity, 0=even, 1=odd | |||
| // bit1: parity, 0=disable, 1=enable | |||
| // bit2: mode, 1=9bit, 0=8bit | |||
| // bit3: mode10: 1=10bit, 0=8bit | |||
| // bit4: rxinv, 0=normal, 1=inverted | |||
| // bit5: txinv, 0=normal, 1=inverted | |||
| // bit6: unused | |||
| // bit7: actual data goes into 9th bit | |||
| #ifdef __cplusplus | |||
| #include "Stream.h" | |||
| #include "core_pins.h" | |||
| @@ -82,7 +151,7 @@ public: | |||
| tx_buffer_(_tx_buffer), rx_buffer_(_rx_buffer), tx_buffer_size_(_tx_buffer_size), rx_buffer_size_(_rx_buffer_size), | |||
| tx_buffer_total_size_(_tx_buffer_size), rx_buffer_total_size_(_rx_buffer_size) { | |||
| } | |||
| void begin(uint32_t baud, uint8_t format=0); | |||
| void begin(uint32_t baud, uint16_t format=0); | |||
| void end(void); | |||
| virtual int available(void); | |||
| @@ -168,82 +237,6 @@ extern HardwareSerial Serial8; | |||
| #endif // __cplusplus | |||
| // Uncomment to enable 9 bit formats. These are default disabled to save memory. | |||
| //#define SERIAL_9BIT_SUPPORT | |||
| // | |||
| // On Windows & Linux, this file is in Arduino's hardware/teensy/avr/cores/teensy3 | |||
| // folder. The Windows installer puts Arduino in C:\Program Files (x86)\Arduino | |||
| // On Macintosh, you must control-click Arduino and select "Show Package Contents", then | |||
| // look in Contents/Java/hardware/teensy/avr/cores/teensy3 to find this file. | |||
| // | |||
| // Teensy 3.x boards support 9 bit mode on all their serial ports | |||
| // Teensy LC only supports 9 bit mode on Serial1. Serial2 & Serial3 can't use 9 bits. | |||
| #define SERIAL_7E1 0x02 | |||
| #define SERIAL_7O1 0x03 | |||
| #define SERIAL_8N1 0x00 | |||
| #define SERIAL_8E1 0x06 | |||
| #define SERIAL_8O1 0x07 | |||
| #define SERIAL_7E1_RXINV 0x12 | |||
| #define SERIAL_7O1_RXINV 0x13 | |||
| #define SERIAL_8N1_RXINV 0x10 | |||
| #define SERIAL_8E1_RXINV 0x16 | |||
| #define SERIAL_8O1_RXINV 0x17 | |||
| #define SERIAL_7E1_TXINV 0x22 | |||
| #define SERIAL_7O1_TXINV 0x23 | |||
| #define SERIAL_8N1_TXINV 0x20 | |||
| #define SERIAL_8E1_TXINV 0x26 | |||
| #define SERIAL_8O1_TXINV 0x27 | |||
| #define SERIAL_7E1_RXINV_TXINV 0x32 | |||
| #define SERIAL_7O1_RXINV_TXINV 0x33 | |||
| #define SERIAL_8N1_RXINV_TXINV 0x30 | |||
| #define SERIAL_8E1_RXINV_TXINV 0x36 | |||
| #define SERIAL_8O1_RXINV_TXINV 0x37 | |||
| #ifdef SERIAL_9BIT_SUPPORT | |||
| #define SERIAL_9N1 0x84 | |||
| #define SERIAL_9E1 0x8E | |||
| #define SERIAL_9O1 0x8F | |||
| #define SERIAL_9N1_RXINV 0x94 | |||
| #define SERIAL_9E1_RXINV 0x9E | |||
| #define SERIAL_9O1_RXINV 0x9F | |||
| #define SERIAL_9N1_TXINV 0xA4 | |||
| #define SERIAL_9E1_TXINV 0xAE | |||
| #define SERIAL_9O1_TXINV 0xAF | |||
| #define SERIAL_9N1_RXINV_TXINV 0xB4 | |||
| #define SERIAL_9E1_RXINV_TXINV 0xBE | |||
| #define SERIAL_9O1_RXINV_TXINV 0xBF | |||
| #endif | |||
| // Teensy LC and 3.5 and 3.6 Uarts have 1/2 bit stop setting | |||
| #if defined(__MK64FX512__) || defined(__MK66FX1M0__) || defined(KINETISL) | |||
| #define SERIAL_2STOP_BITS 0x100 | |||
| #define SERIAL_8E2 (SERIAL_8E1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2 (SERIAL_8O1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_RXINV (SERIAL_8E1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_RXINV (SERIAL_8O1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_TXINV (SERIAL_8E1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_TXINV (SERIAL_8O1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8E2_RXINV_TXINV (SERIAL_8E1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8O2_RXINV_TXINV (SERIAL_8O1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2 (SERIAL_8N1 | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_RXINV (SERIAL_8N1_RXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_TXINV (SERIAL_8N1_TXINV | SERIAL_2STOP_BITS) | |||
| #define SERIAL_8N2_RXINV_TXINV (SERIAL_8N1_RXINV_TXINV | SERIAL_2STOP_BITS) | |||
| #else | |||
| // for Teensy 3.0-3.2 we can fake 2 stop bits by using 9 bit mode | |||
| #define SERIAL_8N2 0x04 | |||
| #define SERIAL_8N2_RXINV 0x14 | |||
| #define SERIAL_8N2_TXINV 0x24 | |||
| #define SERIAL_8N2_RXINV_TXINV 0x34 | |||
| #endif | |||
| // bit0: parity, 0=even, 1=odd | |||
| // bit1: parity, 0=disable, 1=enable | |||
| // bit2: mode, 1=9bit, 0=8bit | |||
| // bit3: mode10: 1=10bit, 0=8bit | |||
| // bit4: rxinv, 0=normal, 1=inverted | |||
| // bit5: txinv, 0=normal, 1=inverted | |||
| // bit6: unused | |||
| // bit7: actual data goes into 9th bit | |||
| // TODO: replace with proper divisor+oversample calculation | |||
Завантаження…