tabs fix
This commit is contained in:
Dmitry Kupriyanov
parent
da1cd1787b
commit
94f9868982
7 changed files with 133 additions and 134 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
config BOARD_ENABLE_DCDC
|
config BOARD_ENABLE_DCDC
|
||||||
bool "Enable DCDC mode"
|
bool "Enable DCDC mode"
|
||||||
select SOC_DCDC_NRF52X
|
select SOC_DCDC_NRF52X
|
||||||
default y
|
default y
|
||||||
depends on (BOARD_DAO_LEFT || BOARD_DAO_RIGHT)
|
depends on (BOARD_DAO_LEFT || BOARD_DAO_RIGHT)
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,9 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
config BOARD_DAO_LEFT
|
config BOARD_DAO_LEFT
|
||||||
bool "dao_left"
|
bool "dao_left"
|
||||||
depends on SOC_NRF52840_QIAA
|
depends on SOC_NRF52840_QIAA
|
||||||
|
|
||||||
config BOARD_DAO_RIGHT
|
config BOARD_DAO_RIGHT
|
||||||
bool "dao_right"
|
bool "dao_right"
|
||||||
depends on SOC_NRF52840_QIAA
|
depends on SOC_NRF52840_QIAA
|
||||||
|
|
|
||||||
|
|
@ -4,40 +4,40 @@
|
||||||
if BOARD_DAO_LEFT
|
if BOARD_DAO_LEFT
|
||||||
|
|
||||||
config ZMK_KEYBOARD_NAME
|
config ZMK_KEYBOARD_NAME
|
||||||
default "Dao"
|
default "Dao"
|
||||||
|
|
||||||
config ZMK_SPLIT_ROLE_CENTRAL
|
config ZMK_SPLIT_ROLE_CENTRAL
|
||||||
default y
|
default y
|
||||||
|
|
||||||
endif # BOARD_DAO_LEFT
|
endif # BOARD_DAO_LEFT
|
||||||
|
|
||||||
if BOARD_DAO_LEFT || BOARD_DAO_RIGHT
|
if BOARD_DAO_LEFT || BOARD_DAO_RIGHT
|
||||||
|
|
||||||
config BOARD
|
config BOARD
|
||||||
default "dao"
|
default "dao"
|
||||||
|
|
||||||
config ZMK_SPLIT
|
config ZMK_SPLIT
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config BT_CTLR
|
config BT_CTLR
|
||||||
default BT
|
default BT
|
||||||
|
|
||||||
config ZMK_BLE
|
config ZMK_BLE
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config ZMK_USB
|
config ZMK_USB
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config ZMK_BATTERY_VOLTAGE_DIVIDER
|
config ZMK_BATTERY_VOLTAGE_DIVIDER
|
||||||
default y
|
default y
|
||||||
|
|
||||||
if USB
|
if USB
|
||||||
|
|
||||||
config USB_NRFX
|
config USB_NRFX
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config USB_DEVICE_STACK
|
config USB_DEVICE_STACK
|
||||||
default y
|
default y
|
||||||
|
|
||||||
endif # USB
|
endif # USB
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,143 +11,142 @@
|
||||||
|
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "dao";
|
model = "dao";
|
||||||
compatible = "dao";
|
compatible = "dao";
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
zephyr,code-partition = &code_partition;
|
zephyr,code-partition = &code_partition;
|
||||||
zephyr,sram = &sram0;
|
zephyr,sram = &sram0;
|
||||||
zephyr,flash = &flash0;
|
zephyr,flash = &flash0;
|
||||||
zmk,kscan = &kscan0;
|
zmk,kscan = &kscan0;
|
||||||
zmk,matrix_transform = &default_transform;
|
zmk,matrix_transform = &default_transform;
|
||||||
zmk,battery = &vbatt;
|
zmk,battery = &vbatt;
|
||||||
};
|
};
|
||||||
|
|
||||||
default_transform: keymap_transform_0 {
|
default_transform: keymap_transform_0 {
|
||||||
compatible = "zmk,matrix-transform";
|
compatible = "zmk,matrix-transform";
|
||||||
columns = <12>;
|
columns = <12>;
|
||||||
rows = <4>;
|
rows = <4>;
|
||||||
|
|
||||||
// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 |
|
// | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 |
|
||||||
// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 |
|
// | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 |
|
||||||
// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
|
// | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 |
|
||||||
// | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | |
|
// | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | |
|
||||||
map = <
|
map = <
|
||||||
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
|
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
|
||||||
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
|
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
|
||||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
|
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
|
||||||
RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
|
RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
extra_keys_transform: keymap_transform_1 {
|
extra_keys_transform: keymap_transform_1 {
|
||||||
compatible = "zmk,matrix-transform";
|
compatible = "zmk,matrix-transform";
|
||||||
columns = <14>;
|
columns = <14>;
|
||||||
rows = <4>;
|
rows = <4>;
|
||||||
|
|
||||||
// | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 |
|
// | SW19 | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | SW19 |
|
||||||
// | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | |
|
// | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | |
|
||||||
// | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | |
|
// | | SW13 | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | SW13 | |
|
||||||
// | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | |
|
// | | | | | SW20 | SW21 | SW22 | | SW22 | SW21 | SW20 | | | | |
|
||||||
map = <
|
map = <
|
||||||
RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6)
|
RC(3,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(3,6)
|
||||||
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
|
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
|
||||||
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
|
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
|
||||||
RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
|
RC(3,3) RC(3,4) RC(3,5) RC(3,11) RC(3,10) RC(3,9)
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
kscan0: kscan {
|
kscan0: kscan {
|
||||||
compatible = "zmk,kscan-gpio-matrix";
|
compatible = "zmk,kscan-gpio-matrix";
|
||||||
label = "KSCAN";
|
label = "KSCAN";
|
||||||
|
|
||||||
diode-direction = "col2row";
|
diode-direction = "col2row";
|
||||||
row-gpios
|
row-gpios
|
||||||
= <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
= <&gpio0 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||||
, <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
, <&gpio0 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||||
, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
, <&gpio0 22 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||||
, <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
, <&gpio0 24 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
vbatt: vbatt {
|
|
||||||
compatible = "zmk,battery-voltage-divider";
|
|
||||||
label = "VBATT";
|
|
||||||
io-channels = <&adc 7>;
|
|
||||||
output-ohms = <2000000>;
|
|
||||||
full-ohms = <(2000000 + 820000)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
vbatt: vbatt {
|
||||||
|
compatible = "zmk,battery-voltage-divider";
|
||||||
|
label = "VBATT";
|
||||||
|
io-channels = <&adc 7>;
|
||||||
|
output-ohms = <2000000>;
|
||||||
|
full-ohms = <(2000000 + 820000)>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
&adc {
|
&adc {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
&gpiote {
|
&gpiote {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
&gpio0 {
|
&gpio0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
&gpio1 {
|
&gpio1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
&usbd {
|
&usbd {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart0 {
|
&uart0 {
|
||||||
compatible = "nordic,nrf-uarte";
|
compatible = "nordic,nrf-uarte";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
current-speed = <115200>;
|
current-speed = <115200>;
|
||||||
tx-pin = <19>;
|
tx-pin = <19>;
|
||||||
rx-pin = <21>;
|
rx-pin = <21>;
|
||||||
rts-pin = <23>;
|
rts-pin = <23>;
|
||||||
cts-pin = <25>;
|
cts-pin = <25>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
&flash0 {
|
&flash0 {
|
||||||
/*
|
/*
|
||||||
* For more information, see:
|
* For more information, see:
|
||||||
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
|
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
|
||||||
*/
|
*/
|
||||||
partitions {
|
partitions {
|
||||||
compatible = "fixed-partitions";
|
compatible = "fixed-partitions";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
|
|
||||||
sd_partition: partition@0 {
|
sd_partition: partition@0 {
|
||||||
label = "softdevice";
|
label = "softdevice";
|
||||||
reg = <0x00000000 0x00026000>;
|
reg = <0x00000000 0x00026000>;
|
||||||
};
|
};
|
||||||
code_partition: partition@26000 {
|
code_partition: partition@26000 {
|
||||||
label = "code_partition";
|
label = "code_partition";
|
||||||
reg = <0x00026000 0x000c6000>;
|
reg = <0x00026000 0x000c6000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The flash starting at 0x000ec000 and ending at
|
* The flash starting at 0x000ec000 and ending at
|
||||||
* 0x000f3fff is reserved for use by the application.
|
* 0x000f3fff is reserved for use by the application.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Storage partition will be used by FCB/LittleFS/NVS
|
* Storage partition will be used by FCB/LittleFS/NVS
|
||||||
* if enabled.
|
* if enabled.
|
||||||
*/
|
*/
|
||||||
storage_partition: partition@ec000 {
|
storage_partition: partition@ec000 {
|
||||||
label = "storage";
|
label = "storage";
|
||||||
reg = <0x000ec000 0x00008000>;
|
reg = <0x000ec000 0x00008000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot_partition: partition@f4000 {
|
boot_partition: partition@f4000 {
|
||||||
label = "adafruit_boot";
|
label = "adafruit_boot";
|
||||||
reg = <0x000f4000 0x0000c000>;
|
reg = <0x000f4000 0x0000c000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,12 @@
|
||||||
#include "dao.dtsi"
|
#include "dao.dtsi"
|
||||||
|
|
||||||
&kscan0 {
|
&kscan0 {
|
||||||
col-gpios
|
col-gpios
|
||||||
= <&gpio0 12 GPIO_ACTIVE_HIGH>
|
= <&gpio0 12 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio1 9 GPIO_ACTIVE_HIGH>
|
, <&gpio1 9 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 8 GPIO_ACTIVE_HIGH>
|
, <&gpio0 8 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 13 GPIO_ACTIVE_HIGH>
|
, <&gpio0 13 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 15 GPIO_ACTIVE_HIGH>
|
, <&gpio0 15 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 20 GPIO_ACTIVE_HIGH>
|
, <&gpio0 20 GPIO_ACTIVE_HIGH>
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -7,20 +7,20 @@
|
||||||
#include "dao.dtsi"
|
#include "dao.dtsi"
|
||||||
|
|
||||||
&default_transform {
|
&default_transform {
|
||||||
col-offset = <6>;
|
col-offset = <6>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&extra_keys_transform {
|
&extra_keys_transform {
|
||||||
col-offset = <6>;
|
col-offset = <6>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&kscan0 {
|
&kscan0 {
|
||||||
col-gpios
|
col-gpios
|
||||||
= <&gpio0 12 GPIO_ACTIVE_HIGH>
|
= <&gpio0 12 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio1 9 GPIO_ACTIVE_HIGH>
|
, <&gpio1 9 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 8 GPIO_ACTIVE_HIGH>
|
, <&gpio0 8 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 13 GPIO_ACTIVE_HIGH>
|
, <&gpio0 13 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 15 GPIO_ACTIVE_HIGH>
|
, <&gpio0 15 GPIO_ACTIVE_HIGH>
|
||||||
, <&gpio0 20 GPIO_ACTIVE_HIGH>
|
, <&gpio0 20 GPIO_ACTIVE_HIGH>
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue