Merge branch 'ap/vendor_firmware' into 'delta-radio-fwu'

Add vendor firmware version

See merge request !29

5 files changed, 6 insertions, 8 deletions

diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h
index 57a4de6..ab6e00a 100644
--- a/include/mts/MTS_IO_CellularRadio.h
+++ b/include/mts/MTS_IO_CellularRadio.h
@@ -55,6 +55,7 @@ namespace MTS {
 
                 CODE getFirmware(std::string& sFirmware) override;
                 CODE getFirmwareBuild(std::string& sFirmwareBuild) override;
+                CODE getVendorFirmware(std::string& sVendorFirmware) override;
                 CODE getHardware(std::string& sHardware) override;
                 CODE getManufacturer(std::string& sManufacturer) override;
                 CODE getImei(std::string& sImei) override;
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index e1edbcd..085c217 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -119,6 +119,7 @@ namespace MTS {
                 static const char *KEY_HARDWARE;      //!< Radio Hardware Version
                 static const char *KEY_FIRMWARE;      //!< Radio Firmware Version
                 static const char *KEY_FIRMWARE_BUILD;//!< Radio Firmware Build
+                static const char *KEY_VENDOR_FIRMWARE;  //!< Radio Vendor Firmware Version
                 static const char *KEY_IMEI;          //!< International Mobile Station Equipment Identity
                 static const char *KEY_MEID;          //!< Mobile Equipment Identifier
                 static const char *KEY_IMSI;          //!< International Mobile Subscriber Identity
@@ -221,6 +222,7 @@ namespace MTS {
 
                 virtual CODE getFirmware(std::string& sFirmware) = 0;
                 virtual CODE getFirmwareBuild(std::string& sFirmwareBuild) = 0;
+                virtual CODE getVendorFirmware(std::string& sVendorFirmware) = 0;
                 virtual CODE getHardware(std::string& sHardware) = 0;
                 virtual CODE getManufacturer(std::string& sManufacturer) = 0;
                 virtual CODE getImei(std::string& sImei) = 0;
diff --git a/include/mts/MTS_IO_ME910Radio.h b/include/mts/MTS_IO_ME910Radio.h
index 09e8ede..93af86f 100644
--- a/include/mts/MTS_IO_ME910Radio.h
+++ b/include/mts/MTS_IO_ME910Radio.h
@@ -36,8 +36,6 @@ namespace MTS {
 
                 virtual CODE setRxDiversity(const Json::Value& jArgs);
 
-                virtual CODE getFirmwareBuild(std::string& sFirmware);
-
             protected:
 
             private:
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 6e7372b..41c89dc 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -31,6 +31,7 @@ namespace MTS {
             public:
                 bool resetRadio(uint32_t iTimeoutMillis = 5000) override;
 
+                CODE getVendorFirmware(std::string& sVendorFirmware) override;
                 CODE getModel(std::string& sModel) override;
                 CODE getIccid(std::string& sIccid) override;
                 CODE getService(std::string& sService) override;
@@ -72,10 +73,6 @@ namespace MTS {
                 static const std::string VALUE_MTS_DELTA_NAME;
                 static const std::string VALUE_MTS_DELTA_PATH;
 
-                // TODO: Consider asbtracting to the ICellularRadio::getFirmwareBuild
-                //!< Get Quectel-specific firmware version (firmware build?)
-                CODE getQuectelFirmware(std::string& sFirmware);
-
                 CODE startFileUpload(const std::string& sTargetFilename, size_t nBytes);
                 CODE abortFileUpload();
 
diff --git a/include/mts/MTS_IO_TelitRadio.h b/include/mts/MTS_IO_TelitRadio.h
index a3425f9..c3ba764 100644
--- a/include/mts/MTS_IO_TelitRadio.h
+++ b/include/mts/MTS_IO_TelitRadio.h
@@ -30,6 +30,8 @@ namespace MTS {
             public:
                 bool resetRadio(uint32_t iTimeoutMillis = 5000) override;
 
+                CODE getFirmwareBuild(std::string& sFirmwareBuild) override;
+                CODE getVendorFirmware(std::string& sVendorFirmware) override;
                 CODE getModel(std::string& sModel) override;
                 CODE getIccid(std::string& sIccid) override;
                 CODE getService(std::string& sService) override;
@@ -79,8 +81,6 @@ namespace MTS {
                 static const size_t FILE_CHUNK_SIZE;
                 static const std::string CMD_ABORT_UPLOAD;
 
-                CODE getTelitFirmware(std::string& sFirmware);
-
                 CODE startWrite();
                 CODE abortWrite();