ben
/
kinesis360
1
0
Fork 0
Code Issues Pull Requests 1 Packages Releases 1 Activity
kinesis360/data/diff-config.patch

280 lines
20 KiB
Diff
Raw Permalink Blame History

diff --git config/adv360.keymap config/adv360.keymap
index cf80f15..fecc082 100644
--- config/adv360.keymap
+++ config/adv360.keymap
@@ -1,6 +1,7 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
+#include <dt-bindings/zmk/outputs.h>
#include <dt-bindings/zmk/rgb.h>
#include <dt-bindings/zmk/backlight.h>
@@ -33,20 +34,20 @@
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
+ &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 &kp GRAVE &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 PSCRN &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 &tog 0
>;
};
- keypad {
+ mac {
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
+ &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 &kp LCMD &kp LALT &trans &kp RCTRL &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 &trans
>;
};
fn {
@@ -60,7 +61,7 @@
};
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 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &trans &none &out OUT_USB &out OUT_BLE &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 &rgb_ug RGB_MEFS_CMD 5 &none &none &none &none &none &none
&none &none &none &none &macro_ver &none &none &none &none &none &none &none &none &none
diff --git config/boards/arm/adv360/adv360.dtsi config/boards/arm/adv360/adv360.dtsi
index 0c85836..71c4131 100644
--- config/boards/arm/adv360/adv360.dtsi
+++ config/boards/arm/adv360/adv360.dtsi
@@ -21,7 +21,7 @@
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
- zephyr,console = &cdc_acm_uart;
+ //zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,backlight = &backlight;
zmk,battery = &vbatt;
@@ -44,8 +44,9 @@
>;
};
- EXT_POWER {
+ ext-power {
compatible = "zmk,ext-power-generic";
+ label = "EXT_POWER";
control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
@@ -90,9 +91,9 @@
&usbd {
status = "okay";
- cdc_acm_uart: cdc_acm_uart {
- compatible = "zephyr,cdc-acm-uart";
- };
+ //cdc_acm_uart: cdc_acm_uart {
+ // compatible = "zephyr,cdc-acm-uart";
+ //};
};
@@ -107,9 +108,11 @@
#size-cells = <1>;
sd_partition: partition@0 {
+ label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
+ label = "code_partition";
reg = <0x00026000 0x000c6000>;
};
@@ -123,10 +126,12 @@
* if enabled.
*/
storage_partition: partition@ec000 {
+ label = "storage";
reg = <0x000ec000 0x00008000>;
};
boot_partition: partition@f4000 {
+ label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
@@ -141,6 +146,7 @@
led_strip: ws2812@0 {
compatible = "worldsemi,ws2812-spi";
+ label = "WS2812";
/* SPI */
reg = <0>;
diff --git config/boards/arm/adv360/adv360_left_defconfig config/boards/arm/adv360/adv360_left_defconfig
index b37679a..486b2bb 100644
--- config/boards/arm/adv360/adv360_left_defconfig
+++ config/boards/arm/adv360/adv360_left_defconfig
@@ -49,26 +49,29 @@ CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
#BT configuration
CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
CONFIG_BT_DIS_MANUF="Kinesis Corporation"
-#CONFIG_BT_PRIVACY=n
-#CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=y
-#CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=600
-#CONFIG_BT_PERIPHERAL_PREF_MIN_INT=12
-#CONFIG_BT_PERIPHERAL_PREF_MAX_INT=24
-#CONFIG_BT_PERIPHERAL_PREF_LATENCY=30
-CONFIG_BT_BAS=n #Set this to y to enable BLE battery reporting
+CONFIG_BT_PRIVACY=y
+CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=y
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=600
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=12
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=24
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=30
+# Battery reporting
+# https://zmk.dev/docs/config/system#bluetooth
+# https://github.com/KinesisCorporation/Adv360-Pro-ZMK/pull/248/files
+CONFIG_BT_BAS=y
#Misc configuration
CONFIG_USB_DEVICE_VID=0x29EA
CONFIG_USB_DEVICE_PID=0x0362
CONFIG_USB_DEVICE_MANUFACTURER="Kinesis Corporation"
CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT=n #Set this to y for F13-F24 and intl keys with NKRO
+#CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT=n #Set this to y for F13-F24 and intl keys with NKRO
CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
-CONFIG_ZMK_BLE_PASSKEY_ENTRY=n
+#CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+#CONFIG_ZMK_BLE_PASSKEY_ENTRY=n
CONFIG_ZMK_BLE=y
CONFIG_ZMK_USB=y
-CONFIG_ZMK_HID_INDICATORS=y
\ No newline at end of file
+#CONFIG_ZMK_HID_INDICATORS=n
diff --git config/boards/arm/adv360/adv360_right_defconfig config/boards/arm/adv360/adv360_right_defconfig
index 3c2e65a..b1abea7 100644
--- config/boards/arm/adv360/adv360_right_defconfig
+++ config/boards/arm/adv360/adv360_right_defconfig
@@ -55,7 +55,7 @@ CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
CONFIG_BUILD_OUTPUT_UF2=y
-CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
+#CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
CONFIG_ZMK_BLE=y
CONFIG_ZMK_USB=y
diff --git config/boards/arm/adv360/board.cmake config/boards/arm/adv360/board.cmake
index 292a274..a5deada 100644
--- config/boards/arm/adv360/board.cmake
+++ 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/uf2.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git config/cust_behaviors.json config/cust_behaviors.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ config/cust_behaviors.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git config/cust_keycodes.json config/cust_keycodes.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ config/cust_keycodes.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git config/keymap.json config/keymap.json
index bd3fa91..2be1c49 100644
--- config/keymap.json
+++ config/keymap.json
@@ -4,23 +4,23 @@
"layout": "LAYOUT",
"layer_names": [
"base",
- "keypad",
+ "mac",
"fn",
"mod"
],
"layers": [
[
- "&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"
+ "&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 ", "&kp GRAVE ", "&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 PSCRN", "&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", "&tog 0 "
], [
- "&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"
+ "&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", "&kp LCMD ", "&kp LALT", "&trans", "&kp RCTRL", "&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", "&trans"
], [
"&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 ",
@@ -28,11 +28,11 @@
"&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"
], [
- "&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 ", "&rgb_ug RGB_MEFS_CMD 5 ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none",
- "&none ", "&none ", "&none ", "&none ", "&macro_ver ", "&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"
+ "&none ", "&bt BT_SEL 0 ", "&bt BT_SEL 1 ", "&bt BT_SEL 2 ", "&bt BT_SEL 3 ", "&bt BT_SEL 4 ", "&none ", "&trans ", "&none ", "&out OUT_USB ", "&out OUT_BLE ", "&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 ", "&rgb_ug RGB_MEFS_CMD 5 ", "&none ", "&none ", "&none ", "&none", "&none", "&none",
+ "&none ", "&none ", "&none ", "&none ", "&macro_ver ", "&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"
]
]
}
diff --git config/west.yml config/west.yml
index 9f3a48d..137ea40 100644
--- config/west.yml
+++ config/west.yml
@@ -7,7 +7,8 @@ manifest:
projects:
- name: zmk
remote: refil
- revision: adv360-z3.5
+ revision: adv360-z3.2
+ #revision: adv360-z3.5
import: app/west.yml
self:
path: config
View Git Blame Copy Permalink