Skip to content

Commit 3778070

Browse files
manjunath-grlrestyled-commits
authored and
pull[bot]
committed
Modified scripts JUNE 01 (#27011)
* Modified scripts: ci-pics-values ciTests.json app1/ciTests.json app1/config.zap app2/config.zap manualTests.json PICS TC_AUDIOOUTPUT_7_2 TC_BINFO_2_1 TC_BRBINFO_2_1 TC_CC_2_2_Simulated TC_CC_6_5 TC_CHANNEL_5_2 TC_CHANNEL_5_3 TC_DGTHREAD_3_2_Simulated TC_MEDIAINPUT_3_11 TC_MEDIAINPUT_3_13 TC_MOD_1_2 TC_MOD_2_1 TC_MOD_2_3 TC_MOD_3_1 TC_MOD_3_2 TC_MOD_3_4 TC_PRS_2_1 TC_PS_1_1 TC_TMP_2_1 * Auto generated files * Restyled by whitespace * Restyled by prettier-json * Added anyOf keyword constraint check for TSTAT Removed TSTAT-2.2 test from ciTests.json file * Restyled by prettier-json * Modify CC-6.5 CI to pass all checks * Fix MediaInput-3.13 * Fix issue 27087 * Fixes issue 567 * Modified tests TC-PRS-2.1 TC-TMP-2.1 TC-DRLK-2.1 TC-WNCV-2.2 TC-WNCV-2.4 Auto generated files * Modified test TC-CC-6.3 * Fixes issue 565 * Modified TC-DRLK-2.1 & Ci-pics-value * Restyled by whitespace * Updated comment for DRLK-2.1 Added test TC-DRLK-2.8 Modified tests TC-DRLK-2.1 TC-DRLK-2.9 TC-TSTAT-2.2 Auto generated files * Auto generated files * Modified Ci-pics-value for DRLK tests * Disabled DRLK-2.8 in init.py Fixes issue 870 * Restyled by autopep8 * Auto generated files * Automated test TC-FAN-2.5 Simulated testcases TC-DRLK-3.1 TC-DGTHREAD-3.1 Modified tests TC-DRLK-2.3 TC-DRLK-2.4 TC-DRLK-2.12 * Auto generated files * Restyled by prettier-json --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent ba62cc3 commit 3778070

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+9310
-14845
lines changed

‎examples/placeholder/linux/apps/app1/ciTests.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"Test_TC_G_3_1_Simulated",
1212
"Test_TC_I_3_1_Simulated",
1313
"Test_TC_PRS_3_1_Simulated",
14-
"Test_TC_PS_3_1_Simulated",
1514
"Test_TC_PSCFG_3_1_Simulated",
1615
"Test_TC_RH_3_1_Simulated",
1716
"Test_TC_SWTCH_3_1_Simulated",
@@ -44,7 +43,10 @@
4443
"Test_TC_OO_3_2_Simulated",
4544
"Test_TC_TSUIC_3_1_Simulated",
4645
"Test_TC_PCC_3_1_Simulated",
47-
"Test_TC_TMP_3_1_Simulated"
46+
"Test_TC_TMP_3_1_Simulated",
47+
"Test_TC_CC_2_2_Simulated",
48+
"Test_TC_DGTHREAD_3_1_Simulated",
49+
"Test_TC_DRLK_3_1_Simulated"
4850
],
4951
"collection": ["Test"]
5052
}

‎examples/placeholder/linux/apps/app1/config.matter

+197-86
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,54 @@ struct OperationalStateStruct {
3333
optional char_string<64> operationalStateLabel = 1;
3434
}
3535

