Rebase and changes for Dragonfly nano support

Author: felser

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

@@ -200,6 +200,10 @@ static void test_activate_context()
 static void test_connect()
 {
     TEST_ASSERT(nw->connect() == NSAPI_ERROR_OK);
+    char count = 0;
+    while ((nw->get_connection_status() != NSAPI_STATUS_GLOBAL_UP) && (count++ < 60)) {
+        wait(1);
+    }
     nsapi_connection_status_t st =  nw->get_connection_status();
     TEST_ASSERT(st == NSAPI_STATUS_GLOBAL_UP);
 }
@@ -223,7 +227,7 @@ static void test_other()
     // can't test values as they are optional
     nsapi_error_t err = nw->get_rate_control(reports, timeUnit, uplinkRate);
     TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
-    if (strcmp(devi, "QUECTEL_BG96") != 0 && strcmp(devi, "TELIT_HE910") != 0) { // QUECTEL_BG96 does not give any specific reason for device error
+    if (strcmp(devi, "QUECTEL_BG96") != 0 && strcmp(devi, "TELIT_HE910") != 0 && strcmp(devi, "SARA4_PPP") != 0) { // QUECTEL_BG96 does not give any specific reason for device error
         if (err == NSAPI_ERROR_DEVICE_ERROR) {
             TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
                         ((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
@@ -234,7 +238,7 @@ static void test_other()
     err = nw->get_apn_backoff_timer(uplinkRate);
     TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR || err == NSAPI_ERROR_PARAMETER);
     if (err == NSAPI_ERROR_DEVICE_ERROR) {
-        if (strcmp(devi, "QUECTEL_BG96") != 0 && strcmp(devi, "TELIT_HE910") != 0) { // QUECTEL_BG96 does not give any specific reason for device error
+        if (strcmp(devi, "QUECTEL_BG96") != 0 && strcmp(devi, "TELIT_HE910") != 0 && strcmp(devi, "SARA4_PPP") != 0) { // QUECTEL_BG96 does not give any specific reason for device error
                     TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
                                 ((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
         }
@@ -320,7 +324,7 @@ static void test_other()
 
     TEST_ASSERT(nw->set_blocking(true) == NSAPI_ERROR_OK);
 
-    if (strcmp(devi, "QUECTEL_BG96") != 0) {
+    if (strcmp(devi, "QUECTEL_BG96") != 0 && strcmp(devi, "SARA4_PPP") != 0) {
         // QUECTEL_BG96 timeouts with this one, tested with 3 minute timeout
         CellularNetwork::operator_names_list op_names;
         err = nw->get_operator_names(op_names);
@@ -344,7 +348,7 @@ static void test_other()
     TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
     if (err == NSAPI_ERROR_DEVICE_ERROR) {
         // if device error then we must check was that really device error or that modem/network does not support the commands
-        if (!(strcmp(devi, "TELIT_HE910") == 0 || strcmp(devi, "QUECTEL_BG96") == 0)) {
+        if (!(strcmp(devi, "TELIT_HE910") == 0 || strcmp(devi, "QUECTEL_BG96") == 0 || strcmp(devi, "SARA4_PPP") == 0)) {
             TEST_ASSERT((((AT_CellularNetwork *)nw)->get_device_error().errType == 3) &&   // 3 == CME error from the modem
                        ((((AT_CellularNetwork *)nw)->get_device_error().errCode == 100) || // 100 == unknown command for modem
                         (((AT_CellularNetwork *)nw)->get_device_error().errCode == 50)));  // 50 == incorrect parameters // seen in wise_1570 for not supported commands
@@ -358,7 +362,7 @@ static void test_other()
     TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
     if (err == NSAPI_ERROR_DEVICE_ERROR) {
         // if device error then we must check was that really device error or that modem/network does not support the commands
-        if (!(strcmp(devi, "TELIT_HE910") == 0 || strcmp(devi, "QUECTEL_BG96") == 0)) {
+        if (!(strcmp(devi, "TELIT_HE910") == 0 || strcmp(devi, "QUECTEL_BG96") == 0 || strcmp(devi, "SARA4_PPP") == 0)) {
             TEST_ASSERT((((AT_CellularNetwork *)nw)->get_device_error().errType == 3) &&   // 3 == CME error from the modem
                        ((((AT_CellularNetwork *)nw)->get_device_error().errCode == 100) || // 100 == unknown command for modem
                         (((AT_CellularNetwork *)nw)->get_device_error().errCode == 50)));  // 50 == incorrect parameters // seen in wise_1570 for not supported commands
@@ -371,6 +375,8 @@ static void test_disconnect()
     nsapi_connection_status_t st =  nw->get_connection_status();
     TEST_ASSERT(st == NSAPI_STATUS_GLOBAL_UP);
     TEST_ASSERT(nw->disconnect() == NSAPI_ERROR_OK);
+    // wait to process URC's, received after disconnect
+    rtos::Thread::wait(500);
 }
 
 static void test_detach()
@@ -384,7 +390,7 @@ static void test_detach()
 
     TEST_ASSERT(nw->detach() == NSAPI_ERROR_OK);
     // wait to process URC's, received after detach
-    rtos::Thread::wait(50);
+    rtos::Thread::wait(500);
     st =  nw->get_connection_status();
     TEST_ASSERT(st == NSAPI_STATUS_DISCONNECTED);
 }

features/cellular/framework/AT/AT_CellularDevice.cpp

@@ -205,13 +205,20 @@ AT_CellularInformation *AT_CellularDevice::open_information_impl(ATHandler &at)
 void AT_CellularDevice::close_network()
 {
     if (_network) {
+<<<<<<< HEAD
         _network_ref_count--;
         if (_network_ref_count == 0) {
             ATHandler *atHandler = &_network->get_at_handler();
             delete _network;
             _network = NULL;
             release_at_handler(atHandler);
         }
+=======
+        ATHandler *at_handler = &_network->get_at_handler();
+        delete _network;
+        release_at_handler(at_handler);
+        _network = NULL;
+>>>>>>> Rebase and changes for Dragonfly nano support
     }
 }
 

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -388,7 +388,6 @@ nsapi_error_t AT_CellularNetwork::open_data_channel()
 {
 #if NSAPI_PPP_AVAILABLE
     tr_info("Open data channel in PPP mode");
-//<<<<<<< HEAD
     if (is_supported(AT_CGDATA)) {
         _at.cmd_start("AT+CGDATA=\"PPP\",");
         _at.write_int(_cid);
@@ -398,16 +397,6 @@ nsapi_error_t AT_CellularNetwork::open_data_channel()
         std::sprintf(cmd_buf, "ATD*99***%d#", _cid);
         _at.cmd_start(cmd_buf);
     }
-//=======
-//
-//#ifdef TARGET_MTS_DRAGONFLY_L471QG
-//    _at.cmd_start("ATD*99***1#");
-//#else
-//    _at.cmd_start("AT+CGDATA=\"PPP\",");
-//    _at.write_int(_cid);
-//#endif
-//
-//>>>>>>> changes to support mts dragonfly nano ppp
     _at.cmd_stop();
 
     _at.resp_start("CONNECT", true);

features/cellular/framework/common/CellularTargets.h

@@ -37,8 +37,8 @@ namespace mbed {
 #endif
 #elif TARGET_UBLOX_C027
 #define CELLULAR_DEVICE UBLOX_PPP
-#elif TARGET_DRAGONFLY_L471QG
-#define CELLULAR_DEVICE UBLOX_PPP
+#elif TARGET_MTS_DRAGONFLY_L471QG
+#define CELLULAR_DEVICE SARA4_PPP
 //#else
 //#error Cellular target not defined, see cellular/targets.h
 //#define CELLULAR_TARGET <target-modem>

features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SARA4_PPP.h"
+#include "SARA4_PPP_CellularNetwork.h"
+#include "SARA4_PPP_CellularPower.h"
+
+using namespace mbed;
+using namespace events;
+
+static const AT_CellularBase::SupportedFeature unsupported_features[] =  {
+    AT_CellularBase::AT_CGSN_WITH_TYPE,
+    AT_CellularBase::AT_CGDATA,
+    AT_CellularBase::SUPPORTED_FEATURE_END_MARK
+};
+
+SARA4_PPP::SARA4_PPP(EventQueue &queue) : AT_CellularDevice(queue)
+{
+    AT_CellularBase::set_unsupported_features(unsupported_features);
+}
+
+SARA4_PPP::~SARA4_PPP()
+{
+}
+
+CellularNetwork *SARA4_PPP::open_network(FileHandle *fh)
+{
+    if (!_network) {
+        ATHandler *atHandler = get_at_handler(fh);
+        if (atHandler) {
+            _network = new SARA4_PPP_CellularNetwork(*atHandler);
+            if (!_network) {
+                release_at_handler(atHandler);
+            }
+        }
+    }
+    return _network;
+}
+
+CellularPower *SARA4_PPP::open_power(FileHandle *fh)
+{
+    if (!_power) {
+        ATHandler *atHandler = get_at_handler(fh);
+        if (atHandler) {
+            _power = new SARA4_PPP_CellularPower(*atHandler);
+            if (!_power) {
+                release_at_handler(atHandler);
+            }
+        }
+    }
+    return _power;
+}
+

features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SARA4_PPP_H_
+#define SARA4_PPP_H_
+
+#include "AT_CellularDevice.h"
+
+namespace mbed {
+
+class SARA4_PPP : public AT_CellularDevice {
+
+public:
+    SARA4_PPP(events::EventQueue &queue);
+    virtual ~SARA4_PPP();
+
+public: // CellularDevice
+    virtual CellularNetwork *open_network(FileHandle *fh);
+    virtual CellularPower *open_power(FileHandle *fh);
+};
+
+} // namespace mbed
+
+#endif // SARA4_PPP_H_

features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP_CellularNetwork.cpp

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SARA4_PPP_CellularNetwork.h"
+
+using namespace mbed;
+
+SARA4_PPP_CellularNetwork::SARA4_PPP_CellularNetwork(ATHandler &atHandler) : AT_CellularNetwork(atHandler)
+{
+}
+
+SARA4_PPP_CellularNetwork::~SARA4_PPP_CellularNetwork()
+{
+}
+
+bool SARA4_PPP_CellularNetwork::get_modem_stack_type(nsapi_ip_stack_t requested_stack)
+{
+    return requested_stack == IPV4_STACK ? true : false;
+}
+
+AT_CellularNetwork::RegistrationMode SARA4_PPP_CellularNetwork::has_registration(RegistrationType reg_type)
+{
+//<<<<<<< HEAD
+    return (reg_type == C_REG || reg_type == C_GREG) ? RegistrationModeLAC : RegistrationModeDisable;
+//=======
+//#ifdef TARGET_DRAGONFLY_L471QG
+//    return (reg_type == C_REG || reg_type == C_EREG);
+//#else
+//    return (reg_type == C_REG || reg_type == C_GREG || reg_type == C_EREG);
+//#endif
+//>>>>>>> Fixed spacing/tabs and clean up targets.json
+}
+
+nsapi_error_t SARA4_PPP_CellularNetwork::set_access_technology_impl(RadioAccessTechnology opRat)
+{
+    _op_act = RAT_CATM1;
+    return NSAPI_ERROR_OK;
+}

features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP_CellularNetwork.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SARA4_PPP_CELLULAR_NETWORK_H_
+#define SARA4_PPP_CELLULAR_NETWORK_H_
+
+#include "AT_CellularNetwork.h"
+
+namespace mbed {
+
+class SARA4_PPP_CellularNetwork : public AT_CellularNetwork {
+public:
+    SARA4_PPP_CellularNetwork(ATHandler &atHandler);
+    virtual ~SARA4_PPP_CellularNetwork();
+
+protected:
+    virtual bool get_modem_stack_type(nsapi_ip_stack_t requested_stack);
+
+    virtual RegistrationMode has_registration(RegistrationType rat);
+
+    virtual nsapi_error_t set_access_technology_impl(RadioAccessTechnology opRat);
+};
+
+} // namespace mbed
+
+#endif // SARA4_PPP_CELLULAR_NETWORK_H_

features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/SARA4_PPP_CellularPower.cpp

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SARA4_PPP_CellularPower.h"
+
+#include "onboard_modem_api.h"
+
+using namespace mbed;
+
+SARA4_PPP_CellularPower::SARA4_PPP_CellularPower(ATHandler &atHandler) : AT_CellularPower(atHandler)
+{
+
+}
+
+SARA4_PPP_CellularPower::~SARA4_PPP_CellularPower()
+{
+
+}
+
+nsapi_error_t SARA4_PPP_CellularPower::on()
+{
+    ::onboard_modem_init();
+    ::onboard_modem_power_up();
+    return NSAPI_ERROR_OK;
+}
+
+nsapi_error_t SARA4_PPP_CellularPower::off()
+{
+    ::onboard_modem_power_down();
+    return NSAPI_ERROR_OK;
+}