From 5acd2b0916940a3fbc99b20a843760f71b8e4986 Mon Sep 17 00:00:00 2001 From: Jason Chestnut Date: Thu, 8 Oct 2020 09:10:51 -0400 Subject: [PATCH] Correct formatting for pull request review. Add ZMK copyright headers where missing. Add BT_ bindings for testing purposes in keymap. --- app/boards/arm/preonic/CMakeLists.txt | 4 + app/boards/arm/preonic/board.cmake | 4 + app/boards/arm/preonic/preonic_rev3.dts | 98 +++++++++++----------- app/boards/arm/preonic/preonic_rev3.keymap | 79 ++++++++--------- 4 files changed, 97 insertions(+), 88 deletions(-) diff --git a/app/boards/arm/preonic/CMakeLists.txt b/app/boards/arm/preonic/CMakeLists.txt index 6a0ec73e..d91ee090 100644 --- a/app/boards/arm/preonic/CMakeLists.txt +++ b/app/boards/arm/preonic/CMakeLists.txt @@ -1,4 +1,8 @@ +# +# Copyright (c) 2020 The ZMK Contributors +# # SPDX-License-Identifier: MIT +# list(APPEND EXTRA_DTC_FLAGS "-qq") diff --git a/app/boards/arm/preonic/board.cmake b/app/boards/arm/preonic/board.cmake index 772796da..9f4749b4 100644 --- a/app/boards/arm/preonic/board.cmake +++ b/app/boards/arm/preonic/board.cmake @@ -1,4 +1,8 @@ +# +# Copyright (c) 2020 The ZMK Contributors +# # SPDX-License-Identifier: MIT +# board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse") board_runner_args(jlink "--device=STM32F303VC" "--speed=4000") diff --git a/app/boards/arm/preonic/preonic_rev3.dts b/app/boards/arm/preonic/preonic_rev3.dts index 0a307487..183dcaf9 100644 --- a/app/boards/arm/preonic/preonic_rev3.dts +++ b/app/boards/arm/preonic/preonic_rev3.dts @@ -9,15 +9,15 @@ #include / { - model = "Preonic PCD, rev3"; - compatible = "preonic,rev3", "st,stm32f303"; + model = "Preonic PCD, rev3"; + compatible = "preonic,rev3", "st,stm32f303"; - chosen { - zephyr,sram = &sram0; - zephyr,flash = &flash0; - zmk,kscan = &kscan0; + chosen { + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zmk,kscan = &kscan0; zmk,matrix_transform = &layout_grid_transform; - }; + }; layout_grid_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; @@ -29,7 +29,7 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5) RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,5) RC(9,0) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5) - >; + >; }; layout_mit_transform: keymap_transform_1 { @@ -42,7 +42,7 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5) RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,0) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5) - >; + >; }; layout_2x2u_transform: keymap_transform_2 { @@ -55,55 +55,55 @@ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5) RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,5) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5) - >; + >; }; - kscan0: kscan_0 { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; diode-direction = "col2row"; - row-gpios - = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioc 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioc 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioc 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioa 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&gpioa 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - col-gpios - = <&gpiob 11 GPIO_ACTIVE_HIGH> - , <&gpiob 10 GPIO_ACTIVE_HIGH> - , <&gpiob 2 GPIO_ACTIVE_HIGH> - , <&gpiob 1 GPIO_ACTIVE_HIGH> - , <&gpioa 7 GPIO_ACTIVE_HIGH> - , <&gpiob 0 GPIO_ACTIVE_HIGH> - ; - }; + row-gpios + = <&gpioa 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioa 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpiob 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioc 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioc 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioc 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioa 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioa 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&gpioa 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&gpiob 11 GPIO_ACTIVE_HIGH> + , <&gpiob 10 GPIO_ACTIVE_HIGH> + , <&gpiob 2 GPIO_ACTIVE_HIGH> + , <&gpiob 1 GPIO_ACTIVE_HIGH> + , <&gpioa 7 GPIO_ACTIVE_HIGH> + , <&gpiob 0 GPIO_ACTIVE_HIGH> + ; + }; }; &usb { - status = "okay"; + status = "okay"; }; &flash0 { - /* - * For more information, see: - * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions - */ - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + /* + * For more information, see: + * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions + */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - /* Set 6Kb of storage at the end of the 256Kb of flash */ - storage_partition: partition@3e800 { - label = "storage"; - reg = <0x0003e800 0x00001800>; - }; - }; + /* Set 6Kb of storage at the end of the 256Kb of flash */ + storage_partition: partition@3e800 { + label = "storage"; + reg = <0x0003e800 0x00001800>; + }; + }; }; diff --git a/app/boards/arm/preonic/preonic_rev3.keymap b/app/boards/arm/preonic/preonic_rev3.keymap index e53dfedd..7b0ef1a3 100644 --- a/app/boards/arm/preonic/preonic_rev3.keymap +++ b/app/boards/arm/preonic/preonic_rev3.keymap @@ -5,6 +5,7 @@ #include #include +#include #define DEFAULT 0 #define LOWER 1 @@ -13,68 +14,68 @@ / { chosen { zmk,matrix_transform = &layout_grid_transform; }; - keymap { - compatible = "zmk,keymap"; + keymap { + compatible = "zmk,keymap"; - default_layer { + default_layer { // ---------------------------------------------------------------------------------------- // | GRAV | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BSPC | // | TAB | Q | W | E | R | T | Y | U | I | O | P | DEL | // | ESC | A | S | D | F | G | H | J | K | L | ; | ' | // | SHIFT | Z | X | C | V | B | N | M | , | . | / | RET | // | | LGUI | LALT | LCTL | LOWR | SPC | SPC | RAIS | LARW | DARW | UARW | RARW | - bindings = < - &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL - &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT - &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RET - &trans &kp LCTL &kp LALT &kp LGUI &mo LOWER &kp SPC &kp SPC &mo RAISE &kp LARW &kp DARW &kp UARW &kp RARW - >; - }; - lower { + bindings = < + &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL + &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT + &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RET + &trans &kp LCTL &kp LALT &kp LGUI &mo LOWER &kp SPC &kp SPC &mo RAISE &kp LARW &kp DARW &kp UARW &kp RARW + >; + }; + lower { // ----------------------------------------------------------------------------------------- // | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | BSPC | // | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | DEL | // | DEL | F1 | F2 | F3 | F4 | F5 | F6 | - | + | [ | ] | | | // | | F7 | F8 | F9 | F10 | F11 | F12 | | LCTL | HOME | END | | // | LALT | | | | | | | ADJ | NEXT | VOL- | VOL+ | PLAY | - bindings = < - &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp BKSP - &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp DEL - &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp KPLS &kp LBKT &kp RBKT &kp PIPE - &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &kp LCTL &kp HOME &kp END &trans - &kp LALT &trans &trans &trans &trans &trans &trans &mo ADJ &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY - >; - }; - raise { + bindings = < + &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp BKSP + &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp DEL + &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp KPLS &kp LBKT &kp RBKT &kp PIPE + &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &kp LCTL &kp HOME &kp END &trans + &kp LALT &trans &trans &trans &trans &trans &trans &mo ADJ &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY + >; + }; + raise { // ----------------------------------------------------------------------------------------- // | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BSPC | // | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | DEL | // | DEL | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ | // | | F7 | F8 | F9 | F10 | F11 | F12 | # | \ | PGUP | PGDN | | // | | | | | ADJ | SHFT | | | NEXT | VOL- | VOL+ | PLAY | - bindings = < - &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP - &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp DEL - &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH - &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans - &trans &trans &trans &trans &mo ADJ &kp LSFT &trans &trans &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY - >; - }; - adjust { + bindings = < + &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP + &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp DEL + &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH + &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans + &trans &trans &trans &trans &mo ADJ &kp LSFT &trans &trans &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY + >; + }; + adjust { // ----------------------------------------------------------------------------------------- // | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | // | |RESET | | | | | | | | | | DEL | // | | | | | | | | | | | | | // | | | | | | | | | | | | | // | | | | | | | | | | | | | - bindings = < - &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 - &trans &reset &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL - &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 - >; - }; - }; + bindings = < + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 + &trans &reset &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL + &trans &trans &bt BT_PRV &bt BT_NXT &bt BT_CLR &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 + >; + }; + }; };