More patches, support time

Author: multiplemonomials

connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h

@@ -139,6 +139,8 @@ class AT_CellularContext : public CellularContext {
     nsapi_error_t check_operation(nsapi_error_t err, ContextOperation op);
     void ciot_opt_cb(mbed::CellularNetwork::CIoT_Supported_Opt ciot_opt);
     virtual void do_connect_with_retry();
+
+protected:
     void set_cid(int cid);
 
 private:

connectivity/cellular/source/framework/AT/AT_CellularContext.cpp

@@ -370,7 +370,7 @@ bool AT_CellularContext::get_context()
         int pdp_type_len = _at.read_string(pdp_type_from_context, sizeof(pdp_type_from_context));
         if (pdp_type_len > 0) {
             apn_len = _at.read_string(apn, sizeof(apn));
-            if (apn_len > 0) {
+            if (apn_len >= 0) {
                 if (_apn && (strcmp(apn, _apn) != 0)) {
                     tr_debug("CID %d APN \"%s\"", cid, apn);
                     continue;
@@ -388,9 +388,6 @@ bool AT_CellularContext::get_context()
                     set_cid(cid);
                 }
             }
-            else {
-                cid_max = 0;
-            }
         }
     }
 

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION.cpp

@@ -17,6 +17,7 @@
 
 #include "GEMALTO_CINTERION_CellularContext.h"
 #include "GEMALTO_CINTERION_CellularInformation.h"
+#include "GEMALTO_CINTERION_CellularNetwork.h"
 #include "GEMALTO_CINTERION.h"
 #include "AT_CellularNetwork.h"
 #include "CellularLog.h"
@@ -30,6 +31,82 @@ GEMALTO_CINTERION::GEMALTO_CINTERION(FileHandle *fh) : AT_CellularDevice(fh)
 {
 }
 
+time_t GEMALTO_CINTERION::get_time()
+{
+    tr_info("GEMALTO_CINTERION::get_time\n");
+
+    //Enable automatic time zone update:
+    set_automatic_time_zone_update();
+
+    _at.lock();
+
+    //"+CCLK: \"%y/%m/%d,%H:%M:%S+ZZ"
+    _at.cmd_start_stop("+CCLK", "?");
+    _at.resp_start("+CCLK:");
+
+    char time_str[50];
+    time_t now = 0;
+    while (_at.info_resp()) {
+        int date_len = _at.read_string(time_str, sizeof(time_str));
+        tr_debug("Read %d bytes for the date\n", date_len);
+        if (date_len > 0) {
+            now = parse_time(time_str);
+        }
+    }
+    _at.resp_stop();
+
+    _at.unlock();
+
+    // adjust for timezone offset which is +/- in 15 minute increments
+    time_t delta = ((time_str[18] - '0') * 10 + (time_str[19] - '0')) * (15 * 60);
+
+    if (time_str[17] == '-') {
+        now = now + delta;
+    } else if (time_str[17] == '+') {
+        now = now - delta;
+    }
+
+    return now;
+}
+
+time_t GEMALTO_CINTERION::get_local_time()
+{
+    tr_info("GEMALTO_CINTERION::get_local_time\n");
+
+    _at.lock();
+
+    //"+CCLK: \"%y/%m/%d,%H:%M:%S"
+    _at.cmd_start_stop("+CCLK", "?");
+    _at.resp_start("+CCLK:");
+
+    char time_str[50];
+    time_t now;
+    while (_at.info_resp()) {
+        int date_len = _at.read_string(time_str, sizeof(time_str));
+        tr_debug("Read %d bytes for the date\n", date_len);
+        if (date_len > 0) {
+            now = parse_time(time_str);
+        }
+    }
+    _at.resp_stop();
+
+    _at.unlock();
+
+    return now;
+}
+
+void GEMALTO_CINTERION::set_time(time_t const epoch, int const timezone)
+{
+    char time_buf[21];
+    strftime(time_buf, sizeof(time_buf), "%g/%m/%d,%H:%M:%S", gmtime(&epoch));
+    snprintf(time_buf + 17, 4, "%+03d", timezone);
+
+    _at.lock();
+    _at.at_cmd_discard("+CCLK", "=", "%s", time_buf);
+    _at.unlock();
+}
+
+
 AT_CellularContext *GEMALTO_CINTERION::create_context_impl(ATHandler &at, const char *apn, bool cp_req, bool nonip_req)
 {
     return new GEMALTO_CINTERION_CellularContext(at, this, apn, cp_req, nonip_req);
@@ -43,6 +120,11 @@ AT_CellularInformation *GEMALTO_CINTERION::open_information_impl(ATHandler &at)
     return AT_CellularDevice::open_information_impl(at);
 }
 
+AT_CellularNetwork *GEMALTO_CINTERION::open_network_impl(ATHandler &at)
+{
+    return new GEMALTO_CINTERION_CellularNetwork(at, *this, _module);
+}
+
 nsapi_error_t GEMALTO_CINTERION::init()
 {
     nsapi_error_t err = AT_CellularDevice::init();
@@ -233,6 +315,26 @@ void GEMALTO_CINTERION::init_module_tx62()
     _module = ModuleTX62;
 }
 
+time_t GEMALTO_CINTERION::parse_time(char const *time_str) {
+    struct tm now;
+
+    now.tm_year = std::strtol(time_str, NULL, 10) + 100; // mktime starts from 1900
+    time_str += 3; // Skip '/'
+    now.tm_mon = std::strtol(time_str, NULL, 10);
+    time_str += 3; // Skip '/'
+    now.tm_mday = std::strtol(time_str, NULL, 10);
+    time_str += 3; // Skip ','
+    now.tm_hour = std::strtol(time_str, NULL, 10);
+    time_str += 3; // Skip ':'
+    now.tm_min = std::strtol(time_str, NULL, 10);
+    time_str += 3;
+    now.tm_sec = std::strtol(time_str, NULL, 10);
+
+    tr_debug("Year: %d, month: %d, day:%d, hour:%d, minute:%d, second:%d\n", now.tm_year, now.tm_mon, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec);
+
+    return mktime(&now);
+}
+
 #if MBED_CONF_GEMALTO_CINTERION_PROVIDE_DEFAULT
 #include "drivers/BufferedSerial.h"
 CellularDevice *CellularDevice::get_default_instance()

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION.h

@@ -48,9 +48,31 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
     };
     static Module get_module();
 
