Gecko SDK 4.0.1

Author: silabsbot

.properties

@@ -1,6 +1,6 @@
 id=com.silabs.sdk.stack.super
 
-version=4.0.0
+version=4.0.1
 
 label=Gecko SDK Suite
 description=Gecko SDK Suite

app/bluetooth/bluetooth_production_demos.xml

@@ -2,10 +2,8 @@
 id=com.silabs.stack.btMesh
 label=Bluetooth Mesh SDK
 description=Bluetooth Mesh Software Development Kit
-version=2.2.0.0
-dependantSdkVersion=3.3.0
-dependentBLESdkVersion=3.3.0
-prop.subLabel=Bluetooth\\ Mesh\\ 2.2.0
+version=2.2.1.0
+prop.subLabel=Bluetooth\\ Mesh\\ 2.2.1
 
 # Default compatibility of the BT Mesh SDK (This is needed for the documentation only)
 prop.boardCompatibility=.*

app/bluetooth/bluetooth_production_templates.xml

@@ -81,22 +81,22 @@
 
 // This macro calculates the number of precompile logging enable request in the
 // specific c file where the this header file is included from
-#define APP_BTMESH_UTIL_COMPONENT_LOGGING \
-  (CTL_CLIENT_LOGGING                     \
-   + CTL_SERVER_LOGGING                   \
-   + FRIEND_LOGGING                       \
-   + GENERIC_ONOFF_SERVER_LOGGING         \
-   + LC_SERVER_LOGGING                    \
-   + LIGHTING_CLIENT_LOGGING              \
-   + LIGHTING_SERVER_LOGGING              \
-   + LPN_LOGGING                          \
-   + PROVISIONING_DECORATOR_LOGGING       \
-   + SCENE_CLIENT_LOGGING                 \
-   + SCHEDULER_SERVER_LOGGING             \
-   + SENSOR_CLIENT_LOGGING                \
-   + SENSOR_SERVER_LOGGING                \
-   + TIME_SERVER_LOGGING                  \
-   + VENDOR_LOOPBACK_LOGGING)
+#define APP_BTMESH_UTIL_COMPONENT_LOGGING             \
+  (SL_BTMESH_CTL_CLIENT_LOGGING_CFG_VAL               \
+   + SL_BTMESH_CTL_SERVER_LOGGING_CFG_VAL             \
+   + SL_BTMESH_FRIEND_LOGGING_CFG_VAL                 \
+   + SL_BTMESH_GENERIC_ONOFF_SERVER_LOGGING_CFG_VAL   \
+   + SL_BTMESH_LC_SERVER_LOGGING_CFG_VAL              \
+   + SL_BTMESH_LIGHTING_CLIENT_LOGGING_CFG_VAL        \
+   + SL_BTMESH_LIGHTING_SERVER_LOGGING_CFG_VAL        \
+   + SL_BTMESH_LPN_LOGGING_CFG_VAL                    \
+   + SL_BTMESH_PROVISIONING_DECORATOR_LOGGING_CFG_VAL \
+   + SL_BTMESH_SCENE_CLIENT_LOGGING_CFG_VAL           \
+   + SL_BTMESH_SCHEDULER_SERVER_LOGGING_CFG_VAL       \
+   + SL_BTMESH_SENSOR_CLIENT_LOGGING_CFG_VAL          \
+   + SL_BTMESH_SENSOR_SERVER_LOGGING_CFG_VAL          \
+   + SL_BTMESH_TIME_SERVER_LOGGING_CFG_VAL            \
+   + SL_BTMESH_VENDOR_LOOPBACK_LOGGING_CFG_VAL)
 // Component A shall not include the config file of another component B because
 // <COMPONENT_B>_LOGGING macro of component B could turn on the logging in the
 // component A unnecessarily. This is important in case of components with log.

app/bluetooth/btmesh.properties

@@ -34,37 +34,37 @@
 
 // <h> CTL Client configuration
 
-// <o CTL_CLIENT_RETRANSMISSION_COUNT> CTL model retransmission count
+// <o SL_BTMESH_CTL_CLIENT_RETRANSMISSION_COUNT_CFG_VAL> CTL model retransmission count
 // <i> Default: 3
 // <i> CTL model retransmission count (How many times CTL model messages are to be sent out for reliability).
-#define CTL_CLIENT_RETRANSMISSION_COUNT   (3)
+#define SL_BTMESH_CTL_CLIENT_RETRANSMISSION_COUNT_CFG_VAL   (3)
 
-// <o CTL_CLIENT_RETRANSMISSION_TIMEOUT> CTL model retransmission timeout [ms] <0-1275:5>
+// <o SL_BTMESH_CTL_CLIENT_RETRANSMISSION_TIMEOUT_CFG_VAL> CTL model retransmission timeout [ms] <0-1275:5>
 // <i> Default: 50
 // <i> CTL model retransmission timeout.
-#define CTL_CLIENT_RETRANSMISSION_TIMEOUT   (50)
+#define SL_BTMESH_CTL_CLIENT_RETRANSMISSION_TIMEOUT_CFG_VAL   (50)
 
-// <q CTL_CLIENT_TEMPERATURE_WRAP_ENABLED> Enable color temperature wraparound
+// <q SL_BTMESH_CTL_CLIENT_TEMPERATURE_WRAP_ENABLED_CFG_VAL> Enable color temperature wraparound
 // <i> Default: 0
 // <i> If the color temperature reaches the max or min value then it wraps around.
-#define CTL_CLIENT_TEMPERATURE_WRAP_ENABLED   (0)
+#define SL_BTMESH_CTL_CLIENT_TEMPERATURE_WRAP_ENABLED_CFG_VAL   (0)
 
