Merge branch 'cleanup_MAT1_MVW1_radios' into 'master'

MTX-3211 Remove the code that is used to support ME910C1-NV and ME910C1-NA

See merge request !10

4 files changed, 23 insertions, 136 deletions

diff --git a/include/mts/MTS_IO_CellularRadioFactory.h b/include/mts/MTS_IO_CellularRadioFactory.h
index 9b36489..e57ca5e 100644
--- a/include/mts/MTS_IO_CellularRadioFactory.h
+++ b/include/mts/MTS_IO_CellularRadioFactory.h
@@ -49,8 +49,6 @@ namespace MTS {
                 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;
diff --git a/include/mts/MTS_IO_ME910C1NARadio.h b/include/mts/MTS_IO_ME910C1NARadio.h
deleted file mode 100644
index e8120bd..0000000
--- a/include/mts/MTS_IO_ME910C1NARadio.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2015 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/>.
- *
- */
-
-/*! 
- \file MTS_IO_ME910C1NARadio.h
- \brief A brief description 
- \date Jan 19, 2015
- \author sgodinez
-
- A more elaborate description
-*/
-#ifndef MTS_IO_ME910C1NARADIO_H_
-#define MTS_IO_ME910C1NARADIO_H_
-
-#include <mts/MTS_IO_ME910Radio.h>
-
-namespace MTS {
-    namespace IO {
-
-        class ME910C1NARadio : public ME910Radio {
-
-            public:
-                static const std::string MODEL_NAME;
-
-                ME910C1NARadio(const std::string& sPort);
-                virtual ~ME910C1NARadio(){};
-
-                virtual CODE setActiveFirmware(const Json::Value& jArgs);
-
-                virtual CODE getActiveFirmware(std::string& sFwId);
-
-            protected:
-
-            private:
-
-        };
-    }
-}
-
-#endif /* MTS_IO_ME910C1NARADIO_H_ */
diff --git a/include/mts/MTS_IO_ME910C1NVRadio.h b/include/mts/MTS_IO_ME910C1NVRadio.h
deleted file mode 100644
index 3d0b3b0..0000000
--- a/include/mts/MTS_IO_ME910C1NVRadio.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2018 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/>.
- *
- */
-
-/*! 
- \file MTS_IO_ME910C1NVRadio.h
- \brief A brief description 
- \date May 1, 2018
- \author mykyta.dorokhin
-
- A more elaborate description
-*/
-#ifndef MTS_IO_ME910C1NVRadio_H_
-#define MTS_IO_ME910C1NVRadio_H_
-
-#include <mts/MTS_IO_ME910Radio.h>
-
-namespace MTS {
-    namespace IO {
-
-        class ME910C1NVRadio : public ME910Radio {
-
-            public:
-                static const std::string MODEL_NAME;
-
-                ME910C1NVRadio(const std::string& sPort);
-                virtual ~ME910C1NVRadio(){};
-
-                virtual CODE updateFumo(const Json::Value& jArgs, UpdateCb& stepCb);
-                virtual CODE getCarrier(std::string& sCarrier);
-
-            protected:
-
-                CODE doGetFirmwareNumbers(std::string &sFirmware, std::string &sFirmwareBuild);
-
-            private:
-                static const std::string KEY_FUMO_PDPID;     //!< PDP context id (default 3)
-                static const std::string KEY_FUMO_PDPTYPE;   //!< PDP context type (default IPV4V6)
-                static const std::string KEY_FUMO_APN;       //!< APN (default empty)
-                static const std::string KEY_FUMO_ADDRESS;   //!< FTP server address
-                static const std::string KEY_FUMO_DIR;       //!< Directory
-                static const std::string KEY_FUMO_FILE;      //!< Name of the upgrade file
-                static const std::string KEY_FUMO_USER;      //!< Username
-                static const std::string KEY_FUMO_PASSWORD;  //!< Password
-                static const std::string KEY_FUMO_DRYRUN;    //!< If set, do not apply the downloaded firmware
-
-                CODE doFumoPerform(const Json::Value &jConfig, UpdateCb& stepCb);
-                CODE doFumoReadConfig(const Json::Value& jArgs, Json::Value &jConfig);
-                CODE doFumoSetup(const Json::Value &jConfig, UpdateCb& stepCb);
-                CODE doFumoFtp(const Json::Value &jConfig, UpdateCb& stepCb);
-                CODE doFumoCleanup(const Json::Value &jConfig, UpdateCb& stepCb);
-                CODE doFumoApplyFirmware(const Json::Value &jConfig, UpdateCb& stepCb);
-                CODE doFumoWaitNewFirmware(const Json::Value &jConfig, UpdateCb& stepCb);
-
-                std::string m_sFw;
-                std::string m_sFwBuild;
-        };
-    }
-}
-
-#endif /* MTS_IO_ME910C1NVRadio_H_ */
diff --git a/include/mts/MTS_IO_ME910C1WWRadio.h b/include/mts/MTS_IO_ME910C1WWRadio.h
index d45d86a..9605862 100644
--- a/include/mts/MTS_IO_ME910C1WWRadio.h
+++ b/include/mts/MTS_IO_ME910C1WWRadio.h
@@ -36,10 +36,33 @@ namespace MTS {
                 ICellularRadio::CODE setActiveFirmware(const Json::Value& jArgs);
                 ICellularRadio::CODE getActiveFirmware(std::string& sFwId);
 
+                virtual CODE updateFumo(const Json::Value& jArgs, UpdateCb& stepCb);
+
             protected:
 
+                CODE doGetFirmwareNumbers(std::string &sFirmware, std::string &sFirmwareBuild);
+
             private:
+                static const std::string KEY_FUMO_PDPID;     //!< PDP context id (default 3)
+                static const std::string KEY_FUMO_PDPTYPE;   //!< PDP context type (default IPV4V6)
+                static const std::string KEY_FUMO_APN;       //!< APN (default empty)
+                static const std::string KEY_FUMO_ADDRESS;   //!< FTP server address
+                static const std::string KEY_FUMO_DIR;       //!< Directory
+                static const std::string KEY_FUMO_FILE;      //!< Name of the upgrade file
+                static const std::string KEY_FUMO_USER;      //!< Username
+                static const std::string KEY_FUMO_PASSWORD;  //!< Password
+                static const std::string KEY_FUMO_DRYRUN;    //!< If set, do not apply the downloaded firmware
+
+                CODE doFumoPerform(const Json::Value &jConfig, UpdateCb& stepCb);
+                CODE doFumoReadConfig(const Json::Value& jArgs, Json::Value &jConfig);
+                CODE doFumoSetup(const Json::Value &jConfig, UpdateCb& stepCb);
+                CODE doFumoFtp(const Json::Value &jConfig, UpdateCb& stepCb);
+                CODE doFumoCleanup(const Json::Value &jConfig, UpdateCb& stepCb);
+                CODE doFumoApplyFirmware(const Json::Value &jConfig, UpdateCb& stepCb);
+                CODE doFumoWaitNewFirmware(const Json::Value &jConfig, UpdateCb& stepCb);
 
+                std::string m_sFw;
+                std::string m_sFwBuild;
         };
     }
 }