Skip to content

Commit 24405ca

Browse files
mubesmubes
committed
Edits as a result of review
1 parent 490a808 commit 24405ca

6 files changed

Lines changed: 24 additions & 27 deletions

File tree

‎ports/atmel-samd/common-hal/busio/UART.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
6565
uint32_t tx_pinmux = 0;
6666
uint8_t tx_pad = 255; // Unset pad
6767

68-
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert == true)) {
68+
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert)) {
6969
mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device"));
7070
}
7171

‎ports/cxd56/common-hal/busio/UART.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
6060
mp_float_t timeout, uint16_t receiver_buffer_size) {
6161
struct termios tio;
6262

63-
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert == true)) {
63+
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert)) {
6464
mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device"));
6565
}
6666

‎ports/mimxrt10xx/common-hal/busio/UART.c‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -123,41 +123,38 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
123123
// For IMXRT the RTS pin is used for RS485 direction
124124
rts = rs485_dir;
125125
}
126-
else
127-
{
128-
if (rs485_invert == true) {
129-
mp_raise_ValueError(translate("RS485 inversion specified when not in RS485 mode"));
130-
}
126+
else {
127+
if (rs485_invert) {
128+
mp_raise_ValueError(translate("RS485 inversion specified when not in RS485 mode"));
131129
}
130+
}
132131

133132
// Now check for RTS/CTS (or overloaded RS485 direction) pin(s)
134133
const uint32_t rts_count = sizeof(mcu_uart_rts_list) / sizeof(mcu_periph_obj_t);
135134
const uint32_t cts_count = sizeof(mcu_uart_cts_list) / sizeof(mcu_periph_obj_t);
136135

137136
if (rts != mp_const_none) {
138-
for (uint32_t i=0; i < rts_count; ++i)
139-
{
140-
if (mcu_uart_rts_list[i].bank_idx == self->rx_pin->bank_idx) {
141-
if (mcu_uart_rts_list[i].pin == rts) {
142-
self->rts_pin = &mcu_uart_rts_list[i];
143-
break;
144-
}
137+
for (uint32_t i=0; i < rts_count; ++i) {
138+
if (mcu_uart_rts_list[i].bank_idx == self->rx_pin->bank_idx) {
139+
if (mcu_uart_rts_list[i].pin == rts) {
140+
self->rts_pin = &mcu_uart_rts_list[i];
141+
break;
145142
}
146143
}
144+
}
147145
if (self->rts_pin == NULL)
148146
mp_raise_ValueError(translate("Selected RTS pin not valid"));
149147
}
150148

151149
if (cts != mp_const_none) {
152-
for (uint32_t i=0; i < cts_count; ++i)
153-
{
154-
if (mcu_uart_cts_list[i].bank_idx == self->rx_pin->bank_idx) {
155-
if (mcu_uart_cts_list[i].pin == cts) {
156-
self->cts_pin = &mcu_uart_cts_list[i];
157-
break;
158-
}
150+
for (uint32_t i=0; i < cts_count; ++i) {
151+
if (mcu_uart_cts_list[i].bank_idx == self->rx_pin->bank_idx) {
152+
if (mcu_uart_cts_list[i].pin == cts) {
153+
self->cts_pin = &mcu_uart_cts_list[i];
154+
break;
159155
}
160156
}
157+
}
161158
if (self->cts_pin == NULL)
162159
mp_raise_ValueError(translate("Selected CTS pin not valid"));
163160
}
@@ -192,7 +189,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
192189
uint32_t modir = (self->uart->MODIR) & ~(LPUART_MODIR_TXRTSPOL_MASK | LPUART_MODIR_TXRTSE_MASK);
193190
if (rs485_dir != mp_const_none) {
194191
modir |= LPUART_MODIR_TXRTSE_MASK;
195-
if ( rs485_invert == true )
192+
if (rs485_invert)
196193
modir |= LPUART_MODIR_TXRTSPOL_MASK;
197194
}
198195
self->uart->MODIR = modir;

‎ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1011/periph.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ extern const mcu_periph_obj_t mcu_spi_miso_list[4];
3636

3737
extern const mcu_periph_obj_t mcu_uart_rx_list[9];
3838
extern const mcu_periph_obj_t mcu_uart_tx_list[9];
39-
const mcu_periph_obj_t mcu_uart_rts_list[4];
40-
const mcu_periph_obj_t mcu_uart_cts_list[4];
39+
extern const mcu_periph_obj_t mcu_uart_rts_list[4];
40+
extern const mcu_periph_obj_t mcu_uart_cts_list[4];
4141

4242
extern const mcu_pwm_obj_t mcu_pwm_list[20];
4343

‎ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/periph.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ extern const mcu_periph_obj_t mcu_spi_miso_list[8];
3636

3737
extern const mcu_periph_obj_t mcu_uart_rx_list[18];
3838
extern const mcu_periph_obj_t mcu_uart_tx_list[18];
39-
const mcu_periph_obj_t mcu_uart_rts_list[9];
40-
const mcu_periph_obj_t mcu_uart_cts_list[9];
39+
extern const mcu_periph_obj_t mcu_uart_rts_list[9];
40+
extern const mcu_periph_obj_t mcu_uart_cts_list[9];
4141

4242
extern const mcu_pwm_obj_t mcu_pwm_list[67];
4343

‎ports/nrf/common-hal/busio/UART.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
135135
uint32_t baudrate, uint8_t bits, uart_parity_t parity, uint8_t stop,
136136
mp_float_t timeout, uint16_t receiver_buffer_size) {
137137

138-
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert == true)) {
138+
if ((rts != mp_const_none) || (cts != mp_const_none) || (rs485_dir != mp_const_none) || (rs485_invert)) {
139139
mp_raise_ValueError(translate("RTS/CTS/RS485 Not yet supported on this device"));
140140
}
141141

0 commit comments

Comments
 (0)