-// <e CTL_CLIENT_LOGGING> Enable Logging
+// <e SL_BTMESH_CTL_CLIENT_LOGGING_CFG_VAL> Enable Logging
 // <i> Default: 1
 // <i> Enable / disable Logging for CTL Client model specific messages for this component.
-#define CTL_CLIENT_LOGGING   (1)
+#define SL_BTMESH_CTL_CLIENT_LOGGING_CFG_VAL   (1)
 
-// <s.128 CTL_CLIENT_LOGGING_NEW_TEMP_SET> Log text when new color temperature has been set.
+// <s.128 SL_BTMESH_CTL_CLIENT_LOGGING_NEW_TEMP_SET_CFG_VAL> Log text when new color temperature has been set.
 // <i> Set Log text when new color temperature has been set
-#define CTL_CLIENT_LOGGING_NEW_TEMP_SET "Set temperature to %u %% / level %u K\r\n"
+#define SL_BTMESH_CTL_CLIENT_LOGGING_NEW_TEMP_SET_CFG_VAL "Set temperature to %u %% / level %u K\r\n"
 
-// <s.128 CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL> Log text when sending a CTL message fails.
+// <s.128 SL_BTMESH_CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL_CFG_VAL> Log text when sending a CTL message fails.
 // <i> Set Log text in case sending a CTL message fails
-#define CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL "CTL Client Publish failed\r\n"
+#define SL_BTMESH_CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL_CFG_VAL "CTL Client Publish failed\r\n"
 
-// <s.128 CTL_CLIENT_LOGGING_RECALL_SUCCESS> Log text when recalling a scene recall is successful.
+// <s.128 SL_BTMESH_CTL_CLIENT_LOGGING_RECALL_SUCCESS_CFG_VAL> Log text when recalling a scene recall is successful.
 // <i> Set Log text a scene recall is successful.
-#define CTL_CLIENT_LOGGING_RECALL_SUCCESS "CTL request sent, trid = %u, delay = %u\r\n"
+#define SL_BTMESH_CTL_CLIENT_LOGGING_RECALL_SUCCESS_CFG_VAL "CTL request sent, trid = %u, delay = %u\r\n"
 
 // </e>
 

app/bluetooth/btmesh_internal_demos.xml

@@ -148,9 +148,9 @@ static void send_ctl_request(uint8_t retrans)
                                        );
 
   if (sc == SL_STATUS_OK) {
-    log_info(CTL_CLIENT_LOGGING_RECALL_SUCCESS, ctl_trid, delay);
+    log_info(SL_BTMESH_CTL_CLIENT_LOGGING_RECALL_SUCCESS_CFG_VAL, ctl_trid, delay);
   } else {
-    log_btmesh_status_f(sc, CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL);
+    log_btmesh_status_f(sc, SL_BTMESH_CTL_CLIENT_LOGGING_CLIENT_PUBLISH_FAIL_CFG_VAL);
   }
 
   // Keep track of how many requests has been sent
@@ -172,15 +172,15 @@ void sl_btmesh_change_temperature(int8_t change_percentage)
   if (change_percentage > 0) {
     temperature_percent += change_percentage;
     if (temperature_percent > TEMPERATURE_PCT_MAX) {
-#if (CTL_CLIENT_TEMPERATURE_WRAP_ENABLED != 0)
+#if (SL_BTMESH_CTL_CLIENT_TEMPERATURE_WRAP_ENABLED_CFG_VAL != 0)
       temperature_percent = 0;
 #else
       temperature_percent = TEMPERATURE_PCT_MAX;
 #endif
     }
   } else {
     if (temperature_percent < (-change_percentage)) {
-#if (CTL_CLIENT_TEMPERATURE_WRAP_ENABLED != 0)
+#if (SL_BTMESH_CTL_CLIENT_TEMPERATURE_WRAP_ENABLED_CFG_VAL != 0)
       temperature_percent = TEMPERATURE_PCT_MAX;
 #else
       temperature_percent = 0;
@@ -217,20 +217,20 @@ void sl_btmesh_set_temperature(uint8_t new_color_temperature_percentage)
                          / TEMPERATURE_PCT_MAX)                    \
                       * (TEMPERATURE_MAX - TEMPERATURE_MIN)        \
                       / TEMPERATURE_SCALE_FACTOR;
-  log(CTL_CLIENT_LOGGING_NEW_TEMP_SET,
+  log(SL_BTMESH_CTL_CLIENT_LOGGING_NEW_TEMP_SET_CFG_VAL,
       temperature_percent * temperature_percent / TEMPERATURE_PCT_MAX,
       temperature_level);
 
   // Request is sent multiple times to improve reliability
-  ctl_request_count = CTL_CLIENT_RETRANSMISSION_COUNT;
+  ctl_request_count = SL_BTMESH_CTL_CLIENT_RETRANSMISSION_COUNT_CFG_VAL;
 
   send_ctl_request(0);  //Send the first request
 
   // If there are more requests to send, start a repeating soft timer
   // to trigger retransmission of the request after 50 ms delay
   if (ctl_request_count > 0) {
     sl_status_t sc = sl_simple_timer_start(&ctl_retransmission_timer,
-                                           CTL_CLIENT_RETRANSMISSION_TIMEOUT,
+                                           SL_BTMESH_CTL_CLIENT_RETRANSMISSION_TIMEOUT_CFG_VAL,
                                            ctl_retransmission_timer_cb,
                                            NO_CALLBACK_DATA,
                                            true);