Skip to content

Commit f272455

Browse files
trgsvtrgsv
committed
merge main into no-studio
2 parents 48c7c96 + 8bea947 commit f272455

11 files changed

+285
-236
lines changed

‎boards/arm/corne_choc_pro/corne_choc_pro.dtsi‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Copyright (c) 2020 The ZMK Contributors
3-
*
4-
* SPDX-License-Identifier: MIT
5-
*/
2+
* Copyright (c) 2020 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
66

77
/dts-v1/;
88
#include <nordic/nrf52840_qiaa.dtsi>
@@ -19,24 +19,24 @@
1919
};
2020

2121
/ {
22-
chosen {
23-
zephyr,code-partition = &code_partition;
24-
zephyr,sram = &sram0;
25-
zephyr,flash = &flash0;
26-
zmk,kscan = &kscan0;
27-
};
28-
29-
default_transform: keymap_transform_0 {
30-
compatible = "zmk,matrix-transform";
31-
columns = <14>;
32-
rows = <4>;
33-
map = <
22+
chosen {
23+
zephyr,code-partition = &code_partition;
24+
zephyr,sram = &sram0;
25+
zephyr,flash = &flash0;
26+
zmk,kscan = &kscan0;
27+
};
28+
29+
default_transform: keymap_transform_0 {
30+
compatible = "zmk,matrix-transform";
31+
columns = <14>;
32+
rows = <4>;
33+
map = <
3434
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(0,10) RC(0,11) RC(0,12) RC(0,13)
3535
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(1,10) RC(1,11) RC(1,12) RC(1,13)
3636
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)
3737
RC(3,3) RC(3,4) RC(3,5) RC(3,8) RC(3,9) RC(3,10)
38-
>;
39-
};
38+
>;
39+
};
4040

4141
five_col_transform: keymap_transform_1 {
4242
compatible = "zmk,matrix-transform";
@@ -90,11 +90,11 @@
9090
};
9191

9292
&gpio0 {
93-
status = "okay";
93+
status = "okay";
9494
};
9595

9696
&gpio1 {
97-
status = "okay";
97+
status = "okay";
9898
};
9999

