Release ver_1.0.2

Author: Unify Automated

.devcontainer/devcontainer.json

@@ -25,7 +25,6 @@
     "cheshirekow.cmake-format",
     "xaver.clang-format"
   ],
-  "postStartCommand": "Xvfb &",
   "containerUser": "root",
   "remoteUser": "user",
   "updateRemoteUserUID": true,
@@ -47,8 +46,7 @@
     // "source=/opt/super,target=/opt/super,type=bind,consistency=cached",
   ],
   "remoteEnv": {
-    "DISPLAY":":0"
     // Uncomment when building ZigPC to specify Gecko SDK path in the container
     // "GSDK_LOCATION": "/opt/super"
-  },
+  }
 }

CMakeLists.txt

@@ -27,18 +27,23 @@ include(cmake/include/doxygen.cmake)
 include(cmake/include/package.cmake)
 include(cmake/include/uic_helper.cmake)
 
-
 enable_language(Rust)
 include(CMakeCargo)
 # ##############################################################################
 # Global includes
 # ##############################################################################
 include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include)
 
-add_custom_target(sl_status_strings
-  SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/include/sl_status.h ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh
-  BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h
-  COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh > ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h
+  COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh >
+          ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/include/sl_status.h
+          ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh)
+add_custom_target(
+  sl_status_strings
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h)
+
 # ##############################################################################
 # Subdirectories
 # ##############################################################################

Cargo.toml

