Skip to content

Commit 1f9e79f

Browse files
mcrossonmcrosson
authored
Merge pull request #13 from anoburn/update-zmk-version
Update zmk version
2 parents 6cba919 + b3a56f0 commit 1f9e79f

20 files changed

+75
-117
lines changed

‎config/ardux.dtsi

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
#if defined ARDUX_RIGHT
149149
#define ARDUX_LAYER_CUSTOM \
150150
custom { \
151-
label = "Custom"; \
151+
display-name = "Custom"; \
152152
bindings = < \
153153
LEADING_NONES \
154154
&kp C_MUTE &kp INS &kp C_VOL_UP &none \
@@ -161,7 +161,7 @@
161161
#if defined ARDUX_LEFT
162162
#define ARDUX_LAYER_CUSTOM \
163163
custom { \
164-
label = "Custom"; \
164+
display-name = "Custom"; \
165165
bindings = < \
166166
LEADING_NONES \
167167
&none &kp C_VOL_UP &kp INS &kp C_MUTE \
@@ -290,23 +290,23 @@
290290
*****************************************/
291291
/ {
292292
behaviors {
293-
layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_base_kp";
294-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
293+
layer_base_kp: layer_base_kp { compatible = "zmk,behavior-hold-tap"; display-name = "layer_base_kp";
294+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
295295
bindings = <&mo>, <&kp>; };
296-
layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_numbers_kp";
297-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
296+
layer_numbers_kp: layer_numbers_kp { compatible = "zmk,behavior-hold-tap"; display-name = "layer_numbers_kp";
297+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
298298
bindings = <&mo>, <&kp>; };
299-
layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_symbols_kp";
300-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
299+
layer_symbols_kp: layer_symbols_kp { compatible = "zmk,behavior-hold-tap"; display-name = "layer_symbols_kp";
300+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
301301
bindings = <&mo>, <&kp>; };
302-
layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_parentheticals_kp";
303-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
302+
layer_parentheticals_kp: layer_parentheticals_kp { compatible = "zmk,behavior-hold-tap"; display-name = "layer_parentheticals_kp";
303+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
304304
bindings = <&mo>, <&kp>; };
305-
layer_custom_kp: layer_custom_kp { compatible = "zmk,behavior-hold-tap"; label = "layer_custom_kp";
306-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
305+
layer_custom_kp: layer_custom_kp { compatible = "zmk,behavior-hold-tap"; display-name = "layer_custom_kp";
306+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
307307
bindings = <&mo>, <&kp>; };
308-
ctrl_alt_kp: ctrl_alt_kp { compatible = "zmk,behavior-hold-tap"; label = "ctrl_alt_kp";
309-
#binding-cells = <2>; tapping_term_ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
308+
ctrl_alt_kp: ctrl_alt_kp { compatible = "zmk,behavior-hold-tap"; display-name = "ctrl_alt_kp";
309+
#binding-cells = <2>; tapping-term-ms = <TIMEOUT_LAYER_HOLD>; flavor = "tap-preferred";
310310
bindings = <&sk>, <&sk>; };
311311
};
312312
};
@@ -321,7 +321,7 @@
321321
compatible = "zmk,keymap";
322322
#if defined ARDUX_BIG
323323
base {
324-
label = "*ARDUX*";
324+
display-name = "*ARDUX*";
325325
bindings = <
326326
BIG_LEADING_NONES
327327
&kp MINUS &layer_parentheticals_kp LAYER_ID_PARENTHETICALS ARDUX_BASE_A &kp ARDUX_BASE_R &kp ARDUX_BASE_T &layer_numbers_kp LAYER_ID_NUMBERS ARDUX_BASE_S
@@ -336,7 +336,7 @@
336336
};
337337
#else
338338
base {
339-
label = "ARDUX";
339+
display-name = "ARDUX";
340340
bindings = <
341341
LEADING_NONES
342342
&layer_parentheticals_kp LAYER_ID_PARENTHETICALS ARDUX_BASE_A &kp ARDUX_BASE_R &kp ARDUX_BASE_T &layer_numbers_kp LAYER_ID_NUMBERS ARDUX_BASE_S
@@ -350,7 +350,7 @@
350350
};
351351
#endif
352352
numbers {
353-
label = "Number";
353+
display-name = "Number";
354354
bindings = <
355355
LEADING_NONES
356356
&kp N1 &kp N2 &kp N3 &mo LAYER_ID_NUMBERS
@@ -360,7 +360,7 @@
360360
>;
361361
};
362362
symbols {
363-
label = "Symbol";
363+
display-name = "Symbol";
364364
bindings = <
365365
LEADING_NONES
366366
&kp EXCL &kp BSLH &kp SEMI &kp GRAVE
@@ -370,7 +370,7 @@
370370
>;
371371
};
372372
parentheticals {
373-
label = "Paren";
373+
display-name = "Paren";
374374
bindings = <
375375
LEADING_NONES
376376
&mo LAYER_ID_PARENTHETICALS &kp LPAR &kp RPAR &kp LBRC
@@ -380,7 +380,7 @@
380380
>;
381381
};
382382
navigation {
383-
label = "Nav";
383+
display-name = "Nav";
384384
bindings = <
385385
LEADING_NONES
386386
&kp HOME &kp UP &kp END &kp PG_UP
@@ -390,7 +390,7 @@
390390
>;
391391
};
392392
bt {
393-
label = "BT";
393+
display-name = "BT";
394394
bindings = <
395395
LEADING_NONES
396396
&bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 ARDUX_BT_TOP
@@ -402,7 +402,7 @@
402402
ARDUX_LAYER_CUSTOM
403403
#if defined ARDUX_BIG
404404
big_ardux_symbol {
405-
label = "*Symbol*";
405+
display-name = "*Symbol*";
406406
bindings = <
407407
BIG_LEADING_NONES
408408
&kp GRAVE &kp HASH &kp LBRC &kp RBRC &kp CARET
@@ -416,7 +416,7 @@
416416
>;
417417
};
418418
big_ardux_function {
419-
label = "*Func*";
419+
display-name = "*Func*";
420420
bindings = <
421421
BIG_LEADING_NONES
422422
&none &kp F1 &kp F2 &kp F3 &kp F4
@@ -444,7 +444,7 @@
444444
compatible = "zmk,keymap";
445445
#if defined ARDUX_BIG
446446
base {
447-
label = "*ARDUX*";
447+
display-name = "*ARDUX*";
448448
bindings = <
449449
BIG_LEADING_NONES
450450
&layer_numbers_kp LAYER_ID_NUMBERS ARDUX_BASE_S &kp ARDUX_BASE_T &kp ARDUX_BASE_R &layer_parentheticals_kp LAYER_ID_PARENTHETICALS ARDUX_BASE_A &kp MINUS
@@ -459,7 +459,7 @@
459459
};
460460
#else
461461
base {
462-
label = "ARDUX";
462+
display-name = "ARDUX";
463463
bindings = <
464464
LEADING_NONES
465465
&layer_numbers_kp LAYER_ID_NUMBERS ARDUX_BASE_S &kp ARDUX_BASE_T &kp ARDUX_BASE_R &layer_parentheticals_kp LAYER_ID_PARENTHETICALS ARDUX_BASE_A
@@ -473,7 +473,7 @@
473473
};
474474
#endif
475475
numbers {
476-
label = "Number";
476+
display-name = "Number";
477477
bindings = <
478478
LEADING_NONES
479479
&mo LAYER_ID_NUMBERS &kp N3 &kp N2 &kp N1
@@ -483,7 +483,7 @@
483483
>;
484484
};
485485
symbols {
486-
label = "Symbol";
486+
display-name = "Symbol";
487487
bindings = <
488488
LEADING_NONES
489489
&kp GRAVE &kp SEMI &kp BSLH &kp EXCL
@@ -493,7 +493,7 @@
493493
>;
494494
};
495495
parentheticals {
496-
label = "Paren";
496+
display-name = "Paren";
497497
bindings = <
498498
LEADING_NONES
499499
&kp LBRC &kp LPAR &kp RPAR &mo LAYER_ID_PARENTHETICALS
@@ -503,7 +503,7 @@
503503
>;
504504
};
505505
navigation {
506-
label = "Nav";
506+
display-name = "Nav";
507507
bindings = <
508508
LEADING_NONES
509509
&kp PG_UP &kp HOME &kp UP &kp END
@@ -513,7 +513,7 @@
513513
>;
514514
};
515515
bt {
516-
label = "BT";
516+
display-name = "BT";
517517
bindings = <
518518
LEADING_NONES
519519
ARDUX_BT_TOP &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0
@@ -525,7 +525,7 @@
525525
ARDUX_LAYER_CUSTOM
526526
#if defined ARDUX_BIG
527527
big_ardux_symbol {
528-
label = "*Symbol*";
528+
display-name = "*Symbol*";
529529
bindings = <
530530
BIG_LEADING_NONES
531531
&kp CARET &kp LBRC &kp RBRC &kp HASH &kp GRAVE
@@ -539,7 +539,7 @@
539539
>;
540540
};
541541
big_ardux_function {
542-
label = "*Func*";
542+
display-name = "*Func*";
543543
bindings = <
544544
BIG_LEADING_NONES
545545
&kp F4 &kp F3 &kp F2 &kp F1 &none

‎config/boards/shields/artboard/Kconfig.defconfig

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,17 @@ config I2C
99
config SSD1306
1010
default y
1111

12-
config SSD1306_REVERSE_MODE
13-
default y
14-
15-
config LVGL_HOR_RES_MAX
16-
default 128
17-
18-
config LVGL_VER_RES_MAX
19-
default 32
20-
21-
config LVGL_VDB_SIZE
12+
config LV_Z_VDB_SIZE
2213
default 64
2314

24-
config LVGL_DPI
15+
config LV_DPI_DEF
2516
default 148
2617

27-
config LVGL_BITS_PER_PIXEL
18+
config LV_Z_BITS_PER_PIXEL
2819
default 1
2920

30-
choice LVGL_COLOR_DEPTH
31-
default LVGL_COLOR_DEPTH_1
21+
choice LV_COLOR_DEPTH
22+
default LV_COLOR_DEPTH_1
3223
endchoice
3324

3425
endif

‎config/boards/shields/artboard/artboard_left.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

‎config/boards/shields/artboard/artboard_right.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

‎config/boards/shields/corne_left/Kconfig.defconfig

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,17 @@ config I2C
99
config SSD1306
1010
default y
1111

12-
config SSD1306_REVERSE_MODE
13-
default y
14-
15-
config LVGL_HOR_RES_MAX
16-
default 128
17-
18-
config LVGL_VER_RES_MAX
19-
default 32
20-
21-
config LVGL_VDB_SIZE
12+
config LV_Z_VDB_SIZE
2213
default 64
2314

24-
config LVGL_DPI
15+
config LV_DPI_DEF
2516
default 148
2617

27-
config LVGL_BITS_PER_PIXEL
18+
config LV_Z_BITS_PER_PIXEL
2819
default 1
2920

30-
choice LVGL_COLOR_DEPTH
31-
default LVGL_COLOR_DEPTH_1
21+
choice LV_COLOR_DEPTH
22+
default LV_COLOR_DEPTH_1
3223
endchoice
3324

3425
endif

‎config/boards/shields/corne_left/corne_5_col_ardux_left.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

‎config/boards/shields/corne_left/corne_5_col_ardux_left_big.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

‎config/boards/shields/corne_left/corne_ardux_left.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

‎config/boards/shields/corne_right/Kconfig.defconfig

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,17 @@ config I2C
99
config SSD1306
1010
default y
1111

12-
config SSD1306_REVERSE_MODE
13-
default y
14-
15-
config LVGL_HOR_RES_MAX
16-
default 128
17-
18-
config LVGL_VER_RES_MAX
19-
default 32
20-
21-
config LVGL_VDB_SIZE
12+
config LV_Z_VDB_SIZE
2213
default 64
2314

24-
config LVGL_DPI
15+
config LV_DPI_DEF
2516
default 148
2617

27-
config LVGL_BITS_PER_PIXEL
18+
config LV_Z_BITS_PER_PIXEL
2819
default 1
2920

30-
choice LVGL_COLOR_DEPTH
31-
default LVGL_COLOR_DEPTH_1
21+
choice LV_COLOR_DEPTH
22+
default LV_COLOR_DEPTH_1
3223
endchoice
3324

3425
endif

‎config/boards/shields/corne_right/corne_5_col_ardux_right.overlay

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
com-invdir;
2424
com-sequential;
2525
prechargep = <0x22>;
26+
inversion-on;
2627
};
2728
};
2829

0 commit comments

Comments
 (0)