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.

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
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
202 changes: 202 additions & 0 deletions keyboards/meetlab/kalice/alice.json
drashna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"name": "Kalice",
"vendorId": "0xAA04",
"productId": "0xBB04",
"matrix": {
"rows": 5,
"cols": 16
},
"keycodes": [
"qmk_lighting"
],
"menus": [
"qmk_rgblight"
],
"layouts": {
"keymap": [
[
{"y": 0.15,"x": 0.45,"c": "#777777"
},
"0,0",
{"x": 16.25,"c": "#aaaaaa"
},
"0,15"
],
[
{"y": -0.85,"x": 1.75,"c": "#cccccc","f": 1
},
"0,1",
"0,2",
{"x": 9.65
},
"0,12",
"0,13",
{"c": "#aaaaaa","w": 2
},
"0,14"
],
[
{"y": -0.15,"x": 0.3,"f": 3
},
"1,0",
{"x": 16.55
},
"1,15"
],
[
{"y": -0.85,"x": 1.5,"f": 1,"w": 1.5
},
"1,1",
{"c": "#cccccc"
},
"1,2",
{"x": 9.15
},
"1,11",
"1,12",
"1,13",
{"c": "#aaaaaa","f": 3,"w": 1.5
},
"1,14"
],
[
{"y": -0.15,"x": 0.15
},
"2,0",
{"x": 16.85
},
"2,15"
],
[
{"y": -0.85,"x": 1.4,"f": 1,"w": 1.75
},
"2,1",
{"c": "#cccccc"
},
"2,2",
{"x": 9.4
},
"2,11",
"2,12",
{"c": "#777777","w": 2.25
},
"2,13"
],
[
{"x": 1.25,"c": "#aaaaaa","w": 2.25
},
"3,1",
{"c": "#cccccc"
},
"3,2",
{"x": 8.75
},
"3,11",
"3,12",
{"c": "#aaaaaa","w": 1.75
},
"3,13",
{"c": "#777777"
},
"3,14"
],
[
{"x": 1.25,"c": "#aaaaaa","w": 1.25
},
"4,0",
{"w": 1.25
},
"4,1",
{"x": 11,"f": 3,"w": 1.25
},
"4,12",
{"c": "#777777","f": 1
},
"4,13",
"4,14",
"4,15"
],
[
{"r": 9,"rx": 4.5,"ry": 2.9,"y": -2.6,"x": -1,"c": "#cccccc"
},
"0,3",
"0,4",
"0,5",
"0,6",
"0,7"
],
[
{"x": -0.6
},
"1,3",
"1,4",
"1,5",
"1,6"
],
[
{"x": -0.25
},
"2,3",
"2,4",
"2,5",
"2,6"
],
[
{"x": 0.25
},
"3,3",
"3,4",
"3,5",
"3,6"
],
[
{"x": 0.5,"c": "#aaaaaa","w": 1.5
},
"4,2",
{"c": "#cccccc","w": 2.25
},
"4,3"
],
[
{"r": -9,"rx": 15,"ry": 3.5,"y": -3.45,"x": -5.25
},
"0,8",
"0,9",
"0,10",
"0,11"
],
[
{"x": -5.65
},
"1,7",
"1,8",
"1,9",
"1,10"
],
[
{"x": -5.45
},
"2,7",
"2,8",
"2,9",
"2,10"
],
[
{"x": -5.85
},
"3,7",
"3,8",
"3,9",
"3,10"
],
[
{"x": -5.85,"w": 2.75
},
"4,10",
{"c": "#aaaaaa","w": 1.5
},
"4,11"
]
]
}
}
23 changes: 23 additions & 0 deletions keyboards/meetlab/kalice/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
#define WS2812_DMA_CHANNEL 5
21 changes: 21 additions & 0 deletions keyboards/meetlab/kalice/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* Copyright 2022 LXF-YZP(yuezp)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once
#include_next <halconf.h>