@@ -4,7 +4,7 @@ members = [
     "applications/upvl",
     "applications/angel",
     "applications/image_provider",
-    "applications/zpc/components/zwave_command_classes",
+    "applications/zpc/components/zwave_rust/rust_command_classes",
     "applications/zpc/components/zwave_rust/zwave_rust_proc_macros",
     "applications/zpc/components/zwave_rust/zwave_controller",
     "applications/zpc/components/zwave_rust/zwave_tx",

README.md

@@ -1,6 +1,6 @@
 # Unify SDK Overview
 
-Latest version of the Unify SDK Overview is available online
+Latest released version of the Unify SDK Overview is available online
 [here](https://siliconlabs.github.io/UnifySDK/userguide/html/index.html).
 
 The Unify SDK provides software source and binary packages for Raspberry Pi 4 to
@@ -13,7 +13,7 @@ The detailed architecture of the Unify SDK is discussed in the Unify SDK Specifi
 
 The Unify SDK uses Unify SDK library to decouple API modules from the PHY drivers.
 This facilitates code reuse and enables easily adding new
-high-level APIs without the need to modify the PHY drivers. 
+high-level APIs without the need to modify the PHY drivers.
 The library provides a number of components that simplify the task of writing a PHY driver
 also known as a Protocol Controller.
 
@@ -66,12 +66,12 @@ The Unify MQTT clients can be grouped into several applications:
 
 - Z-Wave Protocol controller (ZPC)
 - Zigbee Protocol Controller (ZigPC)
-- Unify SDk Smart Start Provisioning list (UPVL)
-- Unify SDK Multicast Group Manager (ANGLE)
+- Unify SDK SmartStart Provisioning list (UPVL)
+- Unify SDK Group Manager (ANGEL)
 - Unify SDK OTA Image Provider (Image Provider)
 - IoT Services (i.e., DEV GUI)
 
-![SDK Overview](doc/assets/img/SDKOverview.svg)
+![SDK Overview](doc/assets/img/SDKOverview.png)
 
 The Unify SDK was previously known as Unified IoT Controller or UIC for short.
 The old name can still be found in some parts of the SDK.
@@ -96,8 +96,8 @@ implementation details can be found in the user guide for each protocol controll
 
 #### The Unified SDK Provisioning List (UPVL)
 
-[The UPVL](applications/upvl/readme_user.md) serves the Smart Start Provisioning
-list to perform Smart Start Security 2 (S2) inclusions and maintains the ucl/SmartStart MQTT topic.
+[The UPVL](applications/upvl/readme_user.md) serves the SmartStart Provisioning
+list to perform SmartStart Security 2 (S2) inclusions and maintains the ucl/SmartStart MQTT topic.
 
 #### The Unify SDK Group Manager (ANGEL)
 
@@ -382,15 +382,15 @@ using [Valgrind](https://valgrind.org/) on a i686 architecture, compiled without
 debugging information.
 
 
-|     Component     |  Flash  |         RAM             |
-|-------------------|---------|-------------------------|
-| libuic            | 4085 kb |                 NA      |
-| uic-zigpc         | 1880 kb |  1900 kb + 8 kb pr node |
-| uic-zpc           | 5888 kb |  1500 kb + 8 kb pr node |
-| uic-angel         | 3220 kb |                1000 kb  |
-| uic-image-provider| 3281 kb |                1000 kb  |
-| uic-upvl          | 3339 kb |                1000 kb  |
-| uic-dev-gui       |   95 MB |                1000 kb  |
+| Component          | Flash   | RAM                    |
+| ------------------ | ------- | ---------------------- |
+| libuic             | 4085 kb | NA                     |
+| uic-zigpc          | 1880 kb | 1900 kb + 8 kb pr node |
+| uic-zpc            | 5888 kb | 1500 kb + 8 kb pr node |
+| uic-angel          | 3220 kb | 1000 kb                |
+| uic-image-provider | 3281 kb | 1000 kb                |
+| uic-upvl           | 3339 kb | 1000 kb                |
+| uic-dev-gui        | 95 MB   | 1000 kb                |
 
 The SDK depends on the following debian packages:
 
@@ -414,14 +414,14 @@ files should be used for reference. It is very important that all the Unify
 components runs as a dedicated system user to prevent attackers from
 compromising the entire system. Also note that most components need write
 access to parts of the filesystem. The default path for writing files is
-`/var/lib/uic`. 
+`/var/lib/uic`.
 ## FAQ
 * *How can I see if the Unify components are running?*<br>
 Unify applications are running as Linux `systemd` services. To get a status overview of all installed Unify components, run the following command:<br>
 ```sh
 systemctl status `ls /lib/systemd/system/uic-*.service | xargs -n 1 basename`
 ```
-The output of this command will tell if the service is loaded and/or is active:  
+The output of this command will tell if the service is loaded and/or is active:
 ```sh
 ● uic-dev-gui-api.service - Unify User Interface API
    Loaded: loaded (/lib/systemd/system/uic-dev-gui-api.service; enabled; vendor preset: enabled)
@@ -431,7 +431,7 @@ The output of this command will tell if the service is loaded and/or is active:
 Logging is collected via Linux `systemd`. In the terminal `journalctl` is able to print the collected logs from all Unify components. Getting the log of, for instance `uic-upvl`, is done via command:
 ```sh
 journalctl -u uic-upvl
-``` 
+```
 * *How do I clear Unify caches and databases?*<br>
 Execute the following command in a terminal on the Unify gateway:
 ```sh
@@ -453,7 +453,7 @@ cat /etc/uic/uic.cfg
 ```
 It outputs the configured rf_region:
 ```bash
-pi@raspberrypi:/etc/uic $ cat uic.cfg 
+pi@raspberrypi:/etc/uic $ cat uic.cfg
 zpc:
   serial: /dev/ttyUSB0
   rf_region: US
@@ -477,9 +477,9 @@ run:
 ```
 Replace the serial argument with the port the Z-Wave controller is connected to.
 * *I have an old Z-Wave device, is it still supported?*<br>
-Yes. However, older devices may be inconsistent in reporting their actual state. This usually means that operating the same command for a second time, the state get updated correctly. 
+Yes. However, older devices may be inconsistent in reporting their actual state. This usually means that operating the same command for a second time, the state get updated correctly.
 * *Can I get detailed diagnostics about devices, its clusters and the network?*<br>
-Using application [`mqtt explorer`](http://mqtt-explorer.com) can give more insights in your Unify network. 
+Using application [`mqtt explorer`](http://mqtt-explorer.com) can give more insights in your Unify network.
 * *How do I determine the root cause for my failed firmware update?*<br>
 The lastError field in the OTA tab of the dev_gui is giving a rough error code. The logging of the uic-zpc usually gives a more detailed explanation of the reason why a firmware update is not accepted.
 * *My device shows up with more clusters than expected!*<br>
@@ -525,8 +525,8 @@ the MSLA applicable to Source Code.
 | Editline      | for console UI                                      | <https://sourceforge.net/projects/libedit/>                                           | BSD           |
 | Sqlite        | for persistent storage                              | <https://www.sqlite.org/copyright.html>                                               | public domain |
 | Boost         | logging, data structures, config files and json     | <https://www.boost.org/LICENSE_1_0.txt>                                               | Boost         |
+| nlohmann/json | json                                                | <https://github.com/nlohmann/>                                                        | MIT           |
 | CMock         | Unittest                                            | <https://github.com/ThrowTheSwitch/CMock/blob/master/LICENSE.txt>                     |               |
 | Unity         | Unittest                                            | <https://github.com/ThrowTheSwitch/Unity/blob/master/LICENSE.txt>                     |               |
 | React         | User interface                                      | <https://github.com/facebook/react/blob/master/LICENSE>                               | MIT           |
 | React License | User interface                                      | <https://github.com/react-icons/react-icons/blob/master/packages/react-icons/LICENSE> | Misc *TBD*    |
-

applications/angel/.cargo/config

@@ -1,4 +1,8 @@
 
 # ANGEL Release Notes
 
+## [1.0.2] - Oct 2021
+### Fixed
+  * Fixed to publish group capabilities correctly
+
 ## Known Bugs

applications/angel/release_notes.md

@@ -13,7 +13,7 @@
 use std::collections::BTreeMap;
 use std::iter::FromIterator;
 use std::{collections::HashSet, vec};
-use uic_log::log_warning;
+use uic_log::log_debug;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct EntryChanged {
@@ -70,13 +70,13 @@ impl Cache {
         if let Some(cached_group) = self.groups_for_endpoints.get(&key) {
             for group in cached_group {
                 if !groups.contains(group) {
-                    to_be_removed.push(group.clone());
+                    to_be_removed.push(*group);
                 }
             }
 
             for group in groups {
                 if !cached_group.contains(group) {
-                    to_be_added.push(group.clone());
+                    to_be_added.push(*group);
                 }
             }
         } else {
@@ -100,9 +100,9 @@ impl Cache {
         }
 
         if let Some(groups) = self.groups_for_endpoints.get(&(unid.to_string(), endpoint)) {
-            return Vec::from_iter(groups.clone());
+            Vec::from_iter(groups.clone())
         } else {
-            return Vec::new();
+            Vec::new()
         }
     }
 
@@ -148,7 +148,7 @@ impl Cache {
         let mut reverse_lookup: BTreeMap<u16, BTreeMap<String, Vec<u16>>> = BTreeMap::new();
         for (k, v) in &self.groups_for_endpoints {
             for group in v {
-                if let Some(unid_list) = reverse_lookup.get_mut(&group) {
+                if let Some(unid_list) = reverse_lookup.get_mut(group) {
                     if let Some(ep_list) = unid_list.get_mut(&k.0) {
                         ep_list.push(k.1);
                     } else {
@@ -157,7 +157,7 @@ impl Cache {
                 } else {
                     let mut map = BTreeMap::new();
                     map.insert(k.0.to_owned(), vec![k.1]);
-                    reverse_lookup.insert(group.clone(), map);
+                    reverse_lookup.insert(*group, map);
                 }
             }
         }
@@ -170,10 +170,10 @@ impl Cache {
     /// or when the new name == the old name
     pub fn update_group_name(&mut self, groupid: u16, name: &str) -> bool {
         if self.get_group_name(groupid).is_some() && name.is_empty() {
-            log_warning(
+            log_debug(
                 "cache",
                 format!(
-                    "omitting groupname update of group {} because of an empty string.",
+                    "Group Name is empty for Group ID {}. Omitting Group Name update",
                     self.group_names.get(&groupid).unwrap()
                 ),
             );
@@ -188,6 +188,10 @@ impl Cache {
         self.group_names.get(&groupid).map(|s| s.into())
     }
 
+    pub fn remove_group_name(&mut self, groupid: u16) {
+        self.group_names.remove(&groupid);
+    }
+
     /// Update the list of supported-commands, per cluster, for the given endpoint.
     pub fn set_endpoint_cluster_supported_commands(
         &mut self,
@@ -197,7 +201,7 @@ impl Cache {
     ) {
         let endpoint = self
             .supported_commands_for_endpoints
-            .entry(key.clone())
+            .entry(key)
             .or_insert(BTreeMap::new());
         endpoint.insert(cluster_name.to_string(), commands);
     }
@@ -213,7 +217,7 @@ impl Cache {
                 return Some(cluster_commands.clone());
             }
         }
-        return None;
+        None
     }
 
     /// Get the list of endpoints that belong to group.
@@ -222,12 +226,47 @@ impl Cache {
             let mut return_vec: Vec<(String, u16)> = Vec::new();
             for (unid, eps) in unid_list {
                 for ep in eps {
-                    return_vec.push((unid.clone(), ep.clone()));
+                    return_vec.push((unid.clone(), *ep));
+                }
+            }
+            return Some(return_vec);
+        }
+        None
+    }
+
+    /// Get the list of commands supported by group per clusters.
+    pub fn get_group_supported_commands_per_cluster(
+        &self,
+        group_id: &u16, // ep: (String, u16),
+    ) -> Option<BTreeMap<String, HashSet<String>>> {
+        if let Some(eps) = self.get_endpoints_for_group(group_id) {
+            return self.get_endpoints_supported_commands_per_cluster(eps);
+        }
+        None
+    }
+
+    /// Get the list of commands supported by endpoint per clusters.
+    pub fn get_endpoints_supported_commands_per_cluster(
+        &self,
+        end_points: Vec<(String, u16)>,
+    ) -> Option<BTreeMap<String, HashSet<String>>> {
+        let mut return_vec: BTreeMap<String, HashSet<String>> = BTreeMap::new();
+        if !end_points.is_empty() {
+            for ep in end_points {
+                if let Some(ep_cluster_commands) = self.supported_commands_for_endpoints.get(&ep) {
+                    for (cluster, commands) in ep_cluster_commands.iter() {
+                        let cluster_commands = return_vec
+                            .entry(cluster.to_string())
+                            .or_insert(HashSet::new());
+                        for command in commands.iter() {
+                            cluster_commands.insert(command.to_string());
+                        }
+                    }
                 }
             }
             return Some(return_vec);
         }
-        return None;
+        None
     }
 }
 
@@ -241,35 +280,35 @@ mod tests {
             unid: unid.to_string(),
             endpoints: ep,
         };
-        changes.iter().find(|&x| x == &entr).is_some()
+        changes.iter().any(|x| x == &entr)
     }
 
     #[test]
     fn set_groups_for_nodes_test() {
         let mut cache = Cache::new();
-        let changes = cache.set_group_list_for_node("zw-1235", 0, &vec![3, 4, 5]);
+        let changes = cache.set_group_list_for_node("zw-1235", 0, &[3, 4, 5]);
         assert_eq!(changes.len(), 3);
         assert!(change_contains(&changes, "zw-1235", 3, vec![0]));
         assert!(change_contains(&changes, "zw-1235", 4, vec![0]));
         assert!(change_contains(&changes, "zw-1235", 5, vec![0]));
 
         // no data change equals no update
-        let changes = cache.set_group_list_for_node("zw-1235", 0, &vec![3, 4, 5]);
+        let changes = cache.set_group_list_for_node("zw-1235", 0, &[3, 4, 5]);
         assert_eq!(changes.len(), 0);
 
         // remove group 5
-        let changes = cache.set_group_list_for_node("zw-1235", 0, &vec![3, 4]);
+        let changes = cache.set_group_list_for_node("zw-1235", 0, &[3, 4]);
         assert_eq!(changes.len(), 1);
         assert!(change_contains(&changes, "zw-1235", 5, vec![]));
 
         // add different unid doesnt effect result
-        let changes = cache.set_group_list_for_node("aa-000", 0, &vec![0, 3]);
+        let changes = cache.set_group_list_for_node("aa-000", 0, &[0, 3]);
         assert_eq!(changes.len(), 2);
         assert!(change_contains(&changes, "aa-000", 0, vec![0]));
         assert!(change_contains(&changes, "aa-000", 3, vec![0]));
 
         // add extra end-point
-        let changes = cache.set_group_list_for_node("zw-1235", 2, &vec![3, 66]);
+        let changes = cache.set_group_list_for_node("zw-1235", 2, &[3, 66]);
         assert_eq!(changes.len(), 2);
         assert!(change_contains(&changes, "zw-1235", 3, vec![0, 2]));
         assert!(change_contains(&changes, "zw-1235", 66, vec![2]));