Cellular: Move eDRX setting from power to network

Author: Ari Parkkila

UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp

@@ -681,3 +681,16 @@ TEST_F(TestAT_CellularNetwork, test_get_connection_status)
     EXPECT_TRUE(NSAPI_STATUS_DISCONNECTED == cn.get_connection_status());
 }
 
+TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_set_receive_period)
+{
+    EventQueue que;
+    FileHandle_stub fh1;
+    ATHandler at(&fh1, que, 0, ",");
+
+    AT_CellularNetwork cn(at);
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
+    EXPECT_TRUE(NSAPI_ERROR_OK == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
+
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
+    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
+}

UNITTESTS/features/cellular/framework/AT/at_cellularpower/at_cellularpowertest.cpp

@@ -151,20 +151,6 @@ TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_power_save_mode)
     EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_power_save_mode(0, 0));
 }
 
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_receive_period)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
-}
-
 TEST_F(TestAT_CellularPower, test_AT_CellularPower_is_device_ready)
 {
     EventQueue que;

UNITTESTS/stubs/AT_CellularNetwork_stub.cpp

@@ -150,3 +150,8 @@ bool AT_CellularNetwork::is_active_context()
 {
     return true;
 }
+
+nsapi_error_t AT_CellularNetwork::set_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
+{
+    return NSAPI_ERROR_OK;
+}

UNITTESTS/stubs/AT_CellularPower_stub.cpp

@@ -60,11 +60,6 @@ nsapi_error_t AT_CellularPower::opt_power_save_mode(int periodic_time, int activ
     return NSAPI_ERROR_OK;
 }
 
-nsapi_error_t AT_CellularPower::opt_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
-{
-    return NSAPI_ERROR_OK;
-}
-
 nsapi_error_t AT_CellularPower::set_device_ready_urc_cb(mbed::Callback<void()> callback)
 {
     return NSAPI_ERROR_OK;

features/cellular/TESTS/api/cellular_power/main.cpp

@@ -97,16 +97,6 @@ static void test_power_interface()
         }
     }
 
-    wait(1);
-    err = pwr->opt_receive_period(0, CellularPower::EDRXEUTRAN_NB_S1_mode, 3);
-    TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
-    if (err == NSAPI_ERROR_DEVICE_ERROR) {
-        if (!(strcmp(devi, "TELIT_HE910") == 0 || strcmp(devi, "QUECTEL_BG96") == 0)) { // TELIT_HE910 and QUECTEL_BG96 just gives an error and no specific error number so we can't know is this real error or that modem/network does not support the command
-            TEST_ASSERT(((AT_CellularPower *)pwr)->get_device_error().errCode == 100 && // 100 == unknown command for modem
-                        ((AT_CellularPower *)pwr)->get_device_error().errType == 3); // 3 == CME error from the modem
-        }
-    }
-
     err = pwr->off();
     TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_UNSUPPORTED);
 

features/cellular/TESTS/cellular_tests_common.h

@@ -50,10 +50,14 @@ static void trace_open()
 
     mbed_cellular_trace::mutex_wait_function_set(trace_wait);
     mbed_cellular_trace::mutex_release_function_set(trace_release);
+
+    greentea_serial->set_trace_mutex(&trace_mutex);
 }
 
 static void trace_close()
 {
+    greentea_serial->set_trace_mutex(NULL);
+
     mbed_cellular_trace::mutex_wait_function_set(NULL);
     mbed_cellular_trace::mutex_release_function_set(NULL);
 

features/cellular/TESTS/socket/udp/main.cpp

@@ -31,7 +31,7 @@
 #endif
 
 #if defined(TARGET_ADV_WISE_1570) || defined(TARGET_MTB_ADV_WISE_1570)
-#error [NOT_SUPPORTED] target MTB_ADV_WISE_1570 is too unstable for network tests, IoT network is unstable
+//#error [NOT_SUPPORTED] target MTB_ADV_WISE_1570 is too unstable for network tests, IoT network is unstable
 #endif
 
 #include "greentea-client/test_env.h"

features/cellular/framework/API/CellularNetwork.h

@@ -363,6 +363,27 @@ class CellularNetwork {
     *                      NSAPI_ERROR_DEVICE_ERROR on failure
     */
     virtual nsapi_error_t get_registration_params(RegistrationType type, registration_params_t &reg_params) = 0;
+
+    /** Set discontinuous reception time on cellular device.
+     *
+     *  @remark See 3GPP TS 27.007 eDRX for details.
+     *
+     *  @param mode          disable or enable the use of eDRX
+     *  @param act_type      type of access technology
+     *  @param edrx_value    requested edxr value. Extended DRX parameters information element.
+     *
+     *  @return              NSAPI_ERROR_OK on success
+     *                       NSAPI_ERROR_DEVICE_ERROR on failure
+     */
+    enum EDRXAccessTechnology {
+        EDRXGSM_EC_GSM_IoT_mode = 1,
+        EDRXGSM_A_Gb_mode,
+        EDRXUTRAN_Iu_mode,
+        EDRXEUTRAN_WB_S1_mode,
+        EDRXEUTRAN_NB_S1_mode
+    };
+    virtual nsapi_error_t set_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value) = 0;
+
 };
 
 /**

features/cellular/framework/API/CellularPower.h

@@ -38,15 +38,6 @@ class CellularPower {
     virtual ~CellularPower() {}
 
 public:
-    /* Access technology used in method opt_receive_period */
-    enum EDRXAccessTechnology {
-        EDRXGSM_EC_GSM_IoT_mode = 1,
-        EDRXGSM_A_Gb_mode,
-        EDRXUTRAN_Iu_mode,
-        EDRXEUTRAN_WB_S1_mode,
-        EDRXEUTRAN_NB_S1_mode
-    };
-
     /** Set cellular device power on. Default implementation is empty.
      *  Device power on/off is modem/board specific behavior and must be done on inherited class if needed.
      *  Power on is done by toggling power pin/button.
@@ -114,19 +105,6 @@ class CellularPower {
      */
     virtual nsapi_error_t opt_power_save_mode(int periodic_time, int active_time) = 0;
 
-    /** Opt for discontinuous reception on cellular device.
-     *
-     *  @remark See 3GPP TS 27.007 eDRX for details.
-     *
-     *  @param mode          disable or enable the use of eDRX
-     *  @param act_type      type of access technology
-     *  @param edrx_value    requested edxr value. Extended DRX parameters information element.
-     *
-     *  @return              NSAPI_ERROR_OK on success
-     *                       NSAPI_ERROR_DEVICE_ERROR on failure
-     */
-    virtual nsapi_error_t opt_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value) = 0;
-
     /** Check whether the device is ready to accept commands.
      *
      *  @return         NSAPI_ERROR_OK on success

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -684,3 +684,20 @@ int AT_CellularNetwork::calculate_periodic_tau(const char *periodic_tau_string,
             return 0;
     }
 }
+
+nsapi_error_t AT_CellularNetwork::set_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
+{
+    char edrx[5];
+    uint_to_binary_str(edrx_value, edrx, 5, 4);
+    edrx[4] = '\0';
+
+    _at.lock();
+
+    _at.cmd_start("AT+CEDRXS=");
+    _at.write_int(mode);
+    _at.write_int(act_type);
+    _at.write_string(edrx);
+    _at.cmd_stop_read_resp();
+
+    return _at.unlock_return_error();
+}