kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up some formatting

Browse source
This commit is contained in:
Kyle McCreery 2022-07-11 14:48:16 -04:00
parent 3d7cfb3015
commit d9fd35782f
10 changed files with 179 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/boards/arm/pillbug/Kconfig
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: MIT
config BOARD_ENABLE_DCDC
bool "Enable DCDC mode"
select SOC_DCDC_NRF52X
default n
depends on (BOARD_PILLBUG)
bool "Enable DCDC mode"
select SOC_DCDC_NRF52X
default n
depends on (BOARD_PILLBUG)

4
app/boards/arm/pillbug/Kconfig.board
View file

@ -2,5 +2,5 @@
# SPDX-License-Identifier: MIT
config BOARD_PILLBUG
bool "PillBug"
depends on SOC_NRF52840_QIAA
bool "PillBug"
depends on SOC_NRF52840_QIAA

10
app/boards/arm/pillbug/Kconfig.defconfig
View file

@ -4,22 +4,22 @@
if BOARD_PILLBUG
config BOARD
default "PillBug"
default "PillBug"
if USB_DEVICE_STACK
config USB_NRFX
default y
default y
endif # USB_DEVICE_STACK
config BT_CTLR
default BT
default BT
config ZMK_BLE
default y
default y
config ZMK_USB
default y
default y
endif # BOARD_PILLBUG

76
app/boards/arm/pillbug/blackpill_pins.dtsi
View file

@ -5,44 +5,44 @@
*/
/ {
blackpill: connector {
compatible = "blackpill";
#gpio-cells = <2>;
gpio-map-mask = <0xffffffff 0xffffffc0>;
gpio-map-pass-thru = <0 0x3f>;
gpio-map
= <2 0 &gpio0 9 0> /* PC13 */
, <3 0 &gpio0 10 0> /* PC14 */
, <4 0 &gpio1 5 0> /* PC15 */
, <10 0 &gpio1 7 0> /* PA0 */
, <11 0 &gpio1 10 0> /* PA1 */
, <12 0 &gpio1 13 0> /* PA2 */
, <13 0 &gpio1 15 0> /* PA3 */
, <14 0 &gpio0 2 0> /* PA4 */
, <15 0 &gpio0 29 0> /* PA5 */
, <16 0 &gpio0 31 0> /* PA6 */
, <17 0 &gpio1 11 0> /* PA7 */
, <18 0 &gpio1 14 0> /* PB0 */
, <19 0 &gpio0 30 0> /* PB1 */
, <20 0 &gpio0 5 0> /* PB2 */
, <21 0 &gpio1 8 0> /* PB10 */
, <25 0 &gpio1 9 0> /* PB12 */
, <26 0 &gpio0 12 0> /* PB13 */
, <27 0 &gpio0 25 0> /* PB14 */
, <28 0 &gpio1 1 0> /* PB15 */
, <29 0 &gpio1 2 0> /* PA8 */
, <30 0 &gpio0 6 0> /* PA9 */
, <31 0 &gpio0 8 0> /* PA10 */
, <38 0 &gpio0 13 0> /* PA15 */
, <39 0 &gpio0 15 0> /* PB3 */
, <40 0 &gpio0 17 0> /* PB4 */
, <41 0 &gpio0 22 0> /* PB5 */
, <42 0 &gpio0 24 0> /* PB6 */
, <43 0 &gpio1 0 0> /* PB7 */
, <45 0 &gpio1 4 0> /* PB8 */
, <46 0 &gpio1 6 0> /* PB9 */
;
};
blackpill: connector {
compatible = "blackpill";
#gpio-cells = <2>;
gpio-map-mask = <0xffffffff 0xffffffc0>;
gpio-map-pass-thru = <0 0x3f>;
gpio-map
= <2 0 &gpio0 9 0> /* PC13 */
, <3 0 &gpio0 10 0> /* PC14 */
, <4 0 &gpio1 5 0> /* PC15 */
, <10 0 &gpio1 7 0> /* PA0 */
, <11 0 &gpio1 10 0> /* PA1 */
, <12 0 &gpio1 13 0> /* PA2 */
, <13 0 &gpio1 15 0> /* PA3 */
, <14 0 &gpio0 2 0> /* PA4 */
, <15 0 &gpio0 29 0> /* PA5 */
, <16 0 &gpio0 31 0> /* PA6 */
, <17 0 &gpio1 11 0> /* PA7 */
, <18 0 &gpio1 14 0> /* PB0 */
, <19 0 &gpio0 30 0> /* PB1 */
, <20 0 &gpio0 5 0> /* PB2 */
, <21 0 &gpio1 8 0> /* PB10 */
, <25 0 &gpio1 9 0> /* PB12 */
, <26 0 &gpio0 12 0> /* PB13 */
, <27 0 &gpio0 25 0> /* PB14 */
, <28 0 &gpio1 1 0> /* PB15 */
, <29 0 &gpio1 2 0> /* PA8 */
, <30 0 &gpio0 6 0> /* PA9 */
, <31 0 &gpio0 8 0> /* PA10 */
, <38 0 &gpio0 13 0> /* PA15 */
, <39 0 &gpio0 15 0> /* PB3 */
, <40 0 &gpio0 17 0> /* PB4 */
, <41 0 &gpio0 22 0> /* PB5 */
, <42 0 &gpio0 24 0> /* PB6 */
, <43 0 &gpio1 0 0> /* PB7 */
, <45 0 &gpio1 4 0> /* PB8 */
, <46 0 &gpio1 6 0> /* PB9 */
;
};
};
blackpill_i2c: &i2c0 {};

