Add support for L4E1 and L4N1 radios1.0.17

8 files changed, 187 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index bf45134..677c34d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,11 @@ MTS_IO_LE866Radio.o \
 MTS_IO_LE866A1JSRadio.o \
 MTS_IO_LE910Radio.o \
 MTS_IO_LE910NAGRadio.o \
+MTS_IO_LE910C4NFRadio.o \
 MTS_IO_LE910NA1Radio.o \
 MTS_IO_LE910SVGRadio.o \
 MTS_IO_LE910EUGRadio.o \
+MTS_IO_LE910C4EURadio.o \
 MTS_IO_LE910EU1Radio.o \
 MTS_IO_LE910C1NSRadio.o \
 MTS_IO_LE910C1APRadio.o \
@@ -49,9 +51,11 @@ MTS_IO_LE866Radio.d \
 MTS_IO_LE866A1JSRadio.d \
 MTS_IO_LE910Radio.d \
 MTS_IO_LE910NAGRadio.d \
+MTS_IO_LE910C4NFRadio.d \
 MTS_IO_LE910NA1Radio.d \
 MTS_IO_LE910SVGRadio.d \
 MTS_IO_LE910EUGRadio.d \
+MTS_IO_LE910C4EURadio.d \
 MTS_IO_LE910EU1Radio.d \
 MTS_IO_LE910C1NSRadio.d \
 MTS_IO_LE910C1APRadio.d \
