Diff: Cellular/Cellular.cpp

Revision:

65:2cdd943bb3a3

Parent:

64:6b6ccf11fb4c

Child:

69:93dace69ee98

--- a/Cellular/Cellular.cpp	Mon Aug 18 18:42:24 2014 +0000
+++ b/Cellular/Cellular.cpp	Mon Aug 18 19:42:44 2014 +0000
@@ -402,15 +402,11 @@
 
 std::string Cellular::getEquipmentIdentifier()
 {
-    string command = "AT+CGSN";
-    string equipmentIdentifier = sendCommand(command, 2000);
+    string equipmentIdentifier = sendCommand("AT+CGSN", 2000);
+    std::vector<std::string> lines = Text::split(equipmentIdentifier, "\r\n");
     
     if (equipmentIdentifier.find("OK") != string::npos) {                
-        size_t cursor; //Dummy var
-        
-        //Need +3 due to /r from echo, and /r/n from radio 
-        //between command echo and equipment identifier number.
-        equipmentIdentifier = Text::getLine(equipmentIdentifier, command.size() + 3, cursor);
+        equipmentIdentifier = lines[1];
     } else {
         //Empty string signifies failure
         equipmentIdentifier.clear();