Merge pull request #6402 from u-blox/cellular_test_target

0xc0170 · web-flow · commit f331ac34c413 · 2018-04-06T12:19:58.000+02:00
Renaming Ublox library for mbed cellular framework
diff --git a/features/cellular/framework/common/CellularTargets.h b/features/cellular/framework/common/CellularTargets.h
@@ -28,9 +28,9 @@ namespace mbed {
 #elif TARGET_MTB_MTS_DRAGONFLY
 #define CELLULAR_DEVICE TELIT_HE910
 #elif TARGET_UBLOX_C030
-#define CELLULAR_DEVICE UBLOX_LISA_U
+#define CELLULAR_DEVICE UBLOX_PPP
 #elif TARGET_UBLOX_C027
-#define CELLULAR_DEVICE UBLOX_LISA_U
+#define CELLULAR_DEVICE UBLOX_PPP
 #else
 //#error Cellular target not defined, see cellular/targets.h
 //#define CELLULAR_TARGET <target-modem>
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.cpp b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.cpp
@@ -15,33 +15,33 @@
  * limitations under the License.
  */
 
-#include "UBLOX_LISA_U.h"
-#include "UBLOX_LISA_U_CellularNetwork.h"
-#include "UBLOX_LISA_U_CellularPower.h"
+#include "UBLOX_PPP.h"
+#include "UBLOX_PPP_CellularNetwork.h"
+#include "UBLOX_PPP_CellularPower.h"
 
 using namespace mbed;
 using namespace events;
 
-UBLOX_LISA_U::UBLOX_LISA_U(EventQueue &queue) : AT_CellularDevice(queue)
+UBLOX_PPP::UBLOX_PPP(EventQueue &queue) : AT_CellularDevice(queue)
 {
 }
 
-UBLOX_LISA_U::~UBLOX_LISA_U()
+UBLOX_PPP::~UBLOX_PPP()
 {
 }
 
-CellularNetwork *UBLOX_LISA_U::open_network(FileHandle *fh)
+CellularNetwork *UBLOX_PPP::open_network(FileHandle *fh)
 {
     if (!_network) {
-        _network = new UBLOX_LISA_U_CellularNetwork(*get_at_handler(fh));
+        _network = new UBLOX_PPP_CellularNetwork(*get_at_handler(fh));
     }
     return _network;
 }
 
-CellularPower *UBLOX_LISA_U::open_power(FileHandle *fh)
+CellularPower *UBLOX_PPP::open_power(FileHandle *fh)
 {
     if (!_power) {
-        _power = new UBLOX_LISA_U_CellularPower(*get_at_handler(fh));
+        _power = new UBLOX_PPP_CellularPower(*get_at_handler(fh));
     }
     return _power;
 }
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.h b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.h
@@ -15,25 +15,30 @@
  * limitations under the License.
  */
 
-#ifndef UBLOX_LISA_U_H_
-#define UBLOX_LISA_U_H_
+#ifndef UBLOX_PPP_H_
+#define UBLOX_PPP_H_
 
 #include "AT_CellularDevice.h"
 
 namespace mbed {
 
-class UBLOX_LISA_U : public AT_CellularDevice
+class UBLOX_PPP : public AT_CellularDevice
 {
 
 public:
-    UBLOX_LISA_U(events::EventQueue &queue);
-    virtual ~UBLOX_LISA_U();
+    UBLOX_PPP(events::EventQueue &queue);
+    virtual ~UBLOX_PPP();
 
 public: // CellularDevice
     virtual CellularNetwork *open_network(FileHandle *fh);
     virtual CellularPower *open_power(FileHandle *fh);
 };
 
+MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, Use UBLOX_PPP instead of UBLOX_LISA_U.")
+class UBLOX_LISA_U : public UBLOX_PPP
+{
+};
+
 } // namespace mbed
 
-#endif // UBLOX_LISA_U_H_
+#endif // UBLOX_PPP_H_
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.cpp b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.cpp
@@ -15,29 +15,29 @@
  * limitations under the License.
  */
 
-#include "UBLOX_LISA_U_CellularNetwork.h"
+#include "UBLOX_PPP_CellularNetwork.h"
 
 using namespace mbed;
 
-UBLOX_LISA_U_CellularNetwork::UBLOX_LISA_U_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)
+UBLOX_PPP_CellularNetwork::UBLOX_PPP_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)
 {
 }
 
