diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.cpp index 7519d89b032..0a85da769be 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.cpp +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.cpp @@ -92,7 +92,7 @@ nsapi_error_t UBLOX_AT::init() { _at->lock(); _at->flush(); - _at->cmd_start("AT"); // echo off + _at->cmd_start("AT"); _at->cmd_stop_read_resp(); #ifdef TARGET_UBLOX_C027 @@ -128,7 +128,7 @@ nsapi_error_t UBLOX_AT::config_authentication_parameters() { char *config = NULL; nsapi_error_t err; - char imsi[MAX_IMSI_LENGTH+1]; + char imsi[MAX_IMSI_LENGTH + 1]; if (apn == NULL) { err = get_imsi(imsi); @@ -149,10 +149,10 @@ nsapi_error_t UBLOX_AT::config_authentication_parameters() return err; } -nsapi_error_t UBLOX_AT::set_authentication_parameters(const char* apn, - const char* username, - const char* password, - CellularContext::AuthenticationType auth) +nsapi_error_t UBLOX_AT::set_authentication_parameters(const char *apn, + const char *username, + const char *password, + CellularContext::AuthenticationType auth) { int modem_security = ubx_context->nsapi_security_to_modem_security(auth); @@ -207,7 +207,7 @@ nsapi_error_t UBLOX_AT::get_imsi(char *imsi) _at->cmd_start("AT+CIMI"); _at->cmd_stop(); _at->resp_start(); - _at->read_string(imsi, MAX_IMSI_LENGTH+1); + _at->read_string(imsi, MAX_IMSI_LENGTH + 1); _at->resp_stop(); return _at->unlock_return_error(); diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.h b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.h index 2bd82cacc15..8877b749e92 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.h +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT.h @@ -49,15 +49,15 @@ class UBLOX_AT : public AT_CellularDevice { private: - UBLOX_AT_CellularContext* ubx_context; + UBLOX_AT_CellularContext *ubx_context; /** Length of IMSI buffer. */ static const int MAX_IMSI_LENGTH = 15; - const char* apn; - const char* uname; - const char* pwd; + const char *apn; + const char *uname; + const char *pwd; /** The type of authentication to use. */ @@ -65,7 +65,7 @@ class UBLOX_AT : public AT_CellularDevice { nsapi_error_t config_authentication_parameters(); - nsapi_error_t set_authentication_parameters(const char* apn, const char* username, const char* password, CellularContext::AuthenticationType auth); + nsapi_error_t set_authentication_parameters(const char *apn, const char *username, const char *password, CellularContext::AuthenticationType auth); /** Read IMSI of modem. */ diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp index 9152e5fca42..7323f678133 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp @@ -59,7 +59,7 @@ void UBLOX_AT_CellularContext::do_connect() #elif defined (TARGET_UBLOX_C030_R412M) if (rat == CellularNetwork::RadioAccessTechnology::RAT_EGPRS) { if (!_is_context_active) { - _at.set_at_timeout(150*1000); + _at.set_at_timeout(150 * 1000); _at.cmd_start("AT+CGACT=1,1"); _at.cmd_stop(); _at.resp_start(); @@ -253,26 +253,26 @@ int UBLOX_AT_CellularContext::nsapi_security_to_modem_security(AuthenticationTyp int modem_security = 3; switch (nsapi_security) { - case NOAUTH: - modem_security = 0; - break; - case PAP: - modem_security = 1; - break; - case CHAP: - modem_security = 2; - break; + case NOAUTH: + modem_security = 0; + break; + case PAP: + modem_security = 1; + break; + case CHAP: + modem_security = 2; + break; #ifndef TARGET_UBLOX_C030_R41XM - case AUTOMATIC: - modem_security = 3; - break; - default: - modem_security = 3; - break; + case AUTOMATIC: + modem_security = 3; + break; + default: + modem_security = 3; + break; #else - default: - modem_security = 0; - break; + default: + modem_security = 0; + break; #endif } @@ -304,7 +304,7 @@ nsapi_error_t UBLOX_AT_CellularContext::get_imsi(char *imsi) _at.cmd_start("AT+CIMI"); _at.cmd_stop(); _at.resp_start(); - _at.read_string(imsi, MAX_IMSI_LENGTH+1); + _at.read_string(imsi, MAX_IMSI_LENGTH + 1); _at.resp_stop(); return _at.unlock_return_error(); @@ -325,19 +325,23 @@ const char *UBLOX_AT_CellularContext::get_gateway() return get_ip_address(); } -const char* UBLOX_AT_CellularContext::get_apn() { +const char *UBLOX_AT_CellularContext::get_apn() +{ return _apn; } -const char* UBLOX_AT_CellularContext::get_uname() { +const char *UBLOX_AT_CellularContext::get_uname() +{ return _uname; } -const char* UBLOX_AT_CellularContext::get_pwd() { +const char *UBLOX_AT_CellularContext::get_pwd() +{ return _pwd; } -CellularContext::AuthenticationType UBLOX_AT_CellularContext::get_auth() { +CellularContext::AuthenticationType UBLOX_AT_CellularContext::get_auth() +{ return _authentication_type; } @@ -353,27 +357,27 @@ CellularNetwork::RadioAccessTechnology UBLOX_AT_CellularContext::read_radio_tech _at.resp_stop(); switch (act) { - case 0: - rat = CellularNetwork::RadioAccessTechnology::RAT_GSM; - break; - case 1: - rat = CellularNetwork::RadioAccessTechnology::RAT_GSM; - break; - case 2: - rat = CellularNetwork::RadioAccessTechnology::RAT_UTRAN; - break; - case 7: - rat = CellularNetwork::RadioAccessTechnology::RAT_CATM1; - break; - case 8: - rat = CellularNetwork::RadioAccessTechnology::RAT_NB1; - break; - case 9: - rat = CellularNetwork::RadioAccessTechnology::RAT_EGPRS; - break; - default: - rat = CellularNetwork::RadioAccessTechnology::RAT_UNKNOWN; - break; + case 0: + rat = CellularNetwork::RadioAccessTechnology::RAT_GSM; + break; + case 1: + rat = CellularNetwork::RadioAccessTechnology::RAT_GSM; + break; + case 2: + rat = CellularNetwork::RadioAccessTechnology::RAT_UTRAN; + break; + case 7: + rat = CellularNetwork::RadioAccessTechnology::RAT_CATM1; + break; + case 8: + rat = CellularNetwork::RadioAccessTechnology::RAT_NB1; + break; + case 9: + rat = CellularNetwork::RadioAccessTechnology::RAT_EGPRS; + break; + default: + rat = CellularNetwork::RadioAccessTechnology::RAT_UNKNOWN; + break; } return rat; diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h index 9de759bcc60..699fbb18891 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h @@ -30,9 +30,9 @@ class UBLOX_AT_CellularContext: public AT_CellularContext { virtual void do_connect(); virtual const char *get_gateway(); - const char* get_apn(void); - const char* get_uname(void); - const char* get_pwd(void); + const char *get_apn(void); + const char *get_uname(void); + const char *get_pwd(void); CellularContext::AuthenticationType get_auth(void); /** Convert nsapi_security_t to the modem security numbers. diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp index 0602b0933e5..986a5d5dc62 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.cpp @@ -22,7 +22,6 @@ using namespace mbed; UBLOX_AT_CellularNetwork::UBLOX_AT_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler) { _op_act = RAT_UNKNOWN; - device = CellularDevice::get_target_default_instance(); } UBLOX_AT_CellularNetwork::~UBLOX_AT_CellularNetwork() @@ -35,45 +34,48 @@ UBLOX_AT_CellularNetwork::~UBLOX_AT_CellularNetwork() nsapi_error_t UBLOX_AT_CellularNetwork::set_access_technology_impl(RadioAccessTechnology opRat) { nsapi_error_t ret = NSAPI_ERROR_OK; + CellularNetwork::AttachStatus status; - if (device->get_context_list()->get_connection_status() != NSAPI_STATUS_DISCONNECTED) { + get_attach(status); + if (status == Attached) { tr_debug("RAT should only be set in detached state"); return NSAPI_ERROR_UNSUPPORTED; } + _at.lock(); switch (opRat) { - case RAT_EGPRS: + case RAT_EGPRS: #if defined (TARGET_UBLOX_C030_R412M) - _at.cmd_start("AT+URAT=9,8"); - _at.cmd_stop_read_resp(); - break; + _at.cmd_start("AT+URAT=9,8"); + _at.cmd_stop_read_resp(); + break; #endif #if defined(TARGET_UBLOX_C030_U201) - case RAT_GSM: - _at.cmd_start("AT+URAT=0,0"); - _at.cmd_stop_read_resp(); - break; - case RAT_UTRAN: - case RAT_HSDPA: - case RAT_HSUPA: - case RAT_HSDPA_HSUPA: - _at.cmd_start("AT+URAT=2,2"); - _at.cmd_stop_read_resp(); - break; + case RAT_GSM: + _at.cmd_start("AT+URAT=0,0"); + _at.cmd_stop_read_resp(); + break; + case RAT_UTRAN: + case RAT_HSDPA: + case RAT_HSUPA: + case RAT_HSDPA_HSUPA: + _at.cmd_start("AT+URAT=2,2"); + _at.cmd_stop_read_resp(); + break; #elif defined(TARGET_UBLOX_C030_R41XM) - case RAT_CATM1: - _at.cmd_start("AT+URAT=7,8"); - _at.cmd_stop_read_resp(); - break; - case RAT_NB1: - _at.cmd_start("AT+URAT=8,7"); - _at.cmd_stop_read_resp(); - break; + case RAT_CATM1: + _at.cmd_start("AT+URAT=7,8"); + _at.cmd_stop_read_resp(); + break; + case RAT_NB1: + _at.cmd_start("AT+URAT=8,7"); + _at.cmd_stop_read_resp(); + break; #endif - default: - _op_act = RAT_UNKNOWN; - ret = NSAPI_ERROR_UNSUPPORTED; - break; + default: + _op_act = RAT_UNKNOWN; + ret = NSAPI_ERROR_UNSUPPORTED; + break; } _at.unlock(); ubx_reboot(); diff --git a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.h b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.h index 27b52e25336..f60a076e777 100644 --- a/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.h +++ b/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularNetwork.h @@ -35,9 +35,6 @@ class UBLOX_AT_CellularNetwork : public AT_CellularNetwork { protected: virtual nsapi_error_t set_access_technology_impl(RadioAccessTechnology opRat); - -private: - CellularDevice* device; }; } // namespace mbed