lib: at_cmd_parser: Parse AT commands

at_cmd_parser was good for parsing AT responses and notifications, but
could not parse AT commands. Fix this by adding extra state in the
parser.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

lib/at_cmd_parser/at_cmd_parser.c

@@ -24,6 +24,7 @@ enum at_parser_state {
 	NUMBER,
 	SMS_PDU,
 	NOTIFICATION,
+	COMMAND,
 	OPTIONAL,
 };
 
@@ -49,6 +50,9 @@ static int at_parse_detect_type(const char **str, int index)
 		 * notification ID, (eg +CEREG:)
 		 */
 		set_new_state(NOTIFICATION);
+	} else if ((index == 0) && is_command(tmpstr)) {
+		/* Next, check if we deal with command (eg AT+CCLK) */
+		set_new_state(COMMAND);
 	} else if (index == 0) {
 		/* If the string start without an notification
 		 * ID, we treat the whole string as one string
@@ -124,7 +128,17 @@ static int at_parse_process_element(const char **str,
 		at_params_string_put(list,
 				     index, start_ptr,
 				     tmpstr - start_ptr);
+	} else if (state == COMMAND) {
+		const char *start_ptr = tmpstr;
+
+		tmpstr += sizeof("AT+") - 1;
 
+		while (is_valid_notification_char(*tmpstr)) {
+			tmpstr++;
+		}
+
+		at_params_string_put(list, index, start_ptr,
+				     tmpstr - start_ptr);
 	} else if (state == OPTIONAL) {
 		at_params_empty_put(list, index);
 

lib/at_cmd_parser/at_utils.h

@@ -20,11 +20,13 @@
 #include <ctype.h>
 
 #define AT_PARAM_SEPARATOR              ','
-#define AT_CMD_SEPARATOR                ':'
+#define AT_RSP_SEPARATOR                ':'
+#define AT_CMD_SEPARATOR                '='
 #define AT_CMD_BUFFER_TERMINATOR        0
 #define AT_CMD_STRING_IDENTIFIER        '\"'
 #define AT_STANDARD_NOTIFICATION_PREFIX '+'
 #define AT_PROP_NOTIFICATION_PREFX      '%'
+#define AT_CUSTOM_COMMAND_PREFX         '#'
 
 /**
  * @brief Check if character is a notification start character
@@ -47,6 +49,33 @@ static inline bool is_notification(char chr)
 	return false;
 }
 
+/**
+ * @brief Check if a string is a beginning of an AT command
+ *
+ * This function will check if the character is a "AT+" or "AT%" which
+ * identifies an AT command.
+ *
+ * @param[in] str String to examine
+ *
+ * @retval true  If the string is an AT command
+ * @retval false Otherwise
+ */
+static inline bool is_command(const char *str)
+{
+	if (strlen(str) < 3) {
+		return false;
+	}
+
+	if ((toupper(str[0]) == 'A') && (toupper(str[1]) == 'T') &&
+	    ((str[2] == AT_STANDARD_NOTIFICATION_PREFIX) ||
+	     (str[2] == AT_PROP_NOTIFICATION_PREFX) ||
+	     (str[2] == AT_CUSTOM_COMMAND_PREFX))) {
+		return true;
+	}
+
+	return false;
+}
+
 /**
  * @brief Verify that the character is a valid character
  *
@@ -102,6 +131,7 @@ static inline bool is_terminated(char chr)
 static inline bool is_separator(char chr)
 {
 	if ((chr == AT_PARAM_SEPARATOR) ||
+	    (chr == AT_RSP_SEPARATOR) ||
 	    (chr == AT_CMD_SEPARATOR)) {
 		return true;
 	}