Merge remote-tracking branch 'origin/master' into sk/quectel-delta-fwu

6 files changed, 55 insertions, 6 deletions

diff --git a/include/mts/MTS_IO_CellularRadioFactory.h b/include/mts/MTS_IO_CellularRadioFactory.h
index e57ca5e..13f3993 100644
--- a/include/mts/MTS_IO_CellularRadioFactory.h
+++ b/include/mts/MTS_IO_CellularRadioFactory.h
@@ -55,6 +55,7 @@ namespace MTS {
                 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;
+                ICellularRadio* createEG25Radio(const std::string& sPort = ICellularRadio::DEFAULT_RADIO_PORT) const;
 
             protected:
                 typedef MTS::IO::ICellularRadio* (CellularRadioFactory::*CREATEFUNCPTR)(const std::string& sPort) const;
diff --git a/include/mts/MTS_IO_EG25Radio.h b/include/mts/MTS_IO_EG25Radio.h
new file mode 100644
index 0000000..46bff20
--- /dev/null
+++ b/include/mts/MTS_IO_EG25Radio.h
@@ -0,0 +1,48 @@
+/*
+ * 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_EG25RADIO_H_
+#define MTS_IO_EG25RADIO_H_
+
+#include "mts/MTS_IO_QuectelRadio.h"
+
+namespace MTS {
+    namespace IO {
+
+        class EG25Radio : public QuectelRadio {
+
+            public:
+                static const std::string MODEL_NAME;
+
+                EG25Radio(const std::string& sPort);
+                virtual ~EG25Radio();
+                CODE setRxDiversity(const Json::Value& jArgs) override;
+
+            protected:
+
+            private:
+                CODE getSupportedCellularModes(CELLULAR_MODES &networks) override;
+
+        };
+    }
+}
+
+#endif /* MTS_IO_EG25RADIO_H_ */
diff --git a/include/mts/MTS_IO_EG95Radio.h b/include/mts/MTS_IO_EG95Radio.h
index 5296e16..17c413e 100644
--- a/include/mts/MTS_IO_EG95Radio.h
+++ b/include/mts/MTS_IO_EG95Radio.h
@@ -40,7 +40,7 @@ namespace MTS {
 
             private:
                 CODE getSupportedCellularModes(CELLULAR_MODES &networks) override;
-                CODE setCellularMode(CELLULAR_MODES networks) override;
+
         };
     }
 }
diff --git a/include/mts/MTS_IO_LockFile.h b/include/mts/MTS_IO_LockFile.h
index 730cf3c..22e641b 100644
--- a/include/mts/MTS_IO_LockFile.h
+++ b/include/mts/MTS_IO_LockFile.h
@@ -34,11 +34,8 @@
 
 namespace MTS {
     namespace IO {
-
         class LockFile : MTS::NonCopyable {
-
             public:
-
                 LockFile(const std::string& sFilePath);
                 virtual ~LockFile();
 
@@ -46,11 +43,10 @@ namespace MTS {
                 void unlock();
                 bool isLocked();
 
-            protected:
-
             private:
                 std::string m_sFile;
                 int m_iLockFd;
+                int m_iLockErr;
         };
 
     }
diff --git a/include/mts/MTS_IO_QuectelRadio.h b/include/mts/MTS_IO_QuectelRadio.h
index 9ccf50a..c55b224 100644
--- a/include/mts/MTS_IO_QuectelRadio.h
+++ b/include/mts/MTS_IO_QuectelRadio.h
@@ -42,6 +42,8 @@ namespace MTS {
 
                 CODE setMdn(const Json::Value& jArgs) override;
 
+                CODE setCellularMode(CELLULAR_MODES networks) override;
+
                 CODE uploadDeltaFirmwareFile(int fd, UpdateCb& stepCb) override;
                 CODE removeDeltaFirmwareFile() override;
                 CODE applyDeltaFirmwareFile(UpdateCb& stepCb) override;
diff --git a/include/mts/MTS_IO_SerialConnection.h b/include/mts/MTS_IO_SerialConnection.h
index a4ca011..b0ce663 100644
--- a/include/mts/MTS_IO_SerialConnection.h
+++ b/include/mts/MTS_IO_SerialConnection.h
@@ -173,6 +173,8 @@ namespace MTS {
                 virtual int doWrite(const char* pBuffer, const uint32_t& iSize, int32_t& timeoutMillis);
 
                 void cleanup();
+                void printPortSetting(const termios *options);
+                const char* humanSpeed(speed_t speed);
         };
     }
 }