Skip to content

Commit

Permalink
Correct gpepIncomingMessageHandler data signature (#594)
Browse files Browse the repository at this point in the history
* Correct gpepIncomingMessageHandler data signature

This assumes that it's the same across all versions. Of course,
that's very difficult to validate given the state of EZSP documentation.
However, on v8 this is absolutely correct, and I don't see
a reason why it might be only v8 as opposed to everywhere else

* Fix whitespace with pre-commit for CI

---------

Co-authored-by: Conrad Kreyling <[email protected]>
  • Loading branch information
Conrad Kreyling and konistehrad authored Nov 20, 2023
1 parent f466452 commit f9cb602
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 81 deletions.
25 changes: 14 additions & 11 deletions bellows/ezsp/v10/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,19 +628,22 @@
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"gpProxyTableGetEntry": (
Expand Down
27 changes: 15 additions & 12 deletions bellows/ezsp/v4/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -608,22 +608,25 @@
),
"dGpSentHandler": (0xC7, (), (t.EmberStatus, t.uint8_t)),
"gpepIncomingMessageHandler": (
0xC5,
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
}
27 changes: 15 additions & 12 deletions bellows/ezsp/v5/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,22 +615,25 @@
),
"dGpSentHandler": (0xC7, (), (t.EmberStatus, t.uint8_t)),
"gpepIncomingMessageHandler": (
0xC5,
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"setSecurityKey": (
Expand Down
27 changes: 15 additions & 12 deletions bellows/ezsp/v6/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,22 +561,25 @@
),
"dGpSentHandler": (0xC7, (), (t.EmberStatus, t.uint8_t)),
"gpepIncomingMessageHandler": (
0xC5,
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"gpProxyTableGetEntry": (
Expand Down
27 changes: 15 additions & 12 deletions bellows/ezsp/v7/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -602,22 +602,25 @@
),
"dGpSentHandler": (0xC7, (), (t.EmberStatus, t.uint8_t)),
"gpepIncomingMessageHandler": (
0xC5,
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"gpProxyTableGetEntry": (
Expand Down
25 changes: 14 additions & 11 deletions bellows/ezsp/v8/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -628,19 +628,22 @@
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"gpProxyTableGetEntry": (
Expand Down
25 changes: 14 additions & 11 deletions bellows/ezsp/v9/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -624,19 +624,22 @@
0x00C5,
(),
(
t.EmberStatus,
t.uint8_t,
t.uint8_t,
t.EmberGpAddress,
t.EmberStatus, # status
t.uint8_t, # gpd link
t.uint8_t, # sequence number
t.uint8_t, # addrType
t.uint32_t, # address
t.uint32_t, # src ID
t.uint8_t, # endpoint
t.EmberGpSecurityLevel,
t.EmberGpKeyType,
t.Bool,
t.Bool,
t.uint32_t,
t.uint8_t,
t.uint32_t,
t.EmberGpSinkListEntry,
t.LVBytes,
t.Bool, # auto commissioning
t.Bool, # rx capable?
t.uint32_t, # security frame counter
t.uint8_t, # gpd command id
t.uint32_t, # MIC
t.uint8_t, # proxy table index
t.LVBytes, # optional payload
),
),
"gpProxyTableGetEntry": (
Expand Down

0 comments on commit f9cb602

Please sign in to comment.