Skip to content

Commit 2f3341f

Browse files
authored
Fix open commissioning window (#222)
1 parent 6adac32 commit 2f3341f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

matter_server/client/client.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -137,16 +137,16 @@ async def open_commissioning_window(
137137
node_id: int,
138138
timeout: int = 300,
139139
iteration: int = 1000,
140-
option: int = 0,
140+
option: int = 1,
141141
discriminator: Optional[int] = None,
142-
) -> int:
142+
) -> tuple[int, str]:
143143
"""
144144
Open a commissioning window to commission a device present on this controller to another.
145145
146146
Returns code to use as discriminator.
147147
"""
148148
return cast(
149-
int,
149+
tuple[int, str],
150150
await self.send_command(
151151
APICommand.OPEN_COMMISSIONING_WINDOW,
152152
node_id=node_id,

matter_server/server/device_controller.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ async def open_commissioning_window(
240240
node_id: int,
241241
timeout: int = 300,
242242
iteration: int = 1000,
243-
option: int = 0,
243+
option: int = 1,
244244
discriminator: int | None = None,
245-
) -> int:
245+
) -> tuple[int, str]:
246246
"""
247247
Open a commissioning window to commission a device present on this controller to another.
248248
@@ -254,15 +254,15 @@ async def open_commissioning_window(
254254
if discriminator is None:
255255
discriminator = 3840 # TODO generate random one
256256

257-
await self._call_sdk(
257+
pin, code = await self._call_sdk(
258258
self.chip_controller.OpenCommissioningWindow,
259259
nodeid=node_id,
260260
timeout=timeout,
261261
iteration=iteration,
262262
discriminator=discriminator,
263263
option=option,
264264
)
265-
return discriminator
265+
return pin, code
266266

267267
@api_command(APICommand.DISCOVER)
268268
async def discover_commissionable_nodes(

tests/server/test_server.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ async def test_server_start(
220220
"node_id": 1,
221221
"timeout": 300,
222222
"iteration": 1000,
223-
"option": 0,
223+
"option": 1,
224224
"discriminator": None,
225225
}
226226
assert not (

0 commit comments

Comments
 (0)