Implemented US layout and formatted tabs/spaces, updated OLED support

OLED not yet tested
This commit is contained in:
laidbackhacker 2022-11-28 20:32:55 +00:00
parent 5a33822309
commit 7705aee07e
3 changed files with 28 additions and 33 deletions

View file

@ -4,7 +4,7 @@ if SHIELD_WATERFOWL_LEFT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME
default "Waterfowl" default "Waterfowl"
config ZMK_SPLIT_BLE_ROLE_CENTRAL config ZMK_SPLIT_ROLE_CENTRAL
default y default y
endif endif
@ -29,12 +29,6 @@ endif # ZMK_DISPLAY
if LVGL if LVGL
config LVGL_HOR_RES_MAX
default 128
config LVGL_VER_RES_MAX
default 64
config LVGL_VDB_SIZE config LVGL_VDB_SIZE
default 64 default 64

View file

@ -8,6 +8,7 @@
/ { / {
chosen { chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0; zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform; zmk,matrix_transform = &default_transform;
}; };
@ -69,7 +70,7 @@ 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
&pro_micro_i2c { &pro_micro_i2c {
status = "okay"; status = "okay";
ssd1306@3c { oled: ssd1306@3c {
compatible = "solomon,ssd1306fb"; compatible = "solomon,ssd1306fb";
reg = <0x3c>; reg = <0x3c>;
label = "DISPLAY"; label = "DISPLAY";

View file

@ -64,20 +64,20 @@
/* SYM /* SYM
* *
* ,----------------------------------. ,----------------------------------. * ,----------------------------------. ,----------------------------------.
* | % | @ | [ | ] | \ | | ¦ | ¬ | ^ | | | * | % | @ | [ | ] | \ | | | | ^ | | |
* |------+------+------+------+------| |------+------+------+------+------| * |------+------+------+------+------| |------+------+------+------+------|
* | # | ! | ( | ) | | | | _ | ' | " | ~ | ` | * | # | ! | ( | ) | | | | _ | ' | " | ~ | ` |
* |------+------+------+------+------| ,-----. ,-----. |------+------+------+------+------| * |------+------+------+------+------| ,-----. ,-----. |------+------+------+------+------|
* | $ | £ | { | } | & | | 2 | | 3 | | | | | | | * | $ | | { | } | & | | 2 | | 3 | | | | | | |
* `----------------------------------' `-----' `-----' `----------------------------------' * `----------------------------------' `-----' `-----' `----------------------------------'
* ,-----. ,--------------------. ,--------------------. ,-----. * ,-----. ,--------------------. ,--------------------. ,-----.
* | 1 | | DEL | SPACE | TAB | | ESC | BS | ENTER | | 4 | * | 1 | | DEL | SPACE | TAB | | ESC | BS | ENTER | | 4 |
* `-----' `--------------------' `--------------------' `-----' * `-----' `--------------------' `--------------------' `-----'
*/ */
bindings = < bindings = <
&kp PRCNT &kp LS(SQT) &kp LBKT &kp RBKT &kp NON_US_BSLH &kp RA(GRAVE) &kp LS(GRAVE) &kp CARET &trans &trans &kp PRCNT &kp AT &kp LBKT &kp RBKT &kp NON_US_BSLH &trans &trans &kp CARET &trans &trans
&kp NON_US_HASH &kp EXCL &kp LPAR &kp RPAR &kp LS(NON_US_BSLH) &kp UNDER &kp APOS &kp LS(N2) &kp LS(NON_US_HASH) &kp GRAVE &kp HASH &kp EXCL &kp LPAR &kp RPAR &kp PIPE &kp UNDER &kp APOS &kp DOUBLE_QUOTES &kp TILDE &kp GRAVE
&kp DLLR &kp LS(N3) &kp LBRC &kp RBRC &kp AMPS &trans &trans &trans &trans &trans &kp DLLR &trans &kp LBRC &kp RBRC &kp AMPS &trans &trans &trans &trans &trans
&kp N1 &lt 3 DEL &lt 1 SPACE &kp TAB &kp N2 &kp N3 &kp ESC &kp BSPC &lt 2 RET &kp N4 &kp N1 &lt 3 DEL &lt 1 SPACE &kp TAB &kp N2 &kp N3 &kp ESC &kp BSPC &lt 2 RET &kp N4
>; >;