Skip to content

Commit

Permalink
update zmk
Browse files Browse the repository at this point in the history
  • Loading branch information
TranThang-2804 committed Jun 19, 2024
1 parent 1ce7306 commit ad79964
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 37 deletions.
Empty file removed boards/shields/.gitkeep
Empty file.
20 changes: 8 additions & 12 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
# This file generates the GitHub Actions matrix.
# For simple board + shield combinations, add them to the top level board and
# shield arrays, for more control, add individual board + shield combinations
# to the `include` property. You can also use the `cmake-args` property to
# pass flags to the build command and `artifact-name` to assign a name to
# distinguish build outputs from each other:
# This file generates the GitHub Actions matrix
# For simple board + shield combinations, add them
# to the top level board and shield arrays, for more
# control, add individual board + shield combinations to
# the `include` property, e.g:
#
# board: [ "nice_nano_v2" ]
# shield: [ "corne_left", "corne_right" ]
# include:
# - board: bdn9_rev2
# - board: nice_nano_v2
# shield: reviung41
# - board: nice_nano_v2
# shield: corne_left
# cmake-args: -DCONFIG_ZMK_USB_LOGGING=y
# artifact-name: corne_left_with_logging
#
---
include:
- board: nice_nano_v2
shield: corne_left
shield: corne_left nice_view_adapter nice_view
- board: nice_nano_v2
shield: corne_right
shield: corne_right nice_view_adapter nice_view

3 changes: 2 additions & 1 deletion config/corne.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
# CONFIG_WS2812_STRIP=y

# Uncomment the following line to enable the Corne OLED Display
# CONFIG_ZMK_DISPLAY=y
CONFIG_ZMK_DISPLAY=y
CONFIG_ZMK_EXT_POWER=y
50 changes: 29 additions & 21 deletions config/corne.keymap
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,33 @@
#include <behaviors.dtsi>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/outputs.h>

