From a5fd3ec099d4df2defaaa2d4a4aec1f405c65a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Thu, 5 Oct 2023 21:40:24 +0800 Subject: [PATCH 1/7] Add keyboard meetlab/kalice --- keyboards/meetlab/kalice/alice.json | 202 ++++++++++++++++++ keyboards/meetlab/kalice/config.h | 23 ++ keyboards/meetlab/kalice/halconf.h | 21 ++ keyboards/meetlab/kalice/info.json | 128 +++++++++++ .../meetlab/kalice/keymaps/default/keymap.c | 35 +++ keyboards/meetlab/kalice/keymaps/via/keymap.c | 49 +++++ keyboards/meetlab/kalice/keymaps/via/rules.mk | 1 + keyboards/meetlab/kalice/mcuconf.h | 23 ++ keyboards/meetlab/kalice/readme.md | 26 +++ keyboards/meetlab/kalice/rules.mk | 1 + 10 files changed, 509 insertions(+) create mode 100644 keyboards/meetlab/kalice/alice.json create mode 100644 keyboards/meetlab/kalice/config.h create mode 100644 keyboards/meetlab/kalice/halconf.h create mode 100644 keyboards/meetlab/kalice/info.json create mode 100644 keyboards/meetlab/kalice/keymaps/default/keymap.c create mode 100644 keyboards/meetlab/kalice/keymaps/via/keymap.c create mode 100644 keyboards/meetlab/kalice/keymaps/via/rules.mk create mode 100644 keyboards/meetlab/kalice/mcuconf.h create mode 100644 keyboards/meetlab/kalice/readme.md create mode 100644 keyboards/meetlab/kalice/rules.mk diff --git a/keyboards/meetlab/kalice/alice.json b/keyboards/meetlab/kalice/alice.json new file mode 100644 index 000000000000..1269cfdd7d6b --- /dev/null +++ b/keyboards/meetlab/kalice/alice.json @@ -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" + ] + ] + } +} \ No newline at end of file diff --git a/keyboards/meetlab/kalice/config.h b/keyboards/meetlab/kalice/config.h new file mode 100644 index 000000000000..80bae79fd8ea --- /dev/null +++ b/keyboards/meetlab/kalice/config.h @@ -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 . + */ + +#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 \ No newline at end of file diff --git a/keyboards/meetlab/kalice/halconf.h b/keyboards/meetlab/kalice/halconf.h new file mode 100644 index 000000000000..3b0e71541c8e --- /dev/null +++ b/keyboards/meetlab/kalice/halconf.h @@ -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 . + */ + +#pragma once +#include_next + +#undef HAL_USE_PWM +#define HAL_USE_PWM TRUE \ No newline at end of file diff --git a/keyboards/meetlab/kalice/info.json b/keyboards/meetlab/kalice/info.json new file mode 100644 index 000000000000..4da424c31f95 --- /dev/null +++ b/keyboards/meetlab/kalice/info.json @@ -0,0 +1,128 @@ +{ + "manufacturer": "lucky_studio", + "keyboard_name": "Kalice", + "maintainer": "yuezp", + "bootloader": "stm32duino", + "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} + + ] + } + } +} \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/default/keymap.c b/keyboards/meetlab/kalice/keymaps/default/keymap.c new file mode 100644 index 000000000000..0a39f0a37d14 --- /dev/null +++ b/keyboards/meetlab/kalice/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT( + 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), + +[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) + +}; \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/keymap.c b/keyboards/meetlab/kalice/keymaps/via/keymap.c new file mode 100644 index 000000000000..e8f8b268f7c7 --- /dev/null +++ b/keyboards/meetlab/kalice/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT( + 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), + +[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), + +[2] = LAYOUT( + 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), + +[3] = LAYOUT( + 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), + +}; \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/rules.mk b/keyboards/meetlab/kalice/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/meetlab/kalice/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/meetlab/kalice/mcuconf.h b/keyboards/meetlab/kalice/mcuconf.h new file mode 100644 index 000000000000..e2f1a5652b99 --- /dev/null +++ b/keyboards/meetlab/kalice/mcuconf.h @@ -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 . + */ + +#pragma once +#include_next + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE +#undef STM32_PWM_USE_ADVANCED +#define STM32_PWM_USE_ADVANCED TRUE \ No newline at end of file diff --git a/keyboards/meetlab/kalice/readme.md b/keyboards/meetlab/kalice/readme.md new file mode 100644 index 000000000000..efa97f2d5e85 --- /dev/null +++ b/keyboards/meetlab/kalice/readme.md @@ -0,0 +1,26 @@ +# Kalice - PCB + +![kalice](https://imgur.com/Q7mW50th.jpg) + +An Alice style board with arrowkeys made by Lucky, based on the Fate Arisu layout. + +* Keyboard Maintainer: https://github.com/LXF-YZP +* Hardware Supported: Lucky PCB + +Make example for this keyboard (after setting up your build environment): + + make meetlab/kalice:default + +Flashing example for this keyboard: + + make meetlab/kalice:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/meetlab/kalice/rules.mk b/keyboards/meetlab/kalice/rules.mk new file mode 100644 index 000000000000..7ff128fa692e --- /dev/null +++ b/keyboards/meetlab/kalice/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From d0ded2f7347f34dbd21a05334f9a0f9d0fa49b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Fri, 6 Oct 2023 07:49:16 +0800 Subject: [PATCH 2/7] delete file --- keyboards/meetlab/kalice/alice.json | 202 ------------------ keyboards/meetlab/kalice/keymaps/via/keymap.c | 17 +- 2 files changed, 1 insertion(+), 218 deletions(-) delete mode 100644 keyboards/meetlab/kalice/alice.json diff --git a/keyboards/meetlab/kalice/alice.json b/keyboards/meetlab/kalice/alice.json deleted file mode 100644 index 1269cfdd7d6b..000000000000 --- a/keyboards/meetlab/kalice/alice.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "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" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/keymap.c b/keyboards/meetlab/kalice/keymaps/via/keymap.c index e8f8b268f7c7..90fe1bf7e53c 100644 --- a/keyboards/meetlab/kalice/keymaps/via/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/via/keymap.c @@ -30,20 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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), - -[2] = LAYOUT( - 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), - -[3] = LAYOUT( - 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) }; \ No newline at end of file From 98004f305a81ef973784f71c94caf7435dce17c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Tue, 10 Oct 2023 19:40:26 +0800 Subject: [PATCH 3/7] modify keymap.c --- keyboards/meetlab/kalice/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/meetlab/kalice/keymaps/default/keymap.c b/keyboards/meetlab/kalice/keymaps/default/keymap.c index 0a39f0a37d14..bfe8ba62c851 100644 --- a/keyboards/meetlab/kalice/keymaps/default/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_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, From ba29d1b56f6c4980c99f4a8a95b8684bfac9388d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Wed, 11 Oct 2023 19:17:06 +0800 Subject: [PATCH 4/7] format keymap.c --- keyboards/meetlab/kalice/info.json | 3 +-- keyboards/meetlab/kalice/keymaps/default/keymap.c | 8 ++++---- keyboards/meetlab/kalice/keymaps/via/keymap.c | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/keyboards/meetlab/kalice/info.json b/keyboards/meetlab/kalice/info.json index 4da424c31f95..084ddd2a65bd 100644 --- a/keyboards/meetlab/kalice/info.json +++ b/keyboards/meetlab/kalice/info.json @@ -2,7 +2,7 @@ "manufacturer": "lucky_studio", "keyboard_name": "Kalice", "maintainer": "yuezp", - "bootloader": "stm32duino", + "development_board": "bluepill", "diode_direction": "COL2ROW", "features": { "bootmagic": true, @@ -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, diff --git a/keyboards/meetlab/kalice/keymaps/default/keymap.c b/keyboards/meetlab/kalice/keymaps/default/keymap.c index bfe8ba62c851..66861a12f460 100644 --- a/keyboards/meetlab/kalice/keymaps/default/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/default/keymap.c @@ -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) }; \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/keymap.c b/keyboards/meetlab/kalice/keymaps/via/keymap.c index 90fe1bf7e53c..50f3761e7705 100644 --- a/keyboards/meetlab/kalice/keymaps/via/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/via/keymap.c @@ -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) }; \ No newline at end of file From 9d342264791a8ca9979b2d1157638d18a8422c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Wed, 11 Oct 2023 19:23:22 +0800 Subject: [PATCH 5/7] format keymap.c --- keyboards/meetlab/kalice/keymaps/default/keymap.c | 8 ++++---- keyboards/meetlab/kalice/keymaps/via/keymap.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/meetlab/kalice/keymaps/default/keymap.c b/keyboards/meetlab/kalice/keymaps/default/keymap.c index 66861a12f460..30fc4b2add8d 100644 --- a/keyboards/meetlab/kalice/keymaps/default/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/default/keymap.c @@ -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) }; \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/keymap.c b/keyboards/meetlab/kalice/keymaps/via/keymap.c index 50f3761e7705..e0f606177ac2 100644 --- a/keyboards/meetlab/kalice/keymaps/via/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/via/keymap.c @@ -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) }; \ No newline at end of file From 48086a03b1dbfe0af25a5dc9eddecd395de6d518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Fri, 13 Oct 2023 21:29:54 +0800 Subject: [PATCH 6/7] modify keymap.c --- .../meetlab/kalice/keymaps/default/keymap.c | 20 +++++++++---------- keyboards/meetlab/kalice/keymaps/via/keymap.c | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/keyboards/meetlab/kalice/keymaps/default/keymap.c b/keyboards/meetlab/kalice/keymaps/default/keymap.c index 30fc4b2add8d..071941063e59 100644 --- a/keyboards/meetlab/kalice/keymaps/default/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/default/keymap.c @@ -19,17 +19,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_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), [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_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) }; \ No newline at end of file diff --git a/keyboards/meetlab/kalice/keymaps/via/keymap.c b/keyboards/meetlab/kalice/keymaps/via/keymap.c index e0f606177ac2..37bd02387fe0 100644 --- a/keyboards/meetlab/kalice/keymaps/via/keymap.c +++ b/keyboards/meetlab/kalice/keymaps/via/keymap.c @@ -19,16 +19,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_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), [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_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) }; \ No newline at end of file From 93952e856e53268491c71210fb0dfb97396155c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cyuezp=E2=80=9D?= <“yuezpchn@126.com”> Date: Sun, 29 Oct 2023 23:12:07 +0800 Subject: [PATCH 7/7] Format the info.json file and modify the halconf.h file --- keyboards/meetlab/kalice/halconf.h | 6 +++--- keyboards/meetlab/kalice/info.json | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/keyboards/meetlab/kalice/halconf.h b/keyboards/meetlab/kalice/halconf.h index 3b0e71541c8e..2c064d1133b1 100644 --- a/keyboards/meetlab/kalice/halconf.h +++ b/keyboards/meetlab/kalice/halconf.h @@ -15,7 +15,7 @@ */ #pragma once -#include_next -#undef HAL_USE_PWM -#define HAL_USE_PWM TRUE \ No newline at end of file +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/meetlab/kalice/info.json b/keyboards/meetlab/kalice/info.json index 084ddd2a65bd..5cb46eb9cf55 100644 --- a/keyboards/meetlab/kalice/info.json +++ b/keyboards/meetlab/kalice/info.json @@ -44,7 +44,6 @@ "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}, @@ -61,7 +60,6 @@ {"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}, @@ -78,7 +76,6 @@ {"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}, @@ -94,7 +91,6 @@ {"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}, @@ -109,7 +105,6 @@ {"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}, @@ -119,8 +114,7 @@ {"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} - + {"matrix": [4, 15], "x": 17.25, "y": 4} ] } }