Cellular: review changes.

Author: Teppo Järvelin

features/cellular/easy_cellular/CellularConnectionFSM.cpp

@@ -144,13 +144,13 @@ bool CellularConnectionFSM::power_on()
     return true;
 }
 
-void CellularConnectionFSM::set_sim_pin(const char * sim_pin)
+void CellularConnectionFSM::set_sim_pin(const char *sim_pin)
 {
     strncpy(_sim_pin, sim_pin, sizeof(_sim_pin));
     _sim_pin[sizeof(_sim_pin)-1] = '\0';
 }
 
-void CellularConnectionFSM::set_plmn(const char* plmn)
+void CellularConnectionFSM::set_plmn(const char *plmn)
 {
     _plmn = plmn;
 }
@@ -250,15 +250,15 @@ bool CellularConnectionFSM::get_network_registration(CellularNetwork::Registrati
     return true;
 }
 
-void CellularConnectionFSM::report_failure(const char* msg)
+void CellularConnectionFSM::report_failure(const char *msg)
 {
     tr_error("Cellular network failed: %s", msg);
     if (_status_callback) {
         _status_callback(_state, _next_state);
     }
 }
 
-const char* CellularConnectionFSM::get_state_string(CellularState state)
+const char *CellularConnectionFSM::get_state_string(CellularState state)
 {
 #if MBED_CONF_MBED_TRACE_ENABLE
     static const char *strings[] = { "Init", "Power", "Device ready", "SIM pin", "Registering network", "Manual registering", "Attaching network", "Activating PDP Context", "Connecting network", "Connected"};
@@ -287,7 +287,7 @@ bool CellularConnectionFSM::is_registered_to_plmn()
         CellularNetwork::operator_names_list names_list;
         nsapi_error_t err = _network->get_operator_names(names_list);
         if (err == NSAPI_ERROR_OK) {
-            CellularNetwork::operator_names_t* op_names = names_list.get_head();
+            CellularNetwork::operator_names_t *op_names = names_list.get_head();
             bool found_match = false;
             while (op_names) {
                 if (format == 0) {
@@ -667,17 +667,17 @@ events::EventQueue *CellularConnectionFSM::get_queue()
     return &_queue;
 }
 
-CellularNetwork* CellularConnectionFSM::get_network()
+CellularNetwork *CellularConnectionFSM::get_network()
 {
     return _network;
 }
 
-CellularDevice* CellularConnectionFSM::get_device()
+CellularDevice *CellularConnectionFSM::get_device()
 {
     return _cellularDevice;
 }
 
-CellularSIM* CellularConnectionFSM::get_sim()
+CellularSIM *CellularConnectionFSM::get_sim()
 {
     return _sim;
 }

features/cellular/easy_cellular/CellularConnectionFSM.h

@@ -95,7 +95,7 @@ class CellularConnectionFSM
     /** Get event queue that can be chained to main event queue (or use start_dispatch)
      *  @return event queue
      */
-    events::EventQueue* get_queue();
+    events::EventQueue *get_queue();
 
     /** Start event queue dispatching
      *  @return see nsapi_error_t, 0 on success
@@ -110,17 +110,17 @@ class CellularConnectionFSM
     /** Get cellular network interface
      *  @return network interface, NULL on failure
      */
-    CellularNetwork* get_network();
+    CellularNetwork *get_network();
 
     /** Get cellular device interface
      *  @return device interface, NULL on failure
      */
-    CellularDevice* get_device();
+    CellularDevice *get_device();
 
     /** Get cellular sim interface
      *  @return sim interface, NULL on failure
      */
-    CellularSIM* get_sim();
+    CellularSIM *get_sim();
 
     /** Change cellular connection to the target state
      *  @param state to continue. Default is to connect.
@@ -153,7 +153,7 @@ class CellularConnectionFSM
      *  @param state state which is returned in string format
      *  @return      string format of the given state
      */
-    const char* get_state_string(CellularState state);
+    const char *get_state_string(CellularState state);
 
 private:
     bool power_on();
@@ -211,7 +211,7 @@ class CellularConnectionFSM
     events::EventQueue _at_queue;
     char _st_string[20];
     int _event_id;
-    const char* _plmn;
+    const char *_plmn;
     bool _command_success;
     bool _plmn_network_found;
 };

features/cellular/easy_cellular/EasyCellularConnection.cpp

@@ -114,7 +114,7 @@ void EasyCellularConnection::set_credentials(const char *apn, const char *uname,
         if (_credentials_err) {
             return;
         }
-        CellularNetwork * network = _cellularConnectionFSM->get_network();
+        CellularNetwork *network = _cellularConnectionFSM->get_network();
         if (network) {
             _credentials_err = network->set_credentials(apn, uname, pwd);
 #if USE_APN_LOOKUP
@@ -192,12 +192,12 @@ nsapi_error_t EasyCellularConnection::connect()
         _target_state = CellularConnectionFSM::STATE_SIM_PIN;
         err = _cellularConnectionFSM->continue_to_state(_target_state);
         if (err == NSAPI_ERROR_OK) {
-            int sim_wait = _cellularSemaphore.wait(60*1000); // reserve 60 seconds to access to SIM
+            int sim_wait = _cellularSemaphore.wait(60 * 1000); // reserve 60 seconds to access to SIM
             if (sim_wait != 1) {
                 tr_error("NO SIM ACCESS");
                 err = NSAPI_ERROR_NO_CONNECTION;
             } else {
-                char imsi[MAX_IMSI_LENGTH+1];
+                char imsi[MAX_IMSI_LENGTH + 1];
                 wait(1); // need to wait to access SIM in some modems
                 err = _cellularConnectionFSM->get_sim()->get_imsi(imsi);
                 if (err == NSAPI_ERROR_OK) {
@@ -313,9 +313,16 @@ void EasyCellularConnection::modem_debug_on(bool on)
     }
 }
 
-void EasyCellularConnection::set_plmn(const char* plmn)
+void EasyCellularConnection::set_plmn(const char *plmn)
 {
-    if (_cellularConnectionFSM) {
+    if (plmn && strlen(plmn) > 0) {
+        if (!_cellularConnectionFSM) {
+            _credentials_err = init();
+
+            if (_credentials_err) {
+                return;
+            }
+        }
         _cellularConnectionFSM->set_plmn(plmn);
     }
 }