Anjay-zephyr 3.5.0

Features
- (commercial feature only) Added support for enabling/disabling bootstrapping from a SIM card in runtime
- Added support for T-Mobile DevEdge IoT Developer Kit

Improvements
- Disabled nRF GNSS priority mode before disconnecting
- Added proper support for realtime clock on devices that use the POSIX clock API for that
- Reversed dependency between ``ANJAY_ZEPHYR_GPS`` and ``ANJAY_ZEPHYR_GPS_{platform}`` Kconfig options for easier configuration; NOTE: this is a breaking change that may require updating your project configuration files
- Reduced number of logs produced when NTP server can't be reached
- Changed the default value of `ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_PERMITTED` Kconfig option to `n`
- Unified persistence saving and loading order
- Added a separate workqueue to perform library-related works

Bugfixes
- Fixed reboot-related bug that occurred when stopping Anjay while processing the A-GPS request
- Fixed invalid memory access when logging errors related to A-GPS requests
- Retained location services result codes between objects creation/deletion
- (commercial feature only) Fixed compatibility of the Core Persistence feature with the Zephyr TLS socket backend
- (commercial feature only) Made sure that Core Persistence data is removed after each attempted use, to prevent old data from being used

Author: Kucmasz

CHANGELOG.md

@@ -1,16 +1,38 @@
 # Changelog
 
+## 3.5.0 (September 7th, 2023)
+
+### Features
+- (commercial feature only) Added support for enabling/disabling bootstrapping from a SIM card in runtime
+- Added support for T-Mobile DevEdge IoT Developer Kit
+
+### Improvements
+- Disabled nRF GNSS priority mode before disconnecting
+- Added proper support for realtime clock on devices that use the POSIX clock API for that
+- Reversed dependency between ``ANJAY_ZEPHYR_GPS`` and ``ANJAY_ZEPHYR_GPS_{platform}`` Kconfig options for easier configuration; NOTE: this is a breaking change that may require updating your project configuration files
+- Reduced number of logs produced when NTP server can't be reached
+- Changed the default value of `ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_PERMITTED` Kconfig option to `n`
+- Unified persistence saving and loading order
+- Added a separate workqueue to perform library-related works
+
+### Bugfixes
+- Fixed reboot-related bug that occurred when stopping Anjay while processing the A-GPS request
+- Fixed invalid memory access when logging errors related to A-GPS requests
+- Retained location services result codes between objects creation/deletion
+- (commercial feature only) Fixed compatibility of the Core Persistence feature with the Zephyr TLS socket backend
+- (commercial feature only) Made sure that Core Persistence data is removed after each attempted use, to prevent old data from being used
+
 ## 3.4.1 (June 23rd, 2023)
 
 ### Features
 - (commercial feature only) Added support for bootstrapping from SIM card on
   nRF9160-based devices
-- Added support for nRF700x Wi-FI IC
+- Added support for nRF700x Wi-Fi IC
 - Added Light Control object for LED handling
 - Added persistence of attribute storage
 - Added support for FOTA of application and modem firmware for nRF9160 using
   experimental Advanced Firmware Update object (/33629)
-- (commercial feature only) Added support for Core Peristence
+- (commercial feature only) Added support for Core Persistence
 
 ### Improvements
 - Updated Anjay to version 3.4.1

CMakeLists.txt

@@ -68,6 +68,11 @@ if(CONFIG_ANJAY)
                  src/gps_impl/gps_nrf.c)
         endif()
 
