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 #11191 from jarvte/fix_ublox_board_support 

Cellular: move RAT reading to better support ublox custom boards
pull/11212/head
Martin Kojtal 2019-08-13 11:21:55 +02:00 committed by GitHub
parent de84004be1 6e71932baf
commit 8767ab4e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.cpp
View File

@ -49,7 +49,6 @@ void UBLOX_AT_CellularContext::do_connect()
{ {
_at.lock(); _at.lock();
_cb_data.error = NSAPI_ERROR_NO_CONNECTION; _cb_data.error = NSAPI_ERROR_NO_CONNECTION;
CellularNetwork::RadioAccessTechnology rat = read_radio_technology();
// Attempt to establish a connection // Attempt to establish a connection
#ifndef TARGET_UBLOX_C030_R41XM #ifndef TARGET_UBLOX_C030_R41XM
@ -59,6 +58,7 @@ void UBLOX_AT_CellularContext::do_connect()
_is_context_activated = true; _is_context_activated = true;
_cb_data.error = NSAPI_ERROR_OK; _cb_data.error = NSAPI_ERROR_OK;
#elif TARGET_UBLOX_C030_R412M #elif TARGET_UBLOX_C030_R412M
CellularNetwork::RadioAccessTechnology rat = read_radio_technology();
if (rat == CellularNetwork::RadioAccessTechnology::RAT_EGPRS) { if (rat == CellularNetwork::RadioAccessTechnology::RAT_EGPRS) {
if (!_is_context_active) { if (!_is_context_active) {
_at.set_at_timeout(150 * 1000); _at.set_at_timeout(150 * 1000);
@ -345,6 +345,7 @@ CellularContext::AuthenticationType UBLOX_AT_CellularContext::get_auth()
return _authentication_type; return _authentication_type;
} }
#ifdef TARGET_UBLOX_C030_R412M
CellularNetwork::RadioAccessTechnology UBLOX_AT_CellularContext::read_radio_technology() CellularNetwork::RadioAccessTechnology UBLOX_AT_CellularContext::read_radio_technology()
{ {
int act; int act;
@ -382,5 +383,6 @@ CellularNetwork::RadioAccessTechnology UBLOX_AT_CellularContext::read_radio_tech
return rat; return rat;
} }
#endif // #ifdef TARGET_UBLOX_C030_R412M
} /* namespace mbed */ } /* namespace mbed */

4
features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularContext.h
View File

@ -45,9 +45,9 @@ public:
/** Get the next set of credentials from the database. /** Get the next set of credentials from the database.
*/ */
void get_next_credentials(char **config); void get_next_credentials(char **config);
#ifdef TARGET_UBLOX_C030_R412M
CellularNetwork::RadioAccessTechnology read_radio_technology(void); CellularNetwork::RadioAccessTechnology read_radio_technology(void);
#endif
protected: protected:
virtual NetworkStack *get_stack(); virtual NetworkStack *get_stack();