Update SDK

api/wms_advertiser.h

@@ -141,13 +141,9 @@ typedef void (*app_lib_advertiser_ackdatacb_f)
  *          APP_RES_INVALID_CONFIGURATION if device is not configured as
  *          @ref APP_LIB_SETTINGS_ROLE_ADVERTISER
  *
- * Operation @ref app_lib_data_set_max_msg_queuing_time_f
- * "lib_data->setMaxMsgQueuingTime()" only allows setting the TTL value
- * in second precision. In CSMA-CA networks, the granularity of that service is
- * not enough. By using this service, advertiser can set the higher-precision
+ * By using this service, advertiser can set the higher-precision
  * TTL and when advertiser sends data to CSMA-CA device, this TTL is also
- * checked (in addition to normal, second-granularity TTL set by @ref
- * app_lib_data_set_max_msg_queuing_time_f "lib_data->setMaxMsgQueuingTime()").
+ * checked.
  * For time-slotted mode networks, this value has no impact due to nature of the
  * time-slotted mode transmission. Neither this service has impact if device is
  * not advertiser.

api/wms_data.h

@@ -29,7 +29,7 @@
 #define APP_LIB_DATA_NAME 0x0003f161 //!< "DATA"
 
 /** \brief Maximum supported library version */
-#define APP_LIB_DATA_VERSION    0x20B
+#define APP_LIB_DATA_VERSION    0x20D
 
 /**
  * @brief Type of tracking ID for data packets
@@ -336,10 +336,6 @@ typedef struct
     size_t num_bytes;
     /** Destination address of packet */
     app_addr_t dest_address;
-    /** Initial end-to-end transmission delay, in 1 / 128 seconds. This could
-     *  be used, for example, to represent actual measurement time if done
-     *  earlier but generated for transmission on later time moment. */
-    uint32_t delay;
     /**
      * Packet tracking ID
      */
@@ -691,56 +687,6 @@ typedef size_t
     (*app_lib_data_get_app_config_num_bytes_f)(void);
 
 
-/**
- * \brief   Set maximum queuing time for messages
- * \param   priority
- *          Message priority which queuing time to be set
- * \param   time
- *          Queuing time in seconds. Accepted range: 2 - 65534s.
- *          Select queuing time carefully, too short value might cause
- *          unnecessary message drops and too big value filling up message
- *          queues. For consistent performance it is recommended to use the
- *          same queuing time in the whole network.
- *
- * \note    Minimum queuing time shall be bigger than access cycle
- *          interval in time-slotted mode networks. It is recommended to use
- *          multiples of access cycle interval (+ extra) to give time for
- *          message repetitions, higher priority messages taking over the access
- *          slot etc. Access cycle is not limiting the minimum value in
- *          CSMA-CA networks.
- * \return  Result code, @ref APP_RES_OK if successful
- *          @ref APP_RES_INVALID_VALUE if unsupported message priority or time
- *
- * Example:
- * @code
- * // Set queueing time for low priority to 5 seconds
- * lib_data->setMaxMsgQueuingTime(APP_LIB_DATA_QOS_NORMAL, 5);
- * @endcode
- */
-typedef app_res_e
-    (*app_lib_data_set_max_msg_queuing_time_f)(app_lib_data_qos_e priority,
-                                               uint16_t time);
-
-/**
- * \brief   Get maximum queuing time of messages
- * \param   priority
- *          Message priority which queuing time to be read
- * \param   time_p
- *          Pointer where to store maximum queuing time
- * \return  Result code, @ref APP_RES_OK if ok,
- *          @ref APP_RES_INVALID_VALUE if unsupported message priority,
- *          @ref APP_RES_INVALID_NULL_POINTER if @p time_p is null
- *
- * Example:
- * @code
- * uint16_t qos_normal_qt;
- * lib_data->getMaxMsgQueuingTime(APP_LIB_DATA_QOS_NORMAL, &qos_normal_qt);
- * @endcode
- */
-typedef app_res_e
-    (*app_lib_data_get_max_msg_queuing_time_f)(app_lib_data_qos_e priority,
-                                               uint16_t * time_p);
-
 /**
  * \brief   Write @ref appconfig "app config DATA"
  * \param   bytes
@@ -858,8 +804,6 @@ typedef struct
     app_lib_data_allow_reception_f allowReception;
     app_lib_data_read_app_config_f readAppConfig;
     app_lib_data_get_app_config_num_bytes_f getAppConfigNumBytes;
-    app_lib_data_set_max_msg_queuing_time_f  setMaxMsgQueuingTime;
-    app_lib_data_get_max_msg_queuing_time_f  getMaxMsgQueuingTime;
     app_lib_data_write_app_config_data_f writeAppConfigData;
     app_lib_data_write_diagnostic_interval_f writeDiagnosticInterval;
     app_lib_data_set_local_mc_f setLocalMulticastInfo;

api/wms_otap.h

@@ -30,7 +30,7 @@
 #define APP_LIB_OTAP_NAME 0x000f2338 //!< "OTAP"
 
 /** @brief Maximum supported library version */
