diff --git a/app/boards/arm/adv360pro/Kconfig.board b/app/boards/arm/adv360pro/Kconfig.board index 9ccf69202e2..51ebaec0791 100644 --- a/app/boards/arm/adv360pro/Kconfig.board +++ b/app/boards/arm/adv360pro/Kconfig.board @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 The ZMK Contributors +# Copyright (c) 2023 The ZMK Contributors # SPDX-License-Identifier: MIT # diff --git a/app/boards/arm/adv360pro/Kconfig.defconfig b/app/boards/arm/adv360pro/Kconfig.defconfig index 908745c0960..ebbda7d213d 100644 --- a/app/boards/arm/adv360pro/Kconfig.defconfig +++ b/app/boards/arm/adv360pro/Kconfig.defconfig @@ -1,14 +1,14 @@ # -# 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 @@ -16,7 +16,7 @@ endif # BOARD_ADV360PRO_LEFT if BOARD_ADV360PRO_RIGHT - config ZMK_KEYBOARD_NAME +config ZMK_KEYBOARD_NAME default "Adv360 Pro rt" endif # BOARD_ADV360PRO_RIGHT diff --git a/app/boards/arm/adv360pro/adv360pro_pinctrl.dtsi b/app/boards/arm/adv360pro/adv360pro-pinctrl.dtsi similarity index 100% rename from app/boards/arm/adv360pro/adv360pro_pinctrl.dtsi rename to app/boards/arm/adv360pro/adv360pro-pinctrl.dtsi diff --git a/app/boards/arm/adv360pro/adv360pro.dtsi b/app/boards/arm/adv360pro/adv360pro.dtsi index 6bfd04589fe..72ee9050996 100644 --- a/app/boards/arm/adv360pro/adv360pro.dtsi +++ b/app/boards/arm/adv360pro/adv360pro.dtsi @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2021 Polarity Works +* Copyright (c) 2023 The ZMK Contributors * SPDX-License-Identifier: MIT * */ @@ -11,16 +11,17 @@ #include #include -#include "adv360pro_pinctrl.dtsi" +#include "adv360pro-pinctrl.dtsi" / { - model = "Adv360"; + model = "Adv360 Pro"; compatible = "kinesis,adv360pro"; chosen { 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; @@ -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"; @@ -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>; }; + }; }; @@ -90,6 +91,10 @@ &usbd { status = "okay"; + cdc_acm_uart: cdc_acm_uart { + compatible = "zephyr,cdc-acm-uart"; + label = "CDC_ACM_0"; + }; }; &flash0 { diff --git a/app/boards/arm/adv360pro/adv360pro_left.dts b/app/boards/arm/adv360pro/adv360pro_left.dts index ab21d7f26d5..6ef5f59071b 100644 --- a/app/boards/arm/adv360pro/adv360pro_left.dts +++ b/app/boards/arm/adv360pro/adv360pro_left.dts @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2022 The ZMK Contributors +* Copyright (c) 2023 The ZMK Contributors * SPDX-License-Identifier: MIT * */ diff --git a/app/boards/arm/adv360pro/adv360pro_left.keymap b/app/boards/arm/adv360pro/adv360pro_left.keymap index 4ff878bfe66..84d9b005b64 100644 --- a/app/boards/arm/adv360pro/adv360pro_left.keymap +++ b/app/boards/arm/adv360pro/adv360pro_left.keymap @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2022 The ZMK Contributors +* Copyright (c) 2023 The ZMK Contributors * SPDX-License-Identifier: MIT * */ diff --git a/app/boards/arm/adv360pro/adv360pro_left_defconfig b/app/boards/arm/adv360pro/adv360pro_left_defconfig index 37dc44e0c1c..6eb5a8d042a 100644 --- a/app/boards/arm/adv360pro/adv360pro_left_defconfig +++ b/app/boards/arm/adv360pro/adv360pro_left_defconfig @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 The ZMK Contributors +# Copyright (c) 2023 The ZMK Contributors # SPDX-License-Identifier: MIT # diff --git a/app/boards/arm/adv360pro/adv360pro_right.dts b/app/boards/arm/adv360pro/adv360pro_right.dts index 03e6d6bb928..97d846f855c 100644 --- a/app/boards/arm/adv360pro/adv360pro_right.dts +++ b/app/boards/arm/adv360pro/adv360pro_right.dts @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2022 The ZMK Contributors +* Copyright (c) 2023 The ZMK Contributors * SPDX-License-Identifier: MIT * */ @@ -8,9 +8,6 @@ #include "adv360pro.dtsi" /{ - - - kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; @@ -39,5 +36,5 @@ }; &default_transform { - col-offset = <10>; - }; + col-offset = <10>; +}; diff --git a/app/boards/arm/adv360pro/adv360pro_right.keymap b/app/boards/arm/adv360pro/adv360pro_right.keymap index 4ff878bfe66..84d9b005b64 100644 --- a/app/boards/arm/adv360pro/adv360pro_right.keymap +++ b/app/boards/arm/adv360pro/adv360pro_right.keymap @@ -1,6 +1,6 @@ /* * -* Copyright (c) 2022 The ZMK Contributors +* Copyright (c) 2023 The ZMK Contributors * SPDX-License-Identifier: MIT * */ diff --git a/app/boards/arm/adv360pro/adv360pro_right_defconfig b/app/boards/arm/adv360pro/adv360pro_right_defconfig index 282c1b0920d..b5174549ea4 100644 --- a/app/boards/arm/adv360pro/adv360pro_right_defconfig +++ b/app/boards/arm/adv360pro/adv360pro_right_defconfig @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 The ZMK Contributors +# Copyright (c) 2023 The ZMK Contributors # SPDX-License-Identifier: MIT # diff --git a/app/boards/arm/adv360pro/board.cmake b/app/boards/arm/adv360pro/board.cmake index 34652907dcf..6d62a8a16bf 100644 --- a/app/boards/arm/adv360pro/board.cmake +++ b/app/boards/arm/adv360pro/board.cmake @@ -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)