36+
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
37+
client cluster Identify = 3 {
38+
enum EffectIdentifierEnum : ENUM8 {
39+
kBlink = 0;
40+
kBreathe = 1;
41+
kOkay = 2;
42+
kChannelChange = 11;
43+
kFinishEffect = 254;
44+
kStopEffect = 255;
45+
}
46+
47+
enum EffectVariantEnum : ENUM8 {
48+
kDefault = 0;
49+
}
50+
51+
enum IdentifyTypeEnum : ENUM8 {
52+
kNone = 0;
53+
kLightOutput = 1;
54+
kVisibleIndicator = 2;
55+
kAudibleBeep = 3;
56+
kDisplay = 4;
57+
kActuator = 5;
58+
}
59+
60+
attribute int16u identifyTime = 0;
61+
readonly attribute IdentifyTypeEnum identifyType = 1;
62+
readonly attribute command_id generatedCommandList[] = 65528;
63+
readonly attribute command_id acceptedCommandList[] = 65529;
64+
readonly attribute event_id eventList[] = 65530;
65+
readonly attribute attrib_id attributeList[] = 65531;
66+
readonly attribute bitmap32 featureMap = 65532;
67+
readonly attribute int16u clusterRevision = 65533;
68+
69+
request struct IdentifyRequest {
70+
INT16U identifyTime = 0;
71+
}
72+
73+
request struct TriggerEffectRequest {
74+
EffectIdentifierEnum effectIdentifier = 0;
75+
EffectVariantEnum effectVariant = 1;
76+
}
77+
78+
/** Command description for Identify */
79+
command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0;
80+
/** Command description for TriggerEffect */
81+
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
82+
}
83+
3684
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
3785
server cluster Identify = 3 {
3886
enum EffectIdentifierEnum : ENUM8 {
@@ -2193,6 +2241,7 @@ server cluster BridgedDeviceBasicInformation = 57 {
21932241
readonly attribute long_char_string<256> productURL = 13;
21942242
readonly attribute char_string<64> productLabel = 14;
21952243
readonly attribute char_string<32> serialNumber = 15;
2244+
readonly attribute boolean reachable = 17;
21962245
readonly attribute char_string<32> uniqueID = 18;
21972246
readonly attribute ProductAppearanceStruct productAppearance = 20;
21982247
readonly attribute command_id generatedCommandList[] = 65528;
@@ -3783,9 +3832,69 @@ server cluster DoorLock = 257 {
37833832
optional OCTET_STRING PINCode = 1;
37843833
}
37853834

3835+
request struct SetWeekDayScheduleRequest {
3836+
INT8U weekDayIndex = 0;
3837+
INT16U userIndex = 1;
3838+
DaysMaskMap daysMask = 2;
3839+
INT8U startHour = 3;
3840+
INT8U startMinute = 4;
3841+
INT8U endHour = 5;
3842+
INT8U endMinute = 6;
3843+
}
3844+
3845+
request struct ClearWeekDayScheduleRequest {
3846+
INT8U weekDayIndex = 0;
3847+
INT16U userIndex = 1;
3848+
}
3849+
3850+
request struct SetYearDayScheduleRequest {
3851+
INT8U yearDayIndex = 0;
3852+
INT16U userIndex = 1;
3853+
epoch_s localStartTime = 2;
3854+
epoch_s localEndTime = 3;
3855+
}
3856+
3857+
request struct ClearYearDayScheduleRequest {
3858+
INT8U yearDayIndex = 0;
3859+
INT16U userIndex = 1;
3860+
}
3861+
3862+
request struct SetHolidayScheduleRequest {
3863+
INT8U holidayIndex = 0;
3864+
epoch_s localStartTime = 1;
3865+
epoch_s localEndTime = 2;
3866+
OperatingModeEnum operatingMode = 3;
3867+
}
3868+
3869+
request struct ClearHolidayScheduleRequest {
3870+
INT8U holidayIndex = 0;
3871+
}
3872+
3873+
request struct SetUserRequest {
3874+
DataOperationTypeEnum operationType = 0;
3875+
INT16U userIndex = 1;
3876+
nullable CHAR_STRING userName = 2;
3877+
nullable INT32U userUniqueID = 3;
3878+
nullable UserStatusEnum userStatus = 4;
3879+
nullable UserTypeEnum userType = 5;
3880+
nullable CredentialRuleEnum credentialRule = 6;
3881+
}
3882+
3883+
request struct ClearCredentialRequest {
3884+
nullable CredentialStruct credential = 0;
3885+
}
3886+
37863887
timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
37873888
timed command UnlockDoor(UnlockDoorRequest): DefaultSuccess = 1;
37883889
timed command UnlockWithTimeout(UnlockWithTimeoutRequest): DefaultSuccess = 3;
3890+
command access(invoke: administer) SetWeekDaySchedule(SetWeekDayScheduleRequest): DefaultSuccess = 11;
3891+
command access(invoke: administer) ClearWeekDaySchedule(ClearWeekDayScheduleRequest): DefaultSuccess = 13;
3892+
command access(invoke: administer) SetYearDaySchedule(SetYearDayScheduleRequest): DefaultSuccess = 14;
3893+
command access(invoke: administer) ClearYearDaySchedule(ClearYearDayScheduleRequest): DefaultSuccess = 16;
3894+
command access(invoke: administer) SetHolidaySchedule(SetHolidayScheduleRequest): DefaultSuccess = 17;
3895+
command access(invoke: administer) ClearHolidaySchedule(ClearHolidayScheduleRequest): DefaultSuccess = 19;
3896+
timed command access(invoke: administer) SetUser(SetUserRequest): DefaultSuccess = 26;
3897+
timed command access(invoke: administer) ClearCredential(ClearCredentialRequest): DefaultSuccess = 38;
37893898
}
37903899

37913900
/** Provides an interface for controlling and adjusting automatic window coverings. */
@@ -6617,20 +6726,21 @@ endpoint 0 {
66176726
emits event StartUp;
66186727
emits event ShutDown;
66196728
emits event Leave;
6620-
callback attribute vendorName;
6621-
callback attribute vendorID;
6622-
callback attribute productName;
6729+
ram attribute vendorName;
6730+
ram attribute vendorID;
6731+
ram attribute productName;
66236732
persist attribute nodeLabel;
6624-
callback attribute hardwareVersion;
6625-
callback attribute hardwareVersionString;
6626-
callback attribute softwareVersion;
6627-
callback attribute softwareVersionString;
6628-
callback attribute manufacturingDate;
6629-
callback attribute partNumber;
6630-
callback attribute productURL;
6631-
callback attribute productLabel;
6632-
callback attribute serialNumber;
6633-
callback attribute uniqueID;
6733+
ram attribute hardwareVersion default = 0;
6734+
ram attribute hardwareVersionString;
6735+
ram attribute softwareVersion default = 0;
6736+
ram attribute softwareVersionString;
6737+
ram attribute manufacturingDate default = "20210614123456ZZ";
6738+
ram attribute partNumber;
6739+
ram attribute productURL;
6740+
ram attribute productLabel;
6741+
ram attribute serialNumber;
6742+
ram attribute reachable default = 1;
6743+
ram attribute uniqueID;
66346744
callback attribute productAppearance;
66356745
ram attribute featureMap default = 0;
66366746
ram attribute clusterRevision default = 2;
@@ -6685,42 +6795,42 @@ endpoint 0 {
66856795
}
66866796

66876797
server cluster DoorLock {
6688-
callback attribute lockState;
6689-
callback attribute lockType;
6798+
ram attribute lockState;
6799+
ram attribute lockType;
66906800
ram attribute actuatorEnabled;
6691-
callback attribute doorState;
6692-
callback attribute doorOpenEvents;
6693-
callback attribute doorClosedEvents;
6694-
callback attribute openPeriod;
6695-
callback attribute numberOfTotalUsersSupported default = 0;
6696-
callback attribute numberOfPINUsersSupported default = 0;
6697-
callback attribute numberOfRFIDUsersSupported default = 0;
6698-
callback attribute numberOfWeekDaySchedulesSupportedPerUser default = 0;
6699-
callback attribute numberOfYearDaySchedulesSupportedPerUser default = 0;
6700-
callback attribute numberOfHolidaySchedulesSupported default = 0;
6701-
callback attribute maxPINCodeLength;
6702-
callback attribute minPINCodeLength;
6703-
callback attribute maxRFIDCodeLength;
6704-
callback attribute minRFIDCodeLength;
6705-
callback attribute credentialRulesSupport default = 1;
6706-
callback attribute numberOfCredentialsSupportedPerUser default = 0;
6707-
callback attribute language;
6708-
callback attribute LEDSettings default = 0;
6709-
callback attribute autoRelockTime;
6710-
callback attribute soundVolume default = 0;
6711-
callback attribute operatingMode default = 0;
6712-
callback attribute supportedOperatingModes default = 65526;
6713-
callback attribute defaultConfigurationRegister default = 0;
6714-
callback attribute enableLocalProgramming default = 1;
6715-
callback attribute enableOneTouchLocking default = 0;
6716-
callback attribute enableInsideStatusLED default = 0;
6717-
callback attribute enablePrivacyModeButton default = 0;
6718-
callback attribute localProgrammingFeatures default = 0;
6719-
callback attribute wrongCodeEntryLimit;
6720-
callback attribute userCodeTemporaryDisableTime;
6721-
callback attribute sendPINOverTheAir default = 0;
6722-
callback attribute requirePINforRemoteOperation default = 0;
6723-
callback attribute expiringUserTimeout;
6801+
ram attribute doorState;
6802+
ram attribute doorOpenEvents;
6803+
ram attribute doorClosedEvents;
6804+
ram attribute openPeriod;
6805+
ram attribute numberOfTotalUsersSupported default = 0;
6806+
ram attribute numberOfPINUsersSupported default = 0;
6807+
ram attribute numberOfRFIDUsersSupported default = 0;
6808+
ram attribute numberOfWeekDaySchedulesSupportedPerUser default = 0;
6809+
ram attribute numberOfYearDaySchedulesSupportedPerUser default = 0;
6810+
ram attribute numberOfHolidaySchedulesSupported default = 0;
6811+
ram attribute maxPINCodeLength;
6812+
ram attribute minPINCodeLength;
6813+
ram attribute maxRFIDCodeLength;
6814+
ram attribute minRFIDCodeLength;
6815+
ram attribute credentialRulesSupport default = 1;
6816+
ram attribute numberOfCredentialsSupportedPerUser default = 0;
6817+
ram attribute language;
6818+
ram attribute LEDSettings default = 0;
6819+
ram attribute autoRelockTime;
6820+
ram attribute soundVolume default = 0;
6821+
ram attribute operatingMode default = 0;
6822+
ram attribute supportedOperatingModes default = 65526;
6823+
ram attribute defaultConfigurationRegister default = 0;
6824+
ram attribute enableLocalProgramming default = 1;
6825+
ram attribute enableOneTouchLocking default = 0;
6826+
ram attribute enableInsideStatusLED default = 0;
6827+
ram attribute enablePrivacyModeButton default = 0;
6828+
ram attribute localProgrammingFeatures default = 0;
6829+
ram attribute wrongCodeEntryLimit;
6830+
ram attribute userCodeTemporaryDisableTime;
6831+
ram attribute sendPINOverTheAir default = 0;
6832+
ram attribute requirePINforRemoteOperation default = 0;
6833+
ram attribute expiringUserTimeout;
67246834
ram attribute clusterRevision default = 6;
67256835
}
67266836

@@ -6983,6 +7093,7 @@ endpoint 0 {
69837093
}
69847094
endpoint 1 {
69857095
device type anonymousEndpointType = 257, version 1;
7096+
binding cluster Identify;
69867097
binding cluster OnOff;
69877098
binding cluster LevelControl;
69887099
binding cluster LocalizationConfiguration;
@@ -7127,54 +7238,54 @@ endpoint 1 {
71277238
server cluster ColorControl {
71287239
ram attribute currentHue default = 0x00;
71297240
ram attribute currentSaturation default = 0x00;
7130-
callback attribute remainingTime default = 0x00;
7241+
ram attribute remainingTime default = 0x00;
71317242
ram attribute currentX default = 0x616B;
71327243
ram attribute currentY default = 0x607D;
7133-
callback attribute driftCompensation;
7134-
callback attribute compensationText;
7244+
ram attribute driftCompensation;
7245+
ram attribute compensationText;
71357246
ram attribute colorTemperatureMireds default = 0x00FA;
7136-
callback attribute colorMode default = 1;
7247+
ram attribute colorMode default = 1;
71377248
ram attribute options default = 0x00;
7138-
callback attribute numberOfPrimaries;
7139-
callback attribute primary1X;
7140-
callback attribute primary1Y;
7141-
callback attribute primary1Intensity;
7142-
callback attribute primary2X;
7143-
callback attribute primary2Y;
7144-
callback attribute primary2Intensity;
7145-
callback attribute primary3X;
7146-
callback attribute primary3Y;
7147-
callback attribute primary3Intensity;
7148-
callback attribute primary4X;
7149-
callback attribute primary4Y;
7150-
callback attribute primary4Intensity;
7151-
callback attribute primary5X;
7152-
callback attribute primary5Y;
7153-
callback attribute primary5Intensity;
7154-
callback attribute primary6X;
7155-
callback attribute primary6Y;
7156-
callback attribute primary6Intensity;
7157-
callback attribute whitePointX;
7158-
callback attribute whitePointY;
7159-
callback attribute colorPointRX;
7160-
callback attribute colorPointRY;
7161-
callback attribute colorPointRIntensity;
7162-
callback attribute colorPointGX;
7163-
callback attribute colorPointGY;
7164-
callback attribute colorPointGIntensity;
7165-
callback attribute colorPointBX;
7166-
callback attribute colorPointBY;
7167-
callback attribute colorPointBIntensity;
7249+
ram attribute numberOfPrimaries;
7250+
ram attribute primary1X;
7251+
ram attribute primary1Y;
7252+
ram attribute primary1Intensity;
7253+
ram attribute primary2X;
7254+
ram attribute primary2Y;
7255+
ram attribute primary2Intensity;
7256+
ram attribute primary3X;
7257+
ram attribute primary3Y;
7258+
ram attribute primary3Intensity;
7259+
ram attribute primary4X;
7260+
ram attribute primary4Y;
7261+
ram attribute primary4Intensity;
7262+
ram attribute primary5X;
7263+
ram attribute primary5Y;
7264+
ram attribute primary5Intensity;
7265+
ram attribute primary6X;
7266+
ram attribute primary6Y;
7267+
ram attribute primary6Intensity;
7268+
ram attribute whitePointX;
7269+
ram attribute whitePointY;
7270+
ram attribute colorPointRX;
7271+
ram attribute colorPointRY;
7272+
ram attribute colorPointRIntensity;
7273+
ram attribute colorPointGX;
7274+
ram attribute colorPointGY;
7275+
ram attribute colorPointGIntensity;
7276+
ram attribute colorPointBX;
7277+
ram attribute colorPointBY;
7278+
ram attribute colorPointBIntensity;
71687279
ram attribute enhancedCurrentHue default = 0x00;
7169-
callback attribute enhancedColorMode default = 0x01;
7280+
ram attribute enhancedColorMode default = 0x01;
71707281
ram attribute colorLoopActive default = 0x00;
71717282
ram attribute colorLoopDirection default = 0x00;
71727283
ram attribute colorLoopTime default = 0x0019;
71737284
ram attribute colorLoopStartEnhancedHue default = 0x2300;
71747285
ram attribute colorLoopStoredEnhancedHue default = 0x00;
7175-
callback attribute colorCapabilities default = 0x00;
7176-
callback attribute colorTempPhysicalMinMireds default = 0x00;
7177-
callback attribute colorTempPhysicalMaxMireds default = 0xfeff;
7286+
ram attribute colorCapabilities default = 0x00;
7287+
ram attribute colorTempPhysicalMinMireds default = 0x00;
7288+
ram attribute colorTempPhysicalMaxMireds default = 0xfeff;
71787289
ram attribute coupleColorTempToLevelMinMireds;
71797290
ram attribute startUpColorTemperatureMireds;
71807291
ram attribute featureMap default = 0;

0 commit comments

Comments
 (0)