Merge branch 'quectel-radio' into quectel-specific

7 files changed, 66 insertions, 50 deletions

diff --git a/include/mts/MTS_IO_CellularRadioFactory.h b/include/mts/MTS_IO_CellularRadioFactory.h
index c26e642..c9cb56f 100644
--- a/include/mts/MTS_IO_CellularRadioFactory.h
+++ b/include/mts/MTS_IO_CellularRadioFactory.h
@@ -35,29 +35,30 @@ namespace MTS {
                 CellularRadioFactory();
                 virtual ~CellularRadioFactory() {};
 
-                virtual ICellularRadio* create(const std::string& sModel, const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-
-                virtual ICellularRadio* createHE910D(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createHE910EUD(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910NAG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910C4NF(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910NA1(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910SVG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910EUG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910C4EU(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910EU1(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910C1NS(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE910C1AP(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createME910C1NA(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createME910C1NV(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createME910C1WW(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createGE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createDE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createCE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
-                virtual ICellularRadio* createLE866A1JS(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
+                ICellularRadio* create(const std::string& sModel, const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
+
+                ICellularRadio* createHE910D(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createHE910EUD(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910NAG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910C4NF(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910NA1(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910SVG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910EUG(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910C4EU(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910EU1(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910C1NS(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE910C1AP(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createME910C1NA(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createME910C1NV(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createME910C1WW(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createGE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createDE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createCE910(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createLE866A1JS(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
+                ICellularRadio* createEG95Radio(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
 
             protected:
-                typedef MTS::IO::ICellularRadio* (CellularRadioFactory::*CREATEFUNCPTR)(const std::string& sPort);
+                typedef MTS::IO::ICellularRadio* (CellularRadioFactory::*CREATEFUNCPTR)(const std::string& sPort) const;
                 std::map< std::string, CREATEFUNCPTR > m_mCreationMap;
 
                 virtual std::string identifyRadio(const std::string& sPort);
diff --git a/include/mts/MTS_IO_EG95Radio.h b/include/mts/MTS_IO_EG95Radio.h
index 07db773..206d15d 100644
--- a/include/mts/MTS_IO_EG95Radio.h
+++ b/include/mts/MTS_IO_EG95Radio.h
@@ -7,6 +7,8 @@ namespace MTS {
     namespace IO {
         class EG95Radio : public QuectelRadio
         {
+        public:
+            static const std::string MODEL_NAME;
 
         };
     }
diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h
index 11ad193..d74ad15 100644
--- a/include/mts/MTS_IO_ICellularRadio.h
+++ b/include/mts/MTS_IO_ICellularRadio.h
@@ -60,7 +60,6 @@ namespace MTS {
                     NOT_INSERTED
                 };
 
-                // TODO: convert functions
                 static CODE convertModelToType(const std::string& sModel, std::string& sType);
                 static CODE convertModelToMtsShortCode(const std::string& sModel, std::string& sCode, ICellularRadio *radioObj = NULL);
                 static CODE convertServiceDomainToString(SERVICEDOMAIN eSd, std::string& sSd);
@@ -79,7 +78,6 @@ namespace MTS {
                 static CODE test(MTS::AutoPtr<MTS::IO::Connection>& apIo, uint32_t timeoutSeconds = 30);
                 static std::string extractModelFromResult(const std::string& sResult);
                 static std::string getCodeAsString(CODE code);
-                // XXX
 
                 static const char *DEFAULT_RADIO_PORT;
                 static const char *DEFAULT_RADIO_DIR;
diff --git a/src/MTS_IO_CellularRadioFactory.cpp b/src/MTS_IO_CellularRadioFactory.cpp
index 0c64221..8ebd8dc 100644
--- a/src/MTS_IO_CellularRadioFactory.cpp
+++ b/src/MTS_IO_CellularRadioFactory.cpp
@@ -37,6 +37,7 @@
 #include <mts/MTS_IO_GE910Radio.h>
 #include <mts/MTS_IO_CE910Radio.h>
 #include <mts/MTS_IO_DE910Radio.h>
+#include "mts/MTS_IO_EG95Radio.h"
 #include <mts/MTS_Logger.h>
 
 using namespace MTS::IO;
@@ -60,6 +61,7 @@ CellularRadioFactory::CellularRadioFactory() {
     m_mCreationMap[DE910Radio::MODEL_NAME]        = &CellularRadioFactory::createDE910;
     m_mCreationMap[CE910Radio::MODEL_NAME]        = &CellularRadioFactory::createCE910;
     m_mCreationMap[LE866A1JSRadio::MODEL_NAME]    = &CellularRadioFactory::createLE866A1JS;
+    m_mCreationMap[EG95Radio::MODEL_NAME]         = &CellularRadioFactory::createEG95Radio;
 }
 
 ICellularRadio* CellularRadioFactory::create(const std::string& sModel, const std::string& sPort) {
@@ -87,22 +89,22 @@ std::string CellularRadioFactory::identifyRadio(const std::string& sPort) {
     apIo.reset(new SerialConnection(SerialConnection::Builder(sPort).baudRate(115200).useLockFile().build()));
     while(!apIo->open(30000)) {
         printError("CellularRadioFactory| Failed to open radio port [%s]", sPort.c_str());
-        return TelitRadio::VALUE_UNKNOWN;
+        return ICellularRadio::VALUE_UNKNOWN;
     }
 
     //Attempt basic radio communication
-    if(TelitRadio::test(apIo) != TelitRadio::SUCCESS) {
+    if(ICellularRadio::test(apIo) != ICellularRadio::SUCCESS) {
         printError("CellularRadioFactory| Failed to communicate with radio on port [%s]", sPort.c_str());
         apIo->close();
-        return TelitRadio::VALUE_UNKNOWN;
+        return ICellularRadio::VALUE_UNKNOWN;
     }
 
     //Get model
     int count = 0;
-    std::string sCmd("ATI4");
+    std::string sCmd("AT+GMM");
     std::string sResult;
     do {
-        sResult = ICellularRadio::sendCommand(apIo, sCmd, TelitRadio::DEFAULT_BAIL_STRINGS, 1000, TelitRadio::CR);
+        sResult = ICellularRadio::sendCommand(apIo, sCmd, ICellularRadio::DEFAULT_BAIL_STRINGS, 1000, ICellularRadio::CR);
         if (sResult.find("OK") == std::string::npos) {
             printDebug("RADIO| Attempting to get radio model [%s] ...", sResult.c_str());
         } else {
@@ -114,83 +116,90 @@ std::string CellularRadioFactory::identifyRadio(const std::string& sPort) {
     if(count == 30) {
         printDebug("RADIO| Unable to get radio model");
         apIo->close();
-        return TelitRadio::VALUE_UNKNOWN;
+        return ICellularRadio::VALUE_UNKNOWN;
     }
 
-    std::string sModel = TelitRadio::extractModelFromResult(sResult);
-    printDebug("RADIO| Extracted [%s] from ATI4 query", sModel.c_str());
+    std::string sModel = ICellularRadio::extractModelFromResult(sResult);
+    printDebug("RADIO| Extracted [%s] from AT+GMM query", sModel.c_str());
     apIo->close();
     return sModel;
 }
 
-ICellularRadio* CellularRadioFactory::createHE910D(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createHE910D(const std::string& sPort) const {
     return new HE910DRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createHE910EUD(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createHE910EUD(const std::string& sPort) const {
     return new HE910EUDRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910NAG(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910NAG(const std::string& sPort) const {
     return new LE910NAGRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910C4NF(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910C4NF(const std::string& sPort) const {
     return new LE910C4NFRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910NA1(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910NA1(const std::string& sPort) const {
     return new LE910NA1Radio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910SVG(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910SVG(const std::string& sPort) const {
     return new LE910SVGRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910EUG(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910EUG(const std::string& sPort) const {
     return new LE910EUGRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910C4EU(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910C4EU(const std::string& sPort) const {
     return new LE910C4EURadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910EU1(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910EU1(const std::string& sPort) const {
     return new LE910EU1Radio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910C1NS(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910C1NS(const std::string& sPort) const {
     return new LE910C1NSRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE910C1AP(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createLE910C1AP(const std::string& sPort) const {
     return new LE910C1APRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createME910C1NA(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createME910C1NA(const std::string& sPort) const {
     return new ME910C1NARadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createME910C1NV(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createME910C1NV(const std::string& sPort) const {
     return new ME910C1NVRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createME910C1WW(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createME910C1WW(const std::string& sPort) const {
     return new ME910C1WWRadio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createGE910(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createGE910(const std::string& sPort) const {
     return new GE910Radio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createDE910(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createDE910(const std::string& sPort) const {
     return new DE910Radio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createCE910(const std::string& sPort) {
+ICellularRadio* CellularRadioFactory::createCE910(const std::string& sPort) const {
     return new CE910Radio(sPort);
 }
 
-ICellularRadio* CellularRadioFactory::createLE866A1JS(const std::string &sPort) {
+ICellularRadio* CellularRadioFactory::createLE866A1JS(const std::string &sPort) const {
     return new LE866A1JSRadio(sPort);
 }
+
+ICellularRadio* CellularRadioFactory::createEG95Radio(const std::string& sPort) const
+{
+    // TODO: return new EG95Radio(sPort);
+    printError("TODO: EG95Radio");
+    return new HE910DRadio(sPort);
+}
diff --git a/src/MTS_IO_EG95Radio.cpp b/src/MTS_IO_EG95Radio.cpp
index 2fca48f..6feee41 100644
--- a/src/MTS_IO_EG95Radio.cpp
+++ b/src/MTS_IO_EG95Radio.cpp
@@ -1 +1,5 @@
 #include "mts/MTS_IO_EG95Radio.h"
+
+using namespace MTS::IO;
+
+const std::string EG95Radio::MODEL_NAME("EG95");
diff --git a/src/MTS_IO_ICellularRadio.cpp b/src/MTS_IO_ICellularRadio.cpp
index 58ccb2b..2f19f3a 100644
--- a/src/MTS_IO_ICellularRadio.cpp
+++ b/src/MTS_IO_ICellularRadio.cpp
@@ -419,6 +419,8 @@ std::string MTS::IO::ICellularRadio::extractModelFromResult(const std::string& s
         sModel = "DE910-DUAL";
     } else if(sResult.find("CE910") != std::string::npos) {
         sModel = "CE910";
+    } else if(sResult.find("EG95") != std::string::npos) {
+        sModel = "EG95";
     }
     return sModel;
 }
diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index 8f747f8..ecd4f36 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -56,7 +56,7 @@ CellularRadio::CODE TelitRadio::getModel(std::string& sModel) {
         printWarning("%s| Unable to get model from radio.  Returning [%s]", getName().c_str(), getName().c_str());
         return SUCCESS;
     } else {
-        sModel = CellularRadio::extractModelFromResult(sResult);
+        sModel = extractModelFromResult(sResult);
         if(sModel.size() == 0) {
             printWarning("%s| Unable to get model from radio.  Returning [%s]", getName().c_str(), getName().c_str());
             return SUCCESS;