diff --git a/include/mts/MTS_IO_CellularRadioFactory.h b/include/mts/MTS_IO_CellularRadioFactory.h
index 69cdd38..49f63bd 100644
--- a/include/mts/MTS_IO_CellularRadioFactory.h
+++ b/include/mts/MTS_IO_CellularRadioFactory.h
@@ -44,9 +44,11 @@ namespace MTS {
                 virtual CellularRadio* createHE910D(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createHE910EUD(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910NAG(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
+                virtual CellularRadio* createLE910C4NF(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910NA1(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910SVG(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910EUG(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
+                virtual CellularRadio* createLE910C4EU(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910EU1(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910C1NS(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
                 virtual CellularRadio* createLE910C1AP(const std::string& sPort = CellularRadio::DEFAULT_RADIO_PORT);
diff --git a/include/mts/MTS_IO_LE910C4EURadio.h b/include/mts/MTS_IO_LE910C4EURadio.h
new file mode 100644
index 0000000..e872df3
--- /dev/null
+++ b/include/mts/MTS_IO_LE910C4EURadio.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 by Multi-Tech Systems
+ *
+ * This file is part of libmts-io.
+ *
+ * libmts-io is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libmts-io is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libmts-io.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MTS_IO_LE910C4EURADIO_H_
+#define MTS_IO_LE910C4EURADIO_H_
+
+#include <mts/MTS_IO_LE910Radio.h>
+
+namespace MTS {
+    namespace IO {
+
+        class LE910C4EURadio : public LE910Radio {
+
+            public:
+                static const std::string MODEL_NAME;
+
+                LE910C4EURadio(const std::string& sPort);
+                virtual ~LE910C4EURadio(){};
+
+            protected:
+
+            private:
+
+        };
+    }
+}
+
+#endif /* MTS_IO_LE910C4EURADIO_H_ */
diff --git a/include/mts/MTS_IO_LE910C4NFRadio.h b/include/mts/MTS_IO_LE910C4NFRadio.h
new file mode 100644
index 0000000..04cb4ea
--- /dev/null
+++ b/include/mts/MTS_IO_LE910C4NFRadio.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 by Multi-Tech Systems
+ *
+ * This file is part of libmts-io.
+ *
+ * libmts-io is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libmts-io is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libmts-io.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MTS_IO_LE910C4NFRADIO_H_
+#define MTS_IO_LE910C4NFRADIO_H_
+
+#include <mts/MTS_IO_LE910Radio.h>
+
+namespace MTS {
+    namespace IO {
+
+        class LE910C4NFRadio : public LE910Radio {
+
+            public:
+                static const std::string MODEL_NAME;
+
+                LE910C4NFRadio(const std::string& sPort);
+                virtual ~LE910C4NFRadio(){};
+
+            protected:
+
+            private:
+
+        };
+    }
+}
+
+#endif /* MTS_IO_LE910C4NFRADIO_H_ */
diff --git a/src/MTS_IO_CellularRadio.cpp b/src/MTS_IO_CellularRadio.cpp
index 46cf61e..3510b43 100644
--- a/src/MTS_IO_CellularRadio.cpp
+++ b/src/MTS_IO_CellularRadio.cpp
@@ -283,6 +283,9 @@ CellularRadio::CODE CellularRadio::convertModelToMtsShortCode(const std::string&
     } else if (sModel.find("LE910-NAG") == 0) {
         sCode = "LAT1";
         eCode = SUCCESS;
+    } else if (sModel.find("LE910C4-NF") == 0) {
+        sCode = "L4N1";
+        eCode = SUCCESS;
     } else if (sModel.find("LE910-NA1") == 0) {
         if (NULL == radioObject) {
             sCode = VALUE_NOT_SUPPORTED;
@@ -318,6 +321,9 @@ CellularRadio::CODE CellularRadio::convertModelToMtsShortCode(const std::string&
     } else if (sModel.find("LE910-EUG") == 0) {
         sCode = "LEU1";
         eCode = SUCCESS;
+    } else if (sModel.find("LE910C4-EU") == 0) {
+        sCode = "L4E1";
+        eCode = SUCCESS;
     } else if (sModel.find("LE910-EU1") == 0) {
         sCode = "LEU3";
         eCode = SUCCESS;
@@ -381,6 +387,9 @@ CellularRadio::CODE CellularRadio::convertModelToType(const std::string& sModel,
     } else if (sModel.find("LE910-NAG") == 0) {
         sType = VALUE_TYPE_LTE;
         eCode = SUCCESS;
+    } else if (sModel.find("LE910C4-NF") == 0) {
+        sType = VALUE_TYPE_LTE;
+        eCode = SUCCESS;
     } else if (sModel.find("LE910-NA1") == 0) {
         sType = VALUE_TYPE_LTE;
         eCode = SUCCESS;
@@ -390,6 +399,9 @@ CellularRadio::CODE CellularRadio::convertModelToType(const std::string& sModel,
     } else if (sModel.find("LE910-EUG") == 0) {
         sType = VALUE_TYPE_LTE;
         eCode = SUCCESS;
+    } else if (sModel.find("LE910C4-EU") == 0) {
+        sType = VALUE_TYPE_LTE;
+        eCode = SUCCESS;
     } else if (sModel.find("LE910-EU1") == 0) {
         sType = VALUE_TYPE_LTE;
         eCode = SUCCESS;
@@ -1587,6 +1599,8 @@ std::string CellularRadio::extractModelFromResult(const std::string& sResult) {
         sModel = "LE866A1-JS";
     } else if(sResult.find("LE910-NAG") != std::string::npos) {
         sModel = "LE910-NAG";
+    } else if(sResult.find("LE910C4-NF") != std::string::npos) {
+        sModel = "LE910C4-NF";
     } else if(sResult.find("LE910-NA1") != std::string::npos) {
         sModel = "LE910-NA1";
     } else if(sResult.find("ME910C1-NA") != std::string::npos) {
@@ -1599,6 +1613,8 @@ std::string CellularRadio::extractModelFromResult(const std::string& sResult) {
         sModel = "LE910-SVG";
     } else if(sResult.find("LE910-EUG") != std::string::npos) {
         sModel = "LE910-EUG";
+    } else if(sResult.find("LE910C4-EU") != std::string::npos) {
+        sModel = "LE910C4-EU";
     } else if(sResult.find("LE910-EU1") != std::string::npos) {
         sModel = "LE910-EU1";
     } else if(sResult.find("LE910C1-NS") != std::string::npos) {
diff --git a/src/MTS_IO_CellularRadioFactory.cpp b/src/MTS_IO_CellularRadioFactory.cpp
index 571797e..ef87f0e 100644
--- a/src/MTS_IO_CellularRadioFactory.cpp
+++ b/src/MTS_IO_CellularRadioFactory.cpp
@@ -22,9 +22,11 @@
 #include <mts/MTS_IO_HE910DRadio.h>
 #include <mts/MTS_IO_HE910EUDRadio.h>
 #include <mts/MTS_IO_LE910NAGRadio.h>
+#include <mts/MTS_IO_LE910C4NFRadio.h>
 #include <mts/MTS_IO_LE910NA1Radio.h>
 #include <mts/MTS_IO_LE910SVGRadio.h>
 #include <mts/MTS_IO_LE910EUGRadio.h>
+#include <mts/MTS_IO_LE910C4EURadio.h>
 #include <mts/MTS_IO_LE910EU1Radio.h>
 #include <mts/MTS_IO_LE910C1NSRadio.h>
 #include <mts/MTS_IO_LE910C1APRadio.h>
@@ -43,9 +45,11 @@ CellularRadioFactory::CellularRadioFactory() {
     m_mCreationMap[HE910DRadio::MODEL_NAME]       = &CellularRadioFactory::createHE910D;
     m_mCreationMap[HE910EUDRadio::MODEL_NAME]     = &CellularRadioFactory::createHE910EUD;
     m_mCreationMap[LE910NAGRadio::MODEL_NAME]     = &CellularRadioFactory::createLE910NAG;
+    m_mCreationMap[LE910C4NFRadio::MODEL_NAME]    = &CellularRadioFactory::createLE910C4NF;
     m_mCreationMap[LE910NA1Radio::MODEL_NAME]     = &CellularRadioFactory::createLE910NA1;
     m_mCreationMap[LE910SVGRadio::MODEL_NAME]     = &CellularRadioFactory::createLE910SVG;
     m_mCreationMap[LE910EUGRadio::MODEL_NAME]     = &CellularRadioFactory::createLE910EUG;
+    m_mCreationMap[LE910C4EURadio::MODEL_NAME]    = &CellularRadioFactory::createLE910C4EU;
     m_mCreationMap[LE910EU1Radio::MODEL_NAME]     = &CellularRadioFactory::createLE910EU1;
     m_mCreationMap[LE910C1NSRadio::MODEL_NAME]    = &CellularRadioFactory::createLE910C1NS;
     m_mCreationMap[LE910C1APRadio::MODEL_NAME]    = &CellularRadioFactory::createLE910C1AP;
@@ -131,6 +135,10 @@ CellularRadio* CellularRadioFactory::createLE910NAG(const std::string& sPort) {
     return new LE910NAGRadio(sPort);
 }
 
+CellularRadio* CellularRadioFactory::createLE910C4NF(const std::string& sPort) {
+    return new LE910C4NFRadio(sPort);
+}
+
 CellularRadio* CellularRadioFactory::createLE910NA1(const std::string& sPort) {
     return new LE910NA1Radio(sPort);
 }
@@ -143,6 +151,10 @@ CellularRadio* CellularRadioFactory::createLE910EUG(const std::string& sPort) {
     return new LE910EUGRadio(sPort);
 }
 
+CellularRadio* CellularRadioFactory::createLE910C4EU(const std::string& sPort) {
+    return new LE910C4EURadio(sPort);
+}
+
 CellularRadio* CellularRadioFactory::createLE910EU1(const std::string& sPort) {
     return new LE910EU1Radio(sPort);
 }
diff --git a/src/MTS_IO_LE910C4EURadio.cpp b/src/MTS_IO_LE910C4EURadio.cpp
new file mode 100644
index 0000000..029a921
--- /dev/null
+++ b/src/MTS_IO_LE910C4EURadio.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2019 by Multi-Tech Systems
+ *
+ * This file is part of libmts-io.
+ *
+ * libmts-io is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libmts-io is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libmts-io.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <mts/MTS_IO_LE910C4EURadio.h>
+
+using namespace MTS::IO;
+
+const std::string LE910C4EURadio::MODEL_NAME("LE910C4-EU");
+
+LE910C4EURadio::LE910C4EURadio(const std::string& sPort)
+: LE910Radio(MODEL_NAME, sPort)
+{
+
+}
diff --git a/src/MTS_IO_LE910C4NFRadio.cpp b/src/MTS_IO_LE910C4NFRadio.cpp
new file mode 100644
index 0000000..53348f7
--- /dev/null
+++ b/src/MTS_IO_LE910C4NFRadio.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 by Multi-Tech Systems
+ *
+ * This file is part of libmts-io.
+ *
+ * libmts-io is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libmts-io is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libmts-io.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <mts/MTS_IO_LE910C4NFRadio.h>
+
+using namespace MTS::IO;
+
+const std::string LE910C4NFRadio::MODEL_NAME("LE910C4-NF");
+
+LE910C4NFRadio::LE910C4NFRadio(const std::string& sPort)
+: LE910Radio(MODEL_NAME, sPort)
+{
+
+}
+