From 12b73f598e4c746d6a7e30d8628289058a106e65 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:07:11 +0000 Subject: [PATCH 1/4] Zephyr 3.5 update --- config/boards/arm/adv360/adv360.dtsi | 5 ----- config/boards/arm/adv360/board.cmake | 2 +- config/west.yml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/boards/arm/adv360/adv360.dtsi b/config/boards/arm/adv360/adv360.dtsi index 0e092033d8..0c85836f72 100644 --- a/config/boards/arm/adv360/adv360.dtsi +++ b/config/boards/arm/adv360/adv360.dtsi @@ -107,11 +107,9 @@ #size-cells = <1>; sd_partition: partition@0 { - label = "softdevice"; reg = <0x00000000 0x00026000>; }; code_partition: partition@26000 { - label = "code_partition"; reg = <0x00026000 0x000c6000>; }; @@ -125,12 +123,10 @@ * if enabled. */ storage_partition: partition@ec000 { - label = "storage"; reg = <0x000ec000 0x00008000>; }; boot_partition: partition@f4000 { - label = "adafruit_boot"; reg = <0x000f4000 0x0000c000>; }; }; @@ -145,7 +141,6 @@ led_strip: ws2812@0 { compatible = "worldsemi,ws2812-spi"; - label = "WS2812"; /* SPI */ reg = <0>; diff --git a/config/boards/arm/adv360/board.cmake b/config/boards/arm/adv360/board.cmake index 34652907dc..292a274fd3 100644 --- a/config/boards/arm/adv360/board.cmake +++ b/config/boards/arm/adv360/board.cmake @@ -5,5 +5,5 @@ board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset") +include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake) include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake) -#include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake) diff --git a/config/west.yml b/config/west.yml index e35c82658b..9f3a48d831 100644 --- a/config/west.yml +++ b/config/west.yml @@ -7,7 +7,7 @@ manifest: projects: - name: zmk remote: refil - revision: adv360-z3.2-3 + revision: adv360-z3.5 import: app/west.yml self: path: config From b71365a90235318d69d6f0d822568017f38801dd Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:31:46 +0100 Subject: [PATCH 2/4] Changelog --- CHANGELOG.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9d722347..1085f81485 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba Many thanks to all those who have submitted issues and pull requests to make this firmware better! ## Config repo +4/5/2024 - Update base ZMK, remove deprecated attributes, change flashing cmake [#424](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/424) + 14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409) 18/2/2024 - Fix version.dtsi reset after build when running local builds [#385](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/385) @@ -107,9 +109,19 @@ There have beeen 5 branches of ZMK used for the 360 Pro so far. Beta branches ar | [adv360-beta](https://github.com/ReFil/zmk/tree/adv360-beta) | 3/1/2022 | 9/17/2022 | V1.0 (since deleted) | | [adv360-z3](https://github.com/ReFil/zmk/tree/adv360-z3) | 9/17/2022 | 7/6/2023 | V2.0 (since deleted) | | [adv360-z3.2](https://github.com/ReFil/zmk/tree/adv360-z3.2) | 7/6/2023 | 20/10/2023 | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (Up to commit 82494e7) | -| [adv360-z3.2-2](https://github.com/ReFil/zmk/tree/adv360-z3.2-2) | 20/10/2023 | 1/14/2024 | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (Up to commit XXXXXXX) | -| [adv360-z3.2-3](https://github.com/ReFil/zmk/tree/adv360-z3.2-3) | 1/14/2024 | To date | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (current) | +| [adv360-z3.2-2](https://github.com/ReFil/zmk/tree/adv360-z3.2-2) | 20/10/2023 | 1/14/2024 | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (Up to commit 4a5003a) | +| [adv360-z3.2-3](https://github.com/ReFil/zmk/tree/adv360-z3.2-3) | 1/14/2024 | 4/5/2024 | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (Up to commit XXXXXXX) | +| [adv360-z3.5](https://github.com/ReFil/zmk/tree/adv360-z3.5) | 4/5/2024 | To date | [V3.0](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/tree/V3.0) (Current) | + +### adv360-z3.5 + +4/8/2024 - Refactor CI to target 360 Pro exclusively + +4/8/2024 - Fix CI failures + +3/27/2024 - Update ZMK event to new format +3/27/2024 - Rebase off latest upstream ZMK (Commit 94c3b9a) ### adv360-z3.2-3 From 93127b922ab0e2ca2a424451f50ccff7c6e89304 Mon Sep 17 00:00:00 2001 From: Keeley Hoek Date: Sun, 7 Apr 2024 08:07:18 -0400 Subject: [PATCH 3/4] Document new layer colors and modifier color configuration option --- README.md | 24 ++++++++++++++++++++++-- assets/swatches/000000.svg | 1 + assets/swatches/0000FF.svg | 1 + assets/swatches/00FF00.svg | 1 + assets/swatches/00FFFF.svg | 1 + assets/swatches/FF0000.svg | 1 + assets/swatches/FF00FF.svg | 1 + assets/swatches/FFFF00.svg | 1 + assets/swatches/FFFFFF.svg | 1 + 9 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 assets/swatches/000000.svg create mode 100644 assets/swatches/0000FF.svg create mode 100644 assets/swatches/00FF00.svg create mode 100644 assets/swatches/00FFFF.svg create mode 100644 assets/swatches/FF0000.svg create mode 100644 assets/swatches/FF00FF.svg create mode 100644 assets/swatches/FFFF00.svg create mode 100644 assets/swatches/FFFFFF.svg diff --git a/README.md b/README.md index 2500787c64..65fcc4911a 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,26 @@ By default this keyboard has NKRO enabled, however for compatibility reasons the ## Battery reporting -By default reporting the battery level over BLE is disabled as this can cause some computers to spontaneously wake up repeatedly. If you'd like to enable this functionality change `CONFIG_BT_BAS=n` to `CONFIG_BT_BAS=y` in [adv360_left_defconfig](/config/boards/arm/adv360/adv360_left_defconfig#L58). Please note that a known bug in windows prevents the battery level from updating by default, it is only updated when the board is paired. A workaround is to set `CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n` in [adv360_left_defconfig](/config/boards/arm/adv360/adv360_left_defconfig). This may cause unexpected results on other OSes +By default reporting the battery level over BLE is disabled as this can cause some computers to spontaneously wake up repeatedly. If you'd like to enable this functionality change `CONFIG_BT_BAS=n` to `CONFIG_BT_BAS=y` in [adv360_left_defconfig](/config/boards/arm/adv360/adv360_left_defconfig#L58). Please note that a known bug in windows prevents the battery level from updating by default, it is only updated when the board is paired. A workaround is to set `CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n` in [adv360_left_defconfig](/config/boards/arm/adv360/adv360_left_defconfig). This may cause unexpected results on other OSes. + +## Modifier indicator color + +The color of the CAPS/NUM/SCROLL LOCK indicator LEDs may be configured by specifying a hexadecimal RGB color code. For example, `CONFIG_ZMK_RGB_UNDERGLOW_MOD_COLOR=0xFF0000` would give red indicator colors. In order to set the indicator color on both modules, ensure that both [adv360_left_defconfig](/config/boards/arm/adv360/adv360_left_defconfig) and [adv360_right_defconfig](/config/boards/arm/adv360/adv360_right_defconfig) have been updated. + +## Layer colors + +A total of 32 layers are supported by ZMK, with the highest currently active layer displayed using the layer LEDs on each of the left and right modules. All possible colors are listed below; for the first 8 layers the same color is displayed on both modules. After that, only the right module color will cycle through until "rolling over", which will cause the left module color to change as well (and this then repeats). To avoid confusion, the black/off LED color is only used for layer 0. + +| Layer # | L/R | Layer # | L/R | Layer # | L/R | Layer # | L/R | +| ---: | :---: | ---: | :---: | ---: | :---: | ---: | :---: | +| 0 | | 8 | | 16 | | 24 | | +| 1 | | 9 | | 17 | | 25 | | +| 2 | | 10 | | 18 | | 26 | | +| 3 | | 11 | | 19 | | 27 | | +| 4 | | 12 | | 20 | | 28 | | +| 5 | | 13 | | 21 | | 29 | | +| 6 | | 14 | | 22 | | 30 | | +| 7 | | 15 | | 23 | | 31 | | ## Changelog @@ -117,7 +136,7 @@ The changelog for both the config repo and the underlying ZMK fork that the conf The Advantage 360 Pro is always getting updates and refinements. If you are willing to beta test you can follow [this guide from ZMK](https://zmk.dev/docs/features/beta-testing#testing-features) on how to change where your config repo points to. The `west.yml` file that is mentioned is located in config/. [This link](config/west.yml) can take you to the file. Typically you will only need to change the `revision: ` to match the beta branch. The current beta branch is [adv360-z3.2-beta](https://github.com/ReFil/zmk/tree/adv360-z3.2-beta) which is compatible with V3.0 config repositories however users must [disable BT privacy](#bluetooth-le-privacy). -Feedback on beta branches should be submitted as a GitHub issue on the base ZMK repository as opposed to this config repository +Feedback on beta branches should be submitted as a GitHub issue on the base ZMK repository as opposed to this config repository. In the event of a major update the beta branch may not be compatible with the current mainline version of the config repository. If this is the case it will be detailed here along with instructions on how to update. @@ -136,3 +155,4 @@ Further support resources can be found on Kinesis.com: In the event of a hardware issue it may be necessary to open a support ticket directly with Kinesis as opposed to a GitHub issue in this repository. * https://kinesis-ergo.com/support/kb360pro/#ticket + diff --git a/assets/swatches/000000.svg b/assets/swatches/000000.svg new file mode 100644 index 0000000000..9d14efad13 --- /dev/null +++ b/assets/swatches/000000.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/0000FF.svg b/assets/swatches/0000FF.svg new file mode 100644 index 0000000000..d445b5429f --- /dev/null +++ b/assets/swatches/0000FF.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/00FF00.svg b/assets/swatches/00FF00.svg new file mode 100644 index 0000000000..f8b4ce0caf --- /dev/null +++ b/assets/swatches/00FF00.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/00FFFF.svg b/assets/swatches/00FFFF.svg new file mode 100644 index 0000000000..4813df5e09 --- /dev/null +++ b/assets/swatches/00FFFF.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/FF0000.svg b/assets/swatches/FF0000.svg new file mode 100644 index 0000000000..3026c7eea3 --- /dev/null +++ b/assets/swatches/FF0000.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/FF00FF.svg b/assets/swatches/FF00FF.svg new file mode 100644 index 0000000000..81f6c6a5da --- /dev/null +++ b/assets/swatches/FF00FF.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/FFFF00.svg b/assets/swatches/FFFF00.svg new file mode 100644 index 0000000000..1fa8992213 --- /dev/null +++ b/assets/swatches/FFFF00.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/swatches/FFFFFF.svg b/assets/swatches/FFFFFF.svg new file mode 100644 index 0000000000..d54a1321ee --- /dev/null +++ b/assets/swatches/FFFFFF.svg @@ -0,0 +1 @@ + \ No newline at end of file From c417973f85a0bbf92342e1cd9c48cafb6696d0e3 Mon Sep 17 00:00:00 2001 From: Keeley Hoek Date: Mon, 15 Apr 2024 07:12:41 -0400 Subject: [PATCH 4/4] Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1085f81485..348f7b7ebf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Here's all notable changes and commits to both the configuration repo and the ba Many thanks to all those who have submitted issues and pull requests to make this firmware better! ## Config repo +4/7/2024 - Add documentation for new layer colors, and configurable modifier indicator color [#431](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/431) + 4/5/2024 - Update base ZMK, remove deprecated attributes, change flashing cmake [#424](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/424) 14/3/2024 - Fix Makefile errors that prevent builds on macOS [#409](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/409) @@ -115,6 +117,10 @@ There have beeen 5 branches of ZMK used for the 360 Pro so far. Beta branches ar ### adv360-z3.5 +4/15/2024 - Clarify list of available BT profile colors [#20](https://github.com/ReFil/zmk/pull/20), fix CI for pulls [#21](https://github.com/ReFil/zmk/pull/21) (Commit b0c91d3) + +4/10/2024 - Add colors for all 32 layers [#18](https://github.com/ReFil/zmk/pull/18), enable configuration of modifier indicator color [#19](https://github.com/ReFil/zmk/pull/19), fix battery level display [#17](https://github.com/ReFil/zmk/pull/17) (Commit 2fcd15d) + 4/8/2024 - Refactor CI to target 360 Pro exclusively 4/8/2024 - Fix CI failures