MTX-2898 mpower 2-3-4g: quectel methods for set-cellular-mode and common methods for get-cellular-mode

1 files changed, 11 insertions, 10 deletions

diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index 501a164..f934e50 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -24,6 +24,7 @@
 #include <climits>
 
 #include <mts/MTS_Logger.h>
+#include <mts/MTS_Text.h>
 
 using namespace MTS::IO;
 
@@ -55,27 +56,27 @@ ICellularRadio::CODE EG95Radio::getSupportedCellularModes(CELLULAR_MODES &networ
     return SUCCESS;
 }
 
-ICellularRadio::CODE EG95Radio::getCellularMode(CELLULAR_MODES&) {
-    return FAILURE;
-}
-
 ICellularRadio::CODE EG95Radio::setCellularMode(CELLULAR_MODES networks) {
     std::string prefNet;
+    unsigned int prefOnly = 0;
     for (int i = sizeof(networks)*CHAR_BIT-1; i>=0; --i){
         switch (1<<i & networks) {
-        case ICellularRadio::CELLULAR_MODE_2G: prefNet += "01"; break;
-        case ICellularRadio::CELLULAR_MODE_3G: prefNet += "0302"; break;
-        case ICellularRadio::CELLULAR_MODE_4G: prefNet += "04"; break;
+        case ICellularRadio::CELLULAR_MODE_2G: prefNet += "01"  ; prefOnly = 1; break;
+        case ICellularRadio::CELLULAR_MODE_3G: prefNet += "0302"; prefOnly = 2; break;
+        case ICellularRadio::CELLULAR_MODE_4G: prefNet += "04"  ; prefOnly = 3; break;
         default: printError("Unhandled preferred network flag.");
         }
     }
-    std::string sCmd("AT+QCFG=\"nwscanseq\",");
-    sCmd += prefNet;
+    std::string sCmd;
+    if (prefNet.size() == 2) { // *g-only
+        sCmd = "AT+QCFG=\"nwscanmode\"," + std::to_string(prefOnly);
+    } else { // preferred
+        sCmd = "AT+QCFG=\"nwscanseq\"," + prefNet;
+    }
     std::string cmdResult = sendCommand(sCmd);
     if (cmdResult.find(ICellularRadio::RSP_OK) == std::string::npos) {
         printDebug("%s| AT+QCFG returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str());
         return FAILURE;
     }
-
     return SUCCESS;
 }