lib: modem_info: Obtain ICCID data

The modem informer now obtains the ICCID parameter
from the modem and adds it to the device JSON string.

Signed-off-by: Henrik Malvik Halvorsen <[email protected]>

Author: hmhalvorsen

include/modem_info.h

@@ -16,10 +16,10 @@
  */
 
 /** Largest expected parameter response size. */
-#define MODEM_INFO_MAX_RESPONSE_SIZE 32
+#define MODEM_INFO_MAX_RESPONSE_SIZE 64
 
 /** Size of the JSON string. */
-#define MODEM_INFO_JSON_STRING_SIZE 128
+#define MODEM_INFO_JSON_STRING_SIZE 256
 
 /** RSRP offset value. */
 #define MODEM_INFO_RSRP_OFFSET_VAL 141
@@ -39,6 +39,7 @@ enum modem_info {
 	MODEM_INFO_BATTERY,	/**< Battery voltage. */
 	MODEM_INFO_TEMP,	/**< Temperature level. */
 	MODEM_INFO_FW_VERSION,  /**< Modem firmware version. */
+	MODEM_INFO_ICCID,	/**< SIM ICCID */
 	MODEM_INFO_COUNT,	/**< Number of legal elements in the enum. */
 };
 

lib/modem_info/modem_info.c

@@ -34,8 +34,9 @@ LOG_MODULE_REGISTER(modem_info);
 #define AT_CMD_VBAT		"AT%XVBAT"
 #define AT_CMD_TEMP		"AT%XTEMP"
 #define AT_CMD_FW_VERSION	"AT+CGMR"
+#define AT_CMD_CRSM		"AT+CRSM"
+#define AT_CMD_ICCID		"AT+CRSM=176,12258,0,0,10"
 #define AT_CMD_SUCCESS_SIZE	5
-
 #define RSRP_PARAM_INDEX 0
 #define RSRP_PARAM_COUNT 2
 #define RSRP_OFFSET_VAL 141
@@ -67,6 +68,9 @@ LOG_MODULE_REGISTER(modem_info);
 #define FW_PARAM_INDEX 0
 #define FW_PARAM_COUNT 1
 
+#define ICCID_PARAM_INDEX 2
+#define ICCID_PARAM_COUNT 3
+
 #define CMD_SIZE(x) (strlen(x) - 1)
 
 static const char success[] = "OK";
@@ -148,6 +152,13 @@ static const struct modem_info_data fw_data = {
 	.data_type = AT_PARAM_TYPE_STRING,
 };
 
+static const struct modem_info_data iccid_data = {
+	.cmd = AT_CMD_ICCID,
+	.param_index = ICCID_PARAM_INDEX,
+	.param_count = ICCID_PARAM_COUNT,
+	.data_type = AT_PARAM_TYPE_STRING,
+};
+
 static const struct modem_info_data *const modem_data[] = {
 	[MODEM_INFO_RSRP] = &rsrp_data,
 	[MODEM_INFO_BAND] = &band_data,
@@ -159,6 +170,7 @@ static const struct modem_info_data *const modem_data[] = {
 	[MODEM_INFO_BATTERY] = &battery_data,
 	[MODEM_INFO_TEMP] = &temp_data,
 	[MODEM_INFO_FW_VERSION] = &fw_data,
+	[MODEM_INFO_ICCID] = &iccid_data,
 };
 
 static const char *const modem_data_name[] = {
@@ -172,6 +184,7 @@ static const char *const modem_data_name[] = {
 	[MODEM_INFO_BATTERY] = "BATTERY",
 	[MODEM_INFO_TEMP] = "TEMP",
 	[MODEM_INFO_FW_VERSION] = "FW",
+	[MODEM_INFO_ICCID] = "ICCID",
 };
 
 static rsrp_cb_t modem_info_rsrp_cb;
@@ -220,6 +233,42 @@ static bool is_cesq_notification(char *buf, size_t len)
 	return strstr(buf, AT_CMD_CESQ_RESP) ? true : false;
 }
 
+static void flip_iccid_string(char *buf)
+{
+	u8_t current_char;
+	u8_t next_char;
+
+	for (size_t i = 0; i < strlen(buf); i = i + 2) {
+		current_char = buf[i];
+		next_char = buf[i + 1];
+
+		buf[i] = next_char;
+		buf[i + 1] = current_char;
+	}
+}
+
+static int modem_info_parse_iccid(const struct modem_info_data *modem_data,
+				  char *buf)
+{
+	int err;
+	u32_t param_index;
+
+	err = at_parser_max_params_from_str(
+		&buf[CMD_SIZE(AT_CMD_CRSM)], &m_param_list,
+		modem_data->param_count);
+
+	if (err != 0) {
+		return err;
+	}
+
+	param_index = at_params_valid_count_get(&m_param_list);
+	if (param_index != modem_data->param_count) {
+		return -EAGAIN;
+	}
+
+	return err;
+}
+
 static int modem_info_parse(const struct modem_info_data *modem_data, char *buf)
 {
 	int err;
@@ -328,7 +377,11 @@ int modem_info_string_get(enum modem_info info, char *buf)
 		return err;
 	}
 
-	err = modem_info_parse(modem_data[info], recv_buf);
+	if (info == MODEM_INFO_ICCID) {
+		err = modem_info_parse_iccid(modem_data[info], recv_buf);
+	} else {
+		err = modem_info_parse(modem_data[info], recv_buf);
+	}
 
 	if (err) {
 		return err;
@@ -351,6 +404,10 @@ int modem_info_string_get(enum modem_info info, char *buf)
 					   MODEM_INFO_MAX_RESPONSE_SIZE);
 	}
 
+	if (info == MODEM_INFO_ICCID) {
+		flip_iccid_string(buf);
+	}
+
 	return len <= 0 ? -ENOTSUP : len;
 }
 

lib/modem_info/modem_info_json.c

@@ -50,6 +50,10 @@ static const struct lte_info modem_info_fw = {
 	.info = MODEM_INFO_FW_VERSION,
 };
 
+static const struct lte_info modem_info_iccid = {
+	.info = MODEM_INFO_ICCID,
+};
+
 static const struct lte_info *const modem_information[] = {
 	&modem_info_band,
 	&modem_info_mode,
@@ -58,6 +62,7 @@ static const struct lte_info *const modem_information[] = {
 	&modem_info_ip_address,
 	&modem_info_uicc,
 	&modem_info_battery,
+	&modem_info_iccid,
 	&modem_info_fw,
 };