Skip to content

Commit 21c0e33

Browse files
trgsvtrgsv
committed
Merge branch 'main' into no-studio
2 parents f272455 + e61c04b commit 21c0e33

36 files changed

Lines changed: 2295 additions & 8 deletions

‎boards/arm/corne_choc_pro/corne_choc_pro_left_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
3939
CONFIG_WS2812_STRIP=y
4040
CONFIG_ZMK_RGB_UNDERGLOW=y
4141
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=20
42-
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=48
43-
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
42+
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=200
43+
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=98
4444

4545
# Windows Battery Reporting Fix
4646
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n

‎boards/arm/corne_choc_pro/corne_choc_pro_right_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
3939
CONFIG_WS2812_STRIP=y
4040
CONFIG_ZMK_RGB_UNDERGLOW=y
4141
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=20
42-
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=48
43-
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
42+
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=200
43+
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=98
4444

4545
# Windows Battery Reporting Fix
4646
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n

‎boards/arm/piantor_pro_bt/piantor_pro_bt_left_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ CONFIG_PINCTRL=y
3535
CONFIG_WS2812_STRIP=y
3636
CONFIG_ZMK_RGB_UNDERGLOW=y
3737
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=20
38-
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=48
39-
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
38+
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=200
39+
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=98
4040

4141
# Windows Battery Reporting Fix
4242
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n

‎boards/arm/piantor_pro_bt/piantor_pro_bt_right_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ CONFIG_PINCTRL=y
3535
CONFIG_WS2812_STRIP=y
3636
CONFIG_ZMK_RGB_UNDERGLOW=y
3737
CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX=20
38-
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=48
39-
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
38+
CONFIG_ZMK_RGB_UNDERGLOW_HUE_START=200
39+
CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=98
4040

4141
# Windows Battery Reporting Fix
4242
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n

‎boards/arm/sofle_choc_pro/Kconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SPDX-License-Identifier: MIT
2+
3+
config BOARD_ENABLE_DCDC
4+
bool "Enable DCDC mode"
5+
select SOC_DCDC_NRF52X
6+
default y
7+
depends on (BOARD_SOFLE_CHOC_PRO_LEFT || BOARD_SOFLE_CHOC_PRO_RIGHT)

‎boards/arm/sofle_choc_pro/Kconfig.board‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Copyright (c) 2020 The ZMK Contributors
2+
# SPDX-License-Identifier: MIT
3+
4+
config BOARD_SOFLE_CHOC_PRO_LEFT
5+
bool "Sofle Choc Pro Left"
6+
depends on SOC_NRF52840_QIAA
7+
8+
config BOARD_SOFLE_CHOC_PRO_RIGHT
9+
bool "Sofle Choc Pro Right"
10+
depends on SOC_NRF52840_QIAA

‎boards/arm/sofle_choc_pro/Kconfig.defconfig‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Copyright (c) 2020 The ZMK Contributors
2+
# SPDX-License-Identifier: MIT
3+
4+
if BOARD_SOFLE_CHOC_PRO_LEFT
5+
6+
config ZMK_KEYBOARD_NAME
7+
default "Sofle Choc Pro"
8+
9+
config ZMK_SPLIT_ROLE_CENTRAL
10+
default y
11+
12+
endif # BOARD_SOFLE_CHOC_PRO_LEFT
13+
14+
if BOARD_SOFLE_CHOC_PRO_LEFT || BOARD_SOFLE_CHOC_PRO_RIGHT
15+
16+
config BOARD
17+
default "sofle_choc_pro"
18+
19+
config ZMK_SPLIT
20+
default y
21+
22+
if USB
23+
24+
config USB_NRFX
25+
default y
26+
27+
config USB_DEVICE_STACK
28+
default y
29+
30+
endif # USB
31+
32+
config BT_CTLR
33+
default BT
34+
35+
config I2C
36+
default y
37+
38+
config ZMK_MAX17048
39+
default y
40+
41+
endif # BOARD_SOFLE_CHOC_PRO_LEFT || BOARD_SOFLE_CHOC_PRO_RIGHT

‎boards/arm/sofle_choc_pro/board.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2021 The ZMK Contributors
2+
# SPDX-License-Identifier: MIT
3+
4+
set(OPENOCD_NRF5_SUBFAMILY nrf52)
5+
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
6+
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
7+
include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