-#define APP_LIB_OTAP_VERSION 0x201
+#define APP_LIB_OTAP_VERSION 0x202
 
 /**
  * @brief Different scratchpad type
@@ -109,9 +109,6 @@ typedef enum
      *  the given delay. Delay starts when node receive the information and the
      *  scratchpad is valid. */
     APP_LIB_OTAP_ACTION_PROPAGATE_AND_PROCESS_WITH_DELAY = 3,
-    /** Exchange and processing of scratchpad is managed the old way
-     *  (sequence comparison). */
-    APP_LIB_OTAP_ACTION_LEGACY = 4,
 } app_lib_otap_action_e;
 
 /**

api/wms_radio_config.h

@@ -32,6 +32,19 @@
 /** @brief Maximum amount of configurable power levels */
 #define APP_LIB_RADIO_CFG_POWER_MAX_CNT     10
 
+/** @brief Minimum configured radio current (10 x mA) */
+#define APP_LIB_RADIO_CFG_CURRENT_MIN       1
+
+/**
+ * @brief Maximum configured radio current (10 x mA) 
+ *
+ * FCC allow maximum power for 2.4GHz to be roughly 600mA, so to be sure that
+ * we don't block the users from doing what they want, but also have some
+ * reasonable limit to root out obviously invalid values, we set the upper
+ * limit for current to be 10A.
+ */
+#define APP_LIB_RADIO_CFG_CURRENT_MAX       1000
+
 /**
  * @brief  FEM control command from firmware to application
  *
@@ -186,7 +199,7 @@ typedef struct
     /** RX state current, unit [mA x 10] */
     uint16_t                        rx_current;
     /** RX LNA gain or 0 [dB] */
-    int8_t                          rx_gain_dbm;
+    int8_t                          rx_gain_db;
     /** Amount of power levels configured */
     uint8_t                         power_count;
     /** TX power level configuration / table.

api/wms_settings.h

@@ -53,12 +53,16 @@
 typedef uint32_t app_lib_settings_net_addr_t;
 
 /**
- * @brief Network channel type definition.
- *
- * All nodes on the network must have the same network channel.
+ * @brief Channel type definition.
  */
 typedef uint8_t app_lib_settings_net_channel_t;
 
+/**
+ * @brief   Reserved value for definition of 'no channel' for @ref
+ *          app_lib_settings_net_channel_t
+ */
+#define CHANNEL_NO_CHANNEL  0
+
 typedef enum {
     /** Sink in Low Energy mode */
     APP_LIB_SETTINGS_ROLE_SINK_LE = 0x00,
@@ -541,10 +545,10 @@ typedef app_res_e
                                                      uint16_t * max_value_p);
 
 /**
- * @brief   Get access cycle range
+ * @brief   Get access cycle range limits
  *
- * Return the minimum and maximum access cycle value, in milliseconds, that can
- * be used when setting the access cycle range with the @ref
+ * Return the minimum and maximum for valid access cycle range, in milliseconds,
+ * that can be used when setting the access cycle range with the @ref
  * app_lib_settings_set_ac_range_f "lib_settings->setAcRange"() function.
  *
  * @param   min_value_p

api/wms_state.h

@@ -27,7 +27,7 @@
 #define APP_LIB_STATE_NAME 0x02f9c165 //!< "STATE"
 
 /** @brief Maximum supported library version */
-#define APP_LIB_STATE_VERSION 0x20D
+#define APP_LIB_STATE_VERSION 0x20E
 
 /**
  * @brief   Macro for cost indicating "no route". Used in @ref
@@ -125,7 +125,7 @@ typedef struct
      * is unknown for this neighbor. */
     uint8_t cost;
     /** Radio channel used by the neighbor  */
-    uint8_t channel;
+    app_lib_settings_net_channel_t channel;
     /** Type of the neighbor. @ref app_lib_state_nbor_type_e  */
     uint8_t type;
     /**
@@ -605,6 +605,13 @@ typedef app_res_e (*app_lib_state_scan_stop_f)(void);
 typedef app_res_e (*app_lib_state_get_install_quality_f)
     (app_lib_state_install_quality_t * qual_out);
 
+/**
+ * @brief   Query cluster channel (i.e. operating channel) currently in use
+ * @return  Cluster channel in use
+ */
+typedef app_lib_settings_net_channel_t (*app_lib_state_get_cluster_channel_t)
+    (void);
+
 /**
  * @brief   List of library functions
  */
@@ -623,6 +630,7 @@ typedef struct
     app_lib_state_scan_stop_f                       stopScanNbors;
     app_lib_state_get_install_quality_f             getInstallQual;
     app_lib_state_set_stack_event_cb_f              setOnStackEventCb;
+    app_lib_state_get_cluster_channel_t             getClusterChannel;
 } app_lib_state_t;
 
 #endif /* APP_LIB_STATE_H_ */