adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: modem: gsm: extend modem info struct about RSSI value

Browse source 
Add RSSI member into gsm_ppp_modem_info structure in order to
get that information using the gsm_ppp_modem_info function.

Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
This commit is contained in:
Bartosz Bilas 2021-10-22 17:56:34 +02:00 committed by Jukka Rissanen
parent 5107691441
commit bf68b670f1
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/modem/gsm_ppp.c
View file

@ -353,16 +353,16 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_rssi_cesq)
rxlev = ATOI(argv[0], 0, "rxlev"); rxlev = ATOI(argv[0], 0, "rxlev");
if (rsrp >= 0 && rsrp <= 97) { if (rsrp >= 0 && rsrp <= 97) {
gsm.context.data_rssi = -140 + (rsrp - 1); minfo.mdm_rssi = -140 + (rsrp - 1);
LOG_INF("RSRP: %d", gsm.context.data_rssi); LOG_INF("RSRP: %d", minfo.mdm_rssi);
} else if (rscp >= 0 && rscp <= 96) { } else if (rscp >= 0 && rscp <= 96) {
gsm.context.data_rssi = -120 + (rscp - 1); minfo.mdm_rssi = -120 + (rscp - 1);
LOG_INF("RSCP: %d", gsm.context.data_rssi); LOG_INF("RSCP: %d", minfo.mdm_rssi);
} else if (rxlev >= 0 && rxlev <= 63) { } else if (rxlev >= 0 && rxlev <= 63) {
gsm.context.data_rssi = -110 + (rxlev - 1); minfo.mdm_rssi = -110 + (rxlev - 1);
LOG_INF("RSSI: %d", gsm.context.data_rssi); LOG_INF("RSSI: %d", minfo.mdm_rssi);
} else { } else {
gsm.context.data_rssi = GSM_RSSI_INVALID; minfo.mdm_rssi = GSM_RSSI_INVALID;
LOG_INF("RSRP/RSCP/RSSI not known"); LOG_INF("RSRP/RSCP/RSSI not known");
} }
@ -382,7 +382,7 @@ MODEM_CMD_DEFINE(on_cmd_atcmdinfo_rssi_csq)
rssi = GSM_RSSI_INVALID; rssi = GSM_RSSI_INVALID;
} }
gsm.context.data_rssi = rssi; minfo.mdm_rssi = rssi;
LOG_INF("RSSI: %d", rssi); LOG_INF("RSSI: %d", rssi);
} }
@ -697,8 +697,8 @@ attaching:
/* Read connection quality (RSSI) before PPP carrier is ON */ /* Read connection quality (RSSI) before PPP carrier is ON */
rssi_handler(NULL); rssi_handler(NULL);
if (!(gsm->context.data_rssi && gsm->context.data_rssi != GSM_RSSI_INVALID && if (!(minfo.mdm_rssi && minfo.mdm_rssi != GSM_RSSI_INVALID &&
gsm->context.data_rssi < GSM_RSSI_MAXVAL)) { minfo.mdm_rssi < GSM_RSSI_MAXVAL)) {
LOG_DBG("Not valid RSSI, %s", "retrying..."); LOG_DBG("Not valid RSSI, %s", "retrying...");
if (gsm->rssi_retries-- > 0) { if (gsm->rssi_retries-- > 0) {
@ -1113,6 +1113,7 @@ static int gsm_init(const struct device *dev)
gsm->context.data_imsi = minfo.mdm_imsi; gsm->context.data_imsi = minfo.mdm_imsi;
gsm->context.data_iccid = minfo.mdm_iccid; gsm->context.data_iccid = minfo.mdm_iccid;
#endif /* CONFIG_MODEM_SIM_NUMBERS */ #endif /* CONFIG_MODEM_SIM_NUMBERS */
gsm->context.data_rssi = minfo.mdm_rssi;
#endif /* CONFIG_MODEM_SHELL */ #endif /* CONFIG_MODEM_SHELL */
gsm->context.is_automatic_oper = false; gsm->context.is_automatic_oper = false;

1
include/drivers/modem/gsm_ppp.h
View file

@ -23,6 +23,7 @@ struct gsm_ppp_modem_info {
char mdm_imsi[GSM_PPP_MDM_IMSI_LENGTH]; char mdm_imsi[GSM_PPP_MDM_IMSI_LENGTH];
char mdm_iccid[GSM_PPP_MDM_ICCID_LENGTH]; char mdm_iccid[GSM_PPP_MDM_ICCID_LENGTH];
#endif #endif
int mdm_rssi;
}; };
/** @cond INTERNAL_HIDDEN */ /** @cond INTERNAL_HIDDEN */