Skip to content

Commit de0f3e7

Browse files
MarkusLassilaSeppoTakalo
authored andcommitted
applications: serial_lte_modem: Remove AT-command workarounds
Previously, AT_CMD_CUSTOM did not correctly handle multiple commands which started the same, but were of varying length. This was fixed some time ago, so remove the workarounds in SLM. Signed-off-by: Markus Lassila <[email protected]>
1 parent 37bd18d commit de0f3e7

File tree

5 files changed

+7
-24
lines changed

5 files changed

+7
-24
lines changed

applications/serial_lte_modem/src/gnss/slm_at_gnss.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,7 @@ static void gnss_event_handler(int event)
688688
}
689689
}
690690

691-
SLM_AT_CMD_CUSTOM(xgps_set, "AT#XGPS=", handle_at_gps);
692-
SLM_AT_CMD_CUSTOM(xgps_read, "AT#XGPS?", handle_at_gps);
691+
SLM_AT_CMD_CUSTOM(xgps, "AT#XGPS", handle_at_gps);
693692
static int handle_at_gps(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
694693
uint32_t param_count)
695694
{

applications/serial_lte_modem/src/gpio/slm_at_gpio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ static int handle_at_gpio_configure(enum at_parser_cmd_type cmd_type,
224224
return err;
225225
}
226226

227-
SLM_AT_CMD_CUSTOM(xgpio_set, "AT#XGPIO=", handle_at_gpio_operate);
228-
SLM_AT_CMD_CUSTOM(xgpio_read, "AT#XGPIO?", handle_at_gpio_operate);
227+
SLM_AT_CMD_CUSTOM(xgpio, "AT#XGPIO", handle_at_gpio_operate);
229228
static int handle_at_gpio_operate(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
230229
uint32_t)
231230
{

applications/serial_lte_modem/src/nrfcloud/slm_at_nrfcloud.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,7 @@ static int nrf_cloud_datamode_callback(uint8_t op, const uint8_t *data, int len,
540540
return ret;
541541
}
542542

543-
SLM_AT_CMD_CUSTOM(xnrfcloud_set, "AT#XNRFCLOUD=", handle_at_nrf_cloud);
544-
SLM_AT_CMD_CUSTOM(xnrfcloud_read, "AT#XNRFCLOUD?", handle_at_nrf_cloud);
543+
SLM_AT_CMD_CUSTOM(xnrfcloud, "AT#XNRFCLOUD", handle_at_nrf_cloud);
545544
static int handle_at_nrf_cloud(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
546545
uint32_t param_count)
547546
{

applications/serial_lte_modem/src/slm_at_socket.c

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,7 @@ static int socket_datamode_callback(uint8_t op, const uint8_t *data, int len, ui
972972
return ret;
973973
}
974974

975-
SLM_AT_CMD_CUSTOM(xsocket_set, "AT#XSOCKET=", handle_at_socket);
976-
SLM_AT_CMD_CUSTOM(xsocket_read, "AT#XSOCKET?", handle_at_socket);
975+
SLM_AT_CMD_CUSTOM(xsocket, "AT#XSOCKET", handle_at_socket);
977976
static int handle_at_socket(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
978977
uint32_t param_count)
979978
{
@@ -1040,8 +1039,7 @@ static int handle_at_socket(enum at_parser_cmd_type cmd_type, struct at_parser *
10401039
return err;
10411040
}
10421041

1043-
SLM_AT_CMD_CUSTOM(xssocket_set, "AT#XSSOCKET=", handle_at_secure_socket);
1044-
SLM_AT_CMD_CUSTOM(xssocket_read, "AT#XSSOCKET?", handle_at_secure_socket);
1042+
SLM_AT_CMD_CUSTOM(xssocket, "AT#XSSOCKET", handle_at_secure_socket);
10451043
static int handle_at_secure_socket(enum at_parser_cmd_type cmd_type,
10461044
struct at_parser *parser, uint32_t param_count)
10471045
{
@@ -1405,16 +1403,6 @@ SLM_AT_CMD_CUSTOM(xsend, "AT#XSEND", handle_at_send);
14051403
static int handle_at_send(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
14061404
uint32_t param_count)
14071405
{
1408-
char at_cmd[32] = {0};
1409-
size_t at_cmd_size = sizeof(at_cmd);
1410-
1411-
if (util_string_get(parser, 0, at_cmd, &at_cmd_size)) {
1412-
return -EINVAL;
1413-
}
1414-
if (!strncasecmp(at_cmd, "AT#XSENDTO", strlen("AT#XSENDTO"))) {
1415-
return handle_at_sendto(cmd_type, parser, param_count);
1416-
}
1417-
14181406
int err = -EINVAL;
14191407
char data[SLM_MAX_PAYLOAD_SIZE + 1] = {0};
14201408
int size;
@@ -1440,8 +1428,7 @@ static int handle_at_send(enum at_parser_cmd_type cmd_type, struct at_parser *pa
14401428
return err;
14411429
}
14421430

1443-
SLM_AT_CMD_CUSTOM(xrecv_set, "AT#XRECV=", handle_at_recv);
1444-
SLM_AT_CMD_CUSTOM(xrecv_read, "AT#XRECV?", handle_at_recv);
1431+
SLM_AT_CMD_CUSTOM(xrecv, "AT#XRECV", handle_at_recv);
14451432
static int handle_at_recv(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
14461433
uint32_t param_count)
14471434
{

applications/serial_lte_modem/src/twi/slm_at_twi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ static int handle_at_twi_list(enum at_parser_cmd_type cmd_type, struct at_parser
160160
return err;
161161
}
162162

163-
SLM_AT_CMD_CUSTOM(xtwiw_set, "AT#XTWIW=", handle_at_twi_write);
164-
SLM_AT_CMD_CUSTOM(xtwiw_read, "AT#XTWIW?", handle_at_twi_write);
163+
SLM_AT_CMD_CUSTOM(xtwiw, "AT#XTWIW", handle_at_twi_write);
165164
static int handle_at_twi_write(enum at_parser_cmd_type cmd_type, struct at_parser *parser,
166165
uint32_t param_count)
167166
{

0 commit comments

Comments
 (0)