From 0057d6ee8983f81351a150bf13a126b9aeb4df28 Mon Sep 17 00:00:00 2001 From: rhmokey Date: Thu, 7 Dec 2023 16:04:46 +0800 Subject: [PATCH 01/11] [Keyboard]add luckycat70 [Keyboard]add luckycat70 --- keyboards/mokey/luckycat70/config.h | 30 +++ keyboards/mokey/luckycat70/info.json | 195 ++++++++++++++++++ .../mokey/luckycat70/keymaps/default/keymap.c | 52 +++++ .../mokey/luckycat70/keymaps/via/keymap.c | 52 +++++ .../mokey/luckycat70/keymaps/via/rules.mk | 1 + keyboards/mokey/luckycat70/readme.md | 23 +++ keyboards/mokey/luckycat70/rules.mk | 11 + 7 files changed, 364 insertions(+) create mode 100644 keyboards/mokey/luckycat70/config.h create mode 100644 keyboards/mokey/luckycat70/info.json create mode 100644 keyboards/mokey/luckycat70/keymaps/default/keymap.c create mode 100644 keyboards/mokey/luckycat70/keymaps/via/keymap.c create mode 100644 keyboards/mokey/luckycat70/keymaps/via/rules.mk create mode 100644 keyboards/mokey/luckycat70/readme.md create mode 100644 keyboards/mokey/luckycat70/rules.mk diff --git a/keyboards/mokey/luckycat70/config.h b/keyboards/mokey/luckycat70/config.h new file mode 100644 index 000000000000..488b3a1e331d --- /dev/null +++ b/keyboards/mokey/luckycat70/config.h @@ -0,0 +1,30 @@ +/* Copyright 2023 luckycat70 + * + * 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 RGBLED_NUM 78 +#define RGB_MATRIX_LED_COUNT 255 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGBLIGHT_LIMIT_VAL 255 +#ifdef RGB_MATRIX_ENABLE +# define RGB_DISABLE_WHEN_USB_SUSPENDED +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS + #define ENABLE_RGB_MATRIX_BREATHING +#endif diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json new file mode 100644 index 000000000000..da716e1c7946 --- /dev/null +++ b/keyboards/mokey/luckycat70/info.json @@ -0,0 +1,195 @@ +{ + "keyboard_name": "Lucky Cat 70", + "manufacturer": "qmk", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x6653", + "pid": "0x0070", + "device_version": "0.0.1" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": false, + "backlight": false, + "rgblight": false, + "rgb_matrix": true, + "audio": false + }, + "matrix_pins": { + "cols": ["A3", "A2", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"], + "rows": ["C13", "C14", "C15", "A0", "A1"] + }, + "ws2812": { + "pin": "A4" + }, + "processor": "STM32F103", + "bootloader": "stm32duino", + "board": "STM32_F103_STM32DUINO", + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 1, "matrix": [0, 1], "x": 1, "y": 0}, + {"flags": 1, "matrix": [0, 2], "x": 2, "y": 0}, + {"flags": 1, "matrix": [0, 3], "x": 3, "y": 0}, + {"flags": 1, "matrix": [0, 4], "x": 4, "y": 0}, + {"flags": 1, "matrix": [0, 5], "x": 5, "y": 0}, + {"flags": 1, "matrix": [0, 6], "x": 6, "y": 0}, + {"flags": 1, "matrix": [0, 7], "x": 7, "y": 0}, + {"flags": 1, "matrix": [0, 8], "x": 8, "y": 0}, + {"flags": 1, "matrix": [0, 9], "x": 9, "y": 0}, + {"flags": 1, "matrix": [0, 10], "x": 10, "y": 0}, + {"flags": 1, "matrix": [0, 11], "x": 11, "y": 0}, + {"flags": 1, "matrix": [0, 12], "x": 12, "y": 0}, + {"flags": 1, "matrix": [0, 13], "x": 13, "y": 0}, + {"flags": 1, "matrix": [0, 14], "x": 15.25, "y": 0}, + {"flags": 1, "matrix": [0, 15], "x": 16.25, "y": 0}, + {"flags": 1, "matrix": [0, 16], "x": 17.25, "y": 0}, + + {"flags": 1, "matrix": [1, 16], "x": 0, "y": 1}, + {"flags": 1, "matrix": [1, 15], "x": 1.5, "y": 1}, + {"flags": 1, "matrix": [1, 14], "x": 2.5, "y": 1}, + {"flags": 1, "matrix": [1, 13], "x": 3.5, "y": 1}, + {"flags": 1, "matrix": [1, 12], "x": 4.5, "y": 1}, + {"flags": 1, "matrix": [1, 11], "x": 5.5, "y": 1}, + {"flags": 1, "matrix": [1, 10], "x": 6.5, "y": 1}, + {"flags": 1, "matrix": [1, 9], "x": 7.5, "y": 1}, + {"flags": 1, "matrix": [1, 8], "x": 8.5, "y": 1}, + {"flags": 1, "matrix": [1, 7], "x": 9.5, "y": 1}, + {"flags": 1, "matrix": [1, 6], "x": 10.5, "y": 1}, + {"flags": 1, "matrix": [1, 5], "x": 11.5, "y": 1}, + {"flags": 1, "matrix": [1, 4], "x": 12.5, "y": 1}, + {"flags": 1, "matrix": [1, 3], "x": 13.5, "y": 1}, + {"flags": 1, "matrix": [1, 2], "x": 15.25, "y": 1}, + {"flags": 1, "matrix": [1, 1], "x": 16.25, "y": 1}, + {"flags": 1, "matrix": [1, 0], "x": 17.25, "y": 1}, + + {"flags": 1, "matrix": [2, 0], "x": 0, "y": 2}, + {"flags": 1, "matrix": [2, 1], "x": 1.75, "y": 2}, + {"flags": 1, "matrix": [2, 2], "x": 2.75, "y": 2}, + {"flags": 1, "matrix": [2, 3], "x": 3.75, "y": 2}, + {"flags": 1, "matrix": [2, 4], "x": 4.75, "y": 2}, + {"flags": 1, "matrix": [2, 5], "x": 5.75, "y": 2}, + {"flags": 1, "matrix": [2, 6], "x": 6.75, "y": 2}, + {"flags": 1, "matrix": [2, 7], "x": 7.75, "y": 2}, + {"flags": 1, "matrix": [2, 8], "x": 8.75, "y": 2}, + {"flags": 1, "matrix": [2, 9], "x": 9.75, "y": 2}, + {"flags": 1, "matrix": [2, 10], "x": 10.75, "y": 2}, + {"flags": 1, "matrix": [2, 11], "x": 11.75, "y": 2}, + {"flags": 1, "matrix": [2, 13], "x": 12.75, "y": 2}, + + {"flags": 1, "matrix": [3, 15], "x": 0, "y": 3}, + {"flags": 1, "matrix": [3, 13], "x": 2.25, "y": 3}, + {"flags": 1, "matrix": [3, 10], "x": 3.25, "y": 3}, + {"flags": 1, "matrix": [3, 9], "x": 4.25, "y": 3}, + {"flags": 1, "matrix": [3, 8], "x": 5.25, "y": 3}, + {"flags": 1, "matrix": [3, 7], "x": 6.25, "y": 3}, + {"flags": 1, "matrix": [3, 6], "x": 7.25, "y": 3}, + {"flags": 1, "matrix": [3, 5], "x": 8.25, "y": 3}, + {"flags": 1, "matrix": [3, 4], "x": 9.25, "y": 3}, + {"flags": 1, "matrix": [3, 3], "x": 10.25, "y": 3}, + {"flags": 1, "matrix": [3, 2], "x": 11.25, "y": 3}, + {"flags": 1, "matrix": [3, 1], "x": 12.25, "y": 3}, + {"flags": 1, "matrix": [3, 0], "x": 16.25, "y": 3}, + + {"flags": 1, "matrix": [4, 0], "x": 0, "y": 4}, + {"flags": 1, "matrix": [4, 1], "x": 1.25, "y": 4}, + {"flags": 1, "matrix": [4, 2], "x": 2.5, "y": 4}, + {"flags": 1, "matrix": [4, 5], "x": 3.75, "y": 4}, + {"flags": 1, "matrix": [4, 9], "x": 10, "y": 4}, + {"flags": 1, "matrix": [4, 10], "x": 11.25, "y": 4}, + {"flags": 1, "matrix": [4, 11], "x": 12.5, "y": 4}, + {"flags": 1, "matrix": [4, 12], "x": 13.75, "y": 4}, + {"flags": 1, "matrix": [4, 14], "x": 15.25, "y": 4}, + {"flags": 1, "matrix": [4, 15], "x": 16.25, "y": 4}, + {"flags": 1, "matrix": [4, 16], "x": 17.25, "y": 4} + ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2, "h": 1}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 16], "x": 0, "y": 1}, + {"matrix": [1, 15], "x": 1.5, "y": 1}, + {"matrix": [1, 14], "x": 2.5, "y": 1}, + {"matrix": [1, 13], "x": 3.5, "y": 1}, + {"matrix": [1, 12], "x": 4.5, "y": 1}, + {"matrix": [1, 11], "x": 5.5, "y": 1}, + {"matrix": [1, 10], "x": 6.5, "y": 1}, + {"matrix": [1, 9], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 6], "x": 10.5, "y": 1}, + {"matrix": [1, 5], "x": 11.5, "y": 1}, + {"matrix": [1, 4], "x": 12.5, "y": 1}, + {"matrix": [1, 3], "x": 13.5, "y": 1, "w": 1, "h": 1.5}, + {"matrix": [1, 2], "x": 15.25, "y": 1}, + {"matrix": [1, 1], "x": 16.25, "y": 1}, + {"matrix": [1, 0], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75, "h": 1}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25, "h": 1}, + + {"matrix": [3, 12], "x": 0, "y": 3, "w": 2.25, "h": 1}, + {"matrix": [3, 11], "x": 2.25, "y": 3}, + {"matrix": [3, 10], "x": 3.25, "y": 3}, + {"matrix": [3, 9], "x": 4.25, "y": 3}, + {"matrix": [3, 8], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 5], "x": 8.25, "y": 3}, + {"matrix": [3, 4], "x": 9.25, "y": 3}, + {"matrix": [3, 3], "x": 10.25, "y": 3}, + {"matrix": [3, 2], "x": 11.25, "y": 3}, + {"matrix": [3, 1], "x": 12.25, "y": 3, "w": 2.75, "h": 1}, + {"matrix": [3, 0], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25, "h": 1}, + {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25, "h": 1}, + {"matrix": [4, 8], "x": 15.25, "y": 4}, + {"matrix": [4, 9], "x": 16.25, "y": 4}, + {"matrix": [4, 10], "x": 17.25, "y": 4} + ] + } + } +} diff --git a/keyboards/mokey/luckycat70/keymaps/default/keymap.c b/keyboards/mokey/luckycat70/keymaps/default/keymap.c new file mode 100644 index 000000000000..c0d525b3fd01 --- /dev/null +++ b/keyboards/mokey/luckycat70/keymaps/default/keymap.c @@ -0,0 +1,52 @@ +/* + * Copyright 2023 luckycat70 + * + * 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_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_HOME, 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_END, 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, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, 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_RALT, KC_GRV, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = 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 + ), + + [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 + ) +}; diff --git a/keyboards/mokey/luckycat70/keymaps/via/keymap.c b/keyboards/mokey/luckycat70/keymaps/via/keymap.c new file mode 100644 index 000000000000..c0d525b3fd01 --- /dev/null +++ b/keyboards/mokey/luckycat70/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* + * Copyright 2023 luckycat70 + * + * 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_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_HOME, 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_END, 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, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, 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_RALT, KC_GRV, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = 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 + ), + + [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 + ) +}; diff --git a/keyboards/mokey/luckycat70/keymaps/via/rules.mk b/keyboards/mokey/luckycat70/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/mokey/luckycat70/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/mokey/luckycat70/readme.md b/keyboards/mokey/luckycat70/readme.md new file mode 100644 index 000000000000..b3c68eb6c66d --- /dev/null +++ b/keyboards/mokey/luckycat70/readme.md @@ -0,0 +1,23 @@ +# mokey12x2 + +STM32F103C8T6 keyboard. + +* Keyboard Maintainer: [rhmokey](https://github.com/rhmokey) +* Hardware Supported: [rhmokey](https://github.com/rhmokey) + +Make example for this keyboard (after setting up your build environment): + + make mokey/luckycat70:default + +Flashing example for this keyboard: + + make mokey/luckycat70: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 2 ways: + +* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/mokey/luckycat70/rules.mk b/keyboards/mokey/luckycat70/rules.mk new file mode 100644 index 000000000000..60c97b41a60d --- /dev/null +++ b/keyboards/mokey/luckycat70/rules.mk @@ -0,0 +1,11 @@ +MCU = STM32F103 + +# Wear-levelling driver +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = embedded_flash + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE + +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -p FFFF -v FFFF From 2678aa7e83836529906dbaae3c1742ab5232ea92 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 09:32:46 +0800 Subject: [PATCH 02/11] Update keyboards/mokey/luckycat70/keymaps/default/keymap.c /* * Copyright 2023 luckycat70 * * 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_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_HOME, 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_END, 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, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, 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_RALT, KC_GRV, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT ) }; Co-authored-by: jack <0x6a73@protonmail.com> --- .../mokey/luckycat70/keymaps/default/keymap.c | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/mokey/luckycat70/keymaps/default/keymap.c b/keyboards/mokey/luckycat70/keymaps/default/keymap.c index c0d525b3fd01..d26115dfbe70 100644 --- a/keyboards/mokey/luckycat70/keymaps/default/keymap.c +++ b/keyboards/mokey/luckycat70/keymaps/default/keymap.c @@ -24,29 +24,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, 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_RALT, KC_GRV, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = 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 - ), - - [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 ) }; From c1b4a5a51a892961c7f863394e1d4319a595da84 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:08:05 +0800 Subject: [PATCH 03/11] Update config.h --- keyboards/mokey/luckycat70/config.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/mokey/luckycat70/config.h b/keyboards/mokey/luckycat70/config.h index 488b3a1e331d..45a1623cc7ab 100644 --- a/keyboards/mokey/luckycat70/config.h +++ b/keyboards/mokey/luckycat70/config.h @@ -15,16 +15,3 @@ */ #pragma once - -#define RGBLED_NUM 78 -#define RGB_MATRIX_LED_COUNT 255 -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGBLIGHT_LIMIT_VAL 255 -#ifdef RGB_MATRIX_ENABLE -# define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS - #define ENABLE_RGB_MATRIX_BREATHING -#endif From d819277a4d1a96041c4efdc39e78502ac0a65890 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:09:38 +0800 Subject: [PATCH 04/11] Update info.json --- keyboards/mokey/luckycat70/info.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json index da716e1c7946..a12f9c4c3f51 100644 --- a/keyboards/mokey/luckycat70/info.json +++ b/keyboards/mokey/luckycat70/info.json @@ -16,10 +16,7 @@ "console": false, "command": false, "nkro": false, - "backlight": false, - "rgblight": false, - "rgb_matrix": true, - "audio": false + "rgb_matrix": true }, "matrix_pins": { "cols": ["A3", "A2", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"], @@ -28,9 +25,24 @@ "ws2812": { "pin": "A4" }, + "rgblight": { + "led_count": 78, + "max_brightness": 255, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "processor": "STM32F103", "bootloader": "stm32duino", - "board": "STM32_F103_STM32DUINO", "rgb_matrix": { "driver": "WS2812", "layout": [ From ef7df3613cc95783ae586e5269fdabffb52f344b Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:10:27 +0800 Subject: [PATCH 05/11] Update keymap.c --- .../mokey/luckycat70/keymaps/via/keymap.c | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/mokey/luckycat70/keymaps/via/keymap.c b/keyboards/mokey/luckycat70/keymaps/via/keymap.c index c0d525b3fd01..d26115dfbe70 100644 --- a/keyboards/mokey/luckycat70/keymaps/via/keymap.c +++ b/keyboards/mokey/luckycat70/keymaps/via/keymap.c @@ -24,29 +24,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, 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_RALT, KC_GRV, KC_LGUI, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = 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 - ), - - [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 ) }; From a486843d2d0dd1d42693c32536f4270b7dc21c7e Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:11:39 +0800 Subject: [PATCH 06/11] Update readme.md --- keyboards/mokey/luckycat70/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mokey/luckycat70/readme.md b/keyboards/mokey/luckycat70/readme.md index b3c68eb6c66d..ffd3a14a26bd 100644 --- a/keyboards/mokey/luckycat70/readme.md +++ b/keyboards/mokey/luckycat70/readme.md @@ -1,9 +1,9 @@ -# mokey12x2 +# luckycat70 STM32F103C8T6 keyboard. * Keyboard Maintainer: [rhmokey](https://github.com/rhmokey) -* Hardware Supported: [rhmokey](https://github.com/rhmokey) +* Hardware Supported: STM32F103C8T6 Make example for this keyboard (after setting up your build environment): @@ -20,4 +20,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 2 ways: * **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 840e1773d5232004a269ea84b483834ab21a2b63 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:11:27 +0800 Subject: [PATCH 07/11] Delete keyboards/mokey/luckycat70/config.h --- keyboards/mokey/luckycat70/config.h | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/mokey/luckycat70/config.h diff --git a/keyboards/mokey/luckycat70/config.h b/keyboards/mokey/luckycat70/config.h deleted file mode 100644 index 45a1623cc7ab..000000000000 --- a/keyboards/mokey/luckycat70/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 luckycat70 - * - * 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 From 526272a8ee5024bf1acb05eb60fd66232793de1e Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:13:26 +0800 Subject: [PATCH 08/11] Update info.json --- keyboards/mokey/luckycat70/info.json | 82 +--------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json index a12f9c4c3f51..359bf4bdd699 100644 --- a/keyboards/mokey/luckycat70/info.json +++ b/keyboards/mokey/luckycat70/info.json @@ -16,7 +16,7 @@ "console": false, "command": false, "nkro": false, - "rgb_matrix": true + "rgblight": true }, "matrix_pins": { "cols": ["A3", "A2", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"], @@ -43,86 +43,6 @@ }, "processor": "STM32F103", "bootloader": "stm32duino", - "rgb_matrix": { - "driver": "WS2812", - "layout": [ - {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 1, "matrix": [0, 1], "x": 1, "y": 0}, - {"flags": 1, "matrix": [0, 2], "x": 2, "y": 0}, - {"flags": 1, "matrix": [0, 3], "x": 3, "y": 0}, - {"flags": 1, "matrix": [0, 4], "x": 4, "y": 0}, - {"flags": 1, "matrix": [0, 5], "x": 5, "y": 0}, - {"flags": 1, "matrix": [0, 6], "x": 6, "y": 0}, - {"flags": 1, "matrix": [0, 7], "x": 7, "y": 0}, - {"flags": 1, "matrix": [0, 8], "x": 8, "y": 0}, - {"flags": 1, "matrix": [0, 9], "x": 9, "y": 0}, - {"flags": 1, "matrix": [0, 10], "x": 10, "y": 0}, - {"flags": 1, "matrix": [0, 11], "x": 11, "y": 0}, - {"flags": 1, "matrix": [0, 12], "x": 12, "y": 0}, - {"flags": 1, "matrix": [0, 13], "x": 13, "y": 0}, - {"flags": 1, "matrix": [0, 14], "x": 15.25, "y": 0}, - {"flags": 1, "matrix": [0, 15], "x": 16.25, "y": 0}, - {"flags": 1, "matrix": [0, 16], "x": 17.25, "y": 0}, - - {"flags": 1, "matrix": [1, 16], "x": 0, "y": 1}, - {"flags": 1, "matrix": [1, 15], "x": 1.5, "y": 1}, - {"flags": 1, "matrix": [1, 14], "x": 2.5, "y": 1}, - {"flags": 1, "matrix": [1, 13], "x": 3.5, "y": 1}, - {"flags": 1, "matrix": [1, 12], "x": 4.5, "y": 1}, - {"flags": 1, "matrix": [1, 11], "x": 5.5, "y": 1}, - {"flags": 1, "matrix": [1, 10], "x": 6.5, "y": 1}, - {"flags": 1, "matrix": [1, 9], "x": 7.5, "y": 1}, - {"flags": 1, "matrix": [1, 8], "x": 8.5, "y": 1}, - {"flags": 1, "matrix": [1, 7], "x": 9.5, "y": 1}, - {"flags": 1, "matrix": [1, 6], "x": 10.5, "y": 1}, - {"flags": 1, "matrix": [1, 5], "x": 11.5, "y": 1}, - {"flags": 1, "matrix": [1, 4], "x": 12.5, "y": 1}, - {"flags": 1, "matrix": [1, 3], "x": 13.5, "y": 1}, - {"flags": 1, "matrix": [1, 2], "x": 15.25, "y": 1}, - {"flags": 1, "matrix": [1, 1], "x": 16.25, "y": 1}, - {"flags": 1, "matrix": [1, 0], "x": 17.25, "y": 1}, - - {"flags": 1, "matrix": [2, 0], "x": 0, "y": 2}, - {"flags": 1, "matrix": [2, 1], "x": 1.75, "y": 2}, - {"flags": 1, "matrix": [2, 2], "x": 2.75, "y": 2}, - {"flags": 1, "matrix": [2, 3], "x": 3.75, "y": 2}, - {"flags": 1, "matrix": [2, 4], "x": 4.75, "y": 2}, - {"flags": 1, "matrix": [2, 5], "x": 5.75, "y": 2}, - {"flags": 1, "matrix": [2, 6], "x": 6.75, "y": 2}, - {"flags": 1, "matrix": [2, 7], "x": 7.75, "y": 2}, - {"flags": 1, "matrix": [2, 8], "x": 8.75, "y": 2}, - {"flags": 1, "matrix": [2, 9], "x": 9.75, "y": 2}, - {"flags": 1, "matrix": [2, 10], "x": 10.75, "y": 2}, - {"flags": 1, "matrix": [2, 11], "x": 11.75, "y": 2}, - {"flags": 1, "matrix": [2, 13], "x": 12.75, "y": 2}, - - {"flags": 1, "matrix": [3, 15], "x": 0, "y": 3}, - {"flags": 1, "matrix": [3, 13], "x": 2.25, "y": 3}, - {"flags": 1, "matrix": [3, 10], "x": 3.25, "y": 3}, - {"flags": 1, "matrix": [3, 9], "x": 4.25, "y": 3}, - {"flags": 1, "matrix": [3, 8], "x": 5.25, "y": 3}, - {"flags": 1, "matrix": [3, 7], "x": 6.25, "y": 3}, - {"flags": 1, "matrix": [3, 6], "x": 7.25, "y": 3}, - {"flags": 1, "matrix": [3, 5], "x": 8.25, "y": 3}, - {"flags": 1, "matrix": [3, 4], "x": 9.25, "y": 3}, - {"flags": 1, "matrix": [3, 3], "x": 10.25, "y": 3}, - {"flags": 1, "matrix": [3, 2], "x": 11.25, "y": 3}, - {"flags": 1, "matrix": [3, 1], "x": 12.25, "y": 3}, - {"flags": 1, "matrix": [3, 0], "x": 16.25, "y": 3}, - - {"flags": 1, "matrix": [4, 0], "x": 0, "y": 4}, - {"flags": 1, "matrix": [4, 1], "x": 1.25, "y": 4}, - {"flags": 1, "matrix": [4, 2], "x": 2.5, "y": 4}, - {"flags": 1, "matrix": [4, 5], "x": 3.75, "y": 4}, - {"flags": 1, "matrix": [4, 9], "x": 10, "y": 4}, - {"flags": 1, "matrix": [4, 10], "x": 11.25, "y": 4}, - {"flags": 1, "matrix": [4, 11], "x": 12.5, "y": 4}, - {"flags": 1, "matrix": [4, 12], "x": 13.75, "y": 4}, - {"flags": 1, "matrix": [4, 14], "x": 15.25, "y": 4}, - {"flags": 1, "matrix": [4, 15], "x": 16.25, "y": 4}, - {"flags": 1, "matrix": [4, 16], "x": 17.25, "y": 4} - ] - }, "layouts": { "LAYOUT": { "layout": [ From ed9e48994d2ce8a83691ad79d8c5c33f11b8f442 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:15:17 +0800 Subject: [PATCH 09/11] Delete keyboards/mokey/luckycat70/rules.mk --- keyboards/mokey/luckycat70/rules.mk | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 keyboards/mokey/luckycat70/rules.mk diff --git a/keyboards/mokey/luckycat70/rules.mk b/keyboards/mokey/luckycat70/rules.mk deleted file mode 100644 index 60c97b41a60d..000000000000 --- a/keyboards/mokey/luckycat70/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -MCU = STM32F103 - -# Wear-levelling driver -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = embedded_flash - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -# Wildcard to allow APM32 MCU -DFU_SUFFIX_ARGS = -p FFFF -v FFFF From 41bfe6a27cd47b3ece003623a2156ec3f2c341a5 Mon Sep 17 00:00:00 2001 From: zvecr Date: Sun, 10 Dec 2023 18:35:02 +0000 Subject: [PATCH 10/11] Add required rules.mk back to make code actually buildable --- keyboards/mokey/luckycat70/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/mokey/luckycat70/rules.mk diff --git a/keyboards/mokey/luckycat70/rules.mk b/keyboards/mokey/luckycat70/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/mokey/luckycat70/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From a8bbc657d655c338a7b8cdd35d55c407a424a8c5 Mon Sep 17 00:00:00 2001 From: rhmokey <57172003+rhmokey@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:35:46 +0800 Subject: [PATCH 11/11] Update keyboards/mokey/luckycat70/info.json { "keyboard_name": "Lucky Cat 70", "manufacturer": "qmk", "url": "", "maintainer": "qmk", "usb": { "vid": "0x6653", "pid": "0x0070", "device_version": "0.0.1" }, "diode_direction": "COL2ROW", "features": { "bootmagic": true, "mousekey": true, "extrakey": true, "console": false, "command": false, "nkro": false, "rgb_matrix": true }, "matrix_pins": { "cols": ["A3", "A2", "A5", "A6", "A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15"], "rows": ["C13", "C14", "C15", "A0", "A1"] }, "ws2812": { "pin": "A4" }, "rgblight": { "led_count": 78, "animations": { "breathing": true, "rainbow_mood": true, "rainbow_swirl": true, "snake": true, "knight": true, "christmas": true, "static_gradient": true, "rgb_test": true, "alternating": true, "twinkle": true } }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 4], "x": 4, "y": 0}, {"matrix": [0, 5], "x": 5, "y": 0}, {"matrix": [0, 6], "x": 6, "y": 0}, {"matrix": [0, 7], "x": 7, "y": 0}, {"matrix": [0, 8], "x": 8, "y": 0}, {"matrix": [0, 9], "x": 9, "y": 0}, {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, {"matrix": [0, 12], "x": 12, "y": 0}, {"matrix": [0, 13], "x": 13, "y": 0, "w": 2, "h": 1}, {"matrix": [0, 14], "x": 15.25, "y": 0}, {"matrix": [0, 15], "x": 16.25, "y": 0}, {"matrix": [0, 16], "x": 17.25, "y": 0}, {"matrix": [1, 16], "x": 0, "y": 1}, {"matrix": [1, 15], "x": 1.5, "y": 1}, {"matrix": [1, 14], "x": 2.5, "y": 1}, {"matrix": [1, 13], "x": 3.5, "y": 1}, {"matrix": [1, 12], "x": 4.5, "y": 1}, {"matrix": [1, 11], "x": 5.5, "y": 1}, {"matrix": [1, 10], "x": 6.5, "y": 1}, {"matrix": [1, 9], "x": 7.5, "y": 1}, {"matrix": [1, 8], "x": 8.5, "y": 1}, {"matrix": [1, 7], "x": 9.5, "y": 1}, {"matrix": [1, 6], "x": 10.5, "y": 1}, {"matrix": [1, 5], "x": 11.5, "y": 1}, {"matrix": [1, 4], "x": 12.5, "y": 1}, {"matrix": [1, 3], "x": 13.5, "y": 1, "w": 1, "h": 1.5}, {"matrix": [1, 2], "x": 15.25, "y": 1}, {"matrix": [1, 1], "x": 16.25, "y": 1}, {"matrix": [1, 0], "x": 17.25, "y": 1}, {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75, "h": 1}, {"matrix": [2, 1], "x": 1.75, "y": 2}, {"matrix": [2, 2], "x": 2.75, "y": 2}, {"matrix": [2, 3], "x": 3.75, "y": 2}, {"matrix": [2, 4], "x": 4.75, "y": 2}, {"matrix": [2, 5], "x": 5.75, "y": 2}, {"matrix": [2, 6], "x": 6.75, "y": 2}, {"matrix": [2, 7], "x": 7.75, "y": 2}, {"matrix": [2, 8], "x": 8.75, "y": 2}, {"matrix": [2, 9], "x": 9.75, "y": 2}, {"matrix": [2, 10], "x": 10.75, "y": 2}, {"matrix": [2, 11], "x": 11.75, "y": 2}, {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25, "h": 1}, {"matrix": [3, 12], "x": 0, "y": 3, "w": 2.25, "h": 1}, {"matrix": [3, 11], "x": 2.25, "y": 3}, {"matrix": [3, 10], "x": 3.25, "y": 3}, {"matrix": [3, 9], "x": 4.25, "y": 3}, {"matrix": [3, 8], "x": 5.25, "y": 3}, {"matrix": [3, 7], "x": 6.25, "y": 3}, {"matrix": [3, 6], "x": 7.25, "y": 3}, {"matrix": [3, 5], "x": 8.25, "y": 3}, {"matrix": [3, 4], "x": 9.25, "y": 3}, {"matrix": [3, 3], "x": 10.25, "y": 3}, {"matrix": [3, 2], "x": 11.25, "y": 3}, {"matrix": [3, 1], "x": 12.25, "y": 3, "w": 2.75, "h": 1}, {"matrix": [3, 0], "x": 16.25, "y": 3}, {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25, "h": 1}, {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25, "h": 1}, {"matrix": [4, 8], "x": 15.25, "y": 4}, {"matrix": [4, 9], "x": 16.25, "y": 4}, {"matrix": [4, 10], "x": 17.25, "y": 4} ] } } } Co-authored-by: Joel Challis --- keyboards/mokey/luckycat70/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json index 359bf4bdd699..0f3ec996fbca 100644 --- a/keyboards/mokey/luckycat70/info.json +++ b/keyboards/mokey/luckycat70/info.json @@ -27,7 +27,6 @@ }, "rgblight": { "led_count": 78, - "max_brightness": 255, "animations": { "breathing": true, "rainbow_mood": true,