Cellular: Fix statemachine stop

Author: Ari Parkkila

features/cellular/framework/device/CellularDevice.cpp

@@ -118,25 +118,26 @@ nsapi_error_t CellularDevice::attach_to_network()
 nsapi_error_t CellularDevice::create_state_machine()
 {
     nsapi_error_t err = NSAPI_ERROR_OK;
+    _nw = open_network(_fh);
+    // Attach to network so we can get update status from the network
+    _nw->attach(callback(this, &CellularDevice::stm_callback));
     if (!_state_machine) {
-        _nw = open_network(_fh);
-        // Attach to network so we can get update status from the network
-        _nw->attach(callback(this, &CellularDevice::stm_callback));
         _state_machine = new CellularStateMachine(*this, *get_queue(), *_nw);
-        _state_machine->set_cellular_callback(callback(this, &CellularDevice::stm_callback));
-        err = _state_machine->start_dispatch();
-        if (err) {
-            tr_error("Start state machine failed.");
-            delete _state_machine;
-            _state_machine = NULL;
-        }
+    }
+    _state_machine->set_cellular_callback(callback(this, &CellularDevice::stm_callback));
+    err = _state_machine->start_dispatch();
+    if (err) {
+        tr_error("Start state machine failed.");
+        delete _state_machine;
+        _state_machine = NULL;
+        return err;
+    }
 
-        if (strlen(_plmn)) {
-            _state_machine->set_plmn(_plmn);
-        }
-        if (strlen(_sim_pin)) {
-            _state_machine->set_sim_pin(_sim_pin);
-        }
+    if (strlen(_plmn)) {
+        _state_machine->set_plmn(_plmn);
+    }
+    if (strlen(_sim_pin)) {
+        _state_machine->set_sim_pin(_sim_pin);
     }
     return err;
 }

features/cellular/framework/device/CellularStateMachine.cpp

@@ -103,7 +103,6 @@ void CellularStateMachine::stop()
 {
     tr_debug("CellularStateMachine stop");
     if (_queue_thread) {
-        _queue.break_dispatch();
         _queue_thread->terminate();
         delete _queue_thread;
         _queue_thread = NULL;
@@ -366,6 +365,9 @@ void CellularStateMachine::state_device_ready()
                 _status = 0;
                 enter_to_state(STATE_SIM_PIN);
             }
+        } else {
+            _status = 0;
+            enter_to_state(STATE_INIT);
         }
     }
     if (_cb_data.error != NSAPI_ERROR_OK) {
@@ -546,7 +548,7 @@ bool CellularStateMachine::get_current_status(CellularStateMachine::CellularStat
 void CellularStateMachine::event()
 {
     // Don't send Signal quality when in signal quality state or it can confuse callback functions when running retry logic
-    if (_state != STATE_SIGNAL_QUALITY) {
+    if (_state > STATE_SIGNAL_QUALITY) {
         _cb_data.error = _network.get_signal_quality(_signal_quality.rssi, &_signal_quality.ber);
         _cb_data.data = &_signal_quality;
 
@@ -633,6 +635,8 @@ nsapi_error_t CellularStateMachine::start_dispatch()
         return NSAPI_ERROR_NO_MEMORY;
     }
 
+    _event_id = -1;
+
     return NSAPI_ERROR_OK;
 }