Fix broken CI builds on Zephyr 3.2 #6
Conversation
…W or BACKLIGHT isn't enabled
* Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE.
|
Ahh, I recognized I had to cherry-pick that commit due to the change in 2797cc9. Do you have any experience if enabling deep sleep as proposed here zmkfirmware#1273 (comment) is enough? What are the drawbacks that you decided to remove BT_BAS completely? And would you be able to use the |
This reverts commit 881da25.
|
Reverted the cherry-pick to keep the changes in this PR non-breaking. Please keep in mind that the |
|
Really sorry i missed this, I didn't get an email. Thank you for the PR, i'll look over it now |
Yes i'll be going to using the merged configuration option, disabling bas was a stopgap measure. |
|
A dedicated bluetooth service to update the lights on the peripheral side is more reliable than the behaviour invocation based technique, and was vital for implementing te layer and hid indicators on the peripheral side |
|
This looks good, i need to test pulling in the latest upstream then i will merge this in. Thank you very much for your work |
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." This reverts commit 881da25. --------- Co-authored-by: Peter Johanson <peter@peterjohanson.com>
Co-authored-by: Pete Johanson <peter@peterjohanson.com>
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." This reverts commit 881da25. --------- Co-authored-by: Peter Johanson <peter@peterjohanson.com>
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." Co-Authored-By: Peter Johanson <peter@peterjohanson.com>
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." This reverts commit 881da25. --------- Co-authored-by: Peter Johanson <peter@peterjohanson.com>
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." This reverts commit 881da25. --------- Co-authored-by: Peter Johanson <peter@peterjohanson.com>
* fix(backlight/tests): Restore original behaviour to fix backlight tests * fix(build): Remove feature-specific code when SPLIT_BLE, RGB_UNDERGLOW or BACKLIGHT isn't enabled * refactor(bluetooth): Add battery reporting config. * Add dedicated battery reporting Kconfig that is `imply`d by enabling ZMK_BLE. * fix(rgb_underglow): Use correct condition in service.c * Revert "refactor(bluetooth): Add battery reporting config." This reverts commit 881da25. --------- Co-authored-by: Peter Johanson <peter@peterjohanson.com>
There are several changes in the Zephyr 3.2 branch that break several tests as well as Non-Advantage 360 builds. To ensure a high software quality and ensure being as compatible as possible to upstream, this pull request tries to fix all CI pipelines.
Tests: Commit a981282 broke the backlight tests due to changed default values. The necessary upstream default values are now used for the tests. I also considered changing the tests itself, but I value a high upstream compatibility over a "perfect fitting" repository for the Advantage 360.
Non-Advantage 360 builds: Commit 10b605e broke compatibility with several build configurations that don't use
CONFIG_ZMK_SPLIT_BLE,CONFIG_ZMK_RGB_UNDERGLOWandCONFIG_ZMK_BACKLIGHT. I'm not sure if these code changes wouldn't fit better in their respective file inside thebehaviourfolder. But as first step I were happy with working builds using preprocessor conditions. What's your opinion on that?For working builds with battery reporting, I needed to cherry-pick 881da25 as well. I guess this change would find their way into the branch in the near future anyway.