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 #8821 from jarvte/add_rat_json 

Cellular: add radio access technology as configurable in json
pull/8798/head
Martin Kojtal 2018-11-27 09:23:57 +01:00 committed by GitHub
parent f4774a9a59 f31db91cfb
commit 5e6dc940ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
features/cellular/framework/device/CellularStateMachine.cpp
View File

@ -378,9 +378,25 @@ bool CellularStateMachine::device_ready()
if (_cellularDevice.init_module() != NSAPI_ERROR_OK) {
return false;
}
if (!_network) {
_network = _cellularDevice.open_network();
}
#ifdef MBED_CONF_CELLULAR_RADIO_ACCESS_TECHNOLOGY
MBED_ASSERT(MBED_CONF_CELLULAR_RADIO_ACCESS_TECHNOLOGY >= CellularNetwork::RAT_GSM &&
MBED_CONF_CELLULAR_RADIO_ACCESS_TECHNOLOGY < CellularNetwork::RAT_UNKNOWN);
nsapi_error_t err = _network->set_access_technology((CellularNetwork::RadioAccessTechnology)MBED_CONF_CELLULAR_RADIO_ACCESS_TECHNOLOGY);
if (err != NSAPI_ERROR_OK && err != NSAPI_ERROR_UNSUPPORTED) {
tr_warning("Failed to set access technology to %d", MBED_CONF_CELLULAR_RADIO_ACCESS_TECHNOLOGY);
return false;
}
#endif // MBED_CONF_CELLULAR_DEBUG_AT
if (_event_status_cb) {
_event_status_cb((nsapi_event_t)CellularDeviceReady, (intptr_t)&_cb_data);
}
_power->remove_device_ready_urc_cb(mbed::callback(this, &CellularStateMachine::ready_urc_cb));
_cellularDevice.close_power();
_power = NULL;
@ -410,9 +426,6 @@ void CellularStateMachine::state_sim_pin()
_cellularDevice.set_timeout(TIMEOUT_SIM_PIN);
tr_info("Setup SIM (timeout %d s)", TIMEOUT_SIM_PIN / 1000);
if (open_sim()) {
if (!_network) {
_network = _cellularDevice.open_network();
}
bool success = false;
for (int type = 0; type < CellularNetwork::C_MAX; type++) {

4
features/cellular/mbed_lib.json
View File

@ -12,6 +12,10 @@
"debug-at": {
"help": "Enable AT debug prints",
"value": false
},
"radio-access-technology": {
"help": "Radio access technology to use. Value in integer: GSM=0, GSM_COMPACT=1, UTRAN=2, EGPRS=3, HSDPA=4, HSUPA=5, HSDPA_HSUPA=6, E_UTRAN=7, CATM1=8 ,NB1=9",
"value": null
}
}
}