Merge branch 'sk/GP-1195/cell-diag' into 'master'

[GP-1195] Cellular debugging - add a query

See merge request !51

1 files changed, 33 insertions, 1 deletions

diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 5db2ddf..4a0a8b2 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -325,7 +325,7 @@ ICellularRadio::CODE TelitRadio::getNetworkStatus(Json::Value& jData) {
             printTrace("%s| Network Status:\n%s\n", getName().c_str(), jData.toStyledString().c_str());
             return SUCCESS; //return SUCCESS because getCommonNetworkStats() succeeded at top of this function
         }
-        if (sResult.find("SIM PIN") != std::string::npos) {
+        if (sResult.find("SIM PIN") != std::string::npos || sResult.find("SIM PUK") != std::string::npos) {
             printError("%s| The SIM is locked and must first be unlocked", getName().c_str());
             printTrace("%s| Network Status:\n%s\n", getName().c_str(), jData.toStyledString().c_str());
             return SUCCESS; //return SUCCESS because getCommonNetworkStats() succeeded at top of this function
@@ -1179,3 +1179,35 @@ bool MTS::IO::TelitRadio::isContainsSignChar(const std::string& str) {
 
     return true;
 }
+
+const std::vector<std::string>& TelitRadio::getDiagCommands(bool) {
+    // Declare as static to initialize only when used, but cache the results.
+    const static std::vector<std::string> vCommands {
+        // Radio model and firmware:
+        "AT+CGMI", "AT+CGMM", "AT+CGMR", "AT#SWPKGV", "AT#CFVR",
+
+        // Current operator profile on the radio side:
+        "AT#FWSWITCH?", "AT+CGSN",
+
+        // SIM card information:
+        "AT#SIMDET?", "AT#CCID", "AT+CPIN?", "AT#PCT",
+
+        // Operating mode of the radio:
+        "AT+CFUN?",
+
+        // Low-level network settings:
+        "AT+WS46?", "AT#RXDIV", "AT#CALLDISA?", "AT+CEMODE?",
+
+        // Data connection configuration:
+        "AT+CGDCONT?", "AT#PDPAUTH?",
+
+        // Registration and connection to the tower:
+        "AT+CIND?", "AT+CSQ", "AT+COPS?", "AT+CREG?", "AT+CGREG?", "AT+CEREG?",
+        "AT#RFSTS", "AT#PSNT?", "AT#MONI",
+
+        // Data connection status:
+        "AT+CGACT?", "AT+CGCONTRDP=1", "AT+CGCONTRDP=2", "AT+CGCONTRDP=3"
+    };
+
+    return vCommands;
+}