Cellular: Fix CellularStateMachine timeout configurations

Author: Ari Parkkila

features/cellular/framework/API/CellularDevice.h

@@ -331,11 +331,26 @@ class CellularDevice {
     virtual void close_information() = 0;
 
     /** Set the default response timeout.
+     *
+     *  @remark CellularStateMachine timeouts for all states are also changed to `timeout`.
      *
      *  @param timeout    milliseconds to wait response from modem
      */
     virtual void set_timeout(int timeout) = 0;
 
+    /** Set an array of timeouts to wait before CellularStateMachine retries after failure.
+     *  To disable retry behavior completely use `set_retry_timeout_array(NULL, 0)`.
+     *  CellularContext callback event `cell_callback_data_t.final_try` indicates true when all retries have failed.
+     *
+     *  @remark Use `set_retry_timeout_array` for CellularStateMachine to wait before it retries again after failure.
+     *          Use `set_timeout` for timeout how long to wait for a response from modem.
+     *
+     *
+     *  @param timeout      timeout array using seconds
+     *  @param array_len    length of the array
+     */
+    void set_retry_timeout_array(const uint16_t timeout[], int array_len);
+
     /** Turn modem debug traces on
      *
      *  @param on         set true to enable debug traces

features/cellular/framework/AT/AT_CellularContext.cpp

@@ -903,6 +903,10 @@ void AT_CellularContext::cellular_callback(nsapi_event_t ev, intptr_t ptr)
         cell_callback_data_t *data = (cell_callback_data_t *)ptr;
         cellular_connection_status_t st = (cellular_connection_status_t)ev;
         _cb_data.error = data->error;
+        _cb_data.final_try = data->final_try;
+        if (data->final_try) {
+            _semaphore.release();
+        }
 #if USE_APN_LOOKUP
         if (st == CellularSIMStatusChanged && data->status_data == CellularDevice::SimStateReady &&
                 _cb_data.error == NSAPI_ERROR_OK) {

features/cellular/framework/AT/AT_CellularDevice.cpp

@@ -346,6 +346,10 @@ void AT_CellularDevice::set_timeout(int timeout)
     _default_timeout = timeout;
 
     ATHandler::set_at_timeout_list(_default_timeout, true);
+
+    if (_state_machine) {
+        _state_machine->set_timeout(_default_timeout);
+    }
 }
 
 uint16_t AT_CellularDevice::get_send_delay() const

features/cellular/framework/device/CellularContext.cpp

@@ -70,6 +70,9 @@ CellularDevice *CellularContext::get_device() const
 
 void CellularContext::do_connect_with_retry()
 {
+    if (_cb_data.final_try) {
+        return;
+    }
     do_connect();
     if (_cb_data.error == NSAPI_ERROR_OK) {
         return;

features/cellular/framework/device/CellularDevice.cpp

@@ -235,4 +235,11 @@ nsapi_error_t CellularDevice::shutdown()
     return NSAPI_ERROR_OK;
 }
 
+void CellularDevice::set_retry_timeout_array(const uint16_t timeout[], int array_len)
+{
+    if (create_state_machine() == NSAPI_ERROR_OK) {
+        _state_machine->set_retry_timeout_array(timeout, array_len);
+    }
+}
+
 } // namespace mbed

features/cellular/framework/device/CellularStateMachine.cpp

@@ -36,6 +36,7 @@
 
 #define RETRY_COUNT_DEFAULT 3
 
+
 const int STM_STOPPED = -99;
 const int ACTIVE_PDP_CONTEXT = 0x01;
 const int ATTACHED_TO_NETWORK = 0x02;
@@ -68,6 +69,12 @@ CellularStateMachine::CellularStateMachine(CellularDevice &device, events::Event
     _retry_timeout_array[8] = 600;
     _retry_timeout_array[9] = TIMEOUT_NETWORK_MAX;
     _retry_array_length = CELLULAR_RETRY_ARRAY_SIZE;
+
+    _state_timeout_power_on = TIMEOUT_POWER_ON;
+    _state_timeout_sim_pin = TIMEOUT_SIM_PIN;
+    _state_timeout_registration = TIMEOUT_REGISTRATION;
+    _state_timeout_network = TIMEOUT_NETWORK;
+    _state_timeout_connect = TIMEOUT_CONNECT;
 }
 
 CellularStateMachine::~CellularStateMachine()
@@ -285,21 +292,23 @@ void CellularStateMachine::enter_to_state(CellularState state)
 
 void CellularStateMachine::retry_state_or_fail()
 {
-    if (++_retry_count < CELLULAR_RETRY_ARRAY_SIZE) {
-        tr_debug("%s: retry %d/%d", get_state_string(_state), _retry_count, CELLULAR_RETRY_ARRAY_SIZE);
+    if (_retry_count < _retry_array_length) {
+        tr_debug("%s: retry %d/%d", get_state_string(_state), _retry_count, _retry_array_length);
         _event_timeout = _retry_timeout_array[_retry_count];
         _is_retry = true;
         _cb_data.error = NSAPI_ERROR_OK;
+        _retry_count++;
     } else {
+        _cb_data.final_try = true;
         report_failure(get_state_string(_state));
         return;
     }
 }
 
 void CellularStateMachine::state_init()
 {
-    _cellularDevice.set_timeout(TIMEOUT_POWER_ON);
-    tr_info("Start connecting (timeout %d s)", TIMEOUT_POWER_ON / 1000);
+    _cellularDevice.set_timeout(_state_timeout_power_on);
+    tr_info("Start connecting (timeout %d ms)", _state_timeout_power_on);
     _cb_data.error = _cellularDevice.is_ready();
     _status = _cb_data.error ? 0 : DEVICE_READY;
     if (_cb_data.error != NSAPI_ERROR_OK) {
@@ -315,8 +324,8 @@ void CellularStateMachine::state_init()
 
 void CellularStateMachine::state_power_on()
 {
-    _cellularDevice.set_timeout(TIMEOUT_POWER_ON);
-    tr_info("Modem power ON (timeout %d s)", TIMEOUT_POWER_ON / 1000);
+    _cellularDevice.set_timeout(_state_timeout_power_on);
+    tr_info("Modem power ON (timeout %d ms)", _state_timeout_power_on);
     if (power_on()) {
         enter_to_state(STATE_DEVICE_READY);
     } else {
@@ -353,7 +362,7 @@ bool CellularStateMachine::device_ready()
 
 void CellularStateMachine::state_device_ready()
 {
-    _cellularDevice.set_timeout(TIMEOUT_POWER_ON);
+    _cellularDevice.set_timeout(_state_timeout_power_on);
     if (!(_status & DEVICE_READY)) {
         tr_debug("Device was not ready, calling soft_power_on()");
         _cb_data.error = _cellularDevice.soft_power_on();
@@ -377,8 +386,8 @@ void CellularStateMachine::state_device_ready()
 
 void CellularStateMachine::state_sim_pin()
 {
-    _cellularDevice.set_timeout(TIMEOUT_SIM_PIN);
-    tr_info("Setup SIM (timeout %d s)", TIMEOUT_SIM_PIN / 1000);
+    _cellularDevice.set_timeout(_state_timeout_sim_pin);
+    tr_info("Setup SIM (timeout %d ms)", _state_timeout_sim_pin);
     if (open_sim()) {
         bool success = false;
         for (int type = 0; type < CellularNetwork::C_MAX; type++) {
@@ -419,8 +428,7 @@ void CellularStateMachine::state_sim_pin()
 
 void CellularStateMachine::state_registering()
 {
-    _cellularDevice.set_timeout(TIMEOUT_NETWORK);
-    tr_info("Network registration (timeout %d s)", TIMEOUT_REGISTRATION / 1000);
+    _cellularDevice.set_timeout(_state_timeout_network);
     if (is_registered()) {
         if (_cb_data.status_data != CellularNetwork::RegisteredHomeNetwork &&
                 _cb_data.status_data != CellularNetwork::RegisteredRoaming && _status) {
@@ -432,7 +440,8 @@ void CellularStateMachine::state_registering()
         // we are already registered, go to attach
         enter_to_state(STATE_ATTACHING_NETWORK);
     } else {
-        _cellularDevice.set_timeout(TIMEOUT_REGISTRATION);
+        tr_info("Network registration (timeout %d ms)", _state_timeout_registration);
+        _cellularDevice.set_timeout(_state_timeout_registration);
         if (!_command_success && !_plmn) { // don't call set_registration twice for manual registration
             _cb_data.error = _network->set_registration(_plmn);
             _command_success = (_cb_data.error == NSAPI_ERROR_OK);
@@ -443,8 +452,8 @@ void CellularStateMachine::state_registering()
 
 void CellularStateMachine::state_attaching()
 {
-    _cellularDevice.set_timeout(TIMEOUT_CONNECT);
-    tr_info("Attaching network (timeout %d s)", TIMEOUT_CONNECT / 1000);
+    _cellularDevice.set_timeout(_state_timeout_connect);
+    tr_info("Attaching network (timeout %d ms)", _state_timeout_connect);
     if (_status != ATTACHED_TO_NETWORK) {
         _cb_data.error = _network->set_attach();
     }
@@ -683,11 +692,10 @@ void CellularStateMachine::device_ready_cb()
 void CellularStateMachine::set_retry_timeout_array(const uint16_t timeout[], int array_len)
 {
     if (!timeout || array_len <= 0) {
-        tr_warn("set_retry_timeout_array, timeout array null or invalid length");
+        _retry_array_length = 0;
         return;
     }
     _retry_array_length = array_len > CELLULAR_RETRY_ARRAY_SIZE ? CELLULAR_RETRY_ARRAY_SIZE : array_len;
-
     for (int i = 0; i < _retry_array_length; i++) {
         _retry_timeout_array[i] = timeout[i];
     }
@@ -701,5 +709,14 @@ void CellularStateMachine::get_retry_timeout_array(uint16_t *timeout, int &array
     array_len = _retry_array_length;
 }
 
+void CellularStateMachine::set_timeout(int timeout)
+{
+    _state_timeout_power_on = timeout;
+    _state_timeout_sim_pin = timeout;
+    _state_timeout_registration = timeout;
+    _state_timeout_network = timeout;
+    _state_timeout_connect = timeout;
+}
+
 } // namespace
 

features/cellular/framework/device/CellularStateMachine.h

@@ -180,6 +180,15 @@ class CellularStateMachine {
     nsapi_event_t _current_event;
     int _status;
     PlatformMutex _mutex;
+
+    // Cellular state timeouts
+    int _state_timeout_power_on;
+    int _state_timeout_sim_pin;
+    int _state_timeout_registration;
+    int _state_timeout_network;
+    int _state_timeout_connect;
+    // Change all cellular state timeouts to `timeout`
+    void set_timeout(int timeout);
 };
 
 } // namespace