Add vendor firmware version

4 files changed, 51 insertions, 36 deletions

diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp
index c4514e6..19f1b7b 100644
--- a/src/MTS_IO_CellularRadio.cpp
+++ b/src/MTS_IO_CellularRadio.cpp
@@ -200,6 +200,11 @@ ICellularRadio::CODE CellularRadio::getFirmwareBuild(std::string& sFirmwareBuild
     return FAILURE;
 }
 
+ICellularRadio::CODE CellularRadio::getVendorFirmware(std::string& sVendorFirmware) {
+    sVendorFirmware = ICellularRadio::VALUE_NOT_SUPPORTED;
+    return FAILURE;
+}
+
 ICellularRadio::CODE CellularRadio::getHardware(std::string& sHardware) {
     printTrace("%s| Get Hardware", m_sName.c_str());
     sHardware = ICellularRadio::VALUE_NOT_SUPPORTED;
diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 4b58189..9dbfad1 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -33,6 +33,7 @@ const char *MTS::IO::ICellularRadio::KEY_MANUFACTURER = "manufacturer";    //!<
 const char *MTS::IO::ICellularRadio::KEY_HARDWARE = "hardware";            //!< Radio Hardware Version
 const char *MTS::IO::ICellularRadio::KEY_FIRMWARE = "firmware";            //!< Radio Firmware Version
 const char *MTS::IO::ICellularRadio::KEY_FIRMWARE_BUILD = "firmwarebuild"; //!< Radio Firmware Build
+const char *MTS::IO::ICellularRadio::KEY_VENDOR_FIRMWARE = "vendorfirmware";  //!< Radio Vendor Firmware Version
 
 const char *MTS::IO::ICellularRadio::KEY_CARRIER = "carrier";   //!< Cellular Service Provider  = Home Network
 const char *MTS::IO::ICellularRadio::VALUE_CARRIER_VERIZON = "Verizon";
diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 2d1ffcd..e32d6e8 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -591,7 +591,7 @@ ICellularRadio::CODE QuectelRadio::fumoLocalApply(ICellularRadio::UpdateCb& step
     ICellularRadio::CODE rc;
     std::string sCmd;
 
-    rc = getQuectelFirmware(m_sQuectelFirmware);
+    rc = getVendorFirmware(m_sQuectelFirmware);
     if (rc != SUCCESS) {
         callNextStep(stepCb, "FUMO Error: Failed to obtain current firmware version");
         return rc;
@@ -954,9 +954,9 @@ ICellularRadio::CODE QuectelRadio::checkFile(bool& bIsFilePresent, const std::st
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::getQuectelFirmware(std::string& sFirmware) {
+ICellularRadio::CODE QuectelRadio::getVendorFirmware(std::string& sVendorFirmware) {
     printTrace("%s| Get Quectel-specific firmware version", getName().c_str());
-    sFirmware = ICellularRadio::VALUE_NOT_SUPPORTED;
+    sVendorFirmware = ICellularRadio::VALUE_NOT_SUPPORTED;
     std::string sCmd("AT+QGMR");
     std::string sResult = sendCommand(sCmd);
     size_t pos = sResult.find(ICellularRadio::RSP_OK);
@@ -965,8 +965,8 @@ ICellularRadio::CODE QuectelRadio::getQuectelFirmware(std::string& sFirmware) {
         return FAILURE;
     }
 
-    sFirmware = MTS::Text::trim(sResult.substr(0, pos));
-    if(sFirmware.size() == 0) {
+    sVendorFirmware = MTS::Text::trim(sResult.substr(0, pos));
+    if(sVendorFirmware.size() == 0) {
         printWarning("%s| Unable to get firmware from radio using command [%s]", getName().c_str(), sCmd.c_str());
         return FAILURE;
     }
@@ -1053,7 +1053,7 @@ ICellularRadio::CODE QuectelRadio::fumoWaitNewFirmware(ICellularRadio::UpdateCb&
 
         MTS::Thread::sleep(10000);
 
-        if (getQuectelFirmware(sQuectelFirmware) != SUCCESS) {
+        if (getVendorFirmware(sQuectelFirmware) != SUCCESS) {
             // The radio is probably unavailable
             resetConnection(100);
             continue;
diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 52b5664..8d762be 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -789,7 +789,7 @@ ICellularRadio::CODE TelitRadio::fumoLocalApply(ICellularRadio::UpdateCb& stepCb
     std::string sCmd;
     FOTA_GROUP group = getFotaGroup();
 
-    rc = getTelitFirmware(m_sTelitFirmware);
+    rc = getVendorFirmware(m_sTelitFirmware);
     if (rc != SUCCESS) {
         callNextStep(stepCb, "FUMO Error: Failed to obtain current firmware version");
         return rc;
@@ -938,39 +938,48 @@ ICellularRadio::CODE TelitRadio::abortWrite() {
     return sendBasicCommand(CMD_ABORT_UPLOAD, 2000, 0x00);
 }
 
-ICellularRadio::CODE TelitRadio::getTelitFirmware(std::string& sFirmware) {
-    /*
-     * Currently, AT+CGMR command is used to determine the radio firmware version.
-     *
-     * AT+CGMR
-     *   M0F.670006
-     *
-     * Perhaps in the future we will use AT#SWPKGV command.
-     *
-     * AT#SWPKGV
-     *   25.20.676-P0F.670690
-     *   M0F.670006
-     *   P0F.670690
-     *   A0F.670006
-     */
-
+ICellularRadio::CODE TelitRadio::getVendorFirmware(std::string& sVendorFirmware) {
     printTrace("%s| Get Telit-specific firmware version", getName().c_str());
-    sFirmware = ICellularRadio::VALUE_NOT_SUPPORTED;
-    std::string sCmd("AT+CGMR");
+    ICellularRadio::CODE rc = FAILURE;
+    sVendorFirmware = ICellularRadio::VALUE_NOT_SUPPORTED;
+    std::string sFirmware;
+    std::string sFirmwareBuild;
+    std::string sCmd("AT#SWPKGV");
     std::string sResult = sendCommand(sCmd);
     size_t pos = sResult.find(ICellularRadio::RSP_OK);
-    if (pos == std::string::npos) {
-        printWarning("%s| Unable to get firmware from radio using command [%s]", getName().c_str(), sCmd.c_str());
-        return FAILURE;
-    }
 
-    sFirmware = MTS::Text::trim(sResult.substr(0, pos));
-    if(sFirmware.size() == 0) {
-        printWarning("%s| Unable to get firmware from radio using command [%s]", getName().c_str(), sCmd.c_str());
-        return FAILURE;
-    }
+    do {
 
-    return SUCCESS;
+        if (pos != std::string::npos) {
+            // Found
+            std::vector<std::string> vLine = MTS::Text::split(sResult, "\r");
+            if(vLine[1].size() == 0) {
+                printWarning("%s| Unable to get firmware from radio using command [%s]", getName().c_str(), sCmd.c_str());
+                rc = FAILURE;
+            } else {
+                sVendorFirmware = MTS::Text::trim(vLine[1]);
+                rc = SUCCESS;
+            }
+            break;
+        }
+
+        // Not Found. Then we will use "AT+CGMR" + "AT#CFVR"
+        rc = getFirmware(sFirmware);
+        if (rc != SUCCESS){
+            break;
+        }
+
+        rc = getFirmwareBuild(sFirmwareBuild);
+        if (rc != SUCCESS){
+            break;
+        }
+
+        sVendorFirmware = sFirmware + "," + sFirmwareBuild;
+
+    } while (false);
+
+
+    return rc;
 }
 
 ICellularRadio::CODE TelitRadio::fumoWaitUpgradeFinished(ICellularRadio::UpdateCb& stepCb) {
@@ -1026,7 +1035,7 @@ ICellularRadio::CODE TelitRadio::fumoCheckNewFirmware(ICellularRadio::UpdateCb&
     CODE rc = SUCCESS;
     std::string sTelitFirmware;
 
-    rc = getTelitFirmware(sTelitFirmware);
+    rc = getVendorFirmware(sTelitFirmware);
 
     if (rc != SUCCESS) {
         callNextStep(stepCb, "FUMO Error: Failed to obtain current firmware version");