#undef HAL_USE_PWM
#define HAL_USE_PWM TRUE
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
128 changes: 128 additions & 0 deletions keyboards/meetlab/kalice/info.json
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{
"manufacturer": "lucky_studio",
"keyboard_name": "Kalice",
"maintainer": "yuezp",
"bootloader": "stm32duino",
drashna marked this conversation as resolved.
Show resolved Hide resolved
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"nkro": true,
"rgblight": true
},
"matrix_pins": {
"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,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
"brightness_steps": 10,
"led_count": 11,
"saturation_steps": 8
},
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0xBB04",
"vid": "0xAA04"
},
"ws2812": {
"driver": "pwm",
"pin": "B14"
},
"layouts": {
"LAYOUT": {
"layout": [

{"matrix": [0, 0], "x": 0.45, "y": 0},
{"matrix": [0, 1], "x": 1.75, "y": 0},
{"matrix": [0, 2], "x": 2.75, "y": 0},
{"matrix": [0, 3], "x": 3.75, "y": 0},
{"matrix": [0, 4], "x": 4.75, "y": 0},
{"matrix": [0, 5], "x": 5.75, "y": 0},
{"matrix": [0, 6], "x": 6.75, "y": 0},
{"matrix": [0, 7], "x": 7.75, "y": 0},
{"matrix": [0, 8], "x": 8.75, "y": 0},
{"matrix": [0, 9], "x": 9.75, "y": 0},
{"matrix": [0, 10], "x": 10.75, "y": 0},
{"matrix": [0, 11], "x": 11.75, "y": 0},
{"matrix": [0, 12], "x": 12.75, "y": 0},
{"matrix": [0, 13], "x": 13.75, "y": 0},
{"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2},
{"matrix": [0, 15], "x": 16.75, "y": 0},

{"matrix": [1, 0], "x": 0.3, "y": 1},
{"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 3, "y": 1},
{"matrix": [1, 3], "x": 4, "y": 1},
{"matrix": [1, 4], "x": 5, "y": 1},
{"matrix": [1, 5], "x": 6, "y": 1},
{"matrix": [1, 6], "x": 7, "y": 1},
{"matrix": [1, 7], "x": 8, "y": 1},
{"matrix": [1, 8], "x": 9, "y": 1},
{"matrix": [1, 9], "x": 10, "y": 1},
{"matrix": [1, 10], "x": 11, "y": 1},
{"matrix": [1, 11], "x": 12, "y": 1},
{"matrix": [1, 12], "x": 13, "y": 1},
{"matrix": [1, 13], "x": 14, "y": 1},
{"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.5, "y": 1},

{"matrix": [2, 0], "x": 0.15, "y": 2},
{"matrix": [2, 1], "x": 1.4, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3.15, "y": 2},
{"matrix": [2, 3], "x": 4.15, "y": 2},
{"matrix": [2, 4], "x": 5.15, "y": 2},
{"matrix": [2, 5], "x": 6.15, "y": 2},
{"matrix": [2, 6], "x": 7.15, "y": 2},
{"matrix": [2, 7], "x": 8.15, "y": 2},
{"matrix": [2, 8], "x": 9.15, "y": 2},
{"matrix": [2, 9], "x": 10.15, "y": 2},
{"matrix": [2, 10], "x": 11.15, "y": 2},
{"matrix": [2, 11], "x": 12.15, "y": 2},
{"matrix": [2, 12], "x": 13.15, "y": 2},
{"matrix": [2, 13], "x": 14.15, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.4, "y": 2},

{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 3.5, "y": 3},
{"matrix": [3, 3], "x": 4.5, "y": 3},
{"matrix": [3, 4], "x": 5.5, "y": 3},
{"matrix": [3, 5], "x": 6.5, "y": 3},
{"matrix": [3, 6], "x": 7.5, "y": 3},
{"matrix": [3, 7], "x": 8.5, "y": 3},
{"matrix": [3, 8], "x": 9.5, "y": 3},
{"matrix": [3, 9], "x": 10.5, "y": 3},
{"matrix": [3, 10], "x": 11.5, "y": 3},
{"matrix": [3, 11], "x": 12.5, "y": 3},
{"matrix": [3, 12], "x": 13.5, "y": 3},
{"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 16.25, "y": 3},

{"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.5},
{"matrix": [4, 3], "x": 5.25, "y": 4, "w": 2.25},
{"matrix": [4, 10], "x": 7.5, "y": 4, "w": 2.75},
{"matrix": [4, 11], "x": 10.25, "y": 4, "w": 1.5},
{"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
{"matrix": [4, 13], "x": 15.25, "y": 4},
{"matrix": [4, 14], "x": 16.25, "y": 4},
{"matrix": [4, 15], "x": 17.25, "y": 4}

]
}
}
}
Loading