Patchs integration and feature #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
January 18, 2024 17:31
…mmand GetAllPINCodes to DoorLock.xml This a patch integration into the Unify codebase. This may be squashed into the original commit. Origin: SiliconLabs#23 Bug-SiliconLabs: UIC-3201 Signed-off-by: Nenad Kljajic <Nenad.Kljajic@SnapOne.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop Last-Update: 2024-01-18 (cherry picked from commit f9425c8c48fc290c07d6ff9e290d68675cba30c8)
…p-generated files for command GetAllPINCodes This is a patch integration into the Unify codebase. This may be squashed into the original commit. Origin: SiliconLabs#23 Bug-SiliconLabs: UIC-3201 Signed-off-by: Nenad Kljajic <Nenad.Kljajic@SnapOne.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop Last-Update: 2024-01-18 (cherry picked from commit 674e23edc5d29903b052b197047ebee2f898a578)
…s in ZPC This is a patch integration into the Unify codebase. This may be squashed into the original commit. Origin: SiliconLabs#23 Bug-SiliconLabs: UIC-3201 Signed-off-by: Nenad Kljajic <Nenad.Kljajic@SnapOne.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop Last-Update: 2024-01-18 (cherry picked from commit db74b5f2abe795d3ee1f54c8387dec9d4ded81be)
|
Please hold merge until it's building in https://github.com/Thomasdjb/UnifySDK/actions/runs/7573331730/job/20625225409 But fell free to rebase your branches on main |
Thomasdjb
force-pushed
the
feature-DoorLock-GetAllPINCodes
branch
from
88a44d4
to
403e72e
Compare
Bug-SiliconLabs: UIC-3201 Signed-off-by: Thomas du Boisrouvray <thdubois@silabs.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop Last-Update: 2024-01-19 (cherry picked from commit 954cdcf4b91776e21760921e9c4f0f086328cc6c)
… Code Set. This allows to get confirmation of the User Code Set through Get Pin Code Response Bug-SiliconLabs: UIC-3072 Signed-off-by: Thomas du Boisrouvray <thdubois@silabs.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop (cherry picked from commit e7debde26fce76a30db3626a8c553348dfb877de)
Bug-SiliconLabs: UIC-3201 Signed-off-by: Thomas du Boisrouvray <thdubois@silabs.com> Forwared-SiliconLabs: thdubois/UIC-3072/c4/develop (cherry picked from commit 5a445787e735313f67e7755a25950d08fe090096)
More to be tested Bug-SiliconLabs: UIC-3082 Bug-GitHub: rzr#3 Origin: https://github.com/rzr/UnifySDK/tree/GH-14/UIC-3082/phcoval/main Forwarded: SiliconLabs#26 Signed-off-by: Philippe Coval <philippe.coval@silabs.com> (cherry picked from commit a3fa1c8)
Thomasdjb
force-pushed
the
feature-DoorLock-GetAllPINCodes
branch
from
d003bb4
to
89085ff
Compare
|
Feedback welcome, if no objection we will probably merge this downstream |
Thomasdjb
force-pushed
the
feature-DoorLock-GetAllPINCodes
branch
from
dc88870
to
8b8a32f
Compare
Bug-SiliconLabs: UIC-3072 Signed-off-by: Thomas du Boisrouvray <thdubois@silabs.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop (cherry picked from commit 66c6bb11ab1bbeeed1307ff9316efcc70b89a476)
Thomasdjb
force-pushed
the
feature-DoorLock-GetAllPINCodes
branch
2 times, most recently
from
95866a9
to
306e06c
Compare
|
Hi Nenad, |
|
Please @nkljajic also check double tests https://github.com/Thomasdjb/UnifySDK/actions/runs/7626028554/job/20771550442 There is no rush we can integrate changes for the next release, current one's window is supposed to close very soon. |
nkljajic
merged commit 6985a1d
into
nkljajic:feature-DoorLock-GetAllPINCodes
1 check failed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change
Added integration of patches to ease the merge into Unify codebase.
Added feature to send GET/REPORT when setting a new User Code
Fixed SL_STATUS_NOT_AVAILABLE
Integration commit can be merged with the original commit later.
Checklist