34
app/boards/arm/pillbug/pillbug.dts
View file

@ -8,22 +8,22 @@
#include "pillbug.dtsi"
/ {
chosen {
zmk,battery = &vbatt;
};
chosen {
zmk,battery = &vbatt;
};
ext-power {
compatible = "zmk,ext-power-generic";
label = "EXT_POWER";
control-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
init-delay-ms = <50>;
};
vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 2>;
output-ohms = <2000000>;
full-ohms = <(2000000 + 820000)>;
};
ext-power {
compatible = "zmk,ext-power-generic";
label = "EXT_POWER";
control-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
init-delay-ms = <50>;
};
vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 2>;
output-ohms = <2000000>;
full-ohms = <(2000000 + 820000)>;
};
};

126
app/boards/arm/pillbug/pillbug.dtsi
View file

@ -8,99 +8,99 @@
#include "blackpill_pins.dtsi"
/ {
model = "PillBug";
compatible = "pillbug";
model = "PillBug";
compatible = "pillbug";
chosen {
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
chosen {
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
};
leds {
compatible = "gpio-leds";
blue_led: led_0 {
gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
label = "Blue LED";
};
};
leds {
compatible = "gpio-leds";
blue_led: led_0 {
gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
label = "Blue LED";
};
};
};
&adc {
status = "okay";
status = "okay";
};
&gpiote {
status = "okay";
status = "okay";
};
&gpio0 {
status = "okay";
status = "okay";
};
&gpio1 {
status = "okay";
status = "okay";
};
&i2c0 {
compatible = "nordic,nrf-twi";
sda-pin = <32>;
scl-pin = <24>;
compatible = "nordic,nrf-twi";
sda-pin = <32>;
scl-pin = <24>;
};
&uart0 {
compatible = "nordic,nrf-uarte";
tx-pin = <6>;
rx-pin = <8>;
compatible = "nordic,nrf-uarte";
tx-pin = <6>;
rx-pin = <8>;
};
&usbd {
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
status = "okay";
cdc_acm_uart: cdc_acm_uart {
compatible = "zephyr,cdc-acm-uart";
label = "CDC_ACM_0";
};
};
&flash0 {
/*
* For more information, see:
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
*/
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
/*
* For more information, see:
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
*/
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
sd_partition: partition@0 {
label = "mbr";
reg = <0x00000000 0x00001000>;
};
sd_partition: partition@0 {
label = "mbr";
reg = <0x00000000 0x00001000>;
};
code_partition: partition@1000 {
label = "code_partition";
reg = <0x00001000 0x000d3000>;
};
code_partition: partition@1000 {
label = "code_partition";
reg = <0x00001000 0x000d3000>;
};
/*
* The flash starting at 0x000d4000 and ending at
* 0x000f3fff is reserved for use by the application.
*/
/*
* The flash starting at 0x000d4000 and ending at
* 0x000f3fff is reserved for use by the application.
*/
/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@d4000 {
label = "storage";
reg = <0x000d4000 0x00020000>;
};
/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@d4000 {
label = "storage";
reg = <0x000d4000 0x00020000>;
};
boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};

2
app/boards/arm/pillbug/pillbug.zmk.yml
View file

@ -9,4 +9,4 @@ outputs:
- usb
- ble
url: https://mechwild.com
exposes:[blackpill]
exposes: [blackpill]

10
app/boards/shields/obe/Kconfig.defconfig
View file

@ -4,21 +4,21 @@
if SHIELD_OBE
config ZMK_KEYBOARD_NAME
default "OrangeBoyErgo"
default "OrangeBoyErgo"
if LVGL
config LVGL_VDB_SIZE
default 64
default 64
config LVGL_DPI
default 148
default 148
config LVGL_BITS_PER_PIXEL
default 1
default 1
choice LVGL_COLOR_DEPTH
default LVGL_COLOR_DEPTH_1
default LVGL_COLOR_DEPTH_1
endchoice
endif # LVGL

2
app/boards/shields/obe/Kconfig.shield
View file

@ -2,4 +2,4 @@
# SPDX-License-Identifier: MIT
config SHIELD_OBE
def_bool $(shields_list_contains,obe)
def_bool $(shields_list_contains,obe)

86
app/boards/shields/obe/obe.overlay
View file

@ -7,59 +7,59 @@
#include <dt-bindings/zmk/matrix_transform.h>
/ {
chosen {
zmk,kscan = &kscan0;
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
};
kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN";
kscan0: kscan {
compatible = "zmk,kscan-gpio-matrix";
label = "KSCAN";
diode-direction = "col2row";
row-gpios
= <&blackpill 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 27 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
diode-direction = "col2row";
row-gpios
= <&blackpill 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 27 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 38 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 39 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
col-gpios
= <&blackpill 21 GPIO_ACTIVE_HIGH>
, <&blackpill 19 GPIO_ACTIVE_HIGH>
, <&blackpill 18 GPIO_ACTIVE_HIGH>
, <&blackpill 17 GPIO_ACTIVE_HIGH>
, <&blackpill 16 GPIO_ACTIVE_HIGH>
, <&blackpill 15 GPIO_ACTIVE_HIGH>
, <&blackpill 14 GPIO_ACTIVE_HIGH>
, <&blackpill 13 GPIO_ACTIVE_HIGH>
, <&blackpill 12 GPIO_ACTIVE_HIGH>
, <&blackpill 11 GPIO_ACTIVE_HIGH>
;
};
, <&blackpill 38 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
, <&blackpill 39 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
;
col-gpios
= <&blackpill 21 GPIO_ACTIVE_HIGH>
, <&blackpill 19 GPIO_ACTIVE_HIGH>
, <&blackpill 18 GPIO_ACTIVE_HIGH>
, <&blackpill 17 GPIO_ACTIVE_HIGH>
, <&blackpill 16 GPIO_ACTIVE_HIGH>
, <&blackpill 15 GPIO_ACTIVE_HIGH>
, <&blackpill 14 GPIO_ACTIVE_HIGH>
, <&blackpill 13 GPIO_ACTIVE_HIGH>
, <&blackpill 12 GPIO_ACTIVE_HIGH>
, <&blackpill 11 GPIO_ACTIVE_HIGH>
;
};
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <12>;
rows = <4>;
map = <
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <12>;
rows = <4>;
map = <
RC(5,5) RC(5,5) RC(5,3) RC(5,2) RC(5,1) RC(5,0) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9)
RC(6,5) RC(5,9) RC(5,8) RC(5,7) RC(5,6) RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9)
RC(6,4) RC(6,9) RC(6,8) RC(6,3) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9)
RC(6,2) RC(6,0) RC(6,7) RC(6,6) RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
RC(6,1) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9)
>;
};
>;
};
encoder_1: encoder_1 {
compatible = "alps,ec11";
label = "Encoder 1";
a-gpios = <&blackpill 40 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
b-gpios = <&blackpill 41 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
resolution = <4>;
status = "disabled";
};
encoder_1: encoder_1 {
compatible = "alps,ec11";
label = "Encoder 1";
a-gpios = <&blackpill 40 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
b-gpios = <&blackpill 41 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
resolution = <4>;
status = "disabled";
};
};