‎boards/arm/sofle_choc_pro/sofle_choc_pro-layouts.dtsi‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#include <physical_layouts.dtsi>
2+
3+
/ {
4+
sofle_choc_pro_position_map {
5+
compatible = "zmk,physical-layout-position-map";
6+
complete;
7+
8+
default_map: default_map {
9+
physical-layout = <&default_layout>;
10+
positions
11+
= < 0 1 2 3 4 5 6 7 8 9 10 11>
12+
, <12 13 14 15 16 17 18 19 20 21 22 23>
13+
, <24 25 26 27 28 29 30 31 32 33 34 35>
14+
, <36 37 38 39 40 41 42 43 44 45 46 47 48 49>
15+
, < 50 51 52 53 54 55 56 57 58 59 >;
16+
};
17+
};
18+
};
19+
20+
/ {
21+
default_layout: default_layout {
22+
compatible = "zmk,physical-layout";
23+
display-name = "Default Layout";
24+
keys // w h x y rot rx ry
25+
= <&key_physical_attrs 100 100 0 37 0 0 0>
26+
, <&key_physical_attrs 100 100 100 37 0 0 0>
27+
, <&key_physical_attrs 100 100 200 12 0 0 0>
28+
, <&key_physical_attrs 100 100 300 0 0 0 0>
29+
, <&key_physical_attrs 100 100 400 12 0 0 0>
30+
, <&key_physical_attrs 100 100 500 24 0 0 0>
31+
, <&key_physical_attrs 100 100 900 24 0 0 0>
32+
, <&key_physical_attrs 100 100 1000 12 0 0 0>
33+
, <&key_physical_attrs 100 100 1100 0 0 0 0>
34+
, <&key_physical_attrs 100 100 1200 12 0 0 0>
35+
, <&key_physical_attrs 100 100 1300 37 0 0 0>
36+
, <&key_physical_attrs 100 100 1400 37 0 0 0>
37+
, <&key_physical_attrs 100 100 0 137 0 0 0>
38+
, <&key_physical_attrs 100 100 100 137 0 0 0>
39+
, <&key_physical_attrs 100 100 200 112 0 0 0>
40+
, <&key_physical_attrs 100 100 300 100 0 0 0>
41+
, <&key_physical_attrs 100 100 400 112 0 0 0>
42+
, <&key_physical_attrs 100 100 500 124 0 0 0>
43+
, <&key_physical_attrs 100 100 900 124 0 0 0>
44+
, <&key_physical_attrs 100 100 1000 112 0 0 0>
45+
, <&key_physical_attrs 100 100 1100 100 0 0 0>
46+
, <&key_physical_attrs 100 100 1200 112 0 0 0>
47+
, <&key_physical_attrs 100 100 1300 137 0 0 0>
48+
, <&key_physical_attrs 100 100 1400 137 0 0 0>
49+
, <&key_physical_attrs 100 100 0 237 0 0 0>
50+
, <&key_physical_attrs 100 100 100 237 0 0 0>
51+
, <&key_physical_attrs 100 100 200 212 0 0 0>
52+
, <&key_physical_attrs 100 100 300 200 0 0 0>
53+
, <&key_physical_attrs 100 100 400 212 0 0 0>
54+
, <&key_physical_attrs 100 100 500 224 0 0 0>
55+
, <&key_physical_attrs 100 100 900 224 0 0 0>
56+
, <&key_physical_attrs 100 100 1000 212 0 0 0>
57+
, <&key_physical_attrs 100 100 1100 200 0 0 0>
58+
, <&key_physical_attrs 100 100 1200 212 0 0 0>
59+
, <&key_physical_attrs 100 100 1300 237 0 0 0>
60+
, <&key_physical_attrs 100 100 1400 237 0 0 0>
61+
, <&key_physical_attrs 100 100 0 337 0 0 0>
62+
, <&key_physical_attrs 100 100 100 337 0 0 0>
63+
, <&key_physical_attrs 100 100 200 312 0 0 0>
64+
, <&key_physical_attrs 100 100 300 300 0 0 0>
65+
, <&key_physical_attrs 100 100 400 312 0 0 0>
66+
, <&key_physical_attrs 100 100 500 324 0 0 0>
67+
, <&key_physical_attrs 100 100 600 274 0 0 0>
68+
, <&key_physical_attrs 100 100 800 274 0 0 0>
69+
, <&key_physical_attrs 100 100 900 324 0 0 0>
70+
, <&key_physical_attrs 100 100 1000 312 0 0 0>
71+
, <&key_physical_attrs 100 100 1100 300 0 0 0>
72+
, <&key_physical_attrs 100 100 1200 312 0 0 0>
73+
, <&key_physical_attrs 100 100 1300 337 0 0 0>
74+
, <&key_physical_attrs 100 100 1400 337 0 0 0>
75+
, <&key_physical_attrs 100 100 175 437 0 0 0>
76+
, <&key_physical_attrs 100 100 275 412 0 0 0>
77+
, <&key_physical_attrs 100 100 375 412 0 0 0>
78+
, <&key_physical_attrs 100 100 490 412 1200 490 412>
79+
, <&key_physical_attrs 100 150 600 383 2400 600 433>
80+
, <&key_physical_attrs 100 150 800 383 (-2400) 900 433>
81+
, <&key_physical_attrs 100 100 910 412 (-1200) 1010 412>
82+
, <&key_physical_attrs 100 100 1025 412 0 0 0>
83+
, <&key_physical_attrs 100 100 1125 412 0 0 0>
84+
, <&key_physical_attrs 100 100 1225 437 0 0 0>
85+
;
86+
};
87+
};

