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.

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

Match Content Launcher Cluster to spec #30176

Merged
merged 26 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
419c54e
Start with some spec matches for content launcher. Also update to rev…
andreilitvin Nov 2, 2023
634c718
Add some string length limits according to the spec
andreilitvin Nov 2, 2023
d0bca6c
zap regen
andreilitvin Nov 2, 2023
4e0366e
rename SupportedStreamingProtocol to SupportedProtocolsBitmap
andreilitvin Nov 2, 2023
3387dc6
Restyle
andreilitvin Nov 2, 2023
df26897
minor change to kick CI
andreilitvin Nov 2, 2023
ab9a471
minor change to kick CI
andreilitvin Nov 2, 2023
7a1e779
Undo availability.yaml updates, those are not correct
andreilitvin Nov 2, 2023
0c67c86
ran zap_convert_all
andreilitvin Nov 2, 2023
4861f06
Mass rename status enum
andreilitvin Nov 2, 2023
c58cd60
Switch back to 1.2 revision 1 (just spec changes, no revision update)
andreilitvin Nov 2, 2023
6b6a6e9
Restyle
andreilitvin Nov 2, 2023
4d9c49e
Fix Darwin backwards compat for the renames.
bzbarsky-apple Nov 2, 2023
d465a09
Better handling for Darwin availability.
bzbarsky-apple Nov 2, 2023
6441e04
Fix odd indent
andreilitvin Nov 3, 2023
c76c2ee
Fix typo in Url vs URL
andreilitvin Nov 3, 2023
397616c
Merge branch 'content_launcher_to_spec' of github.com:andy31415/conne…
andreilitvin Nov 3, 2023
fd1b019
Fix android compile for tv casting app
andreilitvin Nov 3, 2023
fb4ee2a
Also fix compilation of casting server bridge for darwin ... or at le…
andreilitvin Nov 3, 2023
d75df19
Merge branch 'master' into content_launcher_to_spec
andreilitvin Nov 3, 2023
4ed02e3
Merge branch 'master' into content_launcher_to_spec
andreilitvin Nov 3, 2023
70a2447
Fix back the test
andreilitvin Nov 3, 2023
9a2f481
Merge branch 'master' into content_launcher_to_spec
andreilitvin Nov 7, 2023
8cdeb39
Zap regen and fix merge issue
andreilitvin Nov 7, 2023
188ecab
Merge branch 'master' into content_launcher_to_spec
andreilitvin Nov 7, 2023
3483939
Merge branch 'master' into content_launcher_to_spec
andy31415 Nov 7, 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
Original file line number Diff line number Diff line change
Expand Up @@ -6886,7 +6886,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "temperature",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -7559,5 +7559,6 @@
"endpointId": 4,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -6883,7 +6883,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -14856,7 +14856,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "temperature",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -20475,7 +20475,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -21901,5 +21901,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3452,12 +3452,6 @@ server cluster KeypadInput = 1289 {

/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
server cluster ContentLauncher = 1290 {
enum ContentLaunchStatusEnum : enum8 {
kSuccess = 0;
kUrlNotAvailable = 1;
kAuthFailed = 2;
}

enum MetricTypeEnum : enum8 {
kPixels = 0;
kPercentage = 1;
Expand All @@ -3480,12 +3474,18 @@ server cluster ContentLauncher = 1290 {
kVideo = 13;
}

enum StatusEnum : enum8 {
kSuccess = 0;
kURLNotAvailable = 1;
kAuthFailed = 2;
}

bitmap Feature : bitmap32 {
kContentSearch = 0x1;
kURLPlayback = 0x2;
}

bitmap SupportedStreamingProtocol : bitmap32 {
bitmap SupportedProtocolsBitmap : bitmap32 {
kDASH = 0x1;
kHLS = 0x2;
}
Expand All @@ -3497,13 +3497,13 @@ server cluster ContentLauncher = 1290 {
}

struct AdditionalInfoStruct {
char_string name = 0;
char_string value = 1;
char_string<256> name = 0;
char_string<8192> value = 1;
}

struct ParameterStruct {
ParameterEnum type = 0;
char_string value = 1;
char_string<1024> value = 1;
optional AdditionalInfoStruct externalIDList[] = 2;
}

Expand All @@ -3512,13 +3512,13 @@ server cluster ContentLauncher = 1290 {
}

struct StyleInformationStruct {
optional char_string imageURL = 0;
optional char_string color = 1;
optional char_string<8192> imageURL = 0;
optional char_string<9> color = 1;
optional DimensionStruct size = 2;
}

struct BrandingInformationStruct {
char_string providerName = 0;
char_string<256> providerName = 0;
optional StyleInformationStruct background = 1;
optional StyleInformationStruct logo = 2;
optional StyleInformationStruct progressBar = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4702,7 +4702,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -11002,7 +11002,7 @@
"code": 4,
"mfgCode": null,
"side": "server",
"type": "bitmap8",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
Expand Down Expand Up @@ -12348,5 +12348,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -5721,5 +5721,6 @@
"endpointId": 2,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -4795,5 +4795,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -7844,5 +7844,6 @@
"endpointId": 5,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -2961,7 +2961,7 @@
"code": 3,
"mfgCode": null,
"side": "server",
"type": "temperature",
"type": "int16u",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
Expand Down Expand Up @@ -6078,5 +6078,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3938,5 +3938,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3918,5 +3918,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3100,5 +3100,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3532,5 +3532,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3533,5 +3533,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3429,5 +3429,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -4022,5 +4022,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3243,5 +3243,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3002,5 +3002,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2406,5 +2406,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3607,5 +3607,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3002,5 +3002,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3369,5 +3369,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2970,5 +2970,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -2986,5 +2986,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3442,5 +3442,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_onofflight_samplemei.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3574,5 +3574,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3162,5 +3162,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3190,5 +3190,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3012,5 +3012,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_pump_5f904818cc.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3545,5 +3545,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
3 changes: 2 additions & 1 deletion examples/chef/devices/rootnode_pump_a811bb33a0.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3003,5 +3003,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -3793,5 +3793,6 @@
"endpointId": 3,
"networkId": 0
}
]
],
"log": []
}
Loading
Loading