Release ver_1.1.1

Author: Unify Automated

.gitattributes

@@ -1,6 +1,6 @@
-"zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
-"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text
-"zap-2022.1.10.dmg" filter=lfs diff=lfs merge=lfs -text
-"zap_apack_linux.zip" filter=lfs diff=lfs merge=lfs -text
 "slc_cli_linux.zip" filter=lfs diff=lfs merge=lfs -text
+"zap_apack_linux.zip" filter=lfs diff=lfs merge=lfs -text
 "zap_2022.1.10_amd64.deb" filter=lfs diff=lfs merge=lfs -text
+"zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
+"zap-2022.1.10.dmg" filter=lfs diff=lfs merge=lfs -text
+"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text

CMakeLists.txt

@@ -29,6 +29,15 @@ include(cmake/include/package.cmake)
 include(cmake/include/uic_helper.cmake)
 
 enable_language(Rust)
+set(RUST_MIN_VERSION 1.58.1)
+if(CMAKE_Rust_COMPILER_VERSION VERSION_LESS RUST_MIN_VERSION)
+  message(
+    FATAL_ERROR
+      "Rust version is ${CMAKE_Rust_COMPILER_VERSION}, expect at least ${RUST_MIN_VERSION},
+      please update using 'rustup update' or similar,
+      see https://www.rust-lang.org/tools/install documentation for further details."
+  )
+endif()
 include(CMakeCargo)
 # ##############################################################################
 # Global includes

Cargo.lock

@@ -6,6 +6,7 @@ members = [
     "applications/image_provider",
     "applications/nal",
     "applications/upti_cap",
+    "applications/upti_writer",
     "applications/zpc/components/zwave_rust/rust_command_classes",
     "applications/zpc/components/zwave_rust/zwave_rust_proc_macros",
     "applications/zpc/components/zwave_rust/zwave_controller_sys",
@@ -30,7 +31,11 @@ members = [
 # release bins are required to package .deb files.
 [profile.release]
 debug-assertions = true
-overflow-checks = true
-debug = true
-incremental = true
-codegen-units = 256
+lto = true
+
+[profile.RelWithDebInfo]
+inherits = "dev"
+opt-level = 3
+
+[profile.dev]
+rpath = true

Cargo.toml

@@ -279,6 +279,7 @@ below shows the resource usage of the individual components measured on armhf re
 The SDK depends on the following debian packages:
 
 - libedit2
+- libssl1.1
 - libsqlite3-0
 - libmosquitto1
 - libyaml-cpp0.6

README.md

@@ -50,3 +50,7 @@ endif()
 if (BUILD_UPTI_CAP MATCHES ON)
   add_subdirectory(upti_cap)
 endif()
+
+if (BUILD_UPTI_WRITER MATCHES ON)
+  add_subdirectory(upti_writer)
+endif()

applications/CMakeLists.txt

@@ -8,6 +8,7 @@ target_link_libraries(aoxpc
   uic_log
   uic_main
   ncp
+  antenna_array
   aoa_angle
   aoa_utils
   aoa_parse

applications/aox/applications/aoxpc/CMakeLists.txt

@@ -65,7 +65,6 @@ sl_status_t aoxpc_fixt_setup(void)
 {
   process_start(&aoxpc_process, NULL);
   ncp_set_cb(sl_bt_on_event);
-  aoa_cte_init();
   aox_locator_register_on_configuration_updated_callback(
     &aoxpc_configuration_handler_on_aox_locator_configuration_updated);
   return SL_STATUS_OK;
@@ -193,6 +192,8 @@ static void sl_bt_on_event(sl_bt_msg_t *evt)
         #ifdef AOA_ANGLE
         aoa_angle_config_t *config;
         aoa_angle_add_config(locator_unid, &config);
+        // Share antenna array configuration with the CTE component.
+        aoa_cte_config.antenna_array = &config->antenna_array;
         #endif // AOA_ANGLE
 
         // Load the previous AoXLocator configuration from the attribute store
@@ -222,6 +223,10 @@ static void sl_bt_on_event(sl_bt_msg_t *evt)
           aoxpc_configuration_handler_on_aox_locator_configuration_updated();
         }
 
+        // Make sure that the attributes are published at startup even if
+        // the database file is empty and no config file is provided.
+        publish_aox_locator_attributes_to_mqtt();
+
         // Assuming all dotdot MQTT callbacks are set, ask to publish our
         // supported commands for all clusters.
         sl_log_debug(LOG_TAG, "Publishing SupportedCommands for all clusters");

applications/aox/applications/aoxpc/aoxpc.c

@@ -100,6 +100,9 @@ static void aoxpc_configuration_handler_parse_config(const char *config)
   aoa_cte_type_t cte_mode;
   struct sl_rtl_loc_locator_item item;
   CoordinateAndOrientation position = {};
+  uint8_t *antenna_switch_pattern = NULL;
+  uint8_t antenna_switch_pattern_size = 0;
+  enum sl_rtl_aox_array_type antenna_array_type;
 
 #ifdef AOA_ANGLE
   float mask_min                   = 0;
@@ -154,33 +157,45 @@ static void aoxpc_configuration_handler_parse_config(const char *config)
                 aox_mode_string[angle_config->aox_mode]);
     // TBD: AoX Mode is not supported in MQTT; do nothing?
   }
+#endif
 
-  sc = aoa_parse_antenna_mode(&angle_config->array_type, locator_unid);
+  sc = aoa_parse_antenna_mode(&antenna_array_type, locator_unid);
   if (sc == SL_STATUS_OK) {
     sl_log_info(LOG_TAG,
                 "Antenna mode set to: %s",
-                antenna_type_string[angle_config->array_type]);
+                antenna_type_string[antenna_array_type]);
     // TBD: Antenna Mode is not supported in MQTT; do nothing?
-  }
+#ifdef AOA_ANGLE
+    sc = antenna_array_init(&angle_config->antenna_array, antenna_array_type);
+    if (sc != SL_STATUS_OK) {
+      sl_log_error(LOG_TAG,
+                   "antenna_array_init failed for %s",
+                    antenna_type_string[antenna_array_type]);
+    }
 #endif