100100
zephyr_udc0: &usbd {
@@ -129,30 +129,30 @@ nice_view_spi: &spi0 {
129129
};
130130

131131
&flash0 {
132-
/*
133-
* For more information, see:
134-
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
135-
*/
136-
partitions {
137-
compatible = "fixed-partitions";
138-
#address-cells = <1>;
139-
#size-cells = <1>;
140-
141-
sd_partition: partition@0 {
142-
label = "softdevice";
143-
reg = <0x00000000 0x00026000>;
144-
};
145-
code_partition: partition@26000 {
146-
label = "code_partition";
147-
reg = <0x00026000 0x000c6000>;
148-
};
149-
storage_partition: partition@ec000 {
150-
label = "storage";
151-
reg = <0x000ec000 0x00008000>;
152-
};
153-
boot_partition: partition@f4000 {
154-
label = "adafruit_boot";
155-
reg = <0x000f4000 0x0000c000>;
156-
};
157-
};
132+
/*
133+
* For more information, see:
134+
* http://docs.zephyrproject.org/latest/devices/dts/flash_partitions.html
135+
*/
136+
partitions {
137+
compatible = "fixed-partitions";
138+
#address-cells = <1>;
139+
#size-cells = <1>;
140+
141+
sd_partition: partition@0 {
142+
label = "softdevice";
143+
reg = <0x00000000 0x00026000>;
144+
};
145+
code_partition: partition@26000 {
146+
label = "code_partition";
147+
reg = <0x00026000 0x000c6000>;
148+
};
149+
storage_partition: partition@ec000 {
150+
label = "storage";
151+
reg = <0x000ec000 0x00008000>;
152+
};
153+
boot_partition: partition@f4000 {
154+
label = "adafruit_boot";
155+
reg = <0x000f4000 0x0000c000>;
156+
};
157+
};
158158
};

‎boards/arm/corne_choc_pro/corne_choc_pro_left.dts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
/*
2-
* Copyright (c) 2020 The ZMK Contributors
3-
*
4-
* SPDX-License-Identifier: MIT
5-
*/
2+
* Copyright (c) 2020 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
66

77
#include "corne_choc_pro.dtsi"
88
#include <dt-bindings/led/led.h>
99

1010
/ {
11-
model = "corne_choc_pro_left";
12-
compatible = "corne_choc_pro_left";
11+
model = "corne_choc_pro_left";
12+
compatible = "corne_choc_pro_left";
1313

14-
chosen {
15-
zmk,battery = &fuelgauge;
14+
chosen {
15+
zmk,battery = &fuelgauge;
1616
zmk,underglow = &led_strip;
17-
};
18-
19-
kscan0: kscan {
20-
compatible = "zmk,kscan-gpio-matrix";
21-
diode-direction = "col2row";
22-
row-gpios
23-
= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
24-
, <&gpio0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
25-
, <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
17+
};
18+
19+
kscan0: kscan {
20+
compatible = "zmk,kscan-gpio-matrix";
21+
diode-direction = "col2row";
22+
row-gpios
23+
= <&gpio1 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
24+
, <&gpio0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
25+
, <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
2626
, <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
27-
;
28-
col-gpios
29-
= <&gpio0 28 GPIO_ACTIVE_HIGH>
30-
, <&gpio1 13 GPIO_ACTIVE_HIGH>
31-
, <&gpio0 2 GPIO_ACTIVE_HIGH>
32-
, <&gpio0 5 GPIO_ACTIVE_HIGH>
27+
;
28+
col-gpios
29+
= <&gpio0 28 GPIO_ACTIVE_HIGH>
30+
, <&gpio1 13 GPIO_ACTIVE_HIGH>
31+
, <&gpio0 2 GPIO_ACTIVE_HIGH>
32+
, <&gpio0 5 GPIO_ACTIVE_HIGH>
3333
, <&gpio0 22 GPIO_ACTIVE_HIGH>
3434
, <&gpio0 3 GPIO_ACTIVE_HIGH>
3535
, <&gpio0 13 GPIO_ACTIVE_HIGH>
36-
;
36+
;
3737
wakeup-source;
38-
};
38+
};
3939

4040
// Node name must match original "EXT_POWER" label to preserve user settings.
4141
EXT_POWER {
@@ -57,14 +57,14 @@
5757
i2c1_default: i2c1_default {
5858
group1 {
5959
psels = <NRF_PSEL(TWIM_SDA, 0, 4)>,
60-
<NRF_PSEL(TWIM_SCL, 0, 12)>;
60+
<NRF_PSEL(TWIM_SCL, 0, 12)>;
6161
};
6262
};
6363

6464
i2c1_sleep: i2c1_sleep {
6565
group1 {
6666
psels = <NRF_PSEL(TWIM_SDA, 0, 4)>,
67-
<NRF_PSEL(TWIM_SCL, 0, 12)>;
67+
<NRF_PSEL(TWIM_SCL, 0, 12)>;
6868
low-power-enable;
6969
};
7070
};
@@ -103,18 +103,18 @@
103103
spi-one-frame = <0x70>;
104104
spi-zero-frame = <0x40>;
105105
color-mapping = <LED_COLOR_ID_GREEN
106-
LED_COLOR_ID_RED
107-
LED_COLOR_ID_BLUE>;
106+
LED_COLOR_ID_RED
107+
LED_COLOR_ID_BLUE>;
108108
};
109109
};
110110

111111
&i2c1 {
112-
status = "okay";
113-
compatible = "nordic,nrf-twim";
114-
pinctrl-0 = <&i2c1_default>;
112+
status = "okay";
113+
compatible = "nordic,nrf-twim";
114+
pinctrl-0 = <&i2c1_default>;
115115
pinctrl-1 = <&i2c1_sleep>;
116116
pinctrl-names = "default", "sleep";
117-
clock-frequency = <100000>;
117+
clock-frequency = <100000>;
118118

119119
fuelgauge: max17048@36 {
120120
compatible = "zmk,maxim-max17048";

‎boards/arm/corne_choc_pro/corne_choc_pro_left_defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
4444

4545
# Windows Battery Reporting Fix
4646
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
47+
48+
# Improved connection stability
49+
CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y

‎boards/arm/corne_choc_pro/corne_choc_pro_right.dts‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
/*
2-
* Copyright (c) 2020 The ZMK Contributors
3-
*
4-
* SPDX-License-Identifier: MIT
5-
*/
2+
* Copyright (c) 2020 The ZMK Contributors
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*/
66

77
#include "corne_choc_pro.dtsi"
88
#include <dt-bindings/led/led.h>
99

1010
/ {
11-
model = "corne_choc_pro_right";
12-
compatible = "corne_choc_pro_right";
11+
model = "corne_choc_pro_right";
12+
compatible = "corne_choc_pro_right";
1313

14-
chosen {
15-
zmk,battery = &fuelgauge;
14+
chosen {
15+
zmk,battery = &fuelgauge;
1616
zmk,underglow = &led_strip;
17-
};
18-
19-
kscan0: kscan {
20-
compatible = "zmk,kscan-gpio-matrix";
21-
diode-direction = "col2row";
22-
row-gpios
23-
= <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
24-
, <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
25-
, <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
17+
};
18+
19+
kscan0: kscan {
20+
compatible = "zmk,kscan-gpio-matrix";
21+
diode-direction = "col2row";
22+
row-gpios
23+
= <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
24+
, <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
25+
, <&gpio0 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
2626
, <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
27-
;
28-
col-gpios
27+
;
28+
col-gpios
2929
= <&gpio1 13 GPIO_ACTIVE_HIGH>
3030
, <&gpio0 5 GPIO_ACTIVE_HIGH>
3131
, <&gpio0 9 GPIO_ACTIVE_HIGH>
32-
, <&gpio0 10 GPIO_ACTIVE_HIGH>
33-
, <&gpio1 0 GPIO_ACTIVE_HIGH>
34-
, <&gpio0 30 GPIO_ACTIVE_HIGH>
35-
, <&gpio0 2 GPIO_ACTIVE_HIGH>
36-
;
32+
, <&gpio0 10 GPIO_ACTIVE_HIGH>
33+
, <&gpio1 0 GPIO_ACTIVE_HIGH>
34+
, <&gpio0 30 GPIO_ACTIVE_HIGH>
35+
, <&gpio0 2 GPIO_ACTIVE_HIGH>
36+
;
3737
wakeup-source;
38-
};
38+
};
3939

4040
// Node name must match original "EXT_POWER" label to preserve user settings.
4141
EXT_POWER {
@@ -49,6 +49,10 @@
4949
col-offset = <7>;
5050
};
5151

52+
&five_col_transform {
53+
col-offset = <7>;
54+
};
55+
5256
&right_ex1_encoder {
5357
status = "okay";
5458
};
@@ -61,14 +65,14 @@
6165
i2c1_default: i2c1_default {
6266
group1 {
6367
psels = <NRF_PSEL(TWIM_SDA, 0, 4)>,
64-
<NRF_PSEL(TWIM_SCL, 0, 12)>;
68+
<NRF_PSEL(TWIM_SCL, 0, 12)>;
6569
};
6670
};
6771

6872
i2c1_sleep: i2c1_sleep {
6973
group1 {
7074
psels = <NRF_PSEL(TWIM_SDA, 0, 4)>,
71-
<NRF_PSEL(TWIM_SCL, 0, 12)>;
75+
<NRF_PSEL(TWIM_SCL, 0, 12)>;
7276
low-power-enable;
7377
};
7478
};
@@ -107,18 +111,18 @@
107111
spi-one-frame = <0x70>;
108112
spi-zero-frame = <0x40>;
109113
color-mapping = <LED_COLOR_ID_GREEN
110-
LED_COLOR_ID_RED
111-
LED_COLOR_ID_BLUE>;
114+
LED_COLOR_ID_RED
115+
LED_COLOR_ID_BLUE>;
112116
};
113117
};
114118

115119
&i2c1 {
116-
status = "okay";
117-
compatible = "nordic,nrf-twim";
118-
pinctrl-0 = <&i2c1_default>;
120+
status = "okay";
121+
compatible = "nordic,nrf-twim";
122+
pinctrl-0 = <&i2c1_default>;
119123
pinctrl-1 = <&i2c1_sleep>;
120124
pinctrl-names = "default", "sleep";
121-
clock-frequency = <100000>;
125+
clock-frequency = <100000>;
122126

123127
fuelgauge: max17048@36 {
124128
compatible = "zmk,maxim-max17048";

‎boards/arm/corne_choc_pro/corne_choc_pro_right_defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ CONFIG_ZMK_RGB_UNDERGLOW_SAT_START=96
4444

4545
# Windows Battery Reporting Fix
4646
CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
47+
48+
# Improved connection stability
49+
CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y

0 commit comments

Comments
 (0)