Merge branch 'ms/MTX-3444_L4G1_support_implementation' into 'master'

[MTX-3444] mPower Oct20: L4G1 libmts-io support

See merge request !23

1 files changed, 23 insertions, 0 deletions

diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 53c8faa..c9bed33 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -207,6 +207,24 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertModelToMtsShortCod
                 eCode = ERROR;
             }
         }
+    } else if (sModel.find("EG25") == 0) {
+        if (NULL == radioObject) {
+            sCode = VALUE_NOT_SUPPORTED;
+            eCode = ERROR;
+        } else {
+            std::string sValue;
+            eCode = radioObject->getFirmware(sValue);
+            if (eCode != SUCCESS) {
+                sCode = VALUE_NOT_SUPPORTED;
+                eCode = ERROR;
+            } else if (sValue.find("EG25G") != std::string::npos) {
+                sCode = "L4G1";
+                eCode = SUCCESS;
+            } else {
+                sCode = VALUE_NOT_SUPPORTED;
+                eCode = ERROR;
+            }
+        }
     } else {
         sCode = VALUE_NOT_SUPPORTED;
         printError("RADIO| Could not identify MTS short code from model. [%s]", sModel.c_str());
@@ -300,6 +318,9 @@ MTS::IO::ICellularRadio::CODE MTS::IO::ICellularRadio::convertModelToType(const
     } else if (sModel.find("EG95") == 0) {
         sType = VALUE_TYPE_LTE;
         eCode = SUCCESS;
+    } else if (sModel.find("EG25") == 0) {
+        sType = VALUE_TYPE_LTE;
+        eCode = SUCCESS;
     } else {
         sType = VALUE_TYPE_GSM;
         eCode = ERROR;
@@ -445,6 +466,8 @@ std::string MTS::IO::ICellularRadio::extractModelFromResult(const std::string& s
         sModel = "CE910";
     } else if(sResult.find("EG95") != std::string::npos) {
         sModel = "EG95";
+    } else if(sResult.find("EG25") != std::string::npos) {
+        sModel = "EG25";
     }
     return sModel;
 }