Skip to content

TARGET_NRF5: Changed 'serial_baud' implementation to support special baud rates. #2703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2016
Merged

TARGET_NRF5: Changed 'serial_baud' implementation to support special baud rates. #2703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2de59d
Changed 'serial_baud' implementation to make it possible to use baud …
anangl Sep 14, 2016
c9c946f
Made the constant array in serial_baud() static.
anangl Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 37 additions & 54 deletions hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/serial_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,64 +344,47 @@ void serial_free(serial_t *obj)
}
}

static nrf_uart_baudrate_t baud_translate(int rate)
void serial_baud(serial_t *obj, int baudrate)
{
nrf_uart_baudrate_t baud;

if (rate < 57600) {
if (rate < 14400) {
if (rate < 2400) {
baud = NRF_UART_BAUDRATE_1200;
} else if (rate < 4800) {
baud = NRF_UART_BAUDRATE_2400;
} else if (rate < 9600) {
baud = NRF_UART_BAUDRATE_4800;
} else {
baud = NRF_UART_BAUDRATE_9600;
}
} else {
if (rate < 19200) {
baud = NRF_UART_BAUDRATE_14400;
} else if (rate < 28800) {
baud = NRF_UART_BAUDRATE_19200;
} else if (rate < 38400) {
baud = NRF_UART_BAUDRATE_28800;
} else {
baud = NRF_UART_BAUDRATE_38400;
}
}
} else {
if (rate < 250000) {
if (rate < 76800) {
baud = NRF_UART_BAUDRATE_57600;
} else if (rate < 115200) {
baud = NRF_UART_BAUDRATE_76800;
} else if (rate < 230400) {
baud = NRF_UART_BAUDRATE_115200;
} else {
baud = NRF_UART_BAUDRATE_230400;
}
} else {
if (rate < 460800) {
baud = NRF_UART_BAUDRATE_250000;
} else if (rate < 921600) {
baud = NRF_UART_BAUDRATE_460800;
} else if (rate < 1000000) {
baud = NRF_UART_BAUDRATE_921600;
} else {
baud = NRF_UART_BAUDRATE_1000000;
}
// nrf_uart_baudrate_set() is not used here (registers are accessed
// directly) to make it possible to set special baud rates like 56000
// or 31250.

static uint32_t const acceptedSpeeds[][2] = {
{ 1200, UART_BAUDRATE_BAUDRATE_Baud1200 },
{ 2400, UART_BAUDRATE_BAUDRATE_Baud2400 },
{ 4800, UART_BAUDRATE_BAUDRATE_Baud4800 },
{ 9600, UART_BAUDRATE_BAUDRATE_Baud9600 },
{ 14400, UART_BAUDRATE_BAUDRATE_Baud14400 },
{ 19200, UART_BAUDRATE_BAUDRATE_Baud19200 },
{ 28800, UART_BAUDRATE_BAUDRATE_Baud28800 },
{ 31250, (0x00800000UL) /* 31250 baud */ },
{ 38400, UART_BAUDRATE_BAUDRATE_Baud38400 },
{ 56000, (0x00E51000UL) /* 56000 baud */ },
{ 57600, UART_BAUDRATE_BAUDRATE_Baud57600 },
{ 76800, UART_BAUDRATE_BAUDRATE_Baud76800 },
{ 115200, UART_BAUDRATE_BAUDRATE_Baud115200 },
{ 230400, UART_BAUDRATE_BAUDRATE_Baud230400 },
{ 250000, UART_BAUDRATE_BAUDRATE_Baud250000 },
{ 460800, UART_BAUDRATE_BAUDRATE_Baud460800 },
{ 921600, UART_BAUDRATE_BAUDRATE_Baud921600 },
{ 1000000, UART_BAUDRATE_BAUDRATE_Baud1M }
};

if (baudrate <= 1200) {
UART_INSTANCE->BAUDRATE = UART_BAUDRATE_BAUDRATE_Baud1200;
return;
}

int const item_cnt = sizeof(acceptedSpeeds)/sizeof(acceptedSpeeds[0]);
for (int i = 1; i < item_cnt; i++) {
if ((uint32_t)baudrate < acceptedSpeeds[i][0]) {
UART_INSTANCE->BAUDRATE = acceptedSpeeds[i - 1][1];
return;
}
}
return baud;
}
void serial_baud(serial_t *obj, int baudrate)
{
(void)obj;
UART_CB.baudrate = baud_translate(baudrate);

// Reconfigure UART peripheral.
nrf_uart_baudrate_set(UART_INSTANCE, UART_CB.baudrate);
UART_INSTANCE->BAUDRATE = UART_BAUDRATE_BAUDRATE_Baud1M;
}

void serial_format(serial_t *obj,
Expand Down