RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

at: make receive EOL configurable

Browse Source
This commit is contained in:
Vincent Dupont 2018-05-24 15:15:33 +02:00
parent 83af66c49f
commit 3f620d582d
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/at/at.c
View File

@ -70,7 +70,7 @@ int at_send_cmd(at_dev_t *dev, const char *command, uint32_t timeout)
return -1;
}
if (at_expect_bytes(dev, AT_SEND_EOL "\r\n", timeout)) {
if (at_expect_bytes(dev, AT_SEND_EOL AT_RECV_EOL_1 AT_RECV_EOL_2, timeout)) {
return -2;
}
}
@ -114,6 +114,9 @@ out:
ssize_t at_send_cmd_get_lines(at_dev_t *dev, const char *command,
char *resp_buf, size_t len, bool keep_eol, uint32_t timeout)
{
const char eol[] = AT_RECV_EOL_1 AT_RECV_EOL_2;
assert(sizeof(eol) > 1);
ssize_t res;
size_t bytes_left = len - 1;
char *pos = resp_buf;
@ -131,7 +134,7 @@ ssize_t at_send_cmd_get_lines(at_dev_t *dev, const char *command,
res = at_readline(dev, pos, bytes_left, keep_eol, timeout);
if (res == 0) {
if (bytes_left) {
*pos++ = '\n';
*pos++ = eol[sizeof(eol) - 2];
bytes_left--;
}
continue;
@ -154,7 +157,7 @@ ssize_t at_send_cmd_get_lines(at_dev_t *dev, const char *command,
else {
pos += res;
if (bytes_left) {
*pos++ = '\n';
*pos++ = eol[sizeof(eol) - 2];
bytes_left--;
}
else {
@ -184,7 +187,7 @@ int at_send_cmd_wait_prompt(at_dev_t *dev, const char *command, uint32_t timeout
return -1;
}
if (at_expect_bytes(dev, AT_SEND_EOL "\n", timeout)) {
if (at_expect_bytes(dev, AT_SEND_EOL AT_RECV_EOL_2, timeout)) {
return -2;
}
@ -215,6 +218,9 @@ int at_send_cmd_wait_ok(at_dev_t *dev, const char *command, uint32_t timeout)
ssize_t at_readline(at_dev_t *dev, char *resp_buf, size_t len, bool keep_eol, uint32_t timeout)
{
const char eol[] = AT_RECV_EOL_1 AT_RECV_EOL_2;
assert(sizeof(eol) > 1);
ssize_t res = -1;
char *resp_pos = resp_buf;
@ -226,12 +232,12 @@ ssize_t at_readline(at_dev_t *dev, char *resp_buf, size_t len, bool keep_eol, ui
if (AT_PRINT_INCOMING) {
print(resp_pos, read_res);
}
if (*resp_pos == '\r') {
if (sizeof(eol) > 2 && *resp_pos == eol[0]) {
if (!keep_eol) {
continue;
}
}
if (*resp_pos == '\n') {
if (*resp_pos == eol[sizeof(eol) - 2]) {
*resp_pos = '\0';
res = resp_pos - resp_buf;
goto out;

10
drivers/include/at.h
View File

@ -57,6 +57,16 @@ extern "C" {
/** Shortcut for getting send end of line length */
#define AT_SEND_EOL_LEN (sizeof(AT_SEND_EOL) - 1)
#ifndef AT_RECV_EOL_1
/** 1st end of line character received (S3 aka CR character for a modem) */
#define AT_RECV_EOL_1 "\r"
#endif
#ifndef AT_RECV_EOL_2
/** 1st end of line character received (S4 aka LF character for a modem) */
#define AT_RECV_EOL_2 "\n"
#endif
/**
* @brief AT device structure
*/