ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6402 from u-blox/cellular_test_target 

Renaming Ublox library for mbed cellular framework
pull/6561/head
Martin Kojtal 2018-04-06 12:19:58 +02:00 committed by GitHub
parent 501953b1a4 c376e501aa
commit f331ac34c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/cellular/framework/common/CellularTargets.h
View File

@ -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>

18
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U.cpp → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.cpp
View File

@ -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;
}

17
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U.h → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP.h
View File

@ -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_

12
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U_CellularNetwork.cpp → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.cpp
View File

@ -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;

17
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U_CellularNetwork.h → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularNetwork.h
View File

@ -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 @@ protected:
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_

10
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U_CellularPower.cpp → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.cpp
View File

@ -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();

17
features/cellular/framework/targets/UBLOX/LISA_U/UBLOX_LISA_U_CellularPower.h → features/cellular/framework/targets/UBLOX/PPP/UBLOX_PPP_CellularPower.h
View File

@ -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 @@ public: //from 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_