Merge remote-tracking branch 'origin/master' into feature/door_lock_u…

…nbolt

.github/workflows/tests.yaml

@@ -164,6 +164,7 @@ jobs:
  src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml \
+ src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml \
  src/app/zap-templates/zcl/data-model/chip/power-source-configuration-cluster.xml \

build/chip/java/config.gni

@@ -16,7 +16,7 @@ java_path = getenv("JAVA_PATH")
 declare_args() {
  java_matter_controller_dependent_paths = []
  build_java_matter_controller = false
- if (java_path != "") {
+ if (java_path != "" && current_os != "android") {
  java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
 
  if (current_os == "mac") {

build/chip/java/rules.gni

@@ -127,7 +127,8 @@ template("java_library") {
 
  # Compiles the given files into a directory and generates a 'class list'
  _javac_target_name = target_name + "__javac"
- _class_dir = rebase_path(target_out_dir, root_build_dir) + "/classes"
+ _class_dir = rebase_path(target_out_dir, root_build_dir) + "/" +
+ target_name + "/classes"
  _class_list_file = "$target_gen_dir/$target_name.classlist"
  action(_javac_target_name) {
  sources = _java_files
@@ -284,7 +285,8 @@ template("java_binary") {
 
  # Compiles the given files into a directory and generates a 'class list'
  _javac_target_name = target_name + "__javac"
- _class_dir = rebase_path(target_out_dir, root_build_dir) + "/classes"
+ _class_dir = rebase_path(target_out_dir, root_build_dir) + "/" +
+ target_name + "/classes"
  _class_list_file = "$target_gen_dir/$target_name.classlist"
  action(_javac_target_name) {
  sources = _java_files
@@ -441,7 +443,8 @@ template("kotlin_library") {
 
  # Compiles the given files into a directory and generates a 'class list'
  _kotlinc_target_name = target_name + "__kotlinc"
- _class_dir = rebase_path(target_out_dir, root_build_dir) + "/classes"
+ _class_dir = rebase_path(target_out_dir, root_build_dir) + "/" +
+ target_name + "/classes"
  _class_list_file = "$target_gen_dir/$target_name.classlist"
  action(_kotlinc_target_name) {
  sources = _kotlin_files
@@ -598,7 +601,8 @@ template("kotlin_binary") {
 
  # Compiles the given files into a directory and generates a 'class list'
  _kotlinc_target_name = target_name + "__kotlinc"
- _class_dir = rebase_path(target_out_dir, root_build_dir) + "/classes"
+ _class_dir = rebase_path(target_out_dir, root_build_dir) + "/" +
+ target_name + "/classes"
  _class_list_file = "$target_gen_dir/$target_name.classlist"
  action(_kotlinc_target_name) {
  sources = _kotlin_files

config/esp32/components/chip/CMakeLists.txt

@@ -392,7 +392,7 @@ idf_component_get_property(lwip_lib lwip COMPONENT_LIB)
 list(APPEND chip_libraries $<TARGET_FILE:${lwip_lib}>)
 
 
-if (CONFIG_ESP_WIFI_ENABLED)
+if (CONFIG_ESP32_WIFI_ENABLED)
  idf_component_get_property(esp_wifi_lib esp_wifi COMPONENT_LIB)
  idf_component_get_property(esp_wifi_dir esp_wifi COMPONENT_DIR)
  list(APPEND chip_libraries $<TARGET_FILE:${esp_wifi_lib}>)

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -138,7 +138,7 @@ server cluster Scenes = 5 {
 
  struct AttributeValuePair {
  optional attrib_id attributeID = 0;
- int8u attributeValue[] = 1;
+ int32u attributeValue = 1;
  }
 
  struct ExtensionFieldSet {
@@ -151,6 +151,9 @@ server cluster Scenes = 5 {
  readonly attribute group_id currentGroup = 2;
  readonly attribute boolean sceneValid = 3;
  readonly attribute bitmap8 nameSupport = 4;
+ readonly attribute nullable node_id lastConfiguredBy = 5;
+ readonly attribute int16u sceneTableSize = 6;
+ readonly attribute int8u remainingCapacity = 7;
  readonly attribute command_id generatedCommandList[] = 65528;
  readonly attribute command_id acceptedCommandList[] = 65529;
  readonly attribute event_id eventList[] = 65530;
@@ -2329,6 +2332,34 @@ server cluster ModeSelect = 80 {
  command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0;
 }
 
+/** Attributes for reporting air quality classification */
+server cluster AirQuality = 91 {
+ enum AirQualityEnum : ENUM8 {
+ kUnknown = 0;
+ kGood = 1;
+ kFair = 2;
+ kModerate = 3;
+ kPoor = 4;
+ kVeryPoor = 5;
+ kExtremelyPoor = 6;
+ }
+
+ bitmap Feature : BITMAP32 {
+ kFair = 0x1;
+ kModerate = 0x2;
+ kVeryPoor = 0x4;
+ kExtremelyPoor = 0x8;
+ }
+
+ readonly attribute AirQualityEnum airQuality = 0;
+ readonly attribute command_id generatedCommandList[] = 65528;
+ readonly attribute command_id acceptedCommandList[] = 65529;
+ readonly attribute event_id eventList[] = 65530;
+ readonly attribute attrib_id attributeList[] = 65531;
+ readonly attribute bitmap32 featureMap = 65532;
+ readonly attribute int16u clusterRevision = 65533;
+}
+
 /** An interface to a generic way to secure a door */
 server cluster DoorLock = 257 {
  enum AlarmCodeEnum : ENUM8 {
@@ -5025,6 +5056,9 @@ endpoint 1 {
  ram attribute currentGroup default = 0x0000;
  ram attribute sceneValid default = 0x00;
  ram attribute nameSupport;
+ ram attribute lastConfiguredBy;
+ ram attribute sceneTableSize;
+ ram attribute remainingCapacity;
  ram attribute featureMap default = 0;
  ram attribute clusterRevision default = 4;
  }
@@ -5150,6 +5184,16 @@ endpoint 1 {
  ram attribute manufacturerExtension default = 255;
  }
 
+ server cluster AirQuality {
+ ram attribute airQuality default = 0;
+ callback attribute generatedCommandList;
+ callback attribute acceptedCommandList;
+ callback attribute eventList;
+ callback attribute attributeList;
+ ram attribute featureMap default = 15;
+ ram attribute clusterRevision default = 1;
+ }
+
  server cluster DoorLock {
  emits event DoorLockAlarm;
  emits event LockOperation;