+  }
 
-  sc = aoa_parse_antenna_array(&aoa_cte_config.switching_pattern,
-                               &aoa_cte_config.switching_pattern_length,
+  sc = aoa_parse_antenna_array(&antenna_switch_pattern,
+                               &antenna_switch_pattern_size,
                                locator_unid);
 
   if (sc == SL_STATUS_OK) {
-#ifdef AOA_ANGLE
-    sc = aoa_parse_antenna_array(&angle_config->switching_pattern,
-                                 &angle_config->switching_pattern_length,
-                                 locator_unid);
-#endif
-    if (sc == SL_STATUS_OK) {
-      sl_log_info(LOG_TAG, "Antenna array set to: ");
-      for (uint8_t i = 0; i < aoa_cte_config.switching_pattern_length; i++) {
-        sl_log_info(LOG_TAG, "%d,", aoa_cte_config.switching_pattern[i]);
-      }
-      // TBD: Antenna array is not supported in MQTT; do nothing?
+    sl_log_info(LOG_TAG, "Antenna array set to: ");
+    for (uint8_t i = 0; i < antenna_switch_pattern_size; i++) {
+      sl_log_info(LOG_TAG, "%d,", antenna_switch_pattern[i]);
     }
+    // TBD: Antenna array is not supported in MQTT; do nothing?
+#ifdef ANGLE
+    sc = antenna_array_set_pattern(&angle_config->antenna_array,
+                                  antenna_switch_pattern,
+                                  antenna_switch_pattern_size);
+    if (sc != SL_STATUS_OK) {
+      sl_log_error(LOG_TAG,
+                   "antenna_array_set_pattern failed with size %d",
+                   antenna_switch_pattern_size);
+    }
+#endif
+    free(antenna_switch_pattern);
   }
 
 #ifdef AOA_ANGLE
@@ -201,16 +216,6 @@ static void aoxpc_configuration_handler_parse_config(const char *config)
     // TBD: Angle filtering weight is not supported in MQTT; do nothing?
   }
 
-  sc = aoa_parse_simple_config(&angle_config->period_samples,
-                               "periodSamples",
-                               locator_unid);
-  if (sc == SL_STATUS_OK) {
-    sl_log_info(LOG_TAG,
-                "Sample period set to: %d",
-                angle_config->period_samples);
-    // TBD: Sample period is not supported in MQTT; do nothing?
-  }
-
   sc = aoa_parse_simple_config(&angle_config->angle_correction_timeout,
                                "angleCorrectionTimeout",
                                locator_unid);

applications/aox/applications/aoxpc/aoxpc_configuration_handler.c

@@ -21,7 +21,7 @@
 
 #define LOG_TAG "aox_locator_configuration"
 
-// callback for the configuration udpates
+// callback for the configuration updates
 static aox_locator_on_configuration_updated_t configuration_update_callback
   = NULL;
 
@@ -50,8 +50,6 @@ sl_status_t aox_locator_configuration_init()
   uic_mqtt_dotdot_set_aox_locator_write_attributes_callback(
     &aox_locator_write_attributes_callback);
 
-  publish_aox_locator_attributes_to_mqtt();
-
   return SL_STATUS_OK;
 }