Skip to content

Commit

Permalink
Merge branch 'master' into enable_op_state_pause_and_resume_for_compa…
Browse files Browse the repository at this point in the history
…tible_states
  • Loading branch information
hicklin authored Dec 8, 2023
2 parents bdd2eae + 1583a24 commit 96beb6f
Show file tree
Hide file tree
Showing 120 changed files with 1,854 additions and 1,157 deletions.
2 changes: 1 addition & 1 deletion config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ foreach(phy_blob ${phy_blobs})
list(APPEND chip_libraries "${esp_phy_dir}/lib/${target_name}/lib${phy_blob}.a")
endforeach()

set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos)
set(components_to_link esp_event hal esp_system soc efuse vfs driver esp_coex freertos esp_timer)
idf_build_get_property(build_components BUILD_COMPONENTS)
foreach(component ${components_to_link})
# Some of the components are not present in IDF v4.x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -1219,11 +1219,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -1112,11 +1112,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
2 changes: 2 additions & 0 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -763,11 +763,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -742,11 +742,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -447,11 +447,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -469,11 +469,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -545,11 +545,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -742,11 +742,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
2 changes: 2 additions & 0 deletions examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
4 changes: 3 additions & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -545,11 +545,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -742,11 +742,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
4 changes: 3 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -524,11 +524,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
4 changes: 3 additions & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -545,11 +545,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -742,11 +742,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -545,11 +545,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
4 changes: 3 additions & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ cluster OtaSoftwareUpdateRequestor = 42 {
nullable int64s platformCode = 3;
}

attribute ProviderLocation defaultOTAProviders[] = 0;
attribute access(write: administer) ProviderLocation defaultOTAProviders[] = 0;
readonly attribute boolean updatePossible = 1;
readonly attribute UpdateStateEnum updateState = 2;
readonly attribute nullable int8u updateStateProgress = 3;
Expand Down Expand Up @@ -545,11 +545,13 @@ cluster TimeFormatLocalization = 44 {
kKorean = 9;
kPersian = 10;
kTaiwanese = 11;
kUseActiveLocale = 255;
}

enum HourFormatEnum : enum8 {
k12hr = 0;
k24hr = 1;
kUseActiveLocale = 255;
}

bitmap Feature : bitmap32 {
Expand Down
Loading

0 comments on commit 96beb6f

Please sign in to comment.