riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/at: make OK and ERROR replies configurable

Browse Source
This commit is contained in:
Alexandre Abadie 2018-06-04 17:05:11 +02:00
parent d8c3e1da4e
commit ceb9710b3e
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/at/at.c
View File

@ -141,11 +141,17 @@ ssize_t at_send_cmd_get_lines(at_dev_t *dev, const char *command,
} }
else if (res > 0) { else if (res > 0) {
bytes_left -= res; bytes_left -= res;
if ((res == (2 + keep_eol)) && (strncmp(pos, "OK", 2) == 0)) { size_t len_ok = sizeof(AT_RECV_OK) - 1;
size_t len_error = sizeof(AT_RECV_ERROR) - 1;
if (((size_t )res == (len_ok + keep_eol)) &&
(len_ok != 0) &&
(strncmp(pos, AT_RECV_OK, len_ok) == 0)) {
res = len - bytes_left; res = len - bytes_left;
break; break;
} }
else if ((res == (5 + keep_eol)) && (strncmp(pos, "ERROR", 5) == 0)) { else if (((size_t )res == (len_error + keep_eol)) &&
(len_error != 0) &&
(strncmp(pos, AT_RECV_ERROR, len_error) == 0)) {
return -1; return -1;
} }
else if (strncmp(pos, "+CME ERROR:", 11) == 0) { else if (strncmp(pos, "+CME ERROR:", 11) == 0) {
@ -204,8 +210,10 @@ int at_send_cmd_wait_ok(at_dev_t *dev, const char *command, uint32_t timeout)
char resp_buf[64]; char resp_buf[64];
res = at_send_cmd_get_resp(dev, command, resp_buf, sizeof(resp_buf), timeout); res = at_send_cmd_get_resp(dev, command, resp_buf, sizeof(resp_buf), timeout);
if (res > 0) { if (res > 0) {
if (strcmp(resp_buf, "OK") == 0) { ssize_t len_ok = sizeof(AT_RECV_OK) - 1;
if ((len_ok != 0) && (strcmp(resp_buf, AT_RECV_OK) == 0)) {
res = 0; res = 0;
} }
else { else {

10
drivers/include/at.h
View File

@ -67,6 +67,16 @@ extern "C" {
#define AT_RECV_EOL_2 "\n" #define AT_RECV_EOL_2 "\n"
#endif #endif
#ifndef AT_RECV_OK
/** default OK reply of an AT device */
#define AT_RECV_OK "OK"
#endif
#ifndef AT_RECV_ERROR
/** default ERROR reply of an AT device */
#define AT_RECV_ERROR "ERROR"
#endif
/** /**
* @brief AT device structure * @brief AT device structure
*/ */