From 97b3189c8189ba3ca353e644fa13d8a359d74092 Mon Sep 17 00:00:00 2001
From: Maksym Telychko <maksym.telychko@globallogic.com>
Date: Fri, 25 Oct 2019 14:22:09 +0300
Subject: MTX-3028 mpower: fix 2g/3g/4g switch algorithm

---
 src/MTS_IO_EG95Radio.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index aff53d2..f1c040a 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -58,18 +58,17 @@ ICellularRadio::CODE EG95Radio::getSupportedCellularModes(CELLULAR_MODES &networ
 
 ICellularRadio::CODE EG95Radio::setCellularMode(CELLULAR_MODES networks) {
     std::string prefNet;
-    unsigned int prefOnly = 0;
+    unsigned int prefOnly = 0, prefCount = 0;
     for (int i = sizeof(networks)*CHAR_BIT-1; i>=0; --i){
         switch (1<<i & networks) {
-        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.");
+        case ICellularRadio::CELLULAR_MODE_2G: prefNet += "01"  ; prefOnly = 1; prefCount++; break;
+        case ICellularRadio::CELLULAR_MODE_3G: prefNet += "0302"; prefOnly = 2; prefCount++; break;
+        case ICellularRadio::CELLULAR_MODE_4G: prefNet += "04"  ; prefOnly = 3; prefCount++; break;
         }
     }
 
     std::string sCmd;
-    if (prefNet.size() == 2) { // *g-only
+    if (prefCount == 1) { // *g-only
         sCmd = "AT+QCFG=\"nwscanmode\"," + std::to_string(prefOnly);
     } else { // preferred
         sCmd = "AT+QCFG=\"nwscanmode\",0";
-- 
cgit v1.2.3


From a904d8eff7d7add0b341f66ec99a47d906fbceb3 Mon Sep 17 00:00:00 2001
From: Maksym Telychko <maksym.telychko@globallogic.com>
Date: Fri, 25 Oct 2019 17:43:47 +0300
Subject: MTX-3028 mpower quectel: restart added after 2g/3g/4g switch

---
 src/MTS_IO_EG95Radio.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index f1c040a..a8a0c40 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -85,5 +85,12 @@ ICellularRadio::CODE EG95Radio::setCellularMode(CELLULAR_MODES networks) {
         printError("%s| AT+QCFG=\"nwscanseq\" returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str());
         return FAILURE;
     }
+
+    sCmd = "AT+CFUN=1,1";
+    cmdResult = sendCommand(sCmd);
+    if (cmdResult.find(ICellularRadio::RSP_OK) == std::string::npos) {
+        printError("%s| AT+CFUN=1,1 returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str());
+        return FAILURE;
+    }
     return SUCCESS;
 }
-- 
cgit v1.2.3


From a6aa97bcb8dc6ff498e6bd6a641ba92716ad1223 Mon Sep 17 00:00:00 2001
From: Maksym Telychko <maksym.telychko@globallogic.com>
Date: Mon, 28 Oct 2019 17:04:08 +0200
Subject: Revert "MTX-3028 mpower quectel: restart added after 2g/3g/4g switch"

This reverts commit a904d8eff7d7add0b341f66ec99a47d906fbceb3.

Restart moved to cell-radio-mode script
---
 src/MTS_IO_EG95Radio.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src')

diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index a8a0c40..f1c040a 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -85,12 +85,5 @@ ICellularRadio::CODE EG95Radio::setCellularMode(CELLULAR_MODES networks) {
         printError("%s| AT+QCFG=\"nwscanseq\" returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str());
         return FAILURE;
     }
-
-    sCmd = "AT+CFUN=1,1";
-    cmdResult = sendCommand(sCmd);
-    if (cmdResult.find(ICellularRadio::RSP_OK) == std::string::npos) {
-        printError("%s| AT+CFUN=1,1 returned unexpected response: [%s][%s]", getName().c_str(), sCmd.c_str(), cmdResult.c_str());
-        return FAILURE;
-    }
     return SUCCESS;
 }
-- 
cgit v1.2.3