-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
feat(boards) Kinesis Advantage 360 pro #1454
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
4e0262c
feat(boards) Advantage 360 pro
ReFil 4d58241
chore(lighting): fix deprecation
ReFil 85059dd
Merge remote-tracking branch 'upstream/main' into advantage360
ReFil a947cfe
Merge branch 'main' into advantage360
ReFil 42a8f1b
Merge branch 'main' into advantage360
ReFil 76eacb6
Merge branch 'main' into advantage360
ReFil dff7a52
fix(boards): Zephyr 3.2 support
ReFil abf32a6
Merge branch 'main' into advantage360
ReFil 6a4f0bf
Merge branch 'main' into advantage360
ReFil ecc0652
formatting and minor tweaks
ReFil e4c59d8
chore(keymap): Update keymap in line with manual
ReFil 40d9cf1
Merge branch 'main' into advantage360
ReFil 21938b7
Merge remote-tracking branch 'upstream/main' into advantage360
ReFil 1f7b62a
Update _defconfigs to match new conventions
ReFil a924216
Address review comments
ReFil f11c840
Address review comments
ReFil d1e2700
Remove macro template
ReFil f7c9b64
Remove USB CDC label
ReFil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # SPDX-License-Identifier: MIT | ||
|
|
||
| config BOARD_ENABLE_DCDC | ||
| bool "Enable DCDC mode" | ||
| select SOC_DCDC_NRF52X | ||
| default y | ||
| depends on BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # | ||
| # Copyright (c) 2023 The ZMK Contributors | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
|
|
||
| config BOARD_ADV360PRO_LEFT | ||
| bool "adv360pro_left" | ||
| depends on SOC_NRF52840_QIAA | ||
|
|
||
| config BOARD_ADV360PRO_RIGHT | ||
| bool "adv360pro_right" | ||
| depends on SOC_NRF52840_QIAA |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| # | ||
| # Copyright (c) 2023 The ZMK Contributors | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
|
|
||
| if BOARD_ADV360PRO_LEFT | ||
|
|
||
| config ZMK_KEYBOARD_NAME | ||
| default "Adv360 Pro" | ||
|
|
||
| config ZMK_SPLIT_ROLE_CENTRAL | ||
| default y | ||
|
|
||
| endif # BOARD_ADV360PRO_LEFT | ||
|
|
||
| if BOARD_ADV360PRO_RIGHT | ||
|
|
||
| config ZMK_KEYBOARD_NAME | ||
| default "Adv360 Pro rt" | ||
|
|
||
| endif # BOARD_ADV360PRO_RIGHT | ||
|
|
||
|
|
||
| if BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT | ||
|
|
||
| config BOARD | ||
| default "adv360pro" | ||
|
|
||
| config ZMK_SPLIT | ||
| default y | ||
|
|
||
| config SPI | ||
| bool | ||
| default y | ||
|
|
||
| config BT_CTLR | ||
| default BT | ||
|
|
||
| if USB | ||
|
|
||
| config USB_NRFX | ||
| default y | ||
|
|
||
| config USB_DEVICE_STACK | ||
| default y | ||
|
|
||
| endif # USB | ||
|
|
||
| config ZMK_BATTERY_VOLTAGE_DIVIDER | ||
| default y | ||
|
|
||
| config SPI | ||
| default y | ||
|
|
||
| endif # BOARD_ADV360PRO_LEFT || BOARD_ADV360PRO_RIGHT | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # Kinesis Advantage 360 Professional | ||
|
|
||
| This board definition provides upstream support for the [Kinesis Advantage 360 Professional](https://kinesis-ergo.com/keyboards/advantage360/) | ||
|
|
||
| Kinesis offer a specific [custom configuration](https://github.com/KinesisCorporation/Adv360-Pro-ZMK/) for the 360 Pro that references [a customised version of ZMK](https://github.com/ReFil/zmk/tree/adv360-z3.2-2) with Advantage 360 Pro specific functionality and changes over base ZMK. The Kinesis fork is regularly updated to bring the latest updates and changes from base ZMK however will not always be completely up to date, some features such as new keycodes will not be immediately available on the 360 Pro after they are implemented in base ZMK. | ||
|
|
||
| When using this board definition some of the more advanced features (the indicator RGB leds) will not work, and Kinesis cannot provide customer service for usage of base ZMK. Likewise the ZMK community cannot provide support for either the Kinesis keymap editor, nor any usage of the Kinesis custom fork. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (c) 2023 The ZMK Contributors | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| &pinctrl { | ||
| spi3_default: spi3_default { | ||
| group1 { | ||
| psels = <NRF_PSEL(SPIM_MOSI, 0, 20)>; | ||
| }; | ||
| }; | ||
|
|
||
| spi3_sleep: spi3_sleep { | ||
| group1 { | ||
| psels = <NRF_PSEL(SPIM_MOSI, 0, 20)>; | ||
| low-power-enable; | ||
| }; | ||
| }; | ||
| pwm0_default: pwm0_default { | ||
| group1 { | ||
| psels = <NRF_PSEL(PWM_OUT0, 0, 17)>; | ||
| }; | ||
| }; | ||
| pwm0_sleep: pwm0_sleep { | ||
| group1 { | ||
| psels = <NRF_PSEL(PWM_OUT0, 0, 17)>; | ||
| low-power-enable; | ||
| }; | ||
| }; | ||
| }; | ||
ReFil marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| /* | ||
| * | ||
| * Copyright (c) 2023 The ZMK Contributors | ||
| * SPDX-License-Identifier: MIT | ||
| * | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
| #include <nordic/nrf52840_qiaa.dtsi> | ||
|
|
||
| #include <dt-bindings/led/led.h> | ||
| #include <dt-bindings/zmk/matrix_transform.h> | ||
|
|
||
| #include "adv360pro-pinctrl.dtsi" | ||
|
|
||
| / { | ||
| model = "Adv360 Pro"; | ||
| compatible = "kinesis,adv360pro"; | ||
|
|
||
| chosen { | ||
ReFil marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| zephyr,code-partition = &code_partition; | ||
| zephyr,sram = &sram0; | ||
| zephyr,flash = &flash0; | ||
| zephyr,console = &cdc_acm_uart; | ||
| zmk,kscan = &kscan0; | ||
| zmk,backlight = &backlight; | ||
| zmk,battery = &vbatt; | ||
| zmk,matrix_transform = &default_transform; | ||
| zmk,underglow = &led_strip; | ||
| }; | ||
|
|
||
| default_transform: keymap_transform_0 { | ||
| compatible = "zmk,matrix-transform"; | ||
| columns = <20>; | ||
| rows = <5>; | ||
|
|
||
|
|
||
| map = < | ||
| RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,13) RC(4,14) RC(4,15) RC(4,16) RC(4,17) RC(4,18) RC(4,19) | ||
| RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17) RC(3,18) RC(3,19) | ||
| RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,13) RC(2,14) RC(2,15) RC(2,16) RC(2,17) RC(2,18) RC(2,19) | ||
| RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,9) RC(1,10) RC(1,14) RC(1,15) RC(1,16) RC(1,17) RC(1,18) RC(1,19) | ||
| RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19) | ||
|
|
||
| >; | ||
| }; | ||
| ext-power { | ||
| compatible = "zmk,ext-power-generic"; | ||
| label = "EXT_POWER"; | ||
| control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
|
|
||
| vbatt: vbatt { | ||
| compatible = "zmk,battery-voltage-divider"; | ||
| io-channels = <&adc 2>; | ||
| output-ohms = <100000>; | ||
| full-ohms = <(100000 + 100000)>; | ||
| }; | ||
|
|
||
| backlight: pwmleds { | ||
| compatible = "pwm-leds"; | ||
| pwm_led_0 { | ||
| pwms = <&pwm0 0 10000 PWM_POLARITY_NORMAL>; | ||
| }; | ||
| }; | ||
|
|
||
| }; | ||
|
|
||
| &pwm0 { | ||
| status = "okay"; | ||
| pinctrl-0 = <&pwm0_default>; | ||
| pinctrl-1 = <&pwm0_sleep>; | ||
| pinctrl-names = "default", "sleep"; | ||
| }; | ||
|
|
||
| &adc { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpiote { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpio0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &gpio1 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| &usbd { | ||
| status = "okay"; | ||
| cdc_acm_uart: cdc_acm_uart { | ||
| compatible = "zephyr,cdc-acm-uart"; | ||
| }; | ||
| }; | ||
|
|
||
| &flash0 { | ||
| /* | ||
| * For more information, see: | ||
| * http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html | ||
| */ | ||
| partitions { | ||
| compatible = "fixed-partitions"; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
||
| sd_partition: partition@0 { | ||
| label = "softdevice"; | ||
| reg = <0x00000000 0x00026000>; | ||
| }; | ||
| code_partition: partition@26000 { | ||
| label = "code_partition"; | ||
| reg = <0x00026000 0x000c6000>; | ||
| }; | ||
|
|
||
| /* | ||
| * The flash starting at 0x000ec000 and ending at | ||
| * 0x000f3fff is reserved for use by the application. | ||
| */ | ||
|
|
||
| /* | ||
| * Storage partition will be used by FCB/LittleFS/NVS | ||
| * if enabled. | ||
| */ | ||
| storage_partition: partition@ec000 { | ||
| label = "storage"; | ||
| reg = <0x000ec000 0x00008000>; | ||
| }; | ||
|
|
||
| boot_partition: partition@f4000 { | ||
| label = "adafruit_boot"; | ||
| reg = <0x000f4000 0x0000c000>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &spi3 { | ||
| compatible = "nordic,nrf-spim"; | ||
| status = "okay"; | ||
| pinctrl-0 = <&spi3_default>; | ||
| pinctrl-1 = <&spi3_sleep>; | ||
| pinctrl-names = "default", "sleep"; | ||
|
|
||
| led_strip: ws2812@0 { | ||
| compatible = "worldsemi,ws2812-spi"; | ||
| label = "WS2812"; | ||
|
|
||
| /* SPI */ | ||
| reg = <0>; | ||
| spi-max-frequency = <4000000>; | ||
|
|
||
| /* WS2812 */ | ||
| chain-length = <3>; /* number of LEDs */ | ||
| spi-one-frame = <0x70>; | ||
| spi-zero-frame = <0x40>; | ||
|
|
||
| color-mapping = <LED_COLOR_ID_GREEN | ||
| LED_COLOR_ID_RED | ||
| LED_COLOR_ID_BLUE>; | ||
| }; | ||
| }; | ||
ReFil marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #include <behaviors.dtsi> | ||
| #include <dt-bindings/zmk/keys.h> | ||
| #include <dt-bindings/zmk/bt.h> | ||
| #include <dt-bindings/zmk/rgb.h> | ||
| #include <dt-bindings/zmk/backlight.h> | ||
|
|
||
| / { | ||
| keymap { | ||
| compatible = "zmk,keymap"; | ||
|
|
||
| default_layer { | ||
| bindings = < | ||
| &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog 1 &mo 3 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS | ||
| &kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH | ||
| &kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT | ||
| &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT | ||
| &mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT &mo 2 | ||
| >; | ||
| }; | ||
| keypad { | ||
| bindings = < | ||
| &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &mo 3 &kp N6 &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &kp MINUS | ||
| &kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp BSLH | ||
| &kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp SQT | ||
| &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT | ||
| &mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp KP_N0 &kp UP &kp DOWN &kp KP_DOT &kp RBKT &mo 2 | ||
| >; | ||
| }; | ||
| fn { | ||
| bindings = < | ||
| &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog 1 &mo 3 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 | ||
| &trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans | ||
| &trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &trans &trans &trans &trans &trans &trans | ||
| &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans | ||
| &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans | ||
| >; | ||
| }; | ||
| mod { | ||
| bindings = < | ||
| &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &trans &none &none &none &none &none &none | ||
| &none &none &none &none &none &none &bootloader &bootloader &none &none &none &none &none &none | ||
| &none &none &none &none &none &none &none &none &none &bt BT_CLR &none &none &none &none &none &none &none &none | ||
| &none &none &none &none &none &none &none &none &none &none &none &none &none &none | ||
| &none &none &none &none &none &none &none &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_INC &bl BL_DEC &none &none &none | ||
| >; | ||
| }; | ||
| }; | ||
| }; |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| identifier: adv360pro | ||
| name: Advantage 360 Pro | ||
| type: keyboard | ||
| arch: arm | ||
| toolchain: | ||
| - zephyr | ||
| - gnuarmemb | ||
| - xtools | ||
| supported: | ||
| - gpio | ||
| - i2c | ||
| - counter | ||
| - spi | ||
| - usb_device | ||
| - nvs | ||
| - can | ||
| - kscan | ||
| - ble | ||
| - pwm |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| file_format: "1" | ||
| id: adv360pro | ||
| name: Advantage 360 Pro | ||
| type: board | ||
| url: https://kinesis-ergo.com/keyboards/advantage360 | ||
| arch: arm | ||
| features: | ||
| - keys | ||
| - underglow | ||
| - backlight | ||
| outputs: | ||
| - usb | ||
| - ble | ||
| siblings: | ||
| - adv360pro_left | ||
| - adv360pro_right |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.