+    /**
+     * @brief Get the RTC time from the Cinterion, as a UNIX seconds timestamp in UTC
+     */
+    time_t get_time();
+
+    /**
+     * @brief Get the RTC time from the Cinterion, as a UNIX seconds timestamp in the local time zone
+     */
+    time_t get_local_time();
+
+    /**
+     * @brief Set the RTC time on the Cinterion.
+     *
+     * Note that any time set will be overwritten once the modem can get time from a cellular network
+     *
+     * @param timestamp UNIX timestamp to set, in the local time zone
+     * @param timezone Local time zone, as a signed number of 15-minute increments from UTC time. Example:
+     *       passing -8 would indicate UTC-2.
+     */
+    virtual void set_time(time_t timestamp, int const timezone = 0);
+
 protected: // AT_CellularDevice
     virtual AT_CellularContext *create_context_impl(ATHandler &at, const char *apn, bool cp_req = false, bool nonip_req = false);
     virtual AT_CellularInformation *open_information_impl(ATHandler &at);
+    AT_CellularNetwork *open_network_impl(ATHandler &at) override;
 
 protected:
     virtual nsapi_error_t init();
@@ -62,6 +84,9 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
     void init_module_ems31();
     void init_module_ehs5e();
     void init_module_tx62();
+
+    /// Convert time & date string returned by the modem into time_t
+    time_t parse_time(char const * time_str);
 };
 
 } // namespace mbed

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION_CellularContext.cpp

@@ -52,7 +52,7 @@ NetworkStack *GEMALTO_CINTERION_CellularContext::get_stack()
 nsapi_error_t GEMALTO_CINTERION_CellularContext::do_user_authentication()
 {
     // if user has defined user name and password we need to call CGAUTH before activating or modifying context
-    if (_pwd && _uname) {
+    if (_pwd && _uname && (strcmp(_pwd, "") != 0) && (strcmp(_uname, "") != 0)) {
         if (!get_device()->get_property(AT_CellularDevice::PROPERTY_AT_CGAUTH)) {
             return NSAPI_ERROR_UNSUPPORTED;
         }
@@ -63,6 +63,9 @@ nsapi_error_t GEMALTO_CINTERION_CellularContext::do_user_authentication()
             return NSAPI_ERROR_AUTH_FAILURE;
         }
     }
+    else {
+        tr_info("Empty pwd and username fields: no need for authentication\n");
+    }
 
     return NSAPI_ERROR_OK;
 }
