Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mode select xml following spec pr 7151 #27249

Merged
merged 33 commits into from
Jun 16, 2023
Merged

Update mode select xml following spec pr 7151 #27249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e86ef63
Renamed mode-select-cluster.xml to mode-base-cluster.xml and updated …
hicklin Jun 14, 2023
d70dac2
Renamed and updated the mode aliases to match the spec PR 7151. Updat…
hicklin Jun 14, 2023
fdcc732
Added the ModeSelect cluster xml from v1.1
hicklin Jun 14, 2023
6a76ea3
Updated the mode select aliase names in the cotroller BUILD.gn
hicklin Jun 14, 2023
2049608
Added the ModeSelect cluster and mode aliases to the contoller-cluste…
hicklin Jun 14, 2023
a830491
Generated the zap code.
hicklin Jun 14, 2023
f2ad698
Fixed typo in Mode Select
hicklin Jun 14, 2023
d2ba643
Regenerated code.
hicklin Jun 14, 2023
8a3eb84
Reverted the mode select parts of the example source code to v1.1.
hicklin Jun 15, 2023
f553d0f
Merge branch 'master' of github.com:dysonltd/connectedhomeip into upd…
hicklin Jun 15, 2023
75a4cbf
Update src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml
hicklin Jun 15, 2023
8c1ba51
Fixed typo.
hicklin Jun 15, 2023
db27cb2
Merge branch 'update_mode_select_xml_following_spec_pr_7151' of githu…
hicklin Jun 15, 2023
17e5874
Removed the use of the detail namespace for structs as it is failing …
hicklin Jun 15, 2023
852a0ac
Regenerated code.
hicklin Jun 15, 2023
3c13021
Reverted the mode select test to v1.1.
hicklin Jun 15, 2023
fbadac9
Restyled by prettier-yaml
restyled-commits Jun 15, 2023
a87520c
Regenerated code.
hicklin Jun 15, 2023
e5f480f
Authored by Boris Zbarsky: reverts fixes made when semantic tags wher…
hicklin Jun 15, 2023
e0e381c
Merge remote-tracking branch 'origin/master' into update_mode_select_…
hicklin Jun 15, 2023
374eef4
Regenerated code after merge.
hicklin Jun 15, 2023
aac67b3
Removed the description attribete from the mode base and all its alia…
hicklin Jun 15, 2023
d98092b
Regenerated code after removing the description attribute.
hicklin Jun 15, 2023
8fed43d
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 15, 2023
d60d80e
Added a comment to explain why we have ModeBase enums commentd out.
hicklin Jun 15, 2023
7ae693a
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 15, 2023
21f39e5
Regenerated code after merge.
hicklin Jun 15, 2023
fb49a7c
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 15, 2023
fa0bad0
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 15, 2023
a9744d3
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 15, 2023
826c92c
Removed duplicate entries in the data_modle/build.gn file caused by t…
hicklin Jun 16, 2023
e62a80c
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 16, 2023
f55e993
Merge branch 'master' into update_mode_select_xml_following_spec_pr_7151
hicklin Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \
Expand All @@ -155,12 +155,13 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml \
Expand All @@ -176,11 +177,11 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml \
src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/scene.xml \
src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml \
Expand Down
28 changes: 3 additions & 25 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down Expand Up @@ -2315,40 +2314,19 @@ server cluster IcdManagement = 70 {

/** Attributes and commands for selecting a mode from a list of supported options. */
server cluster ModeSelect = 80 {
enum ModeTag : ENUM16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
}

enum StatusCode : ENUM8 {
kSuccess = 0;
kUnsupportedMode = 1;
kGenericFailure = 2;
}

bitmap Feature : BITMAP32 {
kOnOff = 0x1;
kExtendedStatus = 0x2;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
ModeTagStruct modeTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

readonly attribute char_string<64> description = 0;
Expand Down
23 changes: 12 additions & 11 deletions examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,31 @@ using namespace chip::app::Clusters::ModeSelect;
using chip::Protocols::InteractionModel::Status;

using ModeOptionStructType = Structs::ModeOptionStruct::Type;
using ModeTagType = Structs::ModeTagStruct::Type;
using SemanticTag = Structs::SemanticTagStruct::Type;
template <typename T>
using List = app::DataModel::List<T>;
using storage_value_type = const ModeOptionStructType;
namespace {
Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode, const List<const ModeTagType> & modeTags)
Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode,
const List<const SemanticTag> & semanticTags)
{
Structs::ModeOptionStruct::Type option;
option.label = CharSpan::fromCharString(label);
option.mode = mode;
option.modeTags = modeTags;
option.label = CharSpan::fromCharString(label);
option.mode = mode;
option.semanticTags = semanticTags;
return option;
}
} // namespace

ModeTagType modeTagsBlack[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } };
ModeTagType modeTagsCappucino[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } };
ModeTagType modeTagsEspresso[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } };
constexpr SemanticTag semanticTagsBlack[] = { { .value = 0 } };
constexpr SemanticTag semanticTagsCappucino[] = { { .value = 0 } };
constexpr SemanticTag semanticTagsEspresso[] = { { .value = 0 } };

// TODO: Configure your options for each endpoint
storage_value_type StaticSupportedModesManager::coffeeOptions[] = {
buildModeOptionStruct("Black", 0, List<const ModeTagType>(modeTagsBlack)),
buildModeOptionStruct("Cappuccino", 4, List<const ModeTagType>(modeTagsCappucino)),
buildModeOptionStruct("Espresso", 7, List<const ModeTagType>(modeTagsEspresso))
buildModeOptionStruct("Black", 0, List<const SemanticTag>(semanticTagsBlack)),
buildModeOptionStruct("Cappuccino", 4, List<const SemanticTag>(semanticTagsCappucino)),
buildModeOptionStruct("Espresso", 7, List<const SemanticTag>(semanticTagsEspresso))
};
const StaticSupportedModesManager::EndpointSpanPair
StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = {
Expand Down
28 changes: 3 additions & 25 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down Expand Up @@ -2048,40 +2047,19 @@ server cluster BooleanState = 69 {

/** Attributes and commands for selecting a mode from a list of supported options. */
server cluster ModeSelect = 80 {
enum ModeTag : ENUM16 {
kAuto = 0;
kQuick = 1;
kQuiet = 2;
kLowNoise = 3;
kLowEnergy = 4;
kVacation = 5;
kMin = 6;
kMax = 7;
kNight = 8;
kDay = 9;
}

enum StatusCode : ENUM8 {
kSuccess = 0;
kUnsupportedMode = 1;
kGenericFailure = 2;
}

bitmap Feature : BITMAP32 {
kOnOff = 0x1;
kExtendedStatus = 0x2;
}

struct ModeTagStruct {
optional vendor_id mfgCode = 0;
struct SemanticTagStruct {
vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
char_string<64> label = 0;
int8u mode = 1;
ModeTagStruct modeTags[] = 2;
SemanticTagStruct semanticTags[] = 2;
}

readonly attribute char_string<64> description = 0;
Expand Down
1 change: 0 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_pump_a811bb33a0.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
1 change: 0 additions & 1 deletion examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
struct ModeTagStruct {
optional vendor_id mfgCode = 0;
enum16 value = 1;
optional char_string<64> tagName = 2;
}

struct ModeOptionStruct {
Expand Down
Loading