RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #20356 from maribu/boards/msp-fixup

Browse Source 
boards/olimex-msp430-h2618: change UART config
This commit is contained in:
benpicco 2024-02-08 10:18:02 +00:00 committed by GitHub
commit c07eca7696
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/olimex-msp430-h1611/doc.txt
View File

@ -80,7 +80,7 @@ make BOARD=olimex-msp430-h1611 flash
## Using the shell ## Using the shell
stdio is available via the UART interface with `TXD = P3.6` stdio is available via the UART interface with `TXD = P3.6`
(pin 35 on the header) and `RXD = P3.7` (pin 34 on the header) at 115,200 Baud. (pin 35 on the header) and `RXD = P3.7` (pin 34 on the header) at 9,600 Baud.
The easiest way is to connect an USB TTL adapter (such as the cheap `cp210x` The easiest way is to connect an USB TTL adapter (such as the cheap `cp210x`
or `ch341` based adapters) as follows: or `ch341` based adapters) as follows:

8
boards/olimex-msp430-h2618/doc.txt
View File

@ -93,8 +93,8 @@ make BOARD=olimex-msp430-h2618 flash
## Using the shell ## Using the shell
stdio is available via the UART interface with `TXD = P3.4` stdio is available via the UART interface with `TXD = P3.6`
(pin 35 on the header) and `RXD = P3.5` (pin 34 on the header) at 115,200 Baud. (pin 35 on the header) and `RXD = P3.7` (pin 34 on the header) at 115,200 Baud.
The easiest way is to connect an USB TTL adapter (such as the cheap `cp210x` The easiest way is to connect an USB TTL adapter (such as the cheap `cp210x`
or `ch341` based adapters) as follows: or `ch341` based adapters) as follows:
@ -104,8 +104,8 @@ TTL adapter Olimex MSP430-H2618
----------- ------------------- ----------- -------------------
GND --- 63 (DV_SS) GND --- 63 (DV_SS)
TXD --- 33 (P3.5) TXD --- 35 (P3.7)
RXD --- 32 (P3.4) RXD --- 34 (P3.6)
``` ```
*/ */

14
boards/olimex-msp430-h2618/include/periph_conf.h
View File

@ -49,17 +49,17 @@ static const msp430_clock_params_t clock_params = {
*/ */
#define UART_NUMOF (1U) #define UART_NUMOF (1U)
#define UART_BASE (&USCI_A0) #define UART_BASE (&USCI_A1)
#define UART_IE (IE2) #define UART_IE (UC1IE)
#define UART_IF (IFG2) #define UART_IF (UC1IFG)
#define UART_IE_RX_BIT (1 << 0) #define UART_IE_RX_BIT (1 << 0)
#define UART_IE_TX_BIT (1 << 1) #define UART_IE_TX_BIT (1 << 1)
#define UART_RX_PORT (&PORT_3) #define UART_RX_PORT (&PORT_3)
#define UART_RX_PIN (1 << 5) #define UART_RX_PIN (1 << 7)
#define UART_TX_PORT (&PORT_3) #define UART_TX_PORT (&PORT_3)
#define UART_TX_PIN (1 << 4) #define UART_TX_PIN (1 << 6)
#define UART_RX_ISR (USCIAB0RX_VECTOR) #define UART_RX_ISR (USCIAB1RX_VECTOR)
#define UART_TX_ISR (USCIAB0TX_VECTOR) #define UART_TX_ISR (USCIAB1TX_VECTOR)
/** @} */ /** @} */
/** /**

2
cpu/msp430/include/x1xx/periph_cpu.h
View File

@ -220,7 +220,7 @@ extern const msp430_usart_uart_params_t usart1_as_uart;
extern const msp430_usart_spi_params_t usart0_as_spi; extern const msp430_usart_spi_params_t usart0_as_spi;
/** /**
* @brief MSP430 x1xx USART1 in UART configuration * @brief MSP430 x1xx USART1 in SPI configuration
*/ */
extern const msp430_usart_spi_params_t usart1_as_spi; extern const msp430_usart_spi_params_t usart1_as_spi;