-UBLOX_LISA_U_CellularNetwork::~UBLOX_LISA_U_CellularNetwork()
+UBLOX_PPP_CellularNetwork::~UBLOX_PPP_CellularNetwork()
 {
 }
 
-bool UBLOX_LISA_U_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)
+bool UBLOX_PPP_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)
 {
     return requested_stack == IPV4_STACK ? true : false;
 }
 
-bool UBLOX_LISA_U_CellularNetwork::has_registration(RegistrationType reg_type)
+bool UBLOX_PPP_CellularNetwork::has_registration(RegistrationType reg_type)
 {
     return (reg_type == C_REG || reg_type == C_GREG);
 }
 
-nsapi_error_t UBLOX_LISA_U_CellularNetwork::set_access_technology_impl(operator_t::RadioAccessTechnology opRat)
+nsapi_error_t UBLOX_PPP_CellularNetwork::set_access_technology_impl(operator_t::RadioAccessTechnology opRat)
 {
     _op_act = operator_t::RAT_UNKNOWN;
     return NSAPI_ERROR_UNSUPPORTED;
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.h b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.h
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-#ifndef UBLOX_LISA_U_CELLULAR_NETWORK_H_
-#define UBLOX_LISA_U_CELLULAR_NETWORK_H_
+#ifndef UBLOX_PPP_CELLULAR_NETWORK_H_
+#define UBLOX_PPP_CELLULAR_NETWORK_H_
 
 #include "AT_CellularNetwork.h"
 
 namespace mbed {
 
-class UBLOX_LISA_U_CellularNetwork : public AT_CellularNetwork
+class UBLOX_PPP_CellularNetwork : public AT_CellularNetwork
 {
 public:
-    UBLOX_LISA_U_CellularNetwork(ATHandler &atHandler);
-    virtual ~UBLOX_LISA_U_CellularNetwork();
+    UBLOX_PPP_CellularNetwork(ATHandler &atHandler);
+    virtual ~UBLOX_PPP_CellularNetwork();
 
 protected:
     virtual bool get_modem_stack_type(nsapi_ip_stack_t requested_stack);
@@ -36,6 +36,11 @@ class UBLOX_LISA_U_CellularNetwork : public AT_CellularNetwork
     virtual nsapi_error_t set_access_technology_impl(operator_t::RadioAccessTechnology opRat);
 };
 
+MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, Use UBLOX_PPP_CellularNetwork instead of UBLOX_LISA_U_CellularNetwork.")
+class UBLOX_LISA_U_CellularNetwork : public UBLOX_PPP_CellularNetwork
+{
+};
+
 } // namespace mbed
 
-#endif // UBLOX_LISA_U_CELLULAR_NETWORK_H_
+#endif // UBLOX_PPP_CELLULAR_NETWORK_H_
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.cpp b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.cpp
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-#include "UBLOX_LISA_U_CellularPower.h"
+#include "UBLOX_PPP_CellularPower.h"
 
 #include "onboard_modem_api.h"
 
 using namespace mbed;
 
-UBLOX_LISA_U_CellularPower::UBLOX_LISA_U_CellularPower(ATHandler &atHandler) : AT_CellularPower(atHandler)
+UBLOX_PPP_CellularPower::UBLOX_PPP_CellularPower(ATHandler &atHandler) : AT_CellularPower(atHandler)
 {
 
 }
 
-UBLOX_LISA_U_CellularPower::~UBLOX_LISA_U_CellularPower()
+UBLOX_PPP_CellularPower::~UBLOX_PPP_CellularPower()
 {
 
 }
 
-nsapi_error_t UBLOX_LISA_U_CellularPower::on()
+nsapi_error_t UBLOX_PPP_CellularPower::on()
 {
 #if MODEM_ON_BOARD
     ::onboard_modem_init();
@@ -40,7 +40,7 @@ nsapi_error_t UBLOX_LISA_U_CellularPower::on()
     return NSAPI_ERROR_OK;
 }
 
-nsapi_error_t UBLOX_LISA_U_CellularPower::off()
+nsapi_error_t UBLOX_PPP_CellularPower::off()
 {
 #if MODEM_ON_BOARD
     ::onboard_modem_power_down();
diff --git a/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.h b/features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.h
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-#ifndef UBLOX_LISA_U_CELLULARPOWER_H_
-#define UBLOX_LISA_U_CELLULARPOWER_H_
+#ifndef UBLOX_PPP_CELLULARPOWER_H_
+#define UBLOX_PPP_CELLULARPOWER_H_
 
 #include "AT_CellularPower.h"
 
 namespace mbed {
 
-class UBLOX_LISA_U_CellularPower : public AT_CellularPower
+class UBLOX_PPP_CellularPower : public AT_CellularPower
 {
 public:
-    UBLOX_LISA_U_CellularPower(ATHandler &atHandler);
-    virtual ~UBLOX_LISA_U_CellularPower();
+    UBLOX_PPP_CellularPower(ATHandler &atHandler);
+    virtual ~UBLOX_PPP_CellularPower();
 
 public: //from CellularPower
 
@@ -35,6 +35,11 @@ class UBLOX_LISA_U_CellularPower : public AT_CellularPower
     virtual nsapi_error_t off();
 };
 
+MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, Use UBLOX_PPP_CellularPower instead of UBLOX_LISA_U_CellularPower.")
+class UBLOX_LISA_U_CellularPower  : public UBLOX_PPP_CellularPower
+{
+};
+
 } // namespace mbed
 
-#endif // UBLOX_LISA_U_CELLULARPOWER_H_
+#endif // UBLOX_PPP_CELLULARPOWER_H_

Original file line number	Diff line number	Diff line change
`@@ -15,33 +15,33 @@`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include "UBLOX_LISA_U.h"`
`19`		`-#include "UBLOX_LISA_U_CellularNetwork.h"`
`20`		`-#include "UBLOX_LISA_U_CellularPower.h"`
	`18`	`+#include "UBLOX_PPP.h"`
	`19`	`+#include "UBLOX_PPP_CellularNetwork.h"`
	`20`	`+#include "UBLOX_PPP_CellularPower.h"`
`21`	`21`
`22`	`22`	`using namespace mbed;`
`23`	`23`	`using namespace events;`
`24`	`24`
`25`		`-UBLOX_LISA_U::UBLOX_LISA_U(EventQueue &queue) : AT_CellularDevice(queue)`
	`25`	`+UBLOX_PPP::UBLOX_PPP(EventQueue &queue) : AT_CellularDevice(queue)`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
`29`		`-UBLOX_LISA_U::~UBLOX_LISA_U()`
	`29`	`+UBLOX_PPP::~UBLOX_PPP()`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`-CellularNetwork UBLOX_LISA_U::open_network(FileHandle fh)`
	`33`	`+CellularNetwork UBLOX_PPP::open_network(FileHandle fh)`
`34`	`34`	`{`
`35`	`35`	`if (!_network) {`
`36`		`- _network = new UBLOX_LISA_U_CellularNetwork(*get_at_handler(fh));`
	`36`	`+ _network = new UBLOX_PPP_CellularNetwork(*get_at_handler(fh));`
`37`	`37`	`}`
`38`	`38`	`return _network;`
`39`	`39`	`}`
`40`	`40`
`41`		`-CellularPower UBLOX_LISA_U::open_power(FileHandle fh)`
	`41`	`+CellularPower UBLOX_PPP::open_power(FileHandle fh)`
`42`	`42`	`{`
`43`	`43`	`if (!_power) {`
`44`		`- _power = new UBLOX_LISA_U_CellularPower(*get_at_handler(fh));`
	`44`	`+ _power = new UBLOX_PPP_CellularPower(*get_at_handler(fh));`
`45`	`45`	`}`
`46`	`46`	`return _power;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,29 +15,29 @@`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include "UBLOX_LISA_U_CellularNetwork.h"`
	`18`	`+#include "UBLOX_PPP_CellularNetwork.h"`
`19`	`19`
`20`	`20`	`using namespace mbed;`
`21`	`21`
`22`		`-UBLOX_LISA_U_CellularNetwork::UBLOX_LISA_U_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)`
	`22`	`+UBLOX_PPP_CellularNetwork::UBLOX_PPP_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`
`26`		`-UBLOX_LISA_U_CellularNetwork::~UBLOX_LISA_U_CellularNetwork()`
	`26`	`+UBLOX_PPP_CellularNetwork::~UBLOX_PPP_CellularNetwork()`
`27`	`27`	`{`
`28`	`28`	`}`
`29`	`29`
`30`		`-bool UBLOX_LISA_U_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)`
	`30`	`+bool UBLOX_PPP_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)`
`31`	`31`	`{`
`32`	`32`	`return requested_stack == IPV4_STACK ? true : false;`
`33`	`33`	`}`
`34`	`34`
`35`		`-bool UBLOX_LISA_U_CellularNetwork::has_registration(RegistrationType reg_type)`
	`35`	`+bool UBLOX_PPP_CellularNetwork::has_registration(RegistrationType reg_type)`
`36`	`36`	`{`
`37`	`37`	`return (reg_type == C_REG \|\| reg_type == C_GREG);`
`38`	`38`	`}`
`39`	`39`
`40`		`-nsapi_error_t UBLOX_LISA_U_CellularNetwork::set_access_technology_impl(operator_t::RadioAccessTechnology opRat)`
	`40`	`+nsapi_error_t UBLOX_PPP_CellularNetwork::set_access_technology_impl(operator_t::RadioAccessTechnology opRat)`
`41`	`41`	`{`
`42`	`42`	`_op_act = operator_t::RAT_UNKNOWN;`
`43`	`43`	`return NSAPI_ERROR_UNSUPPORTED;`
Original file line number	Diff line number	Diff line change
`@@ -15,23 +15,23 @@`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`	`17`
`18`		`-#include "UBLOX_LISA_U_CellularPower.h"`
	`18`	`+#include "UBLOX_PPP_CellularPower.h"`
`19`	`19`
`20`	`20`	`#include "onboard_modem_api.h"`
`21`	`21`
`22`	`22`	`using namespace mbed;`
`23`	`23`
`24`		`-UBLOX_LISA_U_CellularPower::UBLOX_LISA_U_CellularPower(ATHandler &atHandler) : AT_CellularPower(atHandler)`
	`24`	`+UBLOX_PPP_CellularPower::UBLOX_PPP_CellularPower(ATHandler &atHandler) : AT_CellularPower(atHandler)`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`-UBLOX_LISA_U_CellularPower::~UBLOX_LISA_U_CellularPower()`
	`29`	`+UBLOX_PPP_CellularPower::~UBLOX_PPP_CellularPower()`
`30`	`30`	`{`
`31`	`31`
`32`	`32`	`}`
`33`	`33`
`34`		`-nsapi_error_t UBLOX_LISA_U_CellularPower::on()`
	`34`	`+nsapi_error_t UBLOX_PPP_CellularPower::on()`
`35`	`35`	`{`
`36`	`36`	`#if MODEM_ON_BOARD`
`37`	`37`	`::onboard_modem_init();`
`@@ -40,7 +40,7 @@ nsapi_error_t UBLOX_LISA_U_CellularPower::on()`
`40`	`40`	`return NSAPI_ERROR_OK;`
`41`	`41`	`}`
`42`	`42`
`43`		`-nsapi_error_t UBLOX_LISA_U_CellularPower::off()`
	`43`	`+nsapi_error_t UBLOX_PPP_CellularPower::off()`
`44`	`44`	`{`
`45`	`45`	`#if MODEM_ON_BOARD`
`46`	`46`	`::onboard_modem_power_down();`