+        if(CONFIG_ANJAY_ZEPHYR_GPS_CXD5605)
+            list(APPEND CLIENT_SOURCES
+                 src/gps_impl/gps_cxd5605.c)
+        endif()
+
         if(CONFIG_ANJAY_ZEPHYR_NRF_LC_INFO)
             list(APPEND CLIENT_SOURCES
                  src/nrf_lc_info.c
@@ -111,6 +116,10 @@ if(CONFIG_ANJAY)
         elseif(CONFIG_NET_L2_OPENTHREAD)
             list(APPEND CLIENT_SOURCES
                  src/network/network_openthread.c)
+        elseif(CONFIG_MODEM_MURATA_1SC OR CONFIG_WIFI_RS9116W)
+            list(APPEND CLIENT_SOURCES
+                 src/network/network_devedge.c
+                 src/network/network_devedge.h)
         elseif(CONFIG_WIFI_ESP32)
             list(APPEND CLIENT_SOURCES
                  src/network/network_esp32.c)

Kconfig.anjay_zephyr

@@ -24,7 +24,7 @@ config ANJAY_ZEPHYR_MODEL_NUMBER
 
 config ANJAY_ZEPHYR_VERSION
 	string "Client Version"
-	default "3.4.1"
+	default "3.5.0"
 
 config ANJAY_ZEPHYR_AUTOGENERATE_ENDPOINT_NAME
 	bool "Autogenerate endpoint name"
@@ -104,7 +104,7 @@ menu "Client default options"
 
 	config ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_PERMITTED
 		bool "Default allow temporary activation of the GPS priority mode"
-		default y
+		default n
 		depends on ANJAY_ZEPHYR_GPS_NRF
 		help
 			This is a default value, it will be used if there are no saved settings from a previously
@@ -180,10 +180,28 @@ config ANJAY_ZEPHYR_SHELL
 	select SHELL
 
 config ANJAY_ZEPHYR_GPS
-	def_bool ANJAY_ZEPHYR_GPS_NRF
+	bool "Enable GPS"
+	default n
+	depends on BOARD_THINGY91_NRF9160_NS || BOARD_NRF9160DK_NRF9160_NS || BOARD_TMO_DEV_EDGE
+	select AT_CMD if BOARD_THINGY91_NRF9160_NS || BOARD_NRF9160DK_NRF9160_NS
+	help
+		Enable GPS implementation.
+
+		On nRF9160-based platforms, please note that the system is not able to acquire
+		the cold GPS fix if the chip is interrupted by any LTE activity. The application
+		might temporarily enable GPS priority mode, which shuts down LTE completely and
+		attempts to acquire the fix. This behavior is controlled by
+		ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_PERMITTED and
+		ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_COOLDOWN config options.
+
+config ANJAY_ZEPHYR_GPS_NRF
+	def_bool ANJAY_ZEPHYR_GPS && (BOARD_THINGY91_NRF9160_NS || BOARD_NRF9160DK_NRF9160_NS)
+
+config ANJAY_ZEPHYR_GPS_CXD5605
+	def_bool ANJAY_ZEPHYR_GPS && BOARD_TMO_DEV_EDGE
 
 config ANJAY_ZEPHYR_GPS_ALTITUDE
-	def_bool ANJAY_ZEPHYR_GPS_NRF
+	def_bool ANJAY_ZEPHYR_GPS_NRF || ANJAY_ZEPHYR_GPS_CXD5605
 
 config ANJAY_ZEPHYR_GPS_RADIUS
 	def_bool ANJAY_ZEPHYR_GPS_NRF
@@ -192,7 +210,7 @@ config ANJAY_ZEPHYR_GPS_VELOCITY
 	def_bool n
 
 config ANJAY_ZEPHYR_GPS_SPEED
-	def_bool ANJAY_ZEPHYR_GPS_NRF
+	def_bool ANJAY_ZEPHYR_GPS_NRF || ANJAY_ZEPHYR_GPS_CXD5605
 
 config ANJAY_ZEPHYR_LOCATION_SERVICES
 	def_bool ANJAY_ZEPHYR_LOCATION_SERVICES_ASSISTANCE || ANJAY_ZEPHYR_LOCATION_SERVICES_GROUND_FIX_LOCATION
@@ -210,20 +228,8 @@ config ANJAY_ZEPHYR_LOCATION_SERVICES_SERVER_SSID
 	help
 		SSID of the server to which requests related to location services will be sent.
 
-menuconfig ANJAY_ZEPHYR_GPS_NRF
-	bool "Enable GPS on nRF9160-based devices"
-	default n
-	depends on BOARD_THINGY91_NRF9160_NS || BOARD_NRF9160DK_NRF9160_NS
-	select AT_CMD
-	help
-		Enable GPS on nRF9160-based devices and Location Object implementation.
-
-		Please note, that nRF9160 is not able to acquire the cold GPS fix if
-		the chip is interrupted by any LTE activity. The application might
-		temporarily enable GPS priority mode, which shuts down LTE completely and
-		attempts to acquire the fix. This behavior is controlled by
-		ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_PERMITTED and
-		ANJAY_ZEPHYR_GPS_NRF_PRIO_MODE_COOLDOWN config options.
+menu "GPS on nRF9160-based devices"
+	visible if ANJAY_ZEPHYR_GPS_NRF
 
 	config ANJAY_ZEPHYR_GPS_NRF_EXTERNAL_ANTENNA
 		bool "Use external GPS antenna"
@@ -248,6 +254,8 @@ menuconfig ANJAY_ZEPHYR_GPS_NRF
 			Minimum elevation angle for visible satellites. Only used for A-GPS.
 			-1 indicates that angle is disabled and filtering shouldn't be used.
 
+endmenu
+
 config ANJAY_ZEPHYR_LOCATION_SERVICES_GROUND_FIX_LOCATION
 	bool "Enable ground fix location requests"
 	depends on ANJAY_ZEPHYR_NRF_LC_INFO
@@ -276,7 +284,7 @@ config ANJAY_ZEPHYR_NETWORK_KEEPALIVE_RATE
 	int "Rate of checking whether the network connection is still alive [seconds]"
 	default 60
 	range 1 2147483647
-	depends on WIFI_ESWIFI
+	depends on WIFI_ESWIFI || WIFI_RS9116W
 
 choice ANJAY_ZEPHYR_OTA
 	prompt "Enable Firmware Update Over-the-Air"
@@ -374,4 +382,18 @@ config ANJAY_ZEPHYR_NRF_MODEM_PSK_QUERY
 	depends on NRF_MODEM_LIB && MODEM_KEY_MGMT
 	default "1"
 
+config ANJAY_ZEPHYR_WORKQUEUE_ENABLE
+	bool "Enable Anjay Zephyr workqueue and use it for all works defined in this module"
+	default BOARD_THINGY91_NRF9160_NS || BOARD_NRF9160DK_NRF9160_NS
+
+config ANJAY_ZEPHYR_WORKQUEUE_STACK_SIZE
+	int "Anjay Zephyr workqueue stack size"
+	default 2048
+	depends on ANJAY_ZEPHYR_WORKQUEUE_ENABLE
+
+config ANJAY_ZEPHYR_WORKQUEUE_PRIORITY
+	int "Anjay Zephyr workqueue priority"
+	default 0
+	depends on ANJAY_ZEPHYR_WORKQUEUE_ENABLE
+
 endmenu

compat/time_compat.c

@@ -17,6 +17,10 @@
 #include <avsystem/commons/avs_time.h>
 #include <zephyr/kernel.h>
 
+#ifdef CONFIG_POSIX_CLOCK
+#    include <zephyr/posix/time.h>
+#endif // CONFIG_POSIX_CLOCK
+
 #ifdef CONFIG_DATE_TIME
 #    include <date_time.h>
 #endif // CONFIG_DATE_TIME
@@ -26,11 +30,20 @@ avs_time_monotonic_t avs_time_monotonic_now(void) {
 }
 
 avs_time_real_t avs_time_real_now(void) {
-#ifdef CONFIG_DATE_TIME
+#if defined(CONFIG_DATE_TIME)
     int64_t time_ms;
     if (!date_time_now(&time_ms)) {
         return avs_time_real_from_scalar(time_ms, AVS_TIME_MS);
     }
-#endif // CONFIG_DATE_TIME
+#elif defined(CONFIG_POSIX_CLOCK)
+    struct timespec system_value;
+    avs_time_real_t result;
+    clock_gettime(CLOCK_REALTIME, &system_value);
+    result.since_real_epoch.seconds = system_value.tv_sec;
+    result.since_real_epoch.nanoseconds = (int32_t) system_value.tv_nsec;
+    return result;
+#endif // defined(CONFIG_DATE_TIME) || defined(CONFIG_POSIX_CLOCK)
+#if defined(CONFIG_DATE_TIME) || !defined(CONFIG_POSIX_CLOCK)
     return avs_time_real_from_scalar(k_uptime_get(), AVS_TIME_MS);
+#endif // defined(CONFIG_DATE_TIME) || !defined(CONFIG_POSIX_CLOCK)
 }

config/anjay/anjay_config.h

@@ -297,8 +297,9 @@
  * (<c>anjay_new_from_core_persistence()</c> and
  * <c>anjay_delete_with_core_persistence()</c> APIs).
  *
- * Requires <c>ANJAY_WITH_OBSERVE</c> to be enabled, and
- * <c>AVS_COMMONS_WITH_AVS_PERSISTENCE</c> to be enabled in avs_commons
+ * Requires <c>ANJAY_WITH_OBSERVE</c> to be enabled,
+ * <c>AVS_COMMONS_WITH_AVS_PERSISTENCE</c> to be enabled in avs_commons, and
+ * <c>WITH_AVS_COAP_OBSERVE_PERSISTENCE</c> to be enabled in avs_coap
  * configuration.
  *
  * IMPORTANT: Only available as a commercial feature. Ignored in the open

deps/anjay

@@ -16,6 +16,11 @@
 
 #pragma once
 
+#if (!!defined(CONFIG_MODEM_MURATA_1SC) + !!defined(CONFIG_WIFI_RS9116W)) > 1
+#    define ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+#endif // (!!defined(CONFIG_MODEM_MURATA_1SC) +
+       // !!defined(CONFIG_WIFI_RS9116W)) > 1
+
 enum anjay_zephyr_network_bearer_t {
 #ifdef CONFIG_WIFI
     ANJAY_ZEPHYR_NETWORK_BEARER_WIFI,
@@ -28,3 +33,10 @@ enum anjay_zephyr_network_bearer_t {
 #endif // CONFIG_NET_L2_OPENTHREAD
     ANJAY_ZEPHYR_NETWORK_BEARER_LIMIT
 };
+
+#ifdef ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+struct anjay_zephyr_network_preferred_bearer_list_t {
+    enum anjay_zephyr_network_bearer_t
+            bearers[ANJAY_ZEPHYR_NETWORK_BEARER_LIMIT];
+};
+#endif // ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS

include_public/anjay_zephyr/bearer_list.h

@@ -39,6 +39,10 @@
 #    include <zephyr/net/wifi_mgmt.h>
 #endif // CONFIG_WIFI
 
+#ifdef ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+#    include "bearer_list.h"
+#endif // ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+
 /**
  * Returns the default endpoint name.
  *
@@ -69,6 +73,16 @@ int anjay_zephyr_config_get_wifi_ssid(char *buf, size_t buf_capacity);
 int anjay_zephyr_config_get_wifi_password(char *buf, size_t buf_capacity);
 #endif // CONFIG_WIFI
 
+#ifdef ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+/**
+ * Get preferred network bearer stored in the settings.
+ *
+ * @return              Preferred network bearer.
+ */
+struct anjay_zephyr_network_preferred_bearer_list_t
+anjay_zephyr_config_get_preferred_bearers(void);
+#endif // ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+
 #ifndef CONFIG_ANJAY_ZEPHYR_FACTORY_PROVISIONING
 /**
  * Get the LwM2M client endpoint name stored in the settings.

include_public/anjay_zephyr/config.h

@@ -54,7 +54,11 @@ typedef enum {
      * permanent failure. It means that further location services requests will
      * not be processed before device reboot.
      */
-    ANJAY_ZEPHYR_LOCATION_SERVICES_PERMANENT_FAILURE
+    ANJAY_ZEPHYR_LOCATION_SERVICES_PERMANENT_FAILURE,
+    /**
+     * Anjay was stopped during the request.
+     */
+    ANJAY_ZEPHYR_LOCATION_SERVICES_ANJAY_STOPPED
 } anjay_zephyr_location_services_request_result_t;
 
 /**

include_public/anjay_zephyr/location_services.h

@@ -103,6 +103,29 @@ cmd_anjay_private_key(const struct shell *shell, size_t argc, char **argv) {
 }
 #    endif // CONFIG_ANJAY_ZEPHYR_RUNTIME_CERT_CONFIG
 
+#    ifdef ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+static int cmd_anjay_config_set_preferred_bearer(const struct shell *shell,
+                                                 size_t argc,
+                                                 char **argv) {
+    // We allow setting preferred bearer even when Anjay is running
+    int result = _anjay_zephyr_config_set_option(shell, argc, argv);
+
+    if (result) {
+        return result;
+    }
+
+    struct anjay_zephyr_network_preferred_bearer_list_t bearers =
+            anjay_zephyr_config_get_preferred_bearers();
+
+    if (_anjay_zephyr_network_set_preferred_bearer_list(&bearers)) {
+        shell_print(shell,
+                    "Could not change the currently used network bearer");
+    }
+
+    return 0;
+}
+#    endif // ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+
 static int
 cmd_anjay_config_default(const struct shell *shell, size_t argc, char **argv) {
     ARG_UNUSED(argc);
@@ -279,6 +302,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
                   "Wi-Fi password (empty for no-sec)",
                   cmd_anjay_config_set),
 #    endif // CONFIG_WIFI
+#    ifdef ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
+        SHELL_CMD(OPTION_KEY_PREFERRED_BEARER,
+                  NULL,
+                  "Preferred network bearer",
+                  cmd_anjay_config_set_preferred_bearer),
+#    endif // ANJAY_ZEPHYR_DEVEDGE_MULTIPLE_BEARERS
 #    ifndef CONFIG_ANJAY_ZEPHYR_FACTORY_PROVISIONING
         SHELL_CMD(OPTION_KEY_URI, NULL, "Server URI", cmd_anjay_config_set),
         SHELL_CMD(OPTION_KEY_LIFETIME,