/ {
keymap {
compatible = "zmk,keymap";

default_layer {
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP |
// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' |
// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC |
// | GUI | LWR | SPC | | ENT | RSE | ALT |
Base {
// -----------------------------------------------------------------------------------------
// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP |
// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' |
// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC |
// | GUI | LWR | SPC | | ENT | RSE | ALT |
label = "Base"
bindings = <
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
&kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC
&kp LGUI &kp LALT &kp RET &kp SPACE &mo 1 &mo 2
>;
};
lower_layer {
// -----------------------------------------------------------------------------------------
// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP |
// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | |
// | SHFT | | | | | | | | | | | | |
// | GUI | | SPC | | ENT | | ALT |
Lower {
// -----------------------------------------------------------------------------------------
// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP |
// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | |
// | SHFT | | | | | | | | | | | | |
// | GUI | | SPC | | ENT | | ALT |
label = "Lower"
bindings = <
&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &trans
&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSLH
Expand All @@ -39,18 +42,23 @@
>;
};

raise_layer {
// -----------------------------------------------------------------------------------------
// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP |
// | CTRL | | | | | | | - | = | [ | ] | \ | ` |
// | SHFT | | | | | | | _ | + | { | } | "|" | ~ |
// | GUI | | SPC | | ENT | | ALT |
Raise {
// -----------------------------------------------------------------------------------------
// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP |
// | CTRL | | | | | | | - | = | [ | ] | \ | ` |
// | SHFT | | | | | | | _ | + | { | } | "|" | ~ |
// | GUI | | SPC | | ENT | | ALT |
label = "Raise"
bindings = <
&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F0 &trans
&trans &trans &trans &trans &kp F10 &kp F11 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp PIPE &trans
&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F0 &trans
&trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &bt BT_NXT &bt BT_SEL 0 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans
&out OUT_TOG &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp PIPE &trans
&trans &trans &trans &trans &trans &trans
>;
};
};
};

&nice_view_spi {
cs-gpios = <&pro_micro 0 GPIO_ACTIVE_HIGH>;
};
53 changes: 53 additions & 0 deletions config/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Tab", "row": 0, "col": 0, "x": 0, "y": 0.5 },
{ "label": "Q", "row": 0, "col": 1, "x": 1, "y": 0.5 },
{ "label": "W", "row": 0, "col": 2, "x": 2, "y": 0.2 },
{ "label": "E", "row": 0, "col": 3, "x": 3, "y": 0 },
{ "label": "R", "row": 0, "col": 4, "x": 4, "y": 0.25 },
{ "label": "T", "row": 0, "col": 5, "x": 5, "y": 0.25 },
{ "label": "Y", "row": 0, "col": 7, "x": 9, "y": 0.25 },
{ "label": "U", "row": 0, "col": 8, "x": 10, "y": 0.25 },
{ "label": "I", "row": 0, "col": 9, "x": 11, "y": 0 },
{ "label": "O", "row": 0, "col": 10, "x": 12, "y": 0.2 },
{ "label": "P", "row": 0, "col": 11, "x": 13, "y": 0.5 },
{ "label": "BSPC", "row": 0, "col": 12, "x": 14, "y": 0.5 },

{ "label": "Ctrl", "row": 1, "col": 0, "x": 0, "y": 1.5 },
{ "label": "A", "row": 1, "col": 1, "x": 1, "y": 1.5 },
{ "label": "S", "row": 1, "col": 2, "x": 2, "y": 1.2 },
{ "label": "D", "row": 1, "col": 3, "x": 3, "y": 1 },
{ "label": "F", "row": 1, "col": 4, "x": 4, "y": 1.25 },
{ "label": "G", "row": 1, "col": 5, "x": 5, "y": 1.25 },
{ "label": "H", "row": 1, "col": 7, "x": 9, "y": 1.25 },
{ "label": "J", "row": 1, "col": 8, "x": 10, "y": 1.25 },
{ "label": "K", "row": 1, "col": 9, "x": 11, "y": 1 },
{ "label": "L", "row": 1, "col": 10, "x": 12, "y": 1.2 },
{ "label": ";", "row": 1, "col": 11, "x": 13, "y": 1.5 },
{ "label": "'", "row": 1, "col": 12, "x": 14, "y": 1.5 },

{ "label": "LShift", "row": 2, "col": 0, "x": 0, "y": 2.5 },
{ "label": "Z", "row": 2, "col": 1, "x": 1, "y": 2.5 },
{ "label": "X", "row": 2, "col": 2, "x": 2, "y": 2.2 },
{ "label": "C", "row": 2, "col": 3, "x": 3, "y": 2 },
{ "label": "V", "row": 2, "col": 4, "x": 4, "y": 2.25 },
{ "label": "B", "row": 2, "col": 5, "x": 5, "y": 2.25 },
{ "label": "N", "row": 2, "col": 7, "x": 9, "y": 2.25 },
{ "label": "M", "row": 2, "col": 8, "x": 10, "y": 2.25 },
{ "label": ",", "row": 2, "col": 9, "x": 11, "y": 2 },
{ "label": ".", "row": 2, "col": 10, "x": 12, "y": 2.2 },
{ "label": "/", "row": 2, "col": 11, "x": 13, "y": 2.5 },
{ "label": "Esc", "row": 2, "col": 12, "x": 14, "y": 2.5 },

{ "label": "GUI", "row": 3, "col": 3, "x": 3.5, "y": 3.25 },
{ "label": "LWR", "row": 3, "col": 4, "x": 4.5, "y": 3.25, "r": 13, "ry": 4.25 },
{ "label": "SPC", "row": 3, "col": 5, "x": 5.5, "y": 3.05, "h": 1.5, "r": 26, "ry": 4.6 },
{ "label": "ENT", "row": 3, "col": 7, "x": 8.5, "y": 3.05, "h": 1.5, "r": -26, "rx": 9.5, "ry": 4.6 },
{ "label": "RSE", "row": 3, "col": 8, "x": 9.5, "y": 3.25, "r": -13, "rx": 10.5, "ry": 4.25 },
{ "label": "ALT", "row": 3, "col": 9, "x": 10.5, "y": 3.25 }
]
}
}
}
3 changes: 0 additions & 3 deletions zephyr/module.yml

This file was deleted.

0 comments on commit ad79964

Please sign in to comment.