‎boards/arm/sofle_choc_pro/sofle_choc_pro.dtsi‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*
2+
* Copyright (c) 2020 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
6+
7+
/dts-v1/;
8+
#include <nordic/nrf52840_qiaa.dtsi>
9+
#include <dt-bindings/zmk/matrix_transform.h>
10+
11+
#include "sofle_choc_pro-layouts.dtsi"
12+
13+
&default_layout {
14+
transform = <&default_transform>;
15+
};
16+
17+
/ {
18+
chosen {
19+
zephyr,code-partition = &code_partition;
20+
zephyr,sram = &sram0;
21+
zephyr,flash = &flash0;
22+
zmk,kscan = &kscan0;
23+
};
24+
25+
default_transform: keymap_transform_0 {
26+
compatible = "zmk,matrix-transform";
27+
columns = <14>;
28+
rows = <5>;
29+
map = <
30+
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13)
31+
RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13)
32+
RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13)
33+
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(3,10) RC(3,11) RC(3,12) RC(3,13)
34+
RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10) RC(4,11)
35+
>;
36+
};
37+
38+
left_encoder: encoder_left {
39+
compatible = "alps,ec11";
40+
a-gpios = <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
41+
b-gpios = <&gpio0 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
42+
steps = <80>;
43+
status = "disabled";
44+
};
45+
46+
right_encoder: encoder_right {
47+
compatible = "alps,ec11";
48+
a-gpios = <&gpio0 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
49+
b-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
50+
steps = <80>;
51+
status = "disabled";
52+
};
53+
54+
sensors: sensors {
55+
compatible = "zmk,keymap-sensors";
56+
sensors = <&left_encoder &right_encoder>;
57+
triggers-per-rotation = <24>;
58+
};
59+
};
60+
61+
&gpio0 {
62+
status = "okay";
63+
};
64+
65+
&gpio1 {
66+
status = "okay";
67+
};
68+
69+
zephyr_udc0: &usbd {
70+
status = "okay";
71+
};
72+
73+
&flash0 {
74+
/*
75+
* For more information, see:
76+
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
77+
*/
78+
partitions {
79+
compatible = "fixed-partitions";
80+
#address-cells = <1>;
81+
#size-cells = <1>;
82+
83+
sd_partition: partition@0 {
84+
label = "softdevice";
85+
reg = <0x00000000 0x00026000>;
86+
};
87+
code_partition: partition@26000 {
88+
label = "code_partition";
89+
reg = <0x00026000 0x000c6000>;
90+
};
91+
storage_partition: partition@ec000 {
92+
label = "storage";
93+
reg = <0x000ec000 0x00008000>;
94+
};
95+
boot_partition: partition@f4000 {
96+
label = "adafruit_boot";
97+
reg = <0x000f4000 0x0000c000>;
98+
};
99+
};
100+
};

0 commit comments

Comments
 (0)