[MTS-MTQ] cellular factory: quectel eg95 instance creation

5 files changed, 18 insertions, 0 deletions

diff --git a/include/mts/MTS_IO_CellularRadioFactory.h b/include/mts/MTS_IO_CellularRadioFactory.h
index c26e642..bd5db43 100644
--- a/include/mts/MTS_IO_CellularRadioFactory.h
+++ b/include/mts/MTS_IO_CellularRadioFactory.h
@@ -55,6 +55,7 @@ namespace MTS {
                 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* createEG95Radio(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT);
 
             protected:
                 typedef MTS::IO::ICellularRadio* (CellularRadioFactory::*CREATEFUNCPTR)(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/src/MTS_IO_CellularRadioFactory.cpp b/src/MTS_IO_CellularRadioFactory.cpp
index 146b112..8b2353a 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) {
@@ -194,3 +196,10 @@ ICellularRadio* CellularRadioFactory::createCE910(const std::string& sPort) {
 ICellularRadio* CellularRadioFactory::createLE866A1JS(const std::string &sPort) {
     return new LE866A1JSRadio(sPort);
 }
+
+ICellularRadio* CellularRadioFactory::createEG95Radio(const std::string& sPort)
+{
+    // 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;
 }