Skip to content
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

feat(boards) Kinesis Advantage 360 pro #1454

Merged
merged 18 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/Kconfig.board
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2023 The ZMK Contributors
# SPDX-License-Identifier: MIT
#

Expand Down
8 changes: 4 additions & 4 deletions app/boards/arm/adv360pro/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2023 The ZMK Contributors
# SPDX-License-Identifier: MIT
#

if BOARD_ADV360PRO_LEFT

config ZMK_KEYBOARD_NAME
config ZMK_KEYBOARD_NAME
default "Adv360 Pro"

config ZMK_SPLIT_ROLE_CENTRAL
config ZMK_SPLIT_ROLE_CENTRAL
default y


ReFil marked this conversation as resolved.
Show resolved Hide resolved
endif # BOARD_ADV360PRO_LEFT

if BOARD_ADV360PRO_RIGHT

config ZMK_KEYBOARD_NAME
config ZMK_KEYBOARD_NAME
default "Adv360 Pro rt"

endif # BOARD_ADV360PRO_RIGHT
Expand Down
27 changes: 16 additions & 11 deletions app/boards/arm/adv360pro/adv360pro.dtsi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2021 Polarity Works
* Copyright (c) 2023 The ZMK Contributors
* SPDX-License-Identifier: MIT
*
*/
Expand All @@ -11,16 +11,17 @@
#include <dt-bindings/led/led.h>
#include <dt-bindings/zmk/matrix_transform.h>

#include "adv360pro_pinctrl.dtsi"
#include "adv360pro-pinctrl.dtsi"

/ {
model = "Adv360";
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;
Expand All @@ -44,10 +45,10 @@
>;
};
ext-power {
compatible = "zmk,ext-power-generic";
label = "EXT_POWER";
control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
compatible = "zmk,ext-power-generic";
label = "EXT_POWER";
control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};

vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
Expand All @@ -57,11 +58,11 @@
};

backlight: pwmleds {
compatible = "pwm-leds";
pwm_led_0 {
pwms = <&pwm0 0 10000 PWM_POLARITY_NORMAL>;
};
compatible = "pwm-leds";
pwm_led_0 {
pwms = <&pwm0 0 10000 PWM_POLARITY_NORMAL>;
};
};

};

Expand Down Expand Up @@ -90,6 +91,10 @@

&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};

&flash0 {
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/adv360pro_left.dts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2022 The ZMK Contributors
* Copyright (c) 2023 The ZMK Contributors
* SPDX-License-Identifier: MIT
*
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/adv360pro_left.keymap
ReFil marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2022 The ZMK Contributors
* Copyright (c) 2023 The ZMK Contributors
* SPDX-License-Identifier: MIT
*
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/adv360pro_left_defconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2023 The ZMK Contributors
# SPDX-License-Identifier: MIT
#

Expand Down
9 changes: 3 additions & 6 deletions app/boards/arm/adv360pro/adv360pro_right.dts
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
/*
*
* Copyright (c) 2022 The ZMK Contributors
* Copyright (c) 2023 The ZMK Contributors
* SPDX-License-Identifier: MIT
*
*/

#include "adv360pro.dtsi"

/{



kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";

Expand Down Expand Up @@ -39,5 +36,5 @@
};

&default_transform {
col-offset = <10>;
};
col-offset = <10>;
};
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/adv360pro_right.keymap
ReFil marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2022 The ZMK Contributors
* Copyright (c) 2023 The ZMK Contributors
* SPDX-License-Identifier: MIT
*
*/
Expand Down
2 changes: 1 addition & 1 deletion app/boards/arm/adv360pro/adv360pro_right_defconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2023 The ZMK Contributors
# SPDX-License-Identifier: MIT
#

Expand Down
3 changes: 1 addition & 2 deletions app/boards/arm/adv360pro/board.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#
# Copyright (c) 2022 The ZMK Contributors
# Copyright (c) 2023 The ZMK Contributors
# SPDX-License-Identifier: MIT
#

board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")

include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
#include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
Loading