@@ -96,4 +99,58 @@ void GEMALTO_CINTERION_CellularContext::enable_access_technology()
     }
 }
 
+bool GEMALTO_CINTERION_CellularContext::get_context()
+{
+    _at.cmd_start_stop("+CGDCONT", "?");
+    _at.resp_start("+CGDCONT:");
+    set_cid(-1);
+    int cid_max = 0; // needed when creating new context
+    char apn[MAX_ACCESSPOINT_NAME_LENGTH];
+    int apn_len = 0;
+
+    while (_at.info_resp()) {
+        int cid = _at.read_int();
+        if (cid > cid_max) {
+            cid_max = cid;
+        }
+        char pdp_type_from_context[10];
+        int pdp_type_len = _at.read_string(pdp_type_from_context, sizeof(pdp_type_from_context));
+        if (pdp_type_len > 0) {
+            apn_len = _at.read_string(apn, sizeof(apn));
+            if (apn_len > 0 && (strcmp(apn, _apn) == 0)) {
+                // APN matched -> Check PDP type
+                pdp_type_t pdp_type = string_to_pdp_type(pdp_type_from_context);
+                tr_debug("CID %d APN \"%s\" pdp_type %u", cid, apn, pdp_type);
+
+                // Accept exact matching PDP context type or dual PDP context for modems that support both IPv4 and IPv6 stacks
+                if (get_device()->get_property(pdp_type_t_to_cellular_property(pdp_type)) ||
+                        ((pdp_type == IPV4V6_PDP_TYPE && (get_device()->get_property(AT_CellularDevice::PROPERTY_IPV4_PDP_TYPE) &&
+                                                          get_device()->get_property(AT_CellularDevice::PROPERTY_IPV6_PDP_TYPE))) && !_nonip_req)) {
+                    _pdp_type = pdp_type;
+                    set_cid(cid);
+                }
+            }
+             else {
+                cid_max = 0;
+            }
+        }
+    }
+
+    _at.resp_stop();
+    if (_cid == -1) { // no suitable context was found so create a new one
+        if (!set_new_context(cid_max + 1)) {
+            return false;
+        }
+    }
+
+    // save the apn
+    if (apn_len > 0 && !_apn) {
+        memcpy(_found_apn, apn, apn_len + 1);
+    }
+
+    tr_info("Found PDP context %d", _cid);
+
+    return true;
+}
+
 } /* namespace mbed */

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION_CellularContext.h

@@ -32,6 +32,7 @@ class GEMALTO_CINTERION_CellularContext: public AT_CellularContext {
 #endif // NSAPI_PPP_AVAILABLE
     nsapi_error_t do_user_authentication() override;
     void enable_access_technology() override;
+    bool get_context() override;
 };
 
 } /* namespace mbed */

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION_CellularNetwork.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018, 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 GEMALTO_CINTERION_CELLULARNETWORK_H_
+#define GEMALTO_CINTERION_CELLULARNETWORK_H_
+
+#include "AT_CellularNetwork.h"
+#include "GEMALTO_CINTERION.h"
+
+namespace mbed {
+
+class GEMALTO_CINTERION_CellularNetwork: public AT_CellularNetwork {
+    const GEMALTO_CINTERION::Module _module;
+public:
+    GEMALTO_CINTERION_CellularNetwork(ATHandler &at, AT_CellularDevice &device, GEMALTO_CINTERION::Module module):
+    AT_CellularNetwork(at, device),
+    _module(module)
+    {}
+    
+    virtual nsapi_error_t set_attach()
+    {
+        if (_module == GEMALTO_CINTERION::ModuleTX62) {
+            return NSAPI_ERROR_OK;
+        }
+        return AT_CellularNetwork::set_attach();
+    }
+
+protected:
+};
+
+} /* namespace mbed */
+
+#endif // GEMALTO_CINTERION_CELLULARNETWORK_H_