Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keyboard meetlab/kalice #22207

Merged
merged 27 commits into from
Dec 12, 2023
Merged

Add keyboard meetlab/kalice #22207

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a5fd3ec
Add keyboard meetlab/kalice
Oct 5, 2023
d0ded2f
delete file
Oct 5, 2023
98004f3
modify keymap.c
Oct 10, 2023
ba29d1b
format keymap.c
Oct 11, 2023
9d34226
format keymap.c
Oct 11, 2023
48086a0
modify keymap.c
Oct 13, 2023
93952e8
Format the info.json file and modify the halconf.h file
Oct 29, 2023
9dec68a
Merge branch 'master' into meetlab_kalice
LXF-YZP Nov 28, 2023
a5899c1
Merge branch 'master' into meetlab_kalice
LXF-YZP Nov 28, 2023
de25c6d
Merge branch 'master' into meetlab_kalice
LXF-YZP Nov 28, 2023
576ba48
Merge branch 'master' into meetlab_kalice
LXF-YZP Nov 29, 2023
e024ab6
Merge branch 'master' into meetlab_kalice
LXF-YZP Nov 30, 2023
1041987
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 1, 2023
cb0d204
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 1, 2023
6290308
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 1, 2023
9bbf71a
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 1, 2023
c4cb3fd
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 3, 2023
cae4c3c
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 4, 2023
a770057
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 4, 2023
6235818
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 4, 2023
1989e1f
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 4, 2023
645659e
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 5, 2023
8c9184b
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 6, 2023
9257b0e
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 7, 2023
c17472b
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 7, 2023
d091b72
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 8, 2023
0c0ecb4
Merge branch 'master' into meetlab_kalice
LXF-YZP Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
format keymap.c
  • Loading branch information
“yuezp” committed Oct 11, 2023
commit ba29d1b56f6c4980c99f4a8a95b8684bfac9388d
3 changes: 1 addition & 2 deletions keyboards/meetlab/kalice/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manufacturer": "lucky_studio",
"keyboard_name": "Kalice",
"maintainer": "yuezp",
"bootloader": "stm32duino",
"development_board": "bluepill",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
Expand All @@ -14,7 +14,6 @@
"cols": ["A4", "B10", "B1", "B0", "A7", "A6", "A5", "B7", "B6", "B5", "B4", "B3", "A15", "B13", "B8", "B9"],
"rows": ["A3", "A2", "A1", "B12", "B11"]
},
"processor": "STM32F103",
"rgblight": {
"animations": {
"alternating": true,
Expand Down
8 changes: 4 additions & 4 deletions keyboards/meetlab/kalice/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(1),
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)

};
8 changes: 4 additions & 4 deletions keyboards/meetlab/kalice/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS,
KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(1),
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RCTL, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};