feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

esp-modem: prefix the crash issue both bg96 and sim800l in OVERALL mode

Browse Source
This commit is contained in:
Liu Han
2020-12-22 20:22:27 +08:00
committed by bot
parent 935edc9e09
commit 7f3bcc13d7
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/protocols/pppos_client/components/modem/src/bg96.c
View File

@ -160,7 +160,7 @@ static esp_err_t bg96_handle_cimi(modem_dce_t *dce, const char *line)
* @brief Handle response from AT+COPS? * @brief Handle response from AT+COPS?
*/ */
static esp_err_t bg96_handle_cops(modem_dce_t *dce, const char *line) static esp_err_t bg96_handle_cops(modem_dce_t *dce, const char *line)
{ {
esp_err_t err = ESP_FAIL; esp_err_t err = ESP_FAIL;
if (strstr(line, MODEM_RESULT_CODE_SUCCESS)) { if (strstr(line, MODEM_RESULT_CODE_SUCCESS)) {
err = esp_modem_process_command_done(dce, MODEM_STATE_SUCCESS); err = esp_modem_process_command_done(dce, MODEM_STATE_SUCCESS);
@ -172,7 +172,7 @@ static esp_err_t bg96_handle_cops(modem_dce_t *dce, const char *line)
size_t len = strlen(line); size_t len = strlen(line);
char *line_copy = malloc(len + 1); char *line_copy = malloc(len + 1);
strcpy(line_copy, line); strcpy(line_copy, line);
/* +COPS: <mode>[, <format>[, <oper>][, <Act>]] */ /* +COPS: <mode>[, <format>[, <oper>[, <Act>]]] */
char *str_ptr = NULL; char *str_ptr = NULL;
char *p[5]; char *p[5];
uint8_t i = 0; uint8_t i = 0;
@ -190,9 +190,7 @@ static esp_err_t bg96_handle_cops(modem_dce_t *dce, const char *line)
} }
} }
if (i >= 4) { if (i >= 4) {
char act_str[3] = {0}; dce->act = (uint8_t)strtol(p[3], NULL, 0);
int len = snprintf(act_str, 3, "%s", p[3]);
dce->act = (uint8_t)atoi(act_str);
} }
free(line_copy); free(line_copy);
} }
@ -469,6 +467,8 @@ modem_dce_t *bg96_init(modem_dte_t *dte)
DCE_CHECK(bg96_get_imei_number(bg96_dce) == ESP_OK, "get imei failed", err_io); DCE_CHECK(bg96_get_imei_number(bg96_dce) == ESP_OK, "get imei failed", err_io);
/* Get IMSI number */ /* Get IMSI number */
DCE_CHECK(bg96_get_imsi_number(bg96_dce) == ESP_OK, "get imsi failed", err_io); DCE_CHECK(bg96_get_imsi_number(bg96_dce) == ESP_OK, "get imsi failed", err_io);
/* Get operator name */
DCE_CHECK(bg96_get_operator_name(&(bg96_dce->parent)) == ESP_OK, "get operator name failed", err_io);
return &(bg96_dce->parent); return &(bg96_dce->parent);
err_io: err_io:
free(bg96_dce); free(bg96_dce);

17
examples/protocols/pppos_client/components/modem/src/sim800.c
View File

@ -194,9 +194,9 @@ static esp_err_t sim800_handle_cops(modem_dce_t *dce, const char *line)
size_t len = strlen(line); size_t len = strlen(line);
char *line_copy = malloc(len + 1); char *line_copy = malloc(len + 1);
strcpy(line_copy, line); strcpy(line_copy, line);
/* +COPS: <mode>[, <format>[, <oper>]] */ /* +COPS: <mode>[, <format>[, <oper>[, <Act>]]] */
char *str_ptr = NULL; char *str_ptr = NULL;
char *p[3]; char *p[5];
uint8_t i = 0; uint8_t i = 0;
/* strtok will broke string by replacing delimiter with '\0' */ /* strtok will broke string by replacing delimiter with '\0' */
p[i] = strtok_r(line_copy, ",", &str_ptr); p[i] = strtok_r(line_copy, ",", &str_ptr);
@ -211,6 +211,9 @@ static esp_err_t sim800_handle_cops(modem_dce_t *dce, const char *line)
err = ESP_OK; err = ESP_OK;
} }
} }
if (i >= 4) {
dce->act = (uint8_t)strtol(p[3], NULL, 0);
}
free(line_copy); free(line_copy);
} }
return err; return err;
@ -415,14 +418,15 @@ err:
/** /**
* @brief Get Operator's name * @brief Get Operator's name
* *
* @param sim800_dce sim800 object * @param dce Modem DCE object
* @return esp_err_t * @return esp_err_t
* - ESP_OK on success * - ESP_OK on success
* - ESP_FAIL on error * - ESP_FAIL on error
*/ */
static esp_err_t sim800_get_operator_name(sim800_modem_dce_t *sim800_dce) static esp_err_t sim800_get_operator_name(modem_dce_t *dce)
{ {
modem_dte_t *dte = sim800_dce->parent.dte; modem_dte_t *dte = dce->dte;
sim800_modem_dce_t *sim800_dce = __containerof(dce, sim800_modem_dce_t, parent);
sim800_dce->parent.handle_line = sim800_handle_cops; sim800_dce->parent.handle_line = sim800_handle_cops;
DCE_CHECK(dte->send_cmd(dte, "AT+COPS?\r", MODEM_COMMAND_TIMEOUT_OPERATOR) == ESP_OK, "send command failed", err); DCE_CHECK(dte->send_cmd(dte, "AT+COPS?\r", MODEM_COMMAND_TIMEOUT_OPERATOR) == ESP_OK, "send command failed", err);
DCE_CHECK(sim800_dce->parent.state == MODEM_STATE_SUCCESS, "get network operator failed", err); DCE_CHECK(sim800_dce->parent.state == MODEM_STATE_SUCCESS, "get network operator failed", err);
@ -469,6 +473,7 @@ modem_dce_t *sim800_init(modem_dte_t *dte)
sim800_dce->parent.hang_up = esp_modem_dce_hang_up; sim800_dce->parent.hang_up = esp_modem_dce_hang_up;
sim800_dce->parent.get_signal_quality = sim800_get_signal_quality; sim800_dce->parent.get_signal_quality = sim800_get_signal_quality;
sim800_dce->parent.get_battery_status = sim800_get_battery_status; sim800_dce->parent.get_battery_status = sim800_get_battery_status;
sim800_dce->parent.get_operator_name = sim800_get_operator_name;
sim800_dce->parent.set_working_mode = sim800_set_working_mode; sim800_dce->parent.set_working_mode = sim800_set_working_mode;
sim800_dce->parent.power_down = sim800_power_down; sim800_dce->parent.power_down = sim800_power_down;
sim800_dce->parent.deinit = sim800_deinit; sim800_dce->parent.deinit = sim800_deinit;
@ -483,7 +488,7 @@ modem_dce_t *sim800_init(modem_dte_t *dte)
/* Get IMSI number */ /* Get IMSI number */
DCE_CHECK(sim800_get_imsi_number(sim800_dce) == ESP_OK, "get imsi failed", err_io); DCE_CHECK(sim800_get_imsi_number(sim800_dce) == ESP_OK, "get imsi failed", err_io);
/* Get operator name */ /* Get operator name */
DCE_CHECK(sim800_get_operator_name(sim800_dce) == ESP_OK, "get operator name failed", err_io); DCE_CHECK(sim800_get_operator_name(&(sim800_dce->parent)) == ESP_OK, "get operator name failed", err_io);
return &(sim800_dce->parent); return &(sim800_dce->parent);
err_io: err_io:
free(sim800_dce); free(sim800_dce);

2
examples/protocols/pppos_client/main/Kconfig.projbuild
View File

@ -86,7 +86,7 @@ menu "Example Configuration"
config EXAMPLE_MODEM_UART_EVENT_TASK_STACK_SIZE config EXAMPLE_MODEM_UART_EVENT_TASK_STACK_SIZE
int "UART Event Task Stack Size" int "UART Event Task Stack Size"
range 2000 6000 range 2000 6000
default 2048 default 3072
help help
Stack size of UART event task. Stack size of UART event task.