From b4dfb0876d1e5e4a8c599eb5705167dbfd6d537e Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:38:28 +0800 Subject: [PATCH 001/120] Create config.h --- keyboards/tiger910/config.h | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 keyboards/tiger910/config.h diff --git a/keyboards/tiger910/config.h b/keyboards/tiger910/config.h new file mode 100644 index 000000000000..03aed32857b6 --- /dev/null +++ b/keyboards/tiger910/config.h @@ -0,0 +1,55 @@ +/* +Copyright 2021 Weirdo + +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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x5447 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT tiger910 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + + +#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, B0, B1, B2, B3, B4, B5, B6 } +#define MATRIX_ROW_PINS { B7, C1, C2, C3, C4 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + + + From d4b7a1a718b1761ea299e01c63d14e4baf9fd093 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:38:35 +0800 Subject: [PATCH 002/120] Create info.json --- keyboards/tiger910/info.json | 234 +++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 keyboards/tiger910/info.json diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json new file mode 100644 index 000000000000..fd3132ab90d4 --- /dev/null +++ b/keyboards/tiger910/info.json @@ -0,0 +1,234 @@ +/* Copyright 2021 Weirdo + * + * 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 . + */ +{ + "keyboard_name": "Bakeneko 60", + "url": "https://github.com/kkatano/bakeneko-60-pcb", + "maintainer": "kkatano", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + { "x":0, "y":0 }, + { "x":1, "y":0 }, + { "x":2, "y":0 }, + { "x":3, "y":0 }, + { "x":4, "y":0 }, + { "x":5, "y":0 }, + { "x":6, "y":0 }, + { "x":7, "y":0 }, + { "x":8, "y":0 }, + { "x":9, "y":0 }, + { "x":10, "y":0 }, + { "x":11, "y":0 }, + { "x":12, "y":0 }, + { "x":13, "y":0 }, + { "x":14, "y":0 }, + + { "x":0, "y":1, "w":1.5 }, + { "x":1.5, "y":1 }, + { "x":2.5, "y":1 }, + { "x":3.5, "y":1 }, + { "x":4.5, "y":1 }, + { "x":5.5, "y":1 }, + { "x":6.5, "y":1 }, + { "x":7.5, "y":1 }, + { "x":8.5, "y":1 }, + { "x":9.5, "y":1 }, + { "x":10.5, "y":1 }, + { "x":11.5, "y":1 }, + { "x":12.5, "y":1 }, + { "x":13.5, "y":1, "w":1.5 }, + + { "x":0, "y":2, "w":1.75 }, + { "x":1.75, "y":2 }, + { "x":2.75, "y":2 }, + { "x":3.75, "y":2 }, + { "x":4.75, "y":2 }, + { "x":5.75, "y":2 }, + { "x":6.75, "y":2 }, + { "x":7.75, "y":2 }, + { "x":8.75, "y":2 }, + { "x":9.75, "y":2 }, + { "x":10.75, "y":2 }, + { "x":11.75, "y":2 }, + { "x":12.75, "y":2, "w":2.25 }, + + { "x":0, "y":3, "w":2.25 }, + { "x":2.25, "y":3 }, + { "x":3.25, "y":3 }, + { "x":4.25, "y":3 }, + { "x":5.25, "y":3 }, + { "x":6.25, "y":3 }, + { "x":7.25, "y":3 }, + { "x":8.25, "y":3 }, + { "x":9.25, "y":3 }, + { "x":10.25, "y":3 }, + { "x":11.25, "y":3 }, + { "x":12.25, "y":3, "w":1.75 }, + { "x":14, "y":3 }, + + { "x":0, "y":4, "w":1.25 }, + { "x":1.25, "y":4, "w":1.25 }, + { "x":2.5, "y":4, "w":1.25 }, + { "x":3.75, "y":4, "w":6.25 }, + { "x":10, "y":4, "w":1.25 }, + { "x":11.25, "y":4, "w":1.25 }, + { "x":12.5, "y":4, "w":1.25 }, + { "x":13.75, "y":4, "w":1.25 } + ] + }, + "LAYOUT_60_ansi": { + "layout": [ + { "x":0, "y":0 }, + { "x":1, "y":0 }, + { "x":2, "y":0 }, + { "x":3, "y":0 }, + { "x":4, "y":0 }, + { "x":5, "y":0 }, + { "x":6, "y":0 }, + { "x":7, "y":0 }, + { "x":8, "y":0 }, + { "x":9, "y":0 }, + { "x":10, "y":0 }, + { "x":11, "y":0 }, + { "x":12, "y":0 }, + { "x":13, "y":0, "w":2 }, + + { "x":0, "y":1, "w":1.5 }, + { "x":1.5, "y":1 }, + { "x":2.5, "y":1 }, + { "x":3.5, "y":1 }, + { "x":4.5, "y":1 }, + { "x":5.5, "y":1 }, + { "x":6.5, "y":1 }, + { "x":7.5, "y":1 }, + { "x":8.5, "y":1 }, + { "x":9.5, "y":1 }, + { "x":10.5, "y":1 }, + { "x":11.5, "y":1 }, + { "x":12.5, "y":1 }, + { "x":13.5, "y":1, "w":1.5 }, + + { "x":0, "y":2, "w":1.75 }, + { "x":1.75, "y":2 }, + { "x":2.75, "y":2 }, + { "x":3.75, "y":2 }, + { "x":4.75, "y":2 }, + { "x":5.75, "y":2 }, + { "x":6.75, "y":2 }, + { "x":7.75, "y":2 }, + { "x":8.75, "y":2 }, + { "x":9.75, "y":2 }, + { "x":10.75, "y":2 }, + { "x":11.75, "y":2 }, + { "x":12.75, "y":2, "w":2.25 }, + + { "x":0, "y":3, "w":2.25 }, + { "x":2.25, "y":3 }, + { "x":3.25, "y":3 }, + { "x":4.25, "y":3 }, + { "x":5.25, "y":3 }, + { "x":6.25, "y":3 }, + { "x":7.25, "y":3 }, + { "x":8.25, "y":3 }, + { "x":9.25, "y":3 }, + { "x":10.25, "y":3 }, + { "x":11.25, "y":3 }, + { "x":12.25, "y":3, "w":2.75 }, + + { "x":0, "y":4, "w":1.25 }, + { "x":1.25, "y":4, "w":1.25 }, + { "x":2.5, "y":4, "w":1.25 }, + { "x":3.75, "y":4, "w":6.25 }, + { "x":10, "y":4, "w":1.25 }, + { "x":11.25, "y":4, "w":1.25 }, + { "x":12.5, "y":4, "w":1.25 }, + { "x":13.75, "y":4, "w":1.25 } + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "layout": [ + { "x":0, "y":0 }, + { "x":1, "y":0 }, + { "x":2, "y":0 }, + { "x":3, "y":0 }, + { "x":4, "y":0 }, + { "x":5, "y":0 }, + { "x":6, "y":0 }, + { "x":7, "y":0 }, + { "x":8, "y":0 }, + { "x":9, "y":0 }, + { "x":10, "y":0 }, + { "x":11, "y":0 }, + { "x":12, "y":0 }, + { "x":13, "y":0 }, + { "x":14, "y":0 }, + + { "x":0, "y":1, "w":1.5 }, + { "x":1.5, "y":1 }, + { "x":2.5, "y":1 }, + { "x":3.5, "y":1 }, + { "x":4.5, "y":1 }, + { "x":5.5, "y":1 }, + { "x":6.5, "y":1 }, + { "x":7.5, "y":1 }, + { "x":8.5, "y":1 }, + { "x":9.5, "y":1 }, + { "x":10.5, "y":1 }, + { "x":11.5, "y":1 }, + { "x":12.5, "y":1 }, + { "x":13.5, "y":1, "w":1.5 }, + + { "x":0, "y":2, "w":1.75 }, + { "x":1.75, "y":2 }, + { "x":2.75, "y":2 }, + { "x":3.75, "y":2 }, + { "x":4.75, "y":2 }, + { "x":5.75, "y":2 }, + { "x":6.75, "y":2 }, + { "x":7.75, "y":2 }, + { "x":8.75, "y":2 }, + { "x":9.75, "y":2 }, + { "x":10.75, "y":2 }, + { "x":11.75, "y":2 }, + { "x":12.75, "y":2, "w":2.25 }, + + { "x":0, "y":3, "w":2.25 }, + { "x":2.25, "y":3 }, + { "x":3.25, "y":3 }, + { "x":4.25, "y":3 }, + { "x":5.25, "y":3 }, + { "x":6.25, "y":3 }, + { "x":7.25, "y":3 }, + { "x":8.25, "y":3 }, + { "x":9.25, "y":3 }, + { "x":10.25, "y":3 }, + { "x":11.25, "y":3 }, + { "x":12.25, "y":3, "w":1.75 }, + { "x":14, "y":3 }, + + { "x":0, "y":4, "w":1.5 }, + { "x":1.5, "y":4 }, + { "x":2.5, "y":4, "w":1.5 }, + { "x":4, "y":4, "w":7 }, + { "x":11, "y":4, "w":1.5 }, + { "x":12.5, "y":4 }, + { "x":13.5, "y":4, "w":1.5 } + ] + } + } +} From c6bfe69e83681a0b866e024d51eff68aab6d345f Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:38:42 +0800 Subject: [PATCH 003/120] Create keymap.c --- keyboards/tiger910/keymaps/default/keymap.c | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 keyboards/tiger910/keymaps/default/keymap.c diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/tiger910/keymaps/default/keymap.c new file mode 100644 index 000000000000..c021d6a5f314 --- /dev/null +++ b/keyboards/tiger910/keymaps/default/keymap.c @@ -0,0 +1,38 @@ +/* Copyright 2021 Weirdo + * + * 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 + +#define _BASE 0 +#define _FN1 1 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, \ + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, \ + KC_LSFT, 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_PGDN, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT \ + ), + + [_FN1] = LAYOUT( + KC_GRV, 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_DEL, KC_DEL, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 6c4afb47ef1bd72ee0e3d4588301a069681c6231 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:38:48 +0800 Subject: [PATCH 004/120] Create keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 keyboards/tiger910/keymaps/via/keymap.c diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c new file mode 100644 index 000000000000..fe9b8112f24a --- /dev/null +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +/* Copyright 2021 Weirdo + * + * 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 + + +#define _BASE 0 +#define _FN1 1 + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, \ + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, \ + KC_LSFT, 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_PGDN, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT \ + ), + + [_FN1] = LAYOUT( + KC_GRV, 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_DEL, KC_DEL, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 5fec35012ad3cbb1b33931660e2e7565b85e3299 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:38:54 +0800 Subject: [PATCH 005/120] Create rules.mk --- keyboards/tiger910/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/tiger910/keymaps/via/rules.mk diff --git a/keyboards/tiger910/keymaps/via/rules.mk b/keyboards/tiger910/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/tiger910/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file From bb5b91629233803d1a850ebb4b83096058cdb997 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:39:04 +0800 Subject: [PATCH 006/120] Create readme.md --- keyboards/tiger910/readme.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 keyboards/tiger910/readme.md diff --git a/keyboards/tiger910/readme.md b/keyboards/tiger910/readme.md new file mode 100644 index 000000000000..ed14a307d357 --- /dev/null +++ b/keyboards/tiger910/readme.md @@ -0,0 +1,15 @@ +# Tiger910 + +![Tiger910](https://www.hualigs.cn/image/60272570d2764.jpg) + +A 65% keyboard + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: Tiger910 +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make tiger910:default + +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). From 19faa81fe8be07c83b60e037eb34c74693974b8b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:39:11 +0800 Subject: [PATCH 007/120] Create rules.mk --- keyboards/tiger910/rules.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 keyboards/tiger910/rules.mk diff --git a/keyboards/tiger910/rules.mk b/keyboards/tiger910/rules.mk new file mode 100644 index 000000000000..31e1e06cee19 --- /dev/null +++ b/keyboards/tiger910/rules.mk @@ -0,0 +1,19 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +NKRO_ENABLE = no # USB Nkey Rollover +RGBLIGHT_ENABLE = no + +LAYOUTS = 60_ansi_split_bs_rshift 60_ansi 60_tsangan_hhkb From 5e21f69833f055381020f015a894a9edd23b87e1 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:39:17 +0800 Subject: [PATCH 008/120] Create tiger910s.c --- keyboards/tiger910/tiger910s.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/tiger910/tiger910s.c diff --git a/keyboards/tiger910/tiger910s.c b/keyboards/tiger910/tiger910s.c new file mode 100644 index 000000000000..bb530d595263 --- /dev/null +++ b/keyboards/tiger910/tiger910s.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Weirdo + * + * 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 "tiger910s.h" From 1a82055152e10685e72e5f23de0e12d2537db0bc Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:39:25 +0800 Subject: [PATCH 009/120] Create tiger910s.h --- keyboards/tiger910/tiger910s.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 keyboards/tiger910/tiger910s.h diff --git a/keyboards/tiger910/tiger910s.h b/keyboards/tiger910/tiger910s.h new file mode 100644 index 000000000000..f631fd29462e --- /dev/null +++ b/keyboards/tiger910/tiger910s.h @@ -0,0 +1,33 @@ +/* Copyright 2021 Weirdo + * + * 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 "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ + { K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E } \ +} From 26313625364727a71425e85d0beb74795f8801f5 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:40:29 +0800 Subject: [PATCH 010/120] Delete tiger910s.c --- keyboards/tiger910/tiger910s.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/tiger910/tiger910s.c diff --git a/keyboards/tiger910/tiger910s.c b/keyboards/tiger910/tiger910s.c deleted file mode 100644 index bb530d595263..000000000000 --- a/keyboards/tiger910/tiger910s.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 "tiger910s.h" From 66918364b37223f9d3706a865b2cae8905f21ada Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:40:37 +0800 Subject: [PATCH 011/120] Delete tiger910s.h --- keyboards/tiger910/tiger910s.h | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 keyboards/tiger910/tiger910s.h diff --git a/keyboards/tiger910/tiger910s.h b/keyboards/tiger910/tiger910s.h deleted file mode 100644 index f631fd29462e..000000000000 --- a/keyboards/tiger910/tiger910s.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E } \ -} From 91ef340ba7002eae93088367565f3c2c77f26f21 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:40:46 +0800 Subject: [PATCH 012/120] Create tiger910.c --- keyboards/tiger910/tiger910.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/tiger910/tiger910.c diff --git a/keyboards/tiger910/tiger910.c b/keyboards/tiger910/tiger910.c new file mode 100644 index 000000000000..d0964d9be90c --- /dev/null +++ b/keyboards/tiger910/tiger910.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Weirdo + * + * 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 "tiger910.h" From cc69c09b5d1c98cca392a9fada5cd8ad057dff46 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 18:40:55 +0800 Subject: [PATCH 013/120] Create tiger910.h --- keyboards/tiger910/tiger910.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 keyboards/tiger910/tiger910.h diff --git a/keyboards/tiger910/tiger910.h b/keyboards/tiger910/tiger910.h new file mode 100644 index 000000000000..f631fd29462e --- /dev/null +++ b/keyboards/tiger910/tiger910.h @@ -0,0 +1,33 @@ +/* Copyright 2021 Weirdo + * + * 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 "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ + { K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E } \ +} From 582fb387f82467d07e1c677af646c05c30af5c56 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 17 Apr 2021 19:18:16 +0800 Subject: [PATCH 014/120] Update rules.mk --- keyboards/tiger910/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/tiger910/rules.mk b/keyboards/tiger910/rules.mk index 31e1e06cee19..eb4056e0f820 100644 --- a/keyboards/tiger910/rules.mk +++ b/keyboards/tiger910/rules.mk @@ -16,4 +16,3 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover RGBLIGHT_ENABLE = no -LAYOUTS = 60_ansi_split_bs_rshift 60_ansi 60_tsangan_hhkb From e97dbe6478297e6537ddc793caa1b91abb29b048 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sun, 2 May 2021 21:58:37 +0800 Subject: [PATCH 015/120] Update keyboards/tiger910/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/tiger910/keymaps/default/keymap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/tiger910/keymaps/default/keymap.c index c021d6a5f314..3fa8b28f5318 100644 --- a/keyboards/tiger910/keymaps/default/keymap.c +++ b/keyboards/tiger910/keymaps/default/keymap.c @@ -15,8 +15,10 @@ */ #include QMK_KEYBOARD_H -#define _BASE 0 -#define _FN1 1 +enum custem_layers { + _BASE, + _FN1, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( @@ -35,4 +37,3 @@ 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 \ ) }; - From da9dfb03ca4cfe0854a84e1a0b6de2fbd5d52d73 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sun, 2 May 2021 21:58:48 +0800 Subject: [PATCH 016/120] Update keyboards/tiger910/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/tiger910/keymaps/via/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index fe9b8112f24a..9385620330b6 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -15,10 +15,10 @@ */ #include QMK_KEYBOARD_H - -#define _BASE 0 -#define _FN1 1 - +enum custem_layers { + _BASE, + _FN1, +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 8356b97282fcf61d4b13701e4a7f314e0a9e65e4 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Fri, 28 May 2021 13:10:48 +0800 Subject: [PATCH 017/120] Update keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index 9385620330b6..5e65555131ba 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -17,7 +17,9 @@ enum custem_layers { _BASE, + _FN, _FN1, + _FN2 }; @@ -30,11 +32,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT \ ), - [_FN1] = LAYOUT( + [_FN] = LAYOUT( KC_GRV, 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_DEL, KC_DEL, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + ), + + [_FN1] = 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 \ + ), + + [_FN2] = 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 9ddc665fabd5d3d809ac89d323657ce4abb36529 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Fri, 28 May 2021 13:20:31 +0800 Subject: [PATCH 018/120] Update rules.mk --- keyboards/tiger910/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tiger910/rules.mk b/keyboards/tiger910/rules.mk index eb4056e0f820..a3fe936b1e3d 100644 --- a/keyboards/tiger910/rules.mk +++ b/keyboards/tiger910/rules.mk @@ -2,7 +2,7 @@ MCU = atmega32u4 # Bootloader selection -BOOTLOADER = atmel-dfu +BOOTLOADER = caterina # Build Options # change yes to no to disable From 26af28804377ccf5ce4df70be43c9e49568ed9ce Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 5 Jun 2021 13:27:49 +0800 Subject: [PATCH 019/120] Update keyboards/tiger910/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/tiger910/keymaps/default/keymap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/tiger910/keymaps/default/keymap.c index 3fa8b28f5318..ebc314198b2b 100644 --- a/keyboards/tiger910/keymaps/default/keymap.c +++ b/keyboards/tiger910/keymaps/default/keymap.c @@ -22,18 +22,18 @@ enum custem_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = 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_BSPC, \ - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, \ - KC_LSFT, 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_PGDN, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT \ + 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, + KC_LSFT, 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT ), [_FN1] = LAYOUT( - KC_GRV, 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_DEL, KC_DEL, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 bc3172986b8a67f9d977e27ca5611d255d566903 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 5 Jun 2021 13:32:21 +0800 Subject: [PATCH 020/120] Update keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 40 ++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index 5e65555131ba..bd7eeeab2309 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -25,35 +25,35 @@ enum custem_layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = 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_BSPC, \ - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, \ - KC_LSFT, 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_PGDN, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT \ + 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, + KC_LSFT, 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT ), [_FN] = LAYOUT( - KC_GRV, 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_DEL, KC_DEL, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \ + KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN1] = 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [_FN2] = 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 520a955acd5683f5619385f13a45bf00a6044f86 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 8 Jun 2021 15:38:02 +0800 Subject: [PATCH 021/120] Update readme.md --- keyboards/geminate60/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/geminate60/readme.md b/keyboards/geminate60/readme.md index f08e87739e4a..1f9e85729813 100644 --- a/keyboards/geminate60/readme.md +++ b/keyboards/geminate60/readme.md @@ -12,4 +12,5 @@ Make example for this keyboard (after setting up your build environment): make geminate60:default +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. 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). From ab0fe6b4db47df859758bc20db0c2680932b60ac Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 19 Jun 2021 17:14:08 +0800 Subject: [PATCH 022/120] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=94=AE=E7=9B=98/ti?= =?UTF-8?q?ger910/info.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Drashna Jaelre --- keyboards/tiger910/info.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json index fd3132ab90d4..6310825ae24a 100644 --- a/keyboards/tiger910/info.json +++ b/keyboards/tiger910/info.json @@ -1,18 +1,3 @@ -/* Copyright 2021 Weirdo - * - * 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 . - */ { "keyboard_name": "Bakeneko 60", "url": "https://github.com/kkatano/bakeneko-60-pcb", From 51f125de09492141435430495db53610d17b2b60 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:01:13 +0800 Subject: [PATCH 023/120] Update keyboards/tiger910/rules.mk Co-authored-by: Ryan --- keyboards/tiger910/rules.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/keyboards/tiger910/rules.mk b/keyboards/tiger910/rules.mk index a3fe936b1e3d..bcabafbf2c69 100644 --- a/keyboards/tiger910/rules.mk +++ b/keyboards/tiger910/rules.mk @@ -8,11 +8,15 @@ BOOTLOADER = caterina # change yes to no to disable # BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = no # USB Nkey Rollover -RGBLIGHT_ENABLE = no - +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From 0b6fd7664ec7b17266f84c223269b2d7011b5f9f Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:31:50 +0800 Subject: [PATCH 024/120] Update config.h --- keyboards/tiger910/config.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/tiger910/config.h b/keyboards/tiger910/config.h index 03aed32857b6..0d739eea5229 100644 --- a/keyboards/tiger910/config.h +++ b/keyboards/tiger910/config.h @@ -28,11 +28,10 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 5 -#define MATRIX_COLS 15 +#define MATRIX_COLS 16 - -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7, B0, B1, B2, B3, B4, B5, B6 } -#define MATRIX_ROW_PINS { B7, C1, C2, C3, C4 } +#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } +#define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ From 278c3a79265a21776398cd6ece8da1b082f261d9 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:32:35 +0800 Subject: [PATCH 025/120] Update tiger910.h --- keyboards/tiger910/tiger910.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/tiger910/tiger910.h b/keyboards/tiger910/tiger910.h index f631fd29462e..529c12fc5ee1 100644 --- a/keyboards/tiger910/tiger910.h +++ b/keyboards/tiger910/tiger910.h @@ -19,15 +19,15 @@ #include "quantum.h" #define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ + K40, K41, K42, K46, K4B, K4C, K4E, K4F \ ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K45, K46, K48, K4A, K4B, K4C, K4D, K4E } \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ + { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \ + { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C, KC_NO, K4E, K4F }, \ } From aec9a7811e6bc2fef721c49212383a5cd465111c Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:33:47 +0800 Subject: [PATCH 026/120] Update keymap.c --- keyboards/tiger910/keymaps/default/keymap.c | 27 ++++++--------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/tiger910/keymaps/default/keymap.c index ebc314198b2b..5896a6913c53 100644 --- a/keyboards/tiger910/keymaps/default/keymap.c +++ b/keyboards/tiger910/keymaps/default/keymap.c @@ -15,25 +15,14 @@ */ #include QMK_KEYBOARD_H -enum custem_layers { - _BASE, - _FN1, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_BSPC, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, - KC_LSFT, 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_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT - ), + [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_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_SPC, + 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_SPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), - [_FN1] = LAYOUT( - KC_GRV, 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_DEL, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 83cb870c6323bef7bed7df1cbe4770c65bc2e26d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:34:50 +0800 Subject: [PATCH 027/120] Update keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 46 ++++--------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index bd7eeeab2309..fec6239f6f5e 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -15,45 +15,13 @@ */ #include QMK_KEYBOARD_H -enum custem_layers { - _BASE, - _FN, - _FN1, - _FN2 -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_BSPC, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGUP, - KC_LSFT, 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_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_LEFT, KC_DOWN, KC_RIGHT - ), + [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_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_SPC, + 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_SPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), - [_FN] = LAYOUT( - KC_GRV, 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_DEL, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [_FN1] = 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 - ), - - [_FN2] = 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 8cb70cded394273e2c68aa51e30015c670f60f65 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:35:58 +0800 Subject: [PATCH 028/120] Create keymap.c From 055db494ae1db76549a21d5d9423a0aa91888a5a Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sat, 10 Jul 2021 16:37:15 +0800 Subject: [PATCH 029/120] Update info.json --- keyboards/tiger910/info.json | 282 +++++++++-------------------------- 1 file changed, 71 insertions(+), 211 deletions(-) diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json index 6310825ae24a..0701fbdd32cf 100644 --- a/keyboards/tiger910/info.json +++ b/keyboards/tiger910/info.json @@ -1,219 +1,79 @@ { - "keyboard_name": "Bakeneko 60", - "url": "https://github.com/kkatano/bakeneko-60-pcb", - "maintainer": "kkatano", - "width": 15, + "keyboard_name": "tiger910", + "url": "", + "maintainer": "Weirdo", + "width": 16, "height": 5, "layouts": { - "LAYOUT_60_ansi_split_bs_rshift": { + "LAYOUT": { "layout": [ - { "x":0, "y":0 }, - { "x":1, "y":0 }, - { "x":2, "y":0 }, - { "x":3, "y":0 }, - { "x":4, "y":0 }, - { "x":5, "y":0 }, - { "x":6, "y":0 }, - { "x":7, "y":0 }, - { "x":8, "y":0 }, - { "x":9, "y":0 }, - { "x":10, "y":0 }, - { "x":11, "y":0 }, - { "x":12, "y":0 }, - { "x":13, "y":0 }, - { "x":14, "y":0 }, - - { "x":0, "y":1, "w":1.5 }, - { "x":1.5, "y":1 }, - { "x":2.5, "y":1 }, - { "x":3.5, "y":1 }, - { "x":4.5, "y":1 }, - { "x":5.5, "y":1 }, - { "x":6.5, "y":1 }, - { "x":7.5, "y":1 }, - { "x":8.5, "y":1 }, - { "x":9.5, "y":1 }, - { "x":10.5, "y":1 }, - { "x":11.5, "y":1 }, - { "x":12.5, "y":1 }, - { "x":13.5, "y":1, "w":1.5 }, - - { "x":0, "y":2, "w":1.75 }, - { "x":1.75, "y":2 }, - { "x":2.75, "y":2 }, - { "x":3.75, "y":2 }, - { "x":4.75, "y":2 }, - { "x":5.75, "y":2 }, - { "x":6.75, "y":2 }, - { "x":7.75, "y":2 }, - { "x":8.75, "y":2 }, - { "x":9.75, "y":2 }, - { "x":10.75, "y":2 }, - { "x":11.75, "y":2 }, - { "x":12.75, "y":2, "w":2.25 }, - - { "x":0, "y":3, "w":2.25 }, - { "x":2.25, "y":3 }, - { "x":3.25, "y":3 }, - { "x":4.25, "y":3 }, - { "x":5.25, "y":3 }, - { "x":6.25, "y":3 }, - { "x":7.25, "y":3 }, - { "x":8.25, "y":3 }, - { "x":9.25, "y":3 }, - { "x":10.25, "y":3 }, - { "x":11.25, "y":3 }, - { "x":12.25, "y":3, "w":1.75 }, - { "x":14, "y":3 }, - - { "x":0, "y":4, "w":1.25 }, - { "x":1.25, "y":4, "w":1.25 }, - { "x":2.5, "y":4, "w":1.25 }, - { "x":3.75, "y":4, "w":6.25 }, - { "x":10, "y":4, "w":1.25 }, - { "x":11.25, "y":4, "w":1.25 }, - { "x":12.5, "y":4, "w":1.25 }, - { "x":13.75, "y":4, "w":1.25 } - ] - }, - "LAYOUT_60_ansi": { - "layout": [ - { "x":0, "y":0 }, - { "x":1, "y":0 }, - { "x":2, "y":0 }, - { "x":3, "y":0 }, - { "x":4, "y":0 }, - { "x":5, "y":0 }, - { "x":6, "y":0 }, - { "x":7, "y":0 }, - { "x":8, "y":0 }, - { "x":9, "y":0 }, - { "x":10, "y":0 }, - { "x":11, "y":0 }, - { "x":12, "y":0 }, - { "x":13, "y":0, "w":2 }, - - { "x":0, "y":1, "w":1.5 }, - { "x":1.5, "y":1 }, - { "x":2.5, "y":1 }, - { "x":3.5, "y":1 }, - { "x":4.5, "y":1 }, - { "x":5.5, "y":1 }, - { "x":6.5, "y":1 }, - { "x":7.5, "y":1 }, - { "x":8.5, "y":1 }, - { "x":9.5, "y":1 }, - { "x":10.5, "y":1 }, - { "x":11.5, "y":1 }, - { "x":12.5, "y":1 }, - { "x":13.5, "y":1, "w":1.5 }, - - { "x":0, "y":2, "w":1.75 }, - { "x":1.75, "y":2 }, - { "x":2.75, "y":2 }, - { "x":3.75, "y":2 }, - { "x":4.75, "y":2 }, - { "x":5.75, "y":2 }, - { "x":6.75, "y":2 }, - { "x":7.75, "y":2 }, - { "x":8.75, "y":2 }, - { "x":9.75, "y":2 }, - { "x":10.75, "y":2 }, - { "x":11.75, "y":2 }, - { "x":12.75, "y":2, "w":2.25 }, - - { "x":0, "y":3, "w":2.25 }, - { "x":2.25, "y":3 }, - { "x":3.25, "y":3 }, - { "x":4.25, "y":3 }, - { "x":5.25, "y":3 }, - { "x":6.25, "y":3 }, - { "x":7.25, "y":3 }, - { "x":8.25, "y":3 }, - { "x":9.25, "y":3 }, - { "x":10.25, "y":3 }, - { "x":11.25, "y":3 }, - { "x":12.25, "y":3, "w":2.75 }, - - { "x":0, "y":4, "w":1.25 }, - { "x":1.25, "y":4, "w":1.25 }, - { "x":2.5, "y":4, "w":1.25 }, - { "x":3.75, "y":4, "w":6.25 }, - { "x":10, "y":4, "w":1.25 }, - { "x":11.25, "y":4, "w":1.25 }, - { "x":12.5, "y":4, "w":1.25 }, - { "x":13.75, "y":4, "w":1.25 } - ] - }, - "LAYOUT_60_tsangan_hhkb": { - "layout": [ - { "x":0, "y":0 }, - { "x":1, "y":0 }, - { "x":2, "y":0 }, - { "x":3, "y":0 }, - { "x":4, "y":0 }, - { "x":5, "y":0 }, - { "x":6, "y":0 }, - { "x":7, "y":0 }, - { "x":8, "y":0 }, - { "x":9, "y":0 }, - { "x":10, "y":0 }, - { "x":11, "y":0 }, - { "x":12, "y":0 }, - { "x":13, "y":0 }, - { "x":14, "y":0 }, - - { "x":0, "y":1, "w":1.5 }, - { "x":1.5, "y":1 }, - { "x":2.5, "y":1 }, - { "x":3.5, "y":1 }, - { "x":4.5, "y":1 }, - { "x":5.5, "y":1 }, - { "x":6.5, "y":1 }, - { "x":7.5, "y":1 }, - { "x":8.5, "y":1 }, - { "x":9.5, "y":1 }, - { "x":10.5, "y":1 }, - { "x":11.5, "y":1 }, - { "x":12.5, "y":1 }, - { "x":13.5, "y":1, "w":1.5 }, - - { "x":0, "y":2, "w":1.75 }, - { "x":1.75, "y":2 }, - { "x":2.75, "y":2 }, - { "x":3.75, "y":2 }, - { "x":4.75, "y":2 }, - { "x":5.75, "y":2 }, - { "x":6.75, "y":2 }, - { "x":7.75, "y":2 }, - { "x":8.75, "y":2 }, - { "x":9.75, "y":2 }, - { "x":10.75, "y":2 }, - { "x":11.75, "y":2 }, - { "x":12.75, "y":2, "w":2.25 }, - - { "x":0, "y":3, "w":2.25 }, - { "x":2.25, "y":3 }, - { "x":3.25, "y":3 }, - { "x":4.25, "y":3 }, - { "x":5.25, "y":3 }, - { "x":6.25, "y":3 }, - { "x":7.25, "y":3 }, - { "x":8.25, "y":3 }, - { "x":9.25, "y":3 }, - { "x":10.25, "y":3 }, - { "x":11.25, "y":3 }, - { "x":12.25, "y":3, "w":1.75 }, - { "x":14, "y":3 }, - - { "x":0, "y":4, "w":1.5 }, - { "x":1.5, "y":4 }, - { "x":2.5, "y":4, "w":1.5 }, - { "x":4, "y":4, "w":7 }, - { "x":11, "y":4, "w":1.5 }, - { "x":12.5, "y":4 }, - { "x":13.5, "y":4, "w":1.5 } + {"label":"K00 (B0,B5)", "x":0, "y":0}, + {"label":"K01 (B0,B6)", "x":1, "y":0}, + {"label":"K02 (B0,B7)", "x":2, "y":0}, + {"label":"K03 (B0,C0)", "x":3, "y":0}, + {"label":"K04 (B0,C1)", "x":4, "y":0}, + {"label":"K05 (B0,C2)", "x":5, "y":0}, + {"label":"K06 (B0,C3)", "x":6, "y":0}, + {"label":"K07 (B0,C4)", "x":7, "y":0}, + {"label":"K08 (B0,C5)", "x":8, "y":0}, + {"label":"K09 (B0,C6)", "x":9, "y":0}, + {"label":"K0A (B0,C7)", "x":10, "y":0}, + {"label":"K0B (B0,D0)", "x":11, "y":0}, + {"label":"K0C (B0,D1)", "x":12, "y":0}, + {"label":"K0E (B0,D3)", "x":13, "y":0, "w":2}, + {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, + {"label":"K11 (B1,B6)", "x":1.5, "y":1}, + {"label":"K12 (B1,B7)", "x":2.5, "y":1}, + {"label":"K13 (B1,C0)", "x":3.5, "y":1}, + {"label":"K14 (B1,C1)", "x":4.5, "y":1}, + {"label":"K15 (B1,C2)", "x":5.5, "y":1}, + {"label":"K16 (B1,C3)", "x":6.5, "y":1}, + {"label":"K17 (B1,C4)", "x":7.5, "y":1}, + {"label":"K18 (B1,C5)", "x":8.5, "y":1}, + {"label":"K19 (B1,C6)", "x":9.5, "y":1}, + {"label":"K1A (B1,C7)", "x":10.5, "y":1}, + {"label":"K1B (B1,D0)", "x":11.5, "y":1}, + {"label":"K1C (B1,D1)", "x":12.5, "y":1}, + {"label":"K1E (B1,D3)", "x":13.5, "y":1, "w":1.5}, + {"label":"K1F (B1,D4)", "x":15, "y":1}, + {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, + {"label":"K21 (B2,B6)", "x":1.75, "y":2}, + {"label":"K22 (B2,B7)", "x":2.75, "y":2}, + {"label":"K23 (B2,C0)", "x":3.75, "y":2}, + {"label":"K24 (B2,C1)", "x":4.75, "y":2}, + {"label":"K25 (B2,C2)", "x":5.75, "y":2}, + {"label":"K26 (B2,C3)", "x":6.75, "y":2}, + {"label":"K27 (B2,C4)", "x":7.75, "y":2}, + {"label":"K28 (B2,C5)", "x":8.75, "y":2}, + {"label":"K29 (B2,C6)", "x":9.75, "y":2}, + {"label":"K2A (B2,C7)", "x":10.75, "y":2}, + {"label":"K2B (B2,D0)", "x":11.75, "y":2}, + {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, + {"label":"K2F (B2,D4)", "x":15, "y":2}, + {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, + {"label":"K32 (B3,B7)", "x":2.25, "y":3}, + {"label":"K33 (B3,C0)", "x":3.25, "y":3}, + {"label":"K34 (B3,C1)", "x":4.25, "y":3}, + {"label":"K35 (B3,C2)", "x":5.25, "y":3}, + {"label":"K36 (B3,C3)", "x":6.25, "y":3}, + {"label":"K37 (B3,C4)", "x":7.25, "y":3}, + {"label":"K38 (B3,C5)", "x":8.25, "y":3}, + {"label":"K39 (B3,C6)", "x":9.25, "y":3}, + {"label":"K3A (B3,C7)", "x":10.25, "y":3}, + {"label":"K3B (B3,D0)", "x":11.25, "y":3}, + {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, + {"label":"K3E (B3,D3)", "x":14, "y":3}, + {"label":"K3F (B3,D4)", "x":15, "y":3}, + {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.56}, + {"label":"K41 (B4,B6)", "x":1.5, "y":4}, + {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5}, + {"label":"K46 (B4,C3)", "x":4, "y":4, "w":7}, + {"label":"K4B (B4,D0)", "x":11, "y":4, "w":1.5}, + {"label":"K4C (B4,D1)", "x":13, "y":4}, + {"label":"K4E (B4,D3)", "x":14, "y":4}, + {"label":"K4F (B4,D4)", "x":15, "y":4} ] } } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" } From 4b61a4cdaf24e88863c6faf4fb3039ac4cd6bd63 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sun, 11 Jul 2021 02:08:15 +0800 Subject: [PATCH 030/120] Update keyboards/tiger910/config.h Co-authored-by: Ryan --- keyboards/tiger910/config.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/tiger910/config.h b/keyboards/tiger910/config.h index 0d739eea5229..4f2541739a64 100644 --- a/keyboards/tiger910/config.h +++ b/keyboards/tiger910/config.h @@ -47,8 +47,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - - - - From e98d325ae2762db40a05960f535ceb292f857e30 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sun, 11 Jul 2021 02:30:49 +0800 Subject: [PATCH 031/120] Update keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index fec6239f6f5e..a9ccb056c8ba 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -24,4 +24,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT ), + [1] = 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_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_SPC, + 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_SPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [2] = 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_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_SPC, + 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_SPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + + [3] = 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_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_SPC, + 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_SPC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + }; From 178c086fba835e190d784aefd4c84aae415c8bb6 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Sun, 11 Jul 2021 02:31:17 +0800 Subject: [PATCH 032/120] Update keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c index a9ccb056c8ba..051796e3def5 100644 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ b/keyboards/tiger910/keymaps/via/keymap.c @@ -50,3 +50,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; + From a7d4c9303b0a878bcd4ae8c29d56f3b675f1326a Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:34:50 +0800 Subject: [PATCH 033/120] Create chconf.h --- keyboards/LS_60/chconf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 keyboards/LS_60/chconf.h diff --git a/keyboards/LS_60/chconf.h b/keyboards/LS_60/chconf.h new file mode 100644 index 000000000000..3910c9bf936d --- /dev/null +++ b/keyboards/LS_60/chconf.h @@ -0,0 +1,21 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 . + */ + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 +#include_next "chconf.h" From 88bbe1675d68e4ccae02043b8f09754e328b6a51 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:34:57 +0800 Subject: [PATCH 034/120] Create config.h --- keyboards/LS_60/config.h | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 keyboards/LS_60/config.h diff --git a/keyboards/LS_60/config.h b/keyboards/LS_60/config.h new file mode 100644 index 000000000000..e7151ac10f70 --- /dev/null +++ b/keyboards/LS_60/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x4c53 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT LS_60 + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} +#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN A6 +#define RGBLED_NUM 1 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + From c525f6c1f7126d2ad5f34b27a2368612c62028ac Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:05 +0800 Subject: [PATCH 035/120] Create info.json --- keyboards/LS_60/info.json | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 keyboards/LS_60/info.json diff --git a/keyboards/LS_60/info.json b/keyboards/LS_60/info.json new file mode 100644 index 000000000000..77560b3c37ed --- /dev/null +++ b/keyboards/LS_60/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "LS_60", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K0", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K010", "x":10, "y":0}, + {"label":"K011", "x":11, "y":0}, + {"label":"K012", "x":12, "y":0}, + {"label":"K013", "x":13, "y":0}, + {"label":"K014", "x":14, "y":0}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K11", "x":1.5, "y":1}, + {"label":"K12", "x":2.5, "y":1}, + {"label":"K13", "x":3.5, "y":1}, + {"label":"K14", "x":4.5, "y":1}, + {"label":"K15", "x":5.5, "y":1}, + {"label":"K16", "x":6.5, "y":1}, + {"label":"K17", "x":7.5, "y":1}, + {"label":"K18", "x":8.5, "y":1}, + {"label":"K19", "x":9.5, "y":1}, + {"label":"K110", "x":10.5, "y":1}, + {"label":"K111", "x":11.5, "y":1}, + {"label":"K112", "x":12.5, "y":1}, + {"label":"K113", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K21", "x":1.75, "y":2}, + {"label":"K22", "x":2.75, "y":2}, + {"label":"K23", "x":3.75, "y":2}, + {"label":"K24", "x":4.75, "y":2}, + {"label":"K25", "x":5.75, "y":2}, + {"label":"K26", "x":6.75, "y":2}, + {"label":"K27", "x":7.75, "y":2}, + {"label":"K28", "x":8.75, "y":2}, + {"label":"K29", "x":9.75, "y":2}, + {"label":"K210", "x":10.75, "y":2}, + {"label":"K211", "x":11.75, "y":2}, + {"label":"K212", "x":12.75, "y":2}, + {"label":"K213", "x":13.75, "y":2, "w":1.25}, + {"label":"K30", "x":0, "y":3, "w":1.25}, + {"label":"K31", "x":1.25, "y":3}, + {"label":"K32", "x":2.25, "y":3}, + {"label":"K33", "x":3.25, "y":3}, + {"label":"K34", "x":4.25, "y":3}, + {"label":"K35", "x":5.25, "y":3}, + {"label":"K36", "x":6.25, "y":3}, + {"label":"K37", "x":7.25, "y":3}, + {"label":"K38", "x":8.25, "y":3}, + {"label":"K39", "x":9.25, "y":3}, + {"label":"K310", "x":10.25, "y":3}, + {"label":"K311", "x":11.25, "y":3}, + {"label":"K312", "x":12.25, "y":3, "w":1.75}, + {"label":"K313", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.25}, + {"label":"K41", "x":1.25, "y":4, "w":1.25}, + {"label":"K42", "x":2.5, "y":4, "w":1.25}, + {"label":"K46", "x":3.75, "y":4, "w":6.25}, + {"label":"K410", "x":10, "y":4, "w":1.25}, + {"label":"K411", "x":11.25, "y":4, "w":1.25}, + {"label":"K412", "x":12.5, "y":4, "w":1.25}, + {"label":"K413", "x":13.75, "y":4, "w":1.25} + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} From 97a8f50c14a3bce58ae0bf506673f2ebe55aa205 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:11 +0800 Subject: [PATCH 036/120] Create keymap.c --- keyboards/LS_60/keymaps/default/keymap.c | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 keyboards/LS_60/keymaps/default/keymap.c diff --git a/keyboards/LS_60/keymaps/default/keymap.c b/keyboards/LS_60/keymaps/default/keymap.c new file mode 100644 index 000000000000..bfa3265b6469 --- /dev/null +++ b/keyboards/LS_60/keymaps/default/keymap.c @@ -0,0 +1,50 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // + +}; + +bool led_update_user(led_t led_state) { + + if(led_state.caps_lock){ + rgblight_setrgb_at(192, 192, 192, 0); + }else{ + rgblight_setrgb_at(0, 0, 0, 0); + } + + return true; +} From e3f3b3da464fe24f3c45f77e4d0e189eeccdcb45 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:21 +0800 Subject: [PATCH 037/120] Create keymap.c --- keyboards/LS_60/keymaps/via/keymap.c | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 keyboards/LS_60/keymaps/via/keymap.c diff --git a/keyboards/LS_60/keymaps/via/keymap.c b/keyboards/LS_60/keymaps/via/keymap.c new file mode 100644 index 000000000000..67c5d0f52ebe --- /dev/null +++ b/keyboards/LS_60/keymaps/via/keymap.c @@ -0,0 +1,58 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // + + [_FN1] = 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), + + [_FN2] = 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), +}; + +bool led_update_user(led_t led_state) { + + if(led_state.caps_lock){ + rgblight_setrgb_at(192, 192, 192, 0); + }else{ + rgblight_setrgb_at(0, 0, 0, 0); + } + + return true; +} From cf0718c98e28e78269f231d1e839e4e00eb46517 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:33 +0800 Subject: [PATCH 038/120] Create rules.mk --- keyboards/LS_60/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/LS_60/keymaps/via/rules.mk diff --git a/keyboards/LS_60/keymaps/via/rules.mk b/keyboards/LS_60/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/LS_60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From a923d6341a0a58923fc377ef8d1538f37e1276ea Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:40 +0800 Subject: [PATCH 039/120] Create LS_60.c --- keyboards/LS_60/LS_60.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyboards/LS_60/LS_60.c diff --git a/keyboards/LS_60/LS_60.c b/keyboards/LS_60/LS_60.c new file mode 100644 index 000000000000..3034331c5c7b --- /dev/null +++ b/keyboards/LS_60/LS_60.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "LS_60.h" From 244ef91fe49b11f21ebc52aaa2cb6111f92556ad Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:35:54 +0800 Subject: [PATCH 040/120] Create LS_60.h --- keyboards/LS_60/LS_60.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 keyboards/LS_60/LS_60.h diff --git a/keyboards/LS_60/LS_60.h b/keyboards/LS_60/LS_60.h new file mode 100644 index 000000000000..b099521b9eab --- /dev/null +++ b/keyboards/LS_60/LS_60.h @@ -0,0 +1,30 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \ + K40, K41, K42, K46, K410, K411, K412, K413 ) \ + { \ + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \ + {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ + {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ + {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ + {K40, K41, K42, K46, K410, K411, K412, K413 } \ + } From 203ab8b6bd4f718aaad5410cf31cf34acbcce79d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:36:08 +0800 Subject: [PATCH 041/120] Create readme.md --- keyboards/LS_60/readme.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyboards/LS_60/readme.md diff --git a/keyboards/LS_60/readme.md b/keyboards/LS_60/readme.md new file mode 100644 index 000000000000..9ef03d6f8fc5 --- /dev/null +++ b/keyboards/LS_60/readme.md @@ -0,0 +1,16 @@ +# LS_60 + +![LS_60](https://www.hualigs.cn/image/600d9391f16d7.jpg) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: LS_60 +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make LS_60:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. +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). From 0e21faeaf1a688f797d204d52256d6aa3a60a5f0 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:36:15 +0800 Subject: [PATCH 042/120] Create rules.mk --- keyboards/LS_60/rules.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 keyboards/LS_60/rules.mk diff --git a/keyboards/LS_60/rules.mk b/keyboards/LS_60/rules.mk new file mode 100644 index 000000000000..abb47da9b6fb --- /dev/null +++ b/keyboards/LS_60/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + From 550a34a061a9e27064642d343175e8a356f61965 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 2 Aug 2021 23:54:37 +0800 Subject: [PATCH 043/120] Update readme.md --- keyboards/LS_60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/LS_60/readme.md b/keyboards/LS_60/readme.md index 9ef03d6f8fc5..cdd821f87b9d 100644 --- a/keyboards/LS_60/readme.md +++ b/keyboards/LS_60/readme.md @@ -1,6 +1,6 @@ # LS_60 -![LS_60](https://www.hualigs.cn/image/600d9391f16d7.jpg) +![LS_60](https://www.hualigs.cn/image/6108151699aea.jpg) A 60% keyboard based on STM32f303 From 0d4b68b176fe1f919a3183da829eba1c6d3e0149 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 3 Aug 2021 00:10:05 +0800 Subject: [PATCH 044/120] Update info.json --- keyboards/tiger910/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json index 0701fbdd32cf..01a0ab425db9 100644 --- a/keyboards/tiger910/info.json +++ b/keyboards/tiger910/info.json @@ -64,7 +64,7 @@ {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, {"label":"K3E (B3,D3)", "x":14, "y":3}, {"label":"K3F (B3,D4)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.56}, + {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5}, {"label":"K41 (B4,B6)", "x":1.5, "y":4}, {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5}, {"label":"K46 (B4,C3)", "x":4, "y":4, "w":7}, From 3fbc2571ba58792052d645974bf0ea59c01f2264 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:46:31 +0800 Subject: [PATCH 045/120] Update keyboards/LS_60/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/LS_60/keymaps/default/keymap.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/keyboards/LS_60/keymaps/default/keymap.c b/keyboards/LS_60/keymaps/default/keymap.c index bfa3265b6469..35879593992a 100644 --- a/keyboards/LS_60/keymaps/default/keymap.c +++ b/keyboards/LS_60/keymaps/default/keymap.c @@ -37,14 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // }; - -bool led_update_user(led_t led_state) { - - if(led_state.caps_lock){ - rgblight_setrgb_at(192, 192, 192, 0); - }else{ - rgblight_setrgb_at(0, 0, 0, 0); - } - - return true; -} From ab459f2d297b80e3d64b54d06a0d76e20cbe66d5 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:46:45 +0800 Subject: [PATCH 046/120] Update keyboards/LS_60/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/LS_60/keymaps/via/keymap.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/keyboards/LS_60/keymaps/via/keymap.c b/keyboards/LS_60/keymaps/via/keymap.c index 67c5d0f52ebe..e3af8eb7da8e 100644 --- a/keyboards/LS_60/keymaps/via/keymap.c +++ b/keyboards/LS_60/keymaps/via/keymap.c @@ -45,14 +45,3 @@ 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), }; - -bool led_update_user(led_t led_state) { - - if(led_state.caps_lock){ - rgblight_setrgb_at(192, 192, 192, 0); - }else{ - rgblight_setrgb_at(0, 0, 0, 0); - } - - return true; -} From f786a6adf3ab77640176c627851ca933aa448957 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:46:55 +0800 Subject: [PATCH 047/120] Update keyboards/LS_60/readme.md Co-authored-by: Drashna Jaelre --- keyboards/LS_60/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/LS_60/readme.md b/keyboards/LS_60/readme.md index cdd821f87b9d..0b4acdc76104 100644 --- a/keyboards/LS_60/readme.md +++ b/keyboards/LS_60/readme.md @@ -13,4 +13,5 @@ Make example for this keyboard (after setting up your build environment): make LS_60:default The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + 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). From 9e9a1055c94585eb73f91844dc99f2b16e132a23 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:47:03 +0800 Subject: [PATCH 048/120] Update keyboards/LS_60/LS_60.c Co-authored-by: Drashna Jaelre --- keyboards/LS_60/LS_60.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/LS_60/LS_60.c b/keyboards/LS_60/LS_60.c index 3034331c5c7b..621ed6deb677 100644 --- a/keyboards/LS_60/LS_60.c +++ b/keyboards/LS_60/LS_60.c @@ -14,3 +14,18 @@ * along with this program. If not, see . */ #include "LS_60.h" + +```suggestion +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + if(led_state.caps_lock){ + rgblight_setrgb_at(192, 192, 192, 0); + } else { + rgblight_setrgb_at(0, 0, 0, 0); + } + } + + return res; +} From 6dcac6d55da8d9667ac4cfc70281e1c6c3b2a686 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:50:28 +0800 Subject: [PATCH 049/120] Update LS_60.c --- keyboards/LS_60/LS_60.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/LS_60/LS_60.c b/keyboards/LS_60/LS_60.c index 621ed6deb677..ef29acf9a1f7 100644 --- a/keyboards/LS_60/LS_60.c +++ b/keyboards/LS_60/LS_60.c @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "LS_60.h" +#include "ls_60.h" + -```suggestion bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); From 1b3d7c6980c72e71f4beb4d025b478d9a40fbc91 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:52:41 +0800 Subject: [PATCH 050/120] Rename LS_60.c to ls_60.c --- keyboards/LS_60/{LS_60.c => ls_60.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/LS_60/{LS_60.c => ls_60.c} (100%) diff --git a/keyboards/LS_60/LS_60.c b/keyboards/LS_60/ls_60.c similarity index 100% rename from keyboards/LS_60/LS_60.c rename to keyboards/LS_60/ls_60.c From 414f5eaf90f72e38dcf82877ac878270a5f1d4b9 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:53:01 +0800 Subject: [PATCH 051/120] Rename LS_60.h to ls_60.h --- keyboards/LS_60/{LS_60.h => ls_60.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/LS_60/{LS_60.h => ls_60.h} (100%) diff --git a/keyboards/LS_60/LS_60.h b/keyboards/LS_60/ls_60.h similarity index 100% rename from keyboards/LS_60/LS_60.h rename to keyboards/LS_60/ls_60.h From 2e4e515241db8fa7fad637c8bd4859f061697670 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:09 +0800 Subject: [PATCH 052/120] Delete chconf.h --- keyboards/LS_60/chconf.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 keyboards/LS_60/chconf.h diff --git a/keyboards/LS_60/chconf.h b/keyboards/LS_60/chconf.h deleted file mode 100644 index 3910c9bf936d..000000000000 --- a/keyboards/LS_60/chconf.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 3 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 . - */ - -// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 -// so we need to change resolution and frequency to match. -#define CH_CFG_ST_RESOLUTION 16 -#define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" From 3fc7ee2e0bfaf0e1a2e8410b1c4e1b6c0fe3acc1 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:14 +0800 Subject: [PATCH 053/120] Delete config.h --- keyboards/LS_60/config.h | 52 ---------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 keyboards/LS_60/config.h diff --git a/keyboards/LS_60/config.h b/keyboards/LS_60/config.h deleted file mode 100644 index e7151ac10f70..000000000000 --- a/keyboards/LS_60/config.h +++ /dev/null @@ -1,52 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x4c53 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT LS_60 - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} -#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} -#define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - - -#define RGB_DI_PIN A6 -#define RGBLED_NUM 1 -//#define RGBLIGHT_DISABLE_KEYCODES - - - - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - - - From 85e8fb8f8835e1104b400e757a73290557b309ad Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:20 +0800 Subject: [PATCH 054/120] Delete info.json --- keyboards/LS_60/info.json | 79 --------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 keyboards/LS_60/info.json diff --git a/keyboards/LS_60/info.json b/keyboards/LS_60/info.json deleted file mode 100644 index 77560b3c37ed..000000000000 --- a/keyboards/LS_60/info.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "keyboard_name": "LS_60", - "url": "", - "maintainer": "qmk", - "width": 15, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K0", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K010", "x":10, "y":0}, - {"label":"K011", "x":11, "y":0}, - {"label":"K012", "x":12, "y":0}, - {"label":"K013", "x":13, "y":0}, - {"label":"K014", "x":14, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K11", "x":1.5, "y":1}, - {"label":"K12", "x":2.5, "y":1}, - {"label":"K13", "x":3.5, "y":1}, - {"label":"K14", "x":4.5, "y":1}, - {"label":"K15", "x":5.5, "y":1}, - {"label":"K16", "x":6.5, "y":1}, - {"label":"K17", "x":7.5, "y":1}, - {"label":"K18", "x":8.5, "y":1}, - {"label":"K19", "x":9.5, "y":1}, - {"label":"K110", "x":10.5, "y":1}, - {"label":"K111", "x":11.5, "y":1}, - {"label":"K112", "x":12.5, "y":1}, - {"label":"K113", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":6.75, "y":2}, - {"label":"K27", "x":7.75, "y":2}, - {"label":"K28", "x":8.75, "y":2}, - {"label":"K29", "x":9.75, "y":2}, - {"label":"K210", "x":10.75, "y":2}, - {"label":"K211", "x":11.75, "y":2}, - {"label":"K212", "x":12.75, "y":2}, - {"label":"K213", "x":13.75, "y":2, "w":1.25}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K31", "x":1.25, "y":3}, - {"label":"K32", "x":2.25, "y":3}, - {"label":"K33", "x":3.25, "y":3}, - {"label":"K34", "x":4.25, "y":3}, - {"label":"K35", "x":5.25, "y":3}, - {"label":"K36", "x":6.25, "y":3}, - {"label":"K37", "x":7.25, "y":3}, - {"label":"K38", "x":8.25, "y":3}, - {"label":"K39", "x":9.25, "y":3}, - {"label":"K310", "x":10.25, "y":3}, - {"label":"K311", "x":11.25, "y":3}, - {"label":"K312", "x":12.25, "y":3, "w":1.75}, - {"label":"K313", "x":14, "y":3}, - {"label":"K40", "x":0, "y":4, "w":1.25}, - {"label":"K41", "x":1.25, "y":4, "w":1.25}, - {"label":"K42", "x":2.5, "y":4, "w":1.25}, - {"label":"K46", "x":3.75, "y":4, "w":6.25}, - {"label":"K410", "x":10, "y":4, "w":1.25}, - {"label":"K411", "x":11.25, "y":4, "w":1.25}, - {"label":"K412", "x":12.5, "y":4, "w":1.25}, - {"label":"K413", "x":13.75, "y":4, "w":1.25} - ] - } - } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} From c60188f9c9c93484b4e46ee760db0343cb8ff6c3 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:24 +0800 Subject: [PATCH 055/120] Delete keymap.c --- keyboards/LS_60/keymaps/default/keymap.c | 39 ------------------------ 1 file changed, 39 deletions(-) delete mode 100644 keyboards/LS_60/keymaps/default/keymap.c diff --git a/keyboards/LS_60/keymaps/default/keymap.c b/keyboards/LS_60/keymaps/default/keymap.c deleted file mode 100644 index 35879593992a..000000000000 --- a/keyboards/LS_60/keymaps/default/keymap.c +++ /dev/null @@ -1,39 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - -// [Keymaps] -----------------------------------------------------------------// -enum layer_names { - _BASE, - _FN -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_BSPC, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), - - - [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // - -}; From bcee9f80ed3ef641a22a6ac187a30a69e7f21acf Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:29 +0800 Subject: [PATCH 056/120] Delete keymap.c --- keyboards/LS_60/keymaps/via/keymap.c | 47 ---------------------------- 1 file changed, 47 deletions(-) delete mode 100644 keyboards/LS_60/keymaps/via/keymap.c diff --git a/keyboards/LS_60/keymaps/via/keymap.c b/keyboards/LS_60/keymaps/via/keymap.c deleted file mode 100644 index e3af8eb7da8e..000000000000 --- a/keyboards/LS_60/keymaps/via/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - -// [Keymaps] -----------------------------------------------------------------// -enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_BSPC, - 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), - - - [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // - - [_FN1] = 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), - - [_FN2] = 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), -}; From 14af674760a7c26744fae604c306cf4e7693524b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:33 +0800 Subject: [PATCH 057/120] Delete rules.mk --- keyboards/LS_60/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/LS_60/keymaps/via/rules.mk diff --git a/keyboards/LS_60/keymaps/via/rules.mk b/keyboards/LS_60/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/LS_60/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes From f67eb6385385c75d334478acdc06318a2433f39e Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:37 +0800 Subject: [PATCH 058/120] Delete ls_60.c --- keyboards/LS_60/ls_60.c | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 keyboards/LS_60/ls_60.c diff --git a/keyboards/LS_60/ls_60.c b/keyboards/LS_60/ls_60.c deleted file mode 100644 index ef29acf9a1f7..000000000000 --- a/keyboards/LS_60/ls_60.c +++ /dev/null @@ -1,31 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 "ls_60.h" - - -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - - if (res) { - if(led_state.caps_lock){ - rgblight_setrgb_at(192, 192, 192, 0); - } else { - rgblight_setrgb_at(0, 0, 0, 0); - } - } - - return res; -} From aa33def6a346e5eccddcf7906df62db74314e755 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:41 +0800 Subject: [PATCH 059/120] Delete ls_60.h --- keyboards/LS_60/ls_60.h | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 keyboards/LS_60/ls_60.h diff --git a/keyboards/LS_60/ls_60.h b/keyboards/LS_60/ls_60.h deleted file mode 100644 index b099521b9eab..000000000000 --- a/keyboards/LS_60/ls_60.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Weirdo -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 "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \ - K40, K41, K42, K46, K410, K411, K412, K413 ) \ - { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ - {K40, K41, K42, K46, K410, K411, K412, K413 } \ - } From 9854523a9c0b68523c615ff3ca2a9dccbd232496 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:46 +0800 Subject: [PATCH 060/120] Delete readme.md --- keyboards/LS_60/readme.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/LS_60/readme.md diff --git a/keyboards/LS_60/readme.md b/keyboards/LS_60/readme.md deleted file mode 100644 index 0b4acdc76104..000000000000 --- a/keyboards/LS_60/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# LS_60 - -![LS_60](https://www.hualigs.cn/image/6108151699aea.jpg) - -A 60% keyboard based on STM32f303 - -* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) -* Hardware Supported: LS_60 -* Hardware Availability: Not yet - -Make example for this keyboard (after setting up your build environment): - - make LS_60:default - -The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. - -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). From f135f333fc658d3211ca0ee05ecbe59e8163483e Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 01:59:50 +0800 Subject: [PATCH 061/120] Delete rules.mk --- keyboards/LS_60/rules.mk | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 keyboards/LS_60/rules.mk diff --git a/keyboards/LS_60/rules.mk b/keyboards/LS_60/rules.mk deleted file mode 100644 index abb47da9b6fb..000000000000 --- a/keyboards/LS_60/rules.mk +++ /dev/null @@ -1,21 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output - From 9c1c5d55848f8c941dba529f267e312a580fc8f1 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:00:53 +0800 Subject: [PATCH 062/120] Create config.h --- keyboards/ls_60/config.h | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 keyboards/ls_60/config.h diff --git a/keyboards/ls_60/config.h b/keyboards/ls_60/config.h new file mode 100644 index 000000000000..e7151ac10f70 --- /dev/null +++ b/keyboards/ls_60/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x4c53 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT LS_60 + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15} +#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8} +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN A6 +#define RGBLED_NUM 1 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + From 7542ad19147d4c4b1b5c326cb7ba1b5758c35643 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:00:58 +0800 Subject: [PATCH 063/120] Create keymap.c --- keyboards/ls_60/keymaps/default/keymap.c | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 keyboards/ls_60/keymaps/default/keymap.c diff --git a/keyboards/ls_60/keymaps/default/keymap.c b/keyboards/ls_60/keymaps/default/keymap.c new file mode 100644 index 000000000000..35879593992a --- /dev/null +++ b/keyboards/ls_60/keymaps/default/keymap.c @@ -0,0 +1,39 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // + +}; From b61c2cb2aed6fb4bae3e46032dcfff30d1dcc6d4 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:03 +0800 Subject: [PATCH 064/120] Create keymap.c --- keyboards/ls_60/keymaps/via/keymap.c | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 keyboards/ls_60/keymaps/via/keymap.c diff --git a/keyboards/ls_60/keymaps/via/keymap.c b/keyboards/ls_60/keymaps/via/keymap.c new file mode 100644 index 000000000000..e3af8eb7da8e --- /dev/null +++ b/keyboards/ls_60/keymaps/via/keymap.c @@ -0,0 +1,47 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_BSPC, + 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT), // + + [_FN1] = 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), + + [_FN2] = 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), +}; From 704d8972a3b001765862d4a79458600e73d393cc Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:13 +0800 Subject: [PATCH 065/120] Create info.json --- keyboards/ls_60/info.json | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 keyboards/ls_60/info.json diff --git a/keyboards/ls_60/info.json b/keyboards/ls_60/info.json new file mode 100644 index 000000000000..77560b3c37ed --- /dev/null +++ b/keyboards/ls_60/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "LS_60", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K0", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K010", "x":10, "y":0}, + {"label":"K011", "x":11, "y":0}, + {"label":"K012", "x":12, "y":0}, + {"label":"K013", "x":13, "y":0}, + {"label":"K014", "x":14, "y":0}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K11", "x":1.5, "y":1}, + {"label":"K12", "x":2.5, "y":1}, + {"label":"K13", "x":3.5, "y":1}, + {"label":"K14", "x":4.5, "y":1}, + {"label":"K15", "x":5.5, "y":1}, + {"label":"K16", "x":6.5, "y":1}, + {"label":"K17", "x":7.5, "y":1}, + {"label":"K18", "x":8.5, "y":1}, + {"label":"K19", "x":9.5, "y":1}, + {"label":"K110", "x":10.5, "y":1}, + {"label":"K111", "x":11.5, "y":1}, + {"label":"K112", "x":12.5, "y":1}, + {"label":"K113", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K21", "x":1.75, "y":2}, + {"label":"K22", "x":2.75, "y":2}, + {"label":"K23", "x":3.75, "y":2}, + {"label":"K24", "x":4.75, "y":2}, + {"label":"K25", "x":5.75, "y":2}, + {"label":"K26", "x":6.75, "y":2}, + {"label":"K27", "x":7.75, "y":2}, + {"label":"K28", "x":8.75, "y":2}, + {"label":"K29", "x":9.75, "y":2}, + {"label":"K210", "x":10.75, "y":2}, + {"label":"K211", "x":11.75, "y":2}, + {"label":"K212", "x":12.75, "y":2}, + {"label":"K213", "x":13.75, "y":2, "w":1.25}, + {"label":"K30", "x":0, "y":3, "w":1.25}, + {"label":"K31", "x":1.25, "y":3}, + {"label":"K32", "x":2.25, "y":3}, + {"label":"K33", "x":3.25, "y":3}, + {"label":"K34", "x":4.25, "y":3}, + {"label":"K35", "x":5.25, "y":3}, + {"label":"K36", "x":6.25, "y":3}, + {"label":"K37", "x":7.25, "y":3}, + {"label":"K38", "x":8.25, "y":3}, + {"label":"K39", "x":9.25, "y":3}, + {"label":"K310", "x":10.25, "y":3}, + {"label":"K311", "x":11.25, "y":3}, + {"label":"K312", "x":12.25, "y":3, "w":1.75}, + {"label":"K313", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.25}, + {"label":"K41", "x":1.25, "y":4, "w":1.25}, + {"label":"K42", "x":2.5, "y":4, "w":1.25}, + {"label":"K46", "x":3.75, "y":4, "w":6.25}, + {"label":"K410", "x":10, "y":4, "w":1.25}, + {"label":"K411", "x":11.25, "y":4, "w":1.25}, + {"label":"K412", "x":12.5, "y":4, "w":1.25}, + {"label":"K413", "x":13.75, "y":4, "w":1.25} + ] + } + } + ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} From cd7e2259ef3b01f884e305a5697c6db8ae95d9aa Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:18 +0800 Subject: [PATCH 066/120] Create rules.mk --- keyboards/ls_60/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/ls_60/keymaps/via/rules.mk diff --git a/keyboards/ls_60/keymaps/via/rules.mk b/keyboards/ls_60/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ls_60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 483a09358104d53ee5ea585559c87b94c854fd37 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:22 +0800 Subject: [PATCH 067/120] Create chconf.h --- keyboards/ls_60/chconf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 keyboards/ls_60/chconf.h diff --git a/keyboards/ls_60/chconf.h b/keyboards/ls_60/chconf.h new file mode 100644 index 000000000000..3910c9bf936d --- /dev/null +++ b/keyboards/ls_60/chconf.h @@ -0,0 +1,21 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 . + */ + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 +#include_next "chconf.h" From b5ed8f970dcc3b36e8a27d7e360daa1496074a16 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:26 +0800 Subject: [PATCH 068/120] Create ls_60.c --- keyboards/ls_60/ls_60.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 keyboards/ls_60/ls_60.c diff --git a/keyboards/ls_60/ls_60.c b/keyboards/ls_60/ls_60.c new file mode 100644 index 000000000000..ef29acf9a1f7 --- /dev/null +++ b/keyboards/ls_60/ls_60.c @@ -0,0 +1,31 @@ + /* Copyright 2021 Weirdo + * + * 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 "ls_60.h" + + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + + if (res) { + if(led_state.caps_lock){ + rgblight_setrgb_at(192, 192, 192, 0); + } else { + rgblight_setrgb_at(0, 0, 0, 0); + } + } + + return res; +} From 3fe16dacbd056774ea5cdc63c53a96783833740a Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:30 +0800 Subject: [PATCH 069/120] Create ls_60.h --- keyboards/ls_60/ls_60.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 keyboards/ls_60/ls_60.h diff --git a/keyboards/ls_60/ls_60.h b/keyboards/ls_60/ls_60.h new file mode 100644 index 000000000000..b099521b9eab --- /dev/null +++ b/keyboards/ls_60/ls_60.h @@ -0,0 +1,30 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \ + K40, K41, K42, K46, K410, K411, K412, K413 ) \ + { \ + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \ + {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ + {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ + {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ + {K40, K41, K42, K46, K410, K411, K412, K413 } \ + } From 0836579944f1e912644592beb758794c1fd7ce14 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:34 +0800 Subject: [PATCH 070/120] Create readme.md --- keyboards/ls_60/readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/ls_60/readme.md diff --git a/keyboards/ls_60/readme.md b/keyboards/ls_60/readme.md new file mode 100644 index 000000000000..0b4acdc76104 --- /dev/null +++ b/keyboards/ls_60/readme.md @@ -0,0 +1,17 @@ +# LS_60 + +![LS_60](https://www.hualigs.cn/image/6108151699aea.jpg) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: LS_60 +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make LS_60:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). From d6a789271550d60c74468113b2fc2064dcea4a07 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:01:39 +0800 Subject: [PATCH 071/120] Create rules.mk --- keyboards/ls_60/rules.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 keyboards/ls_60/rules.mk diff --git a/keyboards/ls_60/rules.mk b/keyboards/ls_60/rules.mk new file mode 100644 index 000000000000..abb47da9b6fb --- /dev/null +++ b/keyboards/ls_60/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + From 1f69afb442d58e32b1a95cafc3cdf66c25859872 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:12:16 +0800 Subject: [PATCH 072/120] Update readme.md --- keyboards/geminate60/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/geminate60/readme.md b/keyboards/geminate60/readme.md index 1f9e85729813..f08e87739e4a 100644 --- a/keyboards/geminate60/readme.md +++ b/keyboards/geminate60/readme.md @@ -12,5 +12,4 @@ Make example for this keyboard (after setting up your build environment): make geminate60:default -The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. 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). From 53b499977fd235aa04daa09e4faaf3dcbb937d34 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:29 +0800 Subject: [PATCH 073/120] Delete config.h --- keyboards/tiger910/config.h | 49 ------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 keyboards/tiger910/config.h diff --git a/keyboards/tiger910/config.h b/keyboards/tiger910/config.h deleted file mode 100644 index 4f2541739a64..000000000000 --- a/keyboards/tiger910/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2021 Weirdo - -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 "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x5447 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT tiger910 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, B6, B7, C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, D2, D3, D4 } -#define UNUSED_PINS - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE From 8b04ab8d9266bff82e8006c0262b3da3875350b6 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:34 +0800 Subject: [PATCH 074/120] Delete info.json --- keyboards/tiger910/info.json | 79 ------------------------------------ 1 file changed, 79 deletions(-) delete mode 100644 keyboards/tiger910/info.json diff --git a/keyboards/tiger910/info.json b/keyboards/tiger910/info.json deleted file mode 100644 index 01a0ab425db9..000000000000 --- a/keyboards/tiger910/info.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "keyboard_name": "tiger910", - "url": "", - "maintainer": "Weirdo", - "width": 16, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0E (B0,D3)", "x":13, "y":0, "w":2}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K1E (B1,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B1,D4)", "x":15, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (B2,D4)", "x":15, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (B3,B7)", "x":2.25, "y":3}, - {"label":"K33 (B3,C0)", "x":3.25, "y":3}, - {"label":"K34 (B3,C1)", "x":4.25, "y":3}, - {"label":"K35 (B3,C2)", "x":5.25, "y":3}, - {"label":"K36 (B3,C3)", "x":6.25, "y":3}, - {"label":"K37 (B3,C4)", "x":7.25, "y":3}, - {"label":"K38 (B3,C5)", "x":8.25, "y":3}, - {"label":"K39 (B3,C6)", "x":9.25, "y":3}, - {"label":"K3A (B3,C7)", "x":10.25, "y":3}, - {"label":"K3B (B3,D0)", "x":11.25, "y":3}, - {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (B3,D3)", "x":14, "y":3}, - {"label":"K3F (B3,D4)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B4,B6)", "x":1.5, "y":4}, - {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (B4,C3)", "x":4, "y":4, "w":7}, - {"label":"K4B (B4,D0)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (B4,D1)", "x":13, "y":4}, - {"label":"K4E (B4,D3)", "x":14, "y":4}, - {"label":"K4F (B4,D4)", "x":15, "y":4} - ] - } - } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -} From 50ed09911d2252a78afdce1d73cf2b1fbc115db5 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:38 +0800 Subject: [PATCH 075/120] Delete keymap.c --- keyboards/tiger910/keymaps/default/keymap.c | 28 --------------------- 1 file changed, 28 deletions(-) delete mode 100644 keyboards/tiger910/keymaps/default/keymap.c diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/tiger910/keymaps/default/keymap.c deleted file mode 100644 index 5896a6913c53..000000000000 --- a/keyboards/tiger910/keymaps/default/keymap.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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_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_SPC, - 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_SPC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - -}; - From 8ce51b4671f310729d2f6c044e9c0e8489f4a05b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:42 +0800 Subject: [PATCH 076/120] Delete keymap.c --- keyboards/tiger910/keymaps/via/keymap.c | 53 ------------------------- 1 file changed, 53 deletions(-) delete mode 100644 keyboards/tiger910/keymaps/via/keymap.c diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/tiger910/keymaps/via/keymap.c deleted file mode 100644 index 051796e3def5..000000000000 --- a/keyboards/tiger910/keymaps/via/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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_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_SPC, - 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_SPC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = 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_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_SPC, - 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_SPC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [2] = 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_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_SPC, - 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_SPC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - - [3] = 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_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_SPC, - 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_SPC, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_SPC, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - -}; - From 1b48b747ba6d62951e2d80f79333983338a1c737 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:47 +0800 Subject: [PATCH 077/120] Delete rules.mk --- keyboards/tiger910/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/tiger910/keymaps/via/rules.mk diff --git a/keyboards/tiger910/keymaps/via/rules.mk b/keyboards/tiger910/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3ec..000000000000 --- a/keyboards/tiger910/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file From f276e28693f7b24d5ec13b78c3b209d1430fd18b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:51 +0800 Subject: [PATCH 078/120] Delete readme.md --- keyboards/tiger910/readme.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 keyboards/tiger910/readme.md diff --git a/keyboards/tiger910/readme.md b/keyboards/tiger910/readme.md deleted file mode 100644 index ed14a307d357..000000000000 --- a/keyboards/tiger910/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Tiger910 - -![Tiger910](https://www.hualigs.cn/image/60272570d2764.jpg) - -A 65% keyboard - -* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) -* Hardware Supported: Tiger910 -* Hardware Availability: Not yet - -Make example for this keyboard (after setting up your build environment): - - make tiger910:default - -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). From 2a9b0cd16f20968957c3e9e8b5b1cb5f3cb48dc0 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:55 +0800 Subject: [PATCH 079/120] Delete rules.mk --- keyboards/tiger910/rules.mk | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 keyboards/tiger910/rules.mk diff --git a/keyboards/tiger910/rules.mk b/keyboards/tiger910/rules.mk deleted file mode 100644 index bcabafbf2c69..000000000000 --- a/keyboards/tiger910/rules.mk +++ /dev/null @@ -1,22 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output From 703d8f220448201828ebebea1d72afe0bee1188a Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:13:59 +0800 Subject: [PATCH 080/120] Delete tiger910.c --- keyboards/tiger910/tiger910.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/tiger910/tiger910.c diff --git a/keyboards/tiger910/tiger910.c b/keyboards/tiger910/tiger910.c deleted file mode 100644 index d0964d9be90c..000000000000 --- a/keyboards/tiger910/tiger910.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 "tiger910.h" From 0936a103b216fde663953c342a823a545e052dad Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 02:14:03 +0800 Subject: [PATCH 081/120] Delete tiger910.h --- keyboards/tiger910/tiger910.h | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 keyboards/tiger910/tiger910.h diff --git a/keyboards/tiger910/tiger910.h b/keyboards/tiger910/tiger910.h deleted file mode 100644 index 529c12fc5ee1..000000000000 --- a/keyboards/tiger910/tiger910.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4B, K4C, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C, KC_NO, K4E, K4F }, \ -} From bc1cba1bb038959ecfcf7f1f7265584e284d690f Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 18:54:39 +0800 Subject: [PATCH 082/120] Update keyboards/ls_60/chconf.h Co-authored-by: Ryan --- keyboards/ls_60/chconf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/ls_60/chconf.h b/keyboards/ls_60/chconf.h index 3910c9bf936d..a94afbcd4f29 100644 --- a/keyboards/ls_60/chconf.h +++ b/keyboards/ls_60/chconf.h @@ -18,4 +18,5 @@ // so we need to change resolution and frequency to match. #define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_FREQUENCY 10000 -#include_next "chconf.h" + +#include_next From 6c4c546d69f02a40caab715adbada4ccc710fa9b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 18:54:54 +0800 Subject: [PATCH 083/120] Update keyboards/ls_60/chconf.h Co-authored-by: Ryan --- keyboards/ls_60/chconf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/ls_60/chconf.h b/keyboards/ls_60/chconf.h index a94afbcd4f29..5884dd8b0bde 100644 --- a/keyboards/ls_60/chconf.h +++ b/keyboards/ls_60/chconf.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + // Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 // so we need to change resolution and frequency to match. #define CH_CFG_ST_RESOLUTION 16 From 83b3dbfa0c11fdbed0699b0ca1d758b00da81c67 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Mon, 9 Aug 2021 18:55:14 +0800 Subject: [PATCH 084/120] Update keyboards/ls_60/rules.mk Co-authored-by: Ryan --- keyboards/ls_60/rules.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/ls_60/rules.mk b/keyboards/ls_60/rules.mk index abb47da9b6fb..c8646b2f9133 100644 --- a/keyboards/ls_60/rules.mk +++ b/keyboards/ls_60/rules.mk @@ -2,6 +2,9 @@ MCU = STM32F303 BOARD = QMK_PROTON_C +# Bootloader selection +BOOTLOADER = stm32-dfu + # Build Options # change yes to no to disable # @@ -18,4 +21,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - From 1d3678aa268d71699b4b82c41b7de67a161be191 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Fri, 13 Aug 2021 17:47:25 +0800 Subject: [PATCH 085/120] Update keyboards/ls_60/info.json Co-authored-by: Ryan --- keyboards/ls_60/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ls_60/info.json b/keyboards/ls_60/info.json index 77560b3c37ed..9ca03b965615 100644 --- a/keyboards/ls_60/info.json +++ b/keyboards/ls_60/info.json @@ -75,5 +75,4 @@ ] } } - ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" } From d1244bafdde4c796b9748c140368679af45e7296 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Fri, 13 Aug 2021 20:51:49 +0800 Subject: [PATCH 086/120] Update keyboards/ls_60/readme.md Co-authored-by: Ryan --- keyboards/ls_60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ls_60/readme.md b/keyboards/ls_60/readme.md index 0b4acdc76104..be60fe26d3a5 100644 --- a/keyboards/ls_60/readme.md +++ b/keyboards/ls_60/readme.md @@ -1,6 +1,6 @@ # LS_60 -![LS_60](https://www.hualigs.cn/image/6108151699aea.jpg) +![LS_60](https://i.imgur.com/Cuy5W1H.png) A 60% keyboard based on STM32f303 From 3eb3b1cfa12e613a36fa6e51185c7620c524080e Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Fri, 13 Aug 2021 21:07:06 +0800 Subject: [PATCH 087/120] Update keyboards/ls_60/readme.md Co-authored-by: Ryan --- keyboards/ls_60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ls_60/readme.md b/keyboards/ls_60/readme.md index be60fe26d3a5..e0efdfd9b500 100644 --- a/keyboards/ls_60/readme.md +++ b/keyboards/ls_60/readme.md @@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303 Make example for this keyboard (after setting up your build environment): - make LS_60:default + make ls_60:default The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. From e838e7e40b258ecc62157f0a2156742ef7d5a81b Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:18 +0800 Subject: [PATCH 088/120] Create chconf.h --- keyboards/naiping/np64/chconf.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/naiping/np64/chconf.h diff --git a/keyboards/naiping/np64/chconf.h b/keyboards/naiping/np64/chconf.h new file mode 100644 index 000000000000..5884dd8b0bde --- /dev/null +++ b/keyboards/naiping/np64/chconf.h @@ -0,0 +1,24 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next From 820f086f238d5d68966d3add1bbe0403c7dee5ad Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:23 +0800 Subject: [PATCH 089/120] Create config.h --- keyboards/naiping/np64/config.h | 52 +++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 keyboards/naiping/np64/config.h diff --git a/keyboards/naiping/np64/config.h b/keyboards/naiping/np64/config.h new file mode 100644 index 000000000000..f2eb83a9a00b --- /dev/null +++ b/keyboards/naiping/np64/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x7064 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT NP64 + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN B1 +#define RGBLED_NUM 80 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + From 6c22caf0546b14bad5321f2b8ea94e0edc7e3e28 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:30 +0800 Subject: [PATCH 090/120] Create info.json --- keyboards/naiping/np64/info.json | 77 ++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 keyboards/naiping/np64/info.json diff --git a/keyboards/naiping/np64/info.json b/keyboards/naiping/np64/info.json new file mode 100644 index 000000000000..853ffcbcc028 --- /dev/null +++ b/keyboards/naiping/np64/info.json @@ -0,0 +1,77 @@ +{ + "keyboard_name": "np64", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K03", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K0A", "x":10, "y":0}, + {"label":"K0B", "x":11, "y":0}, + {"label":"K0C", "x":12, "y":0}, + {"label":"K0E", "x":13, "y":0, "w":2}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K12", "x":1.5, "y":1}, + {"label":"K13", "x":2.5, "y":1}, + {"label":"K14", "x":3.5, "y":1}, + {"label":"K15", "x":4.5, "y":1}, + {"label":"K16", "x":5.5, "y":1}, + {"label":"K17", "x":6.5, "y":1}, + {"label":"K18", "x":7.5, "y":1}, + {"label":"K19", "x":8.5, "y":1}, + {"label":"K1A", "x":9.5, "y":1}, + {"label":"K1B", "x":10.5, "y":1}, + {"label":"K1C", "x":11.5, "y":1}, + {"label":"K1D", "x":12.5, "y":1}, + {"label":"K1E", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K22", "x":1.75, "y":2}, + {"label":"K23", "x":2.75, "y":2}, + {"label":"K24", "x":3.75, "y":2}, + {"label":"K25", "x":4.75, "y":2}, + {"label":"K26", "x":5.75, "y":2}, + {"label":"K27", "x":6.75, "y":2}, + {"label":"K28", "x":7.75, "y":2}, + {"label":"K29", "x":8.75, "y":2}, + {"label":"K2A", "x":9.75, "y":2}, + {"label":"K2B", "x":10.75, "y":2}, + {"label":"K2C", "x":11.75, "y":2}, + {"label":"K2E", "x":12.75, "y":2, "w":2.25}, + {"label":"K30", "x":0, "y":3, "w":2}, + {"label":"K32", "x":2, "y":3}, + {"label":"K33", "x":3, "y":3}, + {"label":"K34", "x":4, "y":3}, + {"label":"K35", "x":5, "y":3}, + {"label":"K36", "x":6, "y":3}, + {"label":"K37", "x":7, "y":3}, + {"label":"K38", "x":8, "y":3}, + {"label":"K39", "x":9, "y":3}, + {"label":"K3A", "x":10, "y":3}, + {"label":"K3B", "x":11, "y":3}, + {"label":"K3C", "x":12, "y":3}, + {"label":"K3D", "x":13, "y":3}, + {"label":"K3E", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.25}, + {"label":"K41", "x":1.25, "y":4, "w":1.25}, + {"label":"K42", "x":2.5, "y":4, "w":1.25}, + {"label":"K46", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A", "x":10, "y":4}, + {"label":"K4B", "x":11, "y":4}, + {"label":"K4C", "x":12, "y":4}, + {"label":"K4D", "x":13, "y":4}, + {"label":"K4E", "x":14, "y":4} + ] + } + } +} From 01eda40b9cbb11d1cdb13976652edda40945a9e6 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:34 +0800 Subject: [PATCH 091/120] Create keymap.c --- .../naiping/np64/keymaps/default/keymap.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 keyboards/naiping/np64/keymaps/default/keymap.c diff --git a/keyboards/naiping/np64/keymaps/default/keymap.c b/keyboards/naiping/np64/keymaps/default/keymap.c new file mode 100644 index 000000000000..18a40b45b7c6 --- /dev/null +++ b/keyboards/naiping/np64/keymaps/default/keymap.c @@ -0,0 +1,38 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // +}; From 96ee301cbc1262aab6c25fddfb4851f6cf303998 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:38 +0800 Subject: [PATCH 092/120] Create keymap.c --- keyboards/naiping/np64/keymaps/via/keymap.c | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 keyboards/naiping/np64/keymaps/via/keymap.c diff --git a/keyboards/naiping/np64/keymaps/via/keymap.c b/keyboards/naiping/np64/keymaps/via/keymap.c new file mode 100644 index 000000000000..01d0cba548d4 --- /dev/null +++ b/keyboards/naiping/np64/keymaps/via/keymap.c @@ -0,0 +1,47 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // + + [_FN1] = 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [_FN2] = 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; From db30865291854615135c7f26c7d24915558d5c34 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:43 +0800 Subject: [PATCH 093/120] Create rules.mk --- keyboards/naiping/np64/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/naiping/np64/keymaps/via/rules.mk diff --git a/keyboards/naiping/np64/keymaps/via/rules.mk b/keyboards/naiping/np64/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/naiping/np64/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From c57641aa93ca91aecda5d89213a02e125c7dac02 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:47 +0800 Subject: [PATCH 094/120] Create np64.c --- keyboards/naiping/np64/np64.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyboards/naiping/np64/np64.c diff --git a/keyboards/naiping/np64/np64.c b/keyboards/naiping/np64/np64.c new file mode 100644 index 000000000000..c5602d55f3ba --- /dev/null +++ b/keyboards/naiping/np64/np64.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "np64.h" From 4ff870dfd808c9f1ffd0033b6258bccde20c937f Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:52 +0800 Subject: [PATCH 095/120] Create np64.h --- keyboards/naiping/np64/np64.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 keyboards/naiping/np64/np64.h diff --git a/keyboards/naiping/np64/np64.h b/keyboards/naiping/np64/np64.h new file mode 100644 index 000000000000..a854712228c3 --- /dev/null +++ b/keyboards/naiping/np64/np64.h @@ -0,0 +1,31 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ + K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ +) { \ + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E}, \ + {K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ + {K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E}, \ + {K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ + {K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO,KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E} \ +} From a707d43033132fe70f3be47469ecc1b45fc4045f Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:03:56 +0800 Subject: [PATCH 096/120] Create readme.md --- keyboards/naiping/np64/readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/naiping/np64/readme.md diff --git a/keyboards/naiping/np64/readme.md b/keyboards/naiping/np64/readme.md new file mode 100644 index 000000000000..03b16c4bcca1 --- /dev/null +++ b/keyboards/naiping/np64/readme.md @@ -0,0 +1,17 @@ +# NP_64 + +![NP_64](https://i.imgur.com/DzLy87M.png) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: NP_64 +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make naiping/np64:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). From 727a74b705ff260bc679dd3d38943b50329ad179 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:01 +0800 Subject: [PATCH 097/120] Create rules.mk --- keyboards/naiping/np64/rules.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 keyboards/naiping/np64/rules.mk diff --git a/keyboards/naiping/np64/rules.mk b/keyboards/naiping/np64/rules.mk new file mode 100644 index 000000000000..c8646b2f9133 --- /dev/null +++ b/keyboards/naiping/np64/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From fadb15cd91ffcd44a58e7f40e2403f54efeb58da Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:05 +0800 Subject: [PATCH 098/120] Create chconf.h --- keyboards/naiping/nphhkb/chconf.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/naiping/nphhkb/chconf.h diff --git a/keyboards/naiping/nphhkb/chconf.h b/keyboards/naiping/nphhkb/chconf.h new file mode 100644 index 000000000000..5884dd8b0bde --- /dev/null +++ b/keyboards/naiping/nphhkb/chconf.h @@ -0,0 +1,24 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next From b87812f7a4fe61720d519a32078b9978208c6dcf Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:09 +0800 Subject: [PATCH 099/120] Create config.h --- keyboards/naiping/nphhkb/config.h | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 keyboards/naiping/nphhkb/config.h diff --git a/keyboards/naiping/nphhkb/config.h b/keyboards/naiping/nphhkb/config.h new file mode 100644 index 000000000000..26993eeb7ff3 --- /dev/null +++ b/keyboards/naiping/nphhkb/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x7068 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT NPhhkb + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5} +#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4} +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN A7 +#define RGBLED_NUM 78 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + From fc8490b563bad99d1dafc20b79722b85840e4c7d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:14 +0800 Subject: [PATCH 100/120] Create info.json --- keyboards/naiping/nphhkb/info.json | 75 ++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 keyboards/naiping/nphhkb/info.json diff --git a/keyboards/naiping/nphhkb/info.json b/keyboards/naiping/nphhkb/info.json new file mode 100644 index 000000000000..3e7f23efcef9 --- /dev/null +++ b/keyboards/naiping/nphhkb/info.json @@ -0,0 +1,75 @@ +{ + "keyboard_name": "NP_hhkb", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00)", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K03", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K0A", "x":10, "y":0}, + {"label":"K0B", "x":11, "y":0}, + {"label":"K0C", "x":12, "y":0}, + {"label":"K0D", "x":13, "y":0}, + {"label":"K0E ", "x":14, "y":0}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K11", "x":1.5, "y":1}, + {"label":"K12", "x":2.5, "y":1}, + {"label":"K13", "x":3.5, "y":1}, + {"label":"K14", "x":4.5, "y":1}, + {"label":"K15", "x":5.5, "y":1}, + {"label":"K16", "x":6.5, "y":1}, + {"label":"K17", "x":7.5, "y":1}, + {"label":"K18", "x":8.5, "y":1}, + {"label":"K19", "x":9.5, "y":1}, + {"label":"K1A", "x":10.5, "y":1}, + {"label":"K1B", "x":11.5, "y":1}, + {"label":"K1C", "x":12.5, "y":1}, + {"label":"K1D", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K21", "x":1.75, "y":2}, + {"label":"K22", "x":2.75, "y":2}, + {"label":"K23", "x":3.75, "y":2}, + {"label":"K24", "x":4.75, "y":2}, + {"label":"K25", "x":5.75, "y":2}, + {"label":"K26", "x":6.75, "y":2}, + {"label":"K27", "x":7.75, "y":2}, + {"label":"K28", "x":8.75, "y":2}, + {"label":"K29", "x":9.75, "y":2}, + {"label":"K2A", "x":10.75, "y":2}, + {"label":"K2B", "x":11.75, "y":2}, + {"label":"K2D", "x":12.75, "y":2, "w":2.25}, + {"label":"K30", "x":0, "y":3, "w":2.25}, + {"label":"K31", "x":2.25, "y":3}, + {"label":"K32", "x":3.25, "y":3}, + {"label":"K33", "x":4.25, "y":3}, + {"label":"K34", "x":5.25, "y":3}, + {"label":"K35", "x":6.25, "y":3}, + {"label":"K36", "x":7.25, "y":3}, + {"label":"K37", "x":8.25, "y":3}, + {"label":"K38", "x":9.25, "y":3}, + {"label":"K39", "x":10.25, "y":3}, + {"label":"K3A", "x":11.25, "y":3}, + {"label":"K3B", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.5}, + {"label":"K41", "x":1.5, "y":4}, + {"label":"K42", "x":2.5, "y":4, "w":1.5}, + {"label":"K46", "x":4, "y":4, "w":7}, + {"label":"K4A", "x":11, "y":4, "w":1.5}, + {"label":"K4B", "x":12.5, "y":4}, + {"label":"K4D", "x":13.5, "y":4, "w":1.5} + ] + } + } +} From b7f432d57b063fdc2e8fbe4f836e6c1dd2849de2 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:18 +0800 Subject: [PATCH 101/120] Create keymap.c --- .../naiping/nphhkb/keymaps/default/keymap.c | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 keyboards/naiping/nphhkb/keymaps/default/keymap.c diff --git a/keyboards/naiping/nphhkb/keymaps/default/keymap.c b/keyboards/naiping/nphhkb/keymaps/default/keymap.c new file mode 100644 index 000000000000..cf482ff21eaa --- /dev/null +++ b/keyboards/naiping/nphhkb/keymaps/default/keymap.c @@ -0,0 +1,40 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_DEL, + 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), + + + [_FN] = LAYOUT( + KC_GRV, 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_BSPC, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 a58c43348e19d85ab31feea26a6f35cd33f8f9d3 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:23 +0800 Subject: [PATCH 102/120] Create keymap.c --- keyboards/naiping/nphhkb/keymaps/via/keymap.c | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 keyboards/naiping/nphhkb/keymaps/via/keymap.c diff --git a/keyboards/naiping/nphhkb/keymaps/via/keymap.c b/keyboards/naiping/nphhkb/keymaps/via/keymap.c new file mode 100644 index 000000000000..39c81024e8c0 --- /dev/null +++ b/keyboards/naiping/nphhkb/keymaps/via/keymap.c @@ -0,0 +1,51 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_DEL, + 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), + + + [_FN] = LAYOUT( + KC_GRV, 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_BSPC, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), // + + [_FN1] = 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 ), + + [_FN2] = 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 ), +}; From ad8e953058bb193e18151e152d287561437588eb Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:27 +0800 Subject: [PATCH 103/120] Create rules.mk --- keyboards/naiping/nphhkb/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/naiping/nphhkb/keymaps/via/rules.mk diff --git a/keyboards/naiping/nphhkb/keymaps/via/rules.mk b/keyboards/naiping/nphhkb/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/naiping/nphhkb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From e0c3348a5aba478ff454d7c9f49dd2a430852561 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:31 +0800 Subject: [PATCH 104/120] Create nphhkb.c --- keyboards/naiping/nphhkb/nphhkb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyboards/naiping/nphhkb/nphhkb.c diff --git a/keyboards/naiping/nphhkb/nphhkb.c b/keyboards/naiping/nphhkb/nphhkb.c new file mode 100644 index 000000000000..881522c0b3ad --- /dev/null +++ b/keyboards/naiping/nphhkb/nphhkb.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "nphhkb.h" From 44a4880760a87ab8d1e7d87e07b67b0ab65e83eb Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:35 +0800 Subject: [PATCH 105/120] Create nphhkb.h --- keyboards/naiping/nphhkb/nphhkb.h | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 keyboards/naiping/nphhkb/nphhkb.h diff --git a/keyboards/naiping/nphhkb/nphhkb.h b/keyboards/naiping/nphhkb/nphhkb.h new file mode 100644 index 000000000000..3898abf776f4 --- /dev/null +++ b/keyboards/naiping/nphhkb/nphhkb.h @@ -0,0 +1,32 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + +#define ___ KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ + K40, K41, K42, K46, K4A, K4B, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \ + { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, ___ } \ +} From 7711329a82644bc50a446781f2471a8d66f5262c Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:40 +0800 Subject: [PATCH 106/120] Create readme.md --- keyboards/naiping/nphhkb/readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 keyboards/naiping/nphhkb/readme.md diff --git a/keyboards/naiping/nphhkb/readme.md b/keyboards/naiping/nphhkb/readme.md new file mode 100644 index 000000000000..e16f0e3fec99 --- /dev/null +++ b/keyboards/naiping/nphhkb/readme.md @@ -0,0 +1,17 @@ +# NP_hhkb + +![NP_hhkb](https://i.imgur.com/XnA4qVU.png) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: NP_hhkb +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make naiping/nphhkb:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). From a011a74639c8fc511b5f07a1c6b81686a6108a7d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:44 +0800 Subject: [PATCH 107/120] Create rules.mk --- keyboards/naiping/nphhkb/rules.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 keyboards/naiping/nphhkb/rules.mk diff --git a/keyboards/naiping/nphhkb/rules.mk b/keyboards/naiping/nphhkb/rules.mk new file mode 100644 index 000000000000..c8646b2f9133 --- /dev/null +++ b/keyboards/naiping/nphhkb/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From b4c0bc446bbb01baa658101351cc34638841b34e Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:04:48 +0800 Subject: [PATCH 108/120] Create chconf.h --- keyboards/naiping/npminila/chconf.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 keyboards/naiping/npminila/chconf.h diff --git a/keyboards/naiping/npminila/chconf.h b/keyboards/naiping/npminila/chconf.h new file mode 100644 index 000000000000..5884dd8b0bde --- /dev/null +++ b/keyboards/naiping/npminila/chconf.h @@ -0,0 +1,24 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next From c52cd4b508c415560f1caf7fccf45d9b42c56f03 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:05:00 +0800 Subject: [PATCH 109/120] Create config.h --- keyboards/naiping/npminila/config.h | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 keyboards/naiping/npminila/config.h diff --git a/keyboards/naiping/npminila/config.h b/keyboards/naiping/npminila/config.h new file mode 100644 index 000000000000..f18b36d8e7c1 --- /dev/null +++ b/keyboards/naiping/npminila/config.h @@ -0,0 +1,51 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x706D +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT NPminila + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + +#define RGB_DI_PIN D1 +#define RGBLED_NUM 82 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + From 47c8c5c9707e4cb600b7bdd0871f9e3693fd4bc6 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:05:21 +0800 Subject: [PATCH 110/120] add --- keyboards/naiping/npminila/info.json | 79 +++++++++++++++++++ .../naiping/npminila/keymaps/default/keymap.c | 39 +++++++++ .../naiping/npminila/keymaps/via/keymap.c | 47 +++++++++++ .../naiping/npminila/keymaps/via/rules.mk | 1 + keyboards/naiping/npminila/npminila.c | 16 ++++ keyboards/naiping/npminila/npminila.h | 30 +++++++ keyboards/naiping/npminila/readme.md | 17 ++++ keyboards/naiping/npminila/rules.mk | 23 ++++++ 8 files changed, 252 insertions(+) create mode 100644 keyboards/naiping/npminila/info.json create mode 100644 keyboards/naiping/npminila/keymaps/default/keymap.c create mode 100644 keyboards/naiping/npminila/keymaps/via/keymap.c create mode 100644 keyboards/naiping/npminila/keymaps/via/rules.mk create mode 100644 keyboards/naiping/npminila/npminila.c create mode 100644 keyboards/naiping/npminila/npminila.h create mode 100644 keyboards/naiping/npminila/readme.md create mode 100644 keyboards/naiping/npminila/rules.mk diff --git a/keyboards/naiping/npminila/info.json b/keyboards/naiping/npminila/info.json new file mode 100644 index 000000000000..866a72459c5e --- /dev/null +++ b/keyboards/naiping/npminila/info.json @@ -0,0 +1,79 @@ +{ + "keyboard_name": "NP_minila", + "url": "", + "maintainer": "qmk", + "width": 14, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K03", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K0A", "x":10, "y":0}, + {"label":"K0B", "x":11, "y":0}, + {"label":"K0C", "x":12, "y":0}, + {"label":"K0D", "x":13, "y":0, "w":2}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K11", "x":1.5, "y":1}, + {"label":"K12", "x":2.5, "y":1}, + {"label":"K13", "x":3.5, "y":1}, + {"label":"K14", "x":4.5, "y":1}, + {"label":"K15", "x":5.5, "y":1}, + {"label":"K16", "x":6.5, "y":1}, + {"label":"K17", "x":7.5, "y":1}, + {"label":"K18", "x":8.5, "y":1}, + {"label":"K19", "x":9.5, "y":1}, + {"label":"K1A", "x":10.5, "y":1}, + {"label":"K1B", "x":11.5, "y":1}, + {"label":"K1C", "x":12.5, "y":1}, + {"label":"K1D", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K21", "x":1.75, "y":2}, + {"label":"K22", "x":2.75, "y":2}, + {"label":"K23", "x":3.75, "y":2}, + {"label":"K24", "x":4.75, "y":2}, + {"label":"K25", "x":5.75, "y":2}, + {"label":"K26", "x":6.75, "y":2}, + {"label":"K27", "x":7.75, "y":2}, + {"label":"K28", "x":8.75, "y":2}, + {"label":"K29", "x":9.75, "y":2}, + {"label":"K2A", "x":10.75, "y":2}, + {"label":"K2B", "x":11.75, "y":2}, + {"label":"K2D", "x":12.75, "y":2, "w":2.25}, + {"label":"K30", "x":0, "y":3, "w":2}, + {"label":"K31", "x":2, "y":3}, + {"label":"K32", "x":3, "y":3}, + {"label":"K33", "x":4, "y":3}, + {"label":"K34", "x":5, "y":3}, + {"label":"K35", "x":6, "y":3}, + {"label":"K36", "x":7, "y":3}, + {"label":"K37", "x":8, "y":3}, + {"label":"K38", "x":9, "y":3}, + {"label":"K39", "x":10, "y":3}, + {"label":"K3A", "x":11, "y":3}, + {"label":"K3B", "x":12, "y":3}, + {"label":"K3C", "x":13, "y":3}, + {"label":"K3D", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.75}, + {"label":"K41", "x":1.75, "y":4, "w":1.25}, + {"label":"K42", "x":3, "y":4, "w":1.25}, + {"label":"K43", "x":4.25, "y":4, "w":1.25}, + {"label":"K46", "x":5.5, "y":4, "w":2.75}, + {"label":"K48", "x":8.25, "y":4, "w":1.25}, + {"label":"K49", "x":9.5, "y":4, "w":1.25}, + {"label":"K4A", "x":10.75, "y":4, "w":1.25}, + {"label":"K4B", "x":12, "y":4}, + {"label":"K4C", "x":13, "y":4}, + {"label":"K4D", "x":14, "y":4} + ] + } + } +} diff --git a/keyboards/naiping/npminila/keymaps/default/keymap.c b/keyboards/naiping/npminila/keymaps/default/keymap.c new file mode 100644 index 000000000000..30d6bf291e32 --- /dev/null +++ b/keyboards/naiping/npminila/keymaps/default/keymap.c @@ -0,0 +1,39 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, MO(1), KC_SPACE, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/naiping/npminila/keymaps/via/keymap.c b/keyboards/naiping/npminila/keymaps/via/keymap.c new file mode 100644 index 000000000000..10ec385de9ae --- /dev/null +++ b/keyboards/naiping/npminila/keymaps/via/keymap.c @@ -0,0 +1,47 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, MO(1), KC_SPACE, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // + + [_FN1] = 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), + + [_FN2] = 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), +}; diff --git a/keyboards/naiping/npminila/keymaps/via/rules.mk b/keyboards/naiping/npminila/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/naiping/npminila/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/naiping/npminila/npminila.c b/keyboards/naiping/npminila/npminila.c new file mode 100644 index 000000000000..ab9ebb45d7bd --- /dev/null +++ b/keyboards/naiping/npminila/npminila.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "npminila.h" diff --git a/keyboards/naiping/npminila/npminila.h b/keyboards/naiping/npminila/npminila.h new file mode 100644 index 000000000000..423e45a9e772 --- /dev/null +++ b/keyboards/naiping/npminila/npminila.h @@ -0,0 +1,30 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K40, K41, K42, K43, K46, K48, K49, K4A, K4B, K4C, K4D) \ + { \ + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ + {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ + {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D}, \ + {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ + {K40, K41, K42, K43, KC_NO, KC_NO, K46, KC_NO,K48, K49, K4A, K4B, K4C, K4D} \ + } \ No newline at end of file diff --git a/keyboards/naiping/npminila/readme.md b/keyboards/naiping/npminila/readme.md new file mode 100644 index 000000000000..335e12508db8 --- /dev/null +++ b/keyboards/naiping/npminila/readme.md @@ -0,0 +1,17 @@ +# NP_minila + +![NP_minila](https://i.imgur.com/Cuy5W1H.png) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: NP_minila +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make naiping/npminila:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). diff --git a/keyboards/naiping/npminila/rules.mk b/keyboards/naiping/npminila/rules.mk new file mode 100644 index 000000000000..c8646b2f9133 --- /dev/null +++ b/keyboards/naiping/npminila/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From f38db513f5c74e82c91eec9c02a21242255c3080 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:18:06 +0800 Subject: [PATCH 111/120] updata --- keyboards/naiping/nphhkb/.chconf.h.icloud | Bin 0 -> 156 bytes keyboards/naiping/nphhkb/.config.h.icloud | Bin 0 -> 156 bytes keyboards/naiping/nphhkb/.info.json.icloud | Bin 0 -> 157 bytes keyboards/naiping/nphhkb/.nphhkb.c.icloud | Bin 0 -> 156 bytes keyboards/naiping/nphhkb/.nphhkb.h.icloud | Bin 0 -> 156 bytes keyboards/naiping/nphhkb/.readme.md.icloud | Bin 0 -> 157 bytes keyboards/naiping/nphhkb/.rules.mk.icloud | Bin 0 -> 156 bytes keyboards/naiping/nphhkb/chconf.h | 24 ------ keyboards/naiping/nphhkb/config.h | 52 ------------ keyboards/naiping/nphhkb/info.json | 75 ------------------ .../nphhkb/keymaps/default/.keymap.c.icloud | Bin 0 -> 156 bytes .../naiping/nphhkb/keymaps/default/keymap.c | 40 ---------- .../nphhkb/keymaps/via/.keymap.c.icloud | Bin 0 -> 156 bytes .../nphhkb/keymaps/via/.rules.mk.icloud | Bin 0 -> 155 bytes keyboards/naiping/nphhkb/keymaps/via/keymap.c | 51 ------------ keyboards/naiping/nphhkb/keymaps/via/rules.mk | 1 - keyboards/naiping/nphhkb/nphhkb.c | 16 ---- keyboards/naiping/nphhkb/nphhkb.h | 32 -------- keyboards/naiping/nphhkb/readme.md | 17 ---- keyboards/naiping/nphhkb/rules.mk | 23 ------ 20 files changed, 331 deletions(-) create mode 100644 keyboards/naiping/nphhkb/.chconf.h.icloud create mode 100644 keyboards/naiping/nphhkb/.config.h.icloud create mode 100644 keyboards/naiping/nphhkb/.info.json.icloud create mode 100644 keyboards/naiping/nphhkb/.nphhkb.c.icloud create mode 100644 keyboards/naiping/nphhkb/.nphhkb.h.icloud create mode 100644 keyboards/naiping/nphhkb/.readme.md.icloud create mode 100644 keyboards/naiping/nphhkb/.rules.mk.icloud delete mode 100644 keyboards/naiping/nphhkb/chconf.h delete mode 100644 keyboards/naiping/nphhkb/config.h delete mode 100644 keyboards/naiping/nphhkb/info.json create mode 100644 keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud delete mode 100644 keyboards/naiping/nphhkb/keymaps/default/keymap.c create mode 100644 keyboards/naiping/nphhkb/keymaps/via/.keymap.c.icloud create mode 100644 keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud delete mode 100644 keyboards/naiping/nphhkb/keymaps/via/keymap.c delete mode 100644 keyboards/naiping/nphhkb/keymaps/via/rules.mk delete mode 100644 keyboards/naiping/nphhkb/nphhkb.c delete mode 100644 keyboards/naiping/nphhkb/nphhkb.h delete mode 100644 keyboards/naiping/nphhkb/readme.md delete mode 100644 keyboards/naiping/nphhkb/rules.mk diff --git a/keyboards/naiping/nphhkb/.chconf.h.icloud b/keyboards/naiping/nphhkb/.chconf.h.icloud new file mode 100644 index 0000000000000000000000000000000000000000..4c9931ad4bc5bc03e333f48e2b14e0a8b48ba55e GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh~$jq{Jb>13_<1v@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E0R5CHw*UYD literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.config.h.icloud b/keyboards/naiping/nphhkb/.config.h.icloud new file mode 100644 index 0000000000000000000000000000000000000000..e237a338614c92193d500ba8db0e64383da00ecf GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh~)gdw9It93_;fA@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E00G7+#Q*>R literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.info.json.icloud b/keyboards/naiping/nphhkb/.info.json.icloud new file mode 100644 index 0000000000000000000000000000000000000000..061321904e773e0b8b8c2caf5462c7b7108ce178 GIT binary patch literal 157 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QF$jrR7e7&sV{5(Nk?sx$itm=YN(@S#_i#YgY^u0pD8Nh&%5kfPtLunXQ F1^^saDZKyy literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.nphhkb.c.icloud b/keyboards/naiping/nphhkb/.nphhkb.c.icloud new file mode 100644 index 0000000000000000000000000000000000000000..92635c30163bb780694f74af6370cbfc7952b0b9 GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh`fS~jO--6WI?7I@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E01mz>^8f$< literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.nphhkb.h.icloud b/keyboards/naiping/nphhkb/.nphhkb.h.icloud new file mode 100644 index 0000000000000000000000000000000000000000..0c36d14af93db6c2362e3750cc0e783e7f3d2420 GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh`fS~jO--63_&)YcmWx#%7RkUOLG#7IQV7sy@JCSz<`kvLNl;KX&6-s E0NAZ5FaQ7m literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.readme.md.icloud b/keyboards/naiping/nphhkb/.readme.md.icloud new file mode 100644 index 0000000000000000000000000000000000000000..70390f86a16ec3e38a1649027f10431bea32a128 GIT binary patch literal 157 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QF$fDH5l-yLk+!R5k_wfQUSk(okrkCa<7IE;)=zE2PGk^gjBZOvPhte>r F3;<0^DsKP) literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/.rules.mk.icloud b/keyboards/naiping/nphhkb/.rules.mk.icloud new file mode 100644 index 0000000000000000000000000000000000000000..a2cae61cce72704478c913bca8aea05c587e19ed GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh@#S*)MCBdY(eH#@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E01YQ8>i_@% literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/chconf.h b/keyboards/naiping/nphhkb/chconf.h deleted file mode 100644 index 5884dd8b0bde..000000000000 --- a/keyboards/naiping/nphhkb/chconf.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 3 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 - -// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 -// so we need to change resolution and frequency to match. -#define CH_CFG_ST_RESOLUTION 16 -#define CH_CFG_ST_FREQUENCY 10000 - -#include_next diff --git a/keyboards/naiping/nphhkb/config.h b/keyboards/naiping/nphhkb/config.h deleted file mode 100644 index 26993eeb7ff3..000000000000 --- a/keyboards/naiping/nphhkb/config.h +++ /dev/null @@ -1,52 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x7068 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT NPhhkb - - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -#define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5} -#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4} -#define DIODE_DIRECTION ROW2COL -#define DEBOUNCE 5 - - - -#define RGB_DI_PIN A7 -#define RGBLED_NUM 78 -//#define RGBLIGHT_DISABLE_KEYCODES - - - - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - - - diff --git a/keyboards/naiping/nphhkb/info.json b/keyboards/naiping/nphhkb/info.json deleted file mode 100644 index 3e7f23efcef9..000000000000 --- a/keyboards/naiping/nphhkb/info.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "keyboard_name": "NP_hhkb", - "url": "", - "maintainer": "qmk", - "width": 15, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"K00)", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K0C", "x":12, "y":0}, - {"label":"K0D", "x":13, "y":0}, - {"label":"K0E ", "x":14, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K11", "x":1.5, "y":1}, - {"label":"K12", "x":2.5, "y":1}, - {"label":"K13", "x":3.5, "y":1}, - {"label":"K14", "x":4.5, "y":1}, - {"label":"K15", "x":5.5, "y":1}, - {"label":"K16", "x":6.5, "y":1}, - {"label":"K17", "x":7.5, "y":1}, - {"label":"K18", "x":8.5, "y":1}, - {"label":"K19", "x":9.5, "y":1}, - {"label":"K1A", "x":10.5, "y":1}, - {"label":"K1B", "x":11.5, "y":1}, - {"label":"K1C", "x":12.5, "y":1}, - {"label":"K1D", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":6.75, "y":2}, - {"label":"K27", "x":7.75, "y":2}, - {"label":"K28", "x":8.75, "y":2}, - {"label":"K29", "x":9.75, "y":2}, - {"label":"K2A", "x":10.75, "y":2}, - {"label":"K2B", "x":11.75, "y":2}, - {"label":"K2D", "x":12.75, "y":2, "w":2.25}, - {"label":"K30", "x":0, "y":3, "w":2.25}, - {"label":"K31", "x":2.25, "y":3}, - {"label":"K32", "x":3.25, "y":3}, - {"label":"K33", "x":4.25, "y":3}, - {"label":"K34", "x":5.25, "y":3}, - {"label":"K35", "x":6.25, "y":3}, - {"label":"K36", "x":7.25, "y":3}, - {"label":"K37", "x":8.25, "y":3}, - {"label":"K38", "x":9.25, "y":3}, - {"label":"K39", "x":10.25, "y":3}, - {"label":"K3A", "x":11.25, "y":3}, - {"label":"K3B", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D", "x":14, "y":3}, - {"label":"K40", "x":0, "y":4, "w":1.5}, - {"label":"K41", "x":1.5, "y":4}, - {"label":"K42", "x":2.5, "y":4, "w":1.5}, - {"label":"K46", "x":4, "y":4, "w":7}, - {"label":"K4A", "x":11, "y":4, "w":1.5}, - {"label":"K4B", "x":12.5, "y":4}, - {"label":"K4D", "x":13.5, "y":4, "w":1.5} - ] - } - } -} diff --git a/keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud b/keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud new file mode 100644 index 0000000000000000000000000000000000000000..80578f063a69691ffe2411a0e10ab9e1db44b3ed GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFi0stL+{6OCWI@iG@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E02GBP2LJ#7 literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/keymaps/default/keymap.c b/keyboards/naiping/nphhkb/keymaps/default/keymap.c deleted file mode 100644 index cf482ff21eaa..000000000000 --- a/keyboards/naiping/nphhkb/keymaps/default/keymap.c +++ /dev/null @@ -1,40 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 - - -// [Keymaps] -----------------------------------------------------------------// -enum layer_names { - _BASE, - _FN -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_DEL, - 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), - - - [_FN] = LAYOUT( - KC_GRV, 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_BSPC, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/naiping/nphhkb/keymaps/via/.keymap.c.icloud b/keyboards/naiping/nphhkb/keymaps/via/.keymap.c.icloud new file mode 100644 index 0000000000000000000000000000000000000000..1a27960e5107b544ca91f2da1acce4dd61bc4811 GIT binary patch literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFi0stL+{6OCWI?`;cmWx#%7RkUOLG#7IQV7sy@JCSz<`kvLNl;KX&6-s E0RLwxy8r+H literal 0 HcmV?d00001 diff --git a/keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud b/keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud new file mode 100644 index 0000000000000000000000000000000000000000..31eac9fd2deea669e1b2de771b4ca3033b506f30 GIT binary patch literal 155 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh@#S*)MCBdYyrV|0U4~Sf>P5. - */ -#include QMK_KEYBOARD_H - - -// [Keymaps] -----------------------------------------------------------------// -enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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_DEL, - 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), - - - [_FN] = LAYOUT( - KC_GRV, 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_BSPC, KC_DEL, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), // - - [_FN1] = 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 ), - - [_FN2] = 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 ), -}; diff --git a/keyboards/naiping/nphhkb/keymaps/via/rules.mk b/keyboards/naiping/nphhkb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/naiping/nphhkb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/naiping/nphhkb/nphhkb.c b/keyboards/naiping/nphhkb/nphhkb.c deleted file mode 100644 index 881522c0b3ad..000000000000 --- a/keyboards/naiping/nphhkb/nphhkb.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 Weirdo - * - * 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 "nphhkb.h" diff --git a/keyboards/naiping/nphhkb/nphhkb.h b/keyboards/naiping/nphhkb/nphhkb.h deleted file mode 100644 index 3898abf776f4..000000000000 --- a/keyboards/naiping/nphhkb/nphhkb.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2021 Weirdo -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 "quantum.h" - -#define ___ KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K46, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, ___ } \ -} diff --git a/keyboards/naiping/nphhkb/readme.md b/keyboards/naiping/nphhkb/readme.md deleted file mode 100644 index e16f0e3fec99..000000000000 --- a/keyboards/naiping/nphhkb/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# NP_hhkb - -![NP_hhkb](https://i.imgur.com/XnA4qVU.png) - -A 60% keyboard based on STM32f303 - -* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) -* Hardware Supported: NP_hhkb -* Hardware Availability: Not yet - -Make example for this keyboard (after setting up your build environment): - - make naiping/nphhkb:default - -The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. - -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). diff --git a/keyboards/naiping/nphhkb/rules.mk b/keyboards/naiping/nphhkb/rules.mk deleted file mode 100644 index c8646b2f9133..000000000000 --- a/keyboards/naiping/nphhkb/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output From 75ebb36d6174aef355513afcff4cc77ffadd51de Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 17 Aug 2021 19:21:28 +0800 Subject: [PATCH 112/120] updata --- keyboards/naiping/nphhkb/.chconf.h.icloud | Bin 156 -> 0 bytes keyboards/naiping/nphhkb/.config.h.icloud | Bin 156 -> 0 bytes keyboards/naiping/nphhkb/.info.json.icloud | Bin 157 -> 0 bytes keyboards/naiping/nphhkb/.nphhkb.c.icloud | Bin 156 -> 0 bytes keyboards/naiping/nphhkb/.nphhkb.h.icloud | Bin 156 -> 0 bytes keyboards/naiping/nphhkb/.readme.md.icloud | Bin 157 -> 0 bytes keyboards/naiping/nphhkb/.rules.mk.icloud | Bin 156 -> 0 bytes keyboards/naiping/nphhkb/chconf.h | 24 ++++++ keyboards/naiping/nphhkb/config.h | 52 ++++++++++++ keyboards/naiping/nphhkb/info.json | 75 ++++++++++++++++++ .../nphhkb/keymaps/default/.keymap.c.icloud | Bin 156 -> 0 bytes .../naiping/nphhkb/keymaps/default/keymap.c | 40 ++++++++++ .../nphhkb/keymaps/via/.keymap.c.icloud | Bin 156 -> 0 bytes .../nphhkb/keymaps/via/.rules.mk.icloud | Bin 155 -> 0 bytes keyboards/naiping/nphhkb/keymaps/via/keymap.c | 51 ++++++++++++ keyboards/naiping/nphhkb/keymaps/via/rules.mk | 1 + keyboards/naiping/nphhkb/nphhkb.c | 16 ++++ keyboards/naiping/nphhkb/nphhkb.h | 32 ++++++++ keyboards/naiping/nphhkb/readme.md | 17 ++++ keyboards/naiping/nphhkb/rules.mk | 23 ++++++ 20 files changed, 331 insertions(+) delete mode 100644 keyboards/naiping/nphhkb/.chconf.h.icloud delete mode 100644 keyboards/naiping/nphhkb/.config.h.icloud delete mode 100644 keyboards/naiping/nphhkb/.info.json.icloud delete mode 100644 keyboards/naiping/nphhkb/.nphhkb.c.icloud delete mode 100644 keyboards/naiping/nphhkb/.nphhkb.h.icloud delete mode 100644 keyboards/naiping/nphhkb/.readme.md.icloud delete mode 100644 keyboards/naiping/nphhkb/.rules.mk.icloud create mode 100644 keyboards/naiping/nphhkb/chconf.h create mode 100644 keyboards/naiping/nphhkb/config.h create mode 100644 keyboards/naiping/nphhkb/info.json delete mode 100644 keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud create mode 100644 keyboards/naiping/nphhkb/keymaps/default/keymap.c delete mode 100644 keyboards/naiping/nphhkb/keymaps/via/.keymap.c.icloud delete mode 100644 keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud create mode 100644 keyboards/naiping/nphhkb/keymaps/via/keymap.c create mode 100644 keyboards/naiping/nphhkb/keymaps/via/rules.mk create mode 100644 keyboards/naiping/nphhkb/nphhkb.c create mode 100644 keyboards/naiping/nphhkb/nphhkb.h create mode 100644 keyboards/naiping/nphhkb/readme.md create mode 100644 keyboards/naiping/nphhkb/rules.mk diff --git a/keyboards/naiping/nphhkb/.chconf.h.icloud b/keyboards/naiping/nphhkb/.chconf.h.icloud deleted file mode 100644 index 4c9931ad4bc5bc03e333f48e2b14e0a8b48ba55e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh~$jq{Jb>13_<1v@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E0R5CHw*UYD diff --git a/keyboards/naiping/nphhkb/.config.h.icloud b/keyboards/naiping/nphhkb/.config.h.icloud deleted file mode 100644 index e237a338614c92193d500ba8db0e64383da00ecf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh~)gdw9It93_;fA@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E00G7+#Q*>R diff --git a/keyboards/naiping/nphhkb/.info.json.icloud b/keyboards/naiping/nphhkb/.info.json.icloud deleted file mode 100644 index 061321904e773e0b8b8c2caf5462c7b7108ce178..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QF$jrR7e7&sV{5(Nk?sx$itm=YN(@S#_i#YgY^u0pD8Nh&%5kfPtLunXQ F1^^saDZKyy diff --git a/keyboards/naiping/nphhkb/.nphhkb.c.icloud b/keyboards/naiping/nphhkb/.nphhkb.c.icloud deleted file mode 100644 index 92635c30163bb780694f74af6370cbfc7952b0b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh`fS~jO--6WI?7I@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E01mz>^8f$< diff --git a/keyboards/naiping/nphhkb/.nphhkb.h.icloud b/keyboards/naiping/nphhkb/.nphhkb.h.icloud deleted file mode 100644 index 0c36d14af93db6c2362e3750cc0e783e7f3d2420..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh`fS~jO--63_&)YcmWx#%7RkUOLG#7IQV7sy@JCSz<`kvLNl;KX&6-s E0NAZ5FaQ7m diff --git a/keyboards/naiping/nphhkb/.readme.md.icloud b/keyboards/naiping/nphhkb/.readme.md.icloud deleted file mode 100644 index 70390f86a16ec3e38a1649027f10431bea32a128..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QF$fDH5l-yLk+!R5k_wfQUSk(okrkCa<7IE;)=zE2PGk^gjBZOvPhte>r F3;<0^DsKP) diff --git a/keyboards/naiping/nphhkb/.rules.mk.icloud b/keyboards/naiping/nphhkb/.rules.mk.icloud deleted file mode 100644 index a2cae61cce72704478c913bca8aea05c587e19ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh@#S*)MCBdY(eH#@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E01YQ8>i_@% diff --git a/keyboards/naiping/nphhkb/chconf.h b/keyboards/naiping/nphhkb/chconf.h new file mode 100644 index 000000000000..5884dd8b0bde --- /dev/null +++ b/keyboards/naiping/nphhkb/chconf.h @@ -0,0 +1,24 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next diff --git a/keyboards/naiping/nphhkb/config.h b/keyboards/naiping/nphhkb/config.h new file mode 100644 index 000000000000..26993eeb7ff3 --- /dev/null +++ b/keyboards/naiping/nphhkb/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x7068 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT NPhhkb + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_COL_PINS { A4, C15, C14, A5, A6, A15, B1, B10, B12, B13, B14, B15, B6, A8, B5} +#define MATRIX_ROW_PINS { B7, B8, B9, C13, B4} +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN A7 +#define RGBLED_NUM 78 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + diff --git a/keyboards/naiping/nphhkb/info.json b/keyboards/naiping/nphhkb/info.json new file mode 100644 index 000000000000..3e7f23efcef9 --- /dev/null +++ b/keyboards/naiping/nphhkb/info.json @@ -0,0 +1,75 @@ +{ + "keyboard_name": "NP_hhkb", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00)", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K03", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K0A", "x":10, "y":0}, + {"label":"K0B", "x":11, "y":0}, + {"label":"K0C", "x":12, "y":0}, + {"label":"K0D", "x":13, "y":0}, + {"label":"K0E ", "x":14, "y":0}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K11", "x":1.5, "y":1}, + {"label":"K12", "x":2.5, "y":1}, + {"label":"K13", "x":3.5, "y":1}, + {"label":"K14", "x":4.5, "y":1}, + {"label":"K15", "x":5.5, "y":1}, + {"label":"K16", "x":6.5, "y":1}, + {"label":"K17", "x":7.5, "y":1}, + {"label":"K18", "x":8.5, "y":1}, + {"label":"K19", "x":9.5, "y":1}, + {"label":"K1A", "x":10.5, "y":1}, + {"label":"K1B", "x":11.5, "y":1}, + {"label":"K1C", "x":12.5, "y":1}, + {"label":"K1D", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K21", "x":1.75, "y":2}, + {"label":"K22", "x":2.75, "y":2}, + {"label":"K23", "x":3.75, "y":2}, + {"label":"K24", "x":4.75, "y":2}, + {"label":"K25", "x":5.75, "y":2}, + {"label":"K26", "x":6.75, "y":2}, + {"label":"K27", "x":7.75, "y":2}, + {"label":"K28", "x":8.75, "y":2}, + {"label":"K29", "x":9.75, "y":2}, + {"label":"K2A", "x":10.75, "y":2}, + {"label":"K2B", "x":11.75, "y":2}, + {"label":"K2D", "x":12.75, "y":2, "w":2.25}, + {"label":"K30", "x":0, "y":3, "w":2.25}, + {"label":"K31", "x":2.25, "y":3}, + {"label":"K32", "x":3.25, "y":3}, + {"label":"K33", "x":4.25, "y":3}, + {"label":"K34", "x":5.25, "y":3}, + {"label":"K35", "x":6.25, "y":3}, + {"label":"K36", "x":7.25, "y":3}, + {"label":"K37", "x":8.25, "y":3}, + {"label":"K38", "x":9.25, "y":3}, + {"label":"K39", "x":10.25, "y":3}, + {"label":"K3A", "x":11.25, "y":3}, + {"label":"K3B", "x":12.25, "y":3, "w":1.75}, + {"label":"K3D", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.5}, + {"label":"K41", "x":1.5, "y":4}, + {"label":"K42", "x":2.5, "y":4, "w":1.5}, + {"label":"K46", "x":4, "y":4, "w":7}, + {"label":"K4A", "x":11, "y":4, "w":1.5}, + {"label":"K4B", "x":12.5, "y":4}, + {"label":"K4D", "x":13.5, "y":4, "w":1.5} + ] + } + } +} diff --git a/keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud b/keyboards/naiping/nphhkb/keymaps/default/.keymap.c.icloud deleted file mode 100644 index 80578f063a69691ffe2411a0e10ab9e1db44b3ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFi0stL+{6OCWI@iG@d7efl?A1ym*ylEaq!FNdj*FvfB_>Tgl1re(lDwN E02GBP2LJ#7 diff --git a/keyboards/naiping/nphhkb/keymaps/default/keymap.c b/keyboards/naiping/nphhkb/keymaps/default/keymap.c new file mode 100644 index 000000000000..cf482ff21eaa --- /dev/null +++ b/keyboards/naiping/nphhkb/keymaps/default/keymap.c @@ -0,0 +1,40 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_DEL, + 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), + + + [_FN] = LAYOUT( + KC_GRV, 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_BSPC, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/naiping/nphhkb/keymaps/via/.keymap.c.icloud b/keyboards/naiping/nphhkb/keymaps/via/.keymap.c.icloud deleted file mode 100644 index 1a27960e5107b544ca91f2da1acce4dd61bc4811..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFi0stL+{6OCWI?`;cmWx#%7RkUOLG#7IQV7sy@JCSz<`kvLNl;KX&6-s E0RLwxy8r+H diff --git a/keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud b/keyboards/naiping/nphhkb/keymaps/via/.rules.mk.icloud deleted file mode 100644 index 31eac9fd2deea669e1b2de771b4ca3033b506f30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmYc)$jK}&F)+By$i&RT$`<1n92(@~mzbOComv?$AOPmNW#*&?XI4RkB;Z0psm1xF zMaiill?5QFh@#S*)MCBdYyrV|0U4~Sf>P5. + */ +#include QMK_KEYBOARD_H + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_DEL, + 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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_TRNS, KC_LALT, KC_LCTL, KC_SPC, KC_RCTL, KC_RALT, KC_TRNS ), + + + [_FN] = LAYOUT( + KC_GRV, 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_BSPC, KC_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), // + + [_FN1] = 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 ), + + [_FN2] = 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 ), +}; diff --git a/keyboards/naiping/nphhkb/keymaps/via/rules.mk b/keyboards/naiping/nphhkb/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/naiping/nphhkb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/naiping/nphhkb/nphhkb.c b/keyboards/naiping/nphhkb/nphhkb.c new file mode 100644 index 000000000000..881522c0b3ad --- /dev/null +++ b/keyboards/naiping/nphhkb/nphhkb.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "nphhkb.h" diff --git a/keyboards/naiping/nphhkb/nphhkb.h b/keyboards/naiping/nphhkb/nphhkb.h new file mode 100644 index 000000000000..3898abf776f4 --- /dev/null +++ b/keyboards/naiping/nphhkb/nphhkb.h @@ -0,0 +1,32 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + +#define ___ KC_NO + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ + K40, K41, K42, K46, K4A, K4B, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \ + { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, ___ } \ +} diff --git a/keyboards/naiping/nphhkb/readme.md b/keyboards/naiping/nphhkb/readme.md new file mode 100644 index 000000000000..e16f0e3fec99 --- /dev/null +++ b/keyboards/naiping/nphhkb/readme.md @@ -0,0 +1,17 @@ +# NP_hhkb + +![NP_hhkb](https://i.imgur.com/XnA4qVU.png) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: NP_hhkb +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make naiping/nphhkb:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). diff --git a/keyboards/naiping/nphhkb/rules.mk b/keyboards/naiping/nphhkb/rules.mk new file mode 100644 index 000000000000..c8646b2f9133 --- /dev/null +++ b/keyboards/naiping/nphhkb/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From 26f96ebe970b00b6e600a3c77714ff8709b297ea Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 02:16:27 +0800 Subject: [PATCH 113/120] add kelownaRGB64 --- keyboards/kelowna/rgb64/chconf.h | 24 ++++++ keyboards/kelowna/rgb64/config.h | 52 +++++++++++++ keyboards/kelowna/rgb64/info.json | 77 +++++++++++++++++++ .../kelowna/rgb64/keymaps/default/keymap.c | 38 +++++++++ keyboards/kelowna/rgb64/keymaps/via/keymap.c | 47 +++++++++++ keyboards/kelowna/rgb64/keymaps/via/rules.mk | 1 + keyboards/kelowna/rgb64/readme.md | 17 ++++ keyboards/kelowna/rgb64/rgb64.c | 16 ++++ keyboards/kelowna/rgb64/rgb64.h | 31 ++++++++ keyboards/kelowna/rgb64/rules.mk | 23 ++++++ 10 files changed, 326 insertions(+) create mode 100644 keyboards/kelowna/rgb64/chconf.h create mode 100644 keyboards/kelowna/rgb64/config.h create mode 100644 keyboards/kelowna/rgb64/info.json create mode 100644 keyboards/kelowna/rgb64/keymaps/default/keymap.c create mode 100644 keyboards/kelowna/rgb64/keymaps/via/keymap.c create mode 100644 keyboards/kelowna/rgb64/keymaps/via/rules.mk create mode 100644 keyboards/kelowna/rgb64/readme.md create mode 100644 keyboards/kelowna/rgb64/rgb64.c create mode 100644 keyboards/kelowna/rgb64/rgb64.h create mode 100644 keyboards/kelowna/rgb64/rules.mk diff --git a/keyboards/kelowna/rgb64/chconf.h b/keyboards/kelowna/rgb64/chconf.h new file mode 100644 index 000000000000..5884dd8b0bde --- /dev/null +++ b/keyboards/kelowna/rgb64/chconf.h @@ -0,0 +1,24 @@ +/* Copyright 2021 Weirdo + * + * 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 3 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 + +// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 +// so we need to change resolution and frequency to match. +#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next diff --git a/keyboards/kelowna/rgb64/config.h b/keyboards/kelowna/rgb64/config.h new file mode 100644 index 000000000000..abbfd17d3dd6 --- /dev/null +++ b/keyboards/kelowna/rgb64/config.h @@ -0,0 +1,52 @@ + /* Copyright 2021 Weirdo + * + * 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 "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x7764 +#define PRODUCT_ID 0x4C64 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Weirdo +#define PRODUCT kelownaRGB64 + + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } +#define DIODE_DIRECTION ROW2COL +#define DEBOUNCE 5 + + + +#define RGB_DI_PIN B1 +#define RGBLED_NUM 80 +//#define RGBLIGHT_DISABLE_KEYCODES + + + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + + + diff --git a/keyboards/kelowna/rgb64/info.json b/keyboards/kelowna/rgb64/info.json new file mode 100644 index 000000000000..10878518fbf8 --- /dev/null +++ b/keyboards/kelowna/rgb64/info.json @@ -0,0 +1,77 @@ +{ + "keyboard_name": "kelownaRGB64", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"K00", "x":0, "y":0}, + {"label":"K01", "x":1, "y":0}, + {"label":"K02", "x":2, "y":0}, + {"label":"K03", "x":3, "y":0}, + {"label":"K04", "x":4, "y":0}, + {"label":"K05", "x":5, "y":0}, + {"label":"K06", "x":6, "y":0}, + {"label":"K07", "x":7, "y":0}, + {"label":"K08", "x":8, "y":0}, + {"label":"K09", "x":9, "y":0}, + {"label":"K0A", "x":10, "y":0}, + {"label":"K0B", "x":11, "y":0}, + {"label":"K0C", "x":12, "y":0}, + {"label":"K0E", "x":13, "y":0, "w":2}, + {"label":"K10", "x":0, "y":1, "w":1.5}, + {"label":"K12", "x":1.5, "y":1}, + {"label":"K13", "x":2.5, "y":1}, + {"label":"K14", "x":3.5, "y":1}, + {"label":"K15", "x":4.5, "y":1}, + {"label":"K16", "x":5.5, "y":1}, + {"label":"K17", "x":6.5, "y":1}, + {"label":"K18", "x":7.5, "y":1}, + {"label":"K19", "x":8.5, "y":1}, + {"label":"K1A", "x":9.5, "y":1}, + {"label":"K1B", "x":10.5, "y":1}, + {"label":"K1C", "x":11.5, "y":1}, + {"label":"K1D", "x":12.5, "y":1}, + {"label":"K1E", "x":13.5, "y":1, "w":1.5}, + {"label":"K20", "x":0, "y":2, "w":1.75}, + {"label":"K22", "x":1.75, "y":2}, + {"label":"K23", "x":2.75, "y":2}, + {"label":"K24", "x":3.75, "y":2}, + {"label":"K25", "x":4.75, "y":2}, + {"label":"K26", "x":5.75, "y":2}, + {"label":"K27", "x":6.75, "y":2}, + {"label":"K28", "x":7.75, "y":2}, + {"label":"K29", "x":8.75, "y":2}, + {"label":"K2A", "x":9.75, "y":2}, + {"label":"K2B", "x":10.75, "y":2}, + {"label":"K2C", "x":11.75, "y":2}, + {"label":"K2E", "x":12.75, "y":2, "w":2.25}, + {"label":"K30", "x":0, "y":3, "w":2}, + {"label":"K32", "x":2, "y":3}, + {"label":"K33", "x":3, "y":3}, + {"label":"K34", "x":4, "y":3}, + {"label":"K35", "x":5, "y":3}, + {"label":"K36", "x":6, "y":3}, + {"label":"K37", "x":7, "y":3}, + {"label":"K38", "x":8, "y":3}, + {"label":"K39", "x":9, "y":3}, + {"label":"K3A", "x":10, "y":3}, + {"label":"K3B", "x":11, "y":3}, + {"label":"K3C", "x":12, "y":3}, + {"label":"K3D", "x":13, "y":3}, + {"label":"K3E", "x":14, "y":3}, + {"label":"K40", "x":0, "y":4, "w":1.25}, + {"label":"K41", "x":1.25, "y":4, "w":1.25}, + {"label":"K42", "x":2.5, "y":4, "w":1.25}, + {"label":"K46", "x":3.75, "y":4, "w":6.25}, + {"label":"K4A", "x":10, "y":4}, + {"label":"K4B", "x":11, "y":4}, + {"label":"K4C", "x":12, "y":4}, + {"label":"K4D", "x":13, "y":4}, + {"label":"K4E", "x":14, "y":4} + ] + } + } +} diff --git a/keyboards/kelowna/rgb64/keymaps/default/keymap.c b/keyboards/kelowna/rgb64/keymaps/default/keymap.c new file mode 100644 index 000000000000..18a40b45b7c6 --- /dev/null +++ b/keyboards/kelowna/rgb64/keymaps/default/keymap.c @@ -0,0 +1,38 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // +}; diff --git a/keyboards/kelowna/rgb64/keymaps/via/keymap.c b/keyboards/kelowna/rgb64/keymaps/via/keymap.c new file mode 100644 index 000000000000..01d0cba548d4 --- /dev/null +++ b/keyboards/kelowna/rgb64/keymaps/via/keymap.c @@ -0,0 +1,47 @@ + /* Copyright 2021 Weirdo + * + * 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 + + +// [Keymaps] -----------------------------------------------------------------// +enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = 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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + + [_FN] = LAYOUT(KC_GRV, 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_DEL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // + + [_FN1] = 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [_FN2] = 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/kelowna/rgb64/keymaps/via/rules.mk b/keyboards/kelowna/rgb64/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/kelowna/rgb64/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/kelowna/rgb64/readme.md b/keyboards/kelowna/rgb64/readme.md new file mode 100644 index 000000000000..641145ea84ff --- /dev/null +++ b/keyboards/kelowna/rgb64/readme.md @@ -0,0 +1,17 @@ +# kelownaRGB64 + +![kelownaRGB64](https://i.imgur.com/DzLy87M.png) + +A 60% keyboard based on STM32f303 + +* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Hardware Supported: kelownaRGB64 +* Hardware Availability: Not yet + +Make example for this keyboard (after setting up your build environment): + + make kelowna/rgb64:default + +The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. + +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). diff --git a/keyboards/kelowna/rgb64/rgb64.c b/keyboards/kelowna/rgb64/rgb64.c new file mode 100644 index 000000000000..dd576161612e --- /dev/null +++ b/keyboards/kelowna/rgb64/rgb64.c @@ -0,0 +1,16 @@ + /* Copyright 2021 Weirdo + * + * 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 "rgb64.h" diff --git a/keyboards/kelowna/rgb64/rgb64.h b/keyboards/kelowna/rgb64/rgb64.h new file mode 100644 index 000000000000..a854712228c3 --- /dev/null +++ b/keyboards/kelowna/rgb64/rgb64.h @@ -0,0 +1,31 @@ +/* +Copyright 2021 Weirdo +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 "quantum.h" + + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ + K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ + K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ +) { \ + {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E}, \ + {K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ + {K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E}, \ + {K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ + {K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO,KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E} \ +} diff --git a/keyboards/kelowna/rgb64/rules.mk b/keyboards/kelowna/rgb64/rules.mk new file mode 100644 index 000000000000..c8646b2f9133 --- /dev/null +++ b/keyboards/kelowna/rgb64/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 +BOARD = QMK_PROTON_C + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From eaf2441216a7d42e665337ddba5e1bf46010685d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 02:26:23 +0800 Subject: [PATCH 114/120] Update npminila.h --- keyboards/naiping/npminila/npminila.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/naiping/npminila/npminila.h b/keyboards/naiping/npminila/npminila.h index 423e45a9e772..3d0d927a0b66 100644 --- a/keyboards/naiping/npminila/npminila.h +++ b/keyboards/naiping/npminila/npminila.h @@ -27,4 +27,4 @@ along with this program. If not, see . {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D}, \ {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ {K40, K41, K42, K43, KC_NO, KC_NO, K46, KC_NO,K48, K49, K4A, K4B, K4C, K4D} \ - } \ No newline at end of file + } From 968579a6d9f7f11355f844b4a054e5110ab42959 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 11:23:31 +0800 Subject: [PATCH 115/120] Update readme.md --- keyboards/kelowna/rgb64/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kelowna/rgb64/readme.md b/keyboards/kelowna/rgb64/readme.md index 641145ea84ff..c854cbe6e10e 100644 --- a/keyboards/kelowna/rgb64/readme.md +++ b/keyboards/kelowna/rgb64/readme.md @@ -4,7 +4,7 @@ A 60% keyboard based on STM32f303 -* Keyboard Maintainer: [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361) +* Keyboard Maintainer: [Weirdo](https://github.com/Weirdo-F)(https://github.com/Weirdo-F) * Hardware Supported: kelownaRGB64 * Hardware Availability: Not yet From 2584b91cb2edc2754704af40ecd611357aab3b10 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 16:22:53 +0800 Subject: [PATCH 116/120] updata --- keyboards/kelowna/rgb64/chconf.h | 24 ------------------- keyboards/kelowna/rgb64/config.h | 9 ++++--- .../kelowna/rgb64/keymaps/default/keymap.c | 2 +- keyboards/kelowna/rgb64/readme.md | 2 -- 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 keyboards/kelowna/rgb64/chconf.h diff --git a/keyboards/kelowna/rgb64/chconf.h b/keyboards/kelowna/rgb64/chconf.h deleted file mode 100644 index 5884dd8b0bde..000000000000 --- a/keyboards/kelowna/rgb64/chconf.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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 3 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 - -// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303 -// so we need to change resolution and frequency to match. -#define CH_CFG_ST_RESOLUTION 16 -#define CH_CFG_ST_FREQUENCY 10000 - -#include_next diff --git a/keyboards/kelowna/rgb64/config.h b/keyboards/kelowna/rgb64/config.h index abbfd17d3dd6..906755d88abe 100644 --- a/keyboards/kelowna/rgb64/config.h +++ b/keyboards/kelowna/rgb64/config.h @@ -23,20 +23,19 @@ #define MANUFACTURER Weirdo #define PRODUCT kelownaRGB64 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 } +#define MATRIX_COL_PINS { A3, A4, A5, A7, B0, B1, B10, B15, A8, A9, A10, B7, B6, B5, B4} +#define MATRIX_ROW_PINS { B12, B13, B14, C11, A1} #define DIODE_DIRECTION ROW2COL #define DEBOUNCE 5 -#define RGB_DI_PIN B1 -#define RGBLED_NUM 80 +#define RGB_DI_PIN A6 +#define RGBLED_NUM 64 //#define RGBLIGHT_DISABLE_KEYCODES diff --git a/keyboards/kelowna/rgb64/keymaps/default/keymap.c b/keyboards/kelowna/rgb64/keymaps/default/keymap.c index 18a40b45b7c6..b350235b8327 100644 --- a/keyboards/kelowna/rgb64/keymaps/default/keymap.c +++ b/keyboards/kelowna/rgb64/keymaps/default/keymap.c @@ -35,4 +35,4 @@ 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // -}; +}; \ No newline at end of file diff --git a/keyboards/kelowna/rgb64/readme.md b/keyboards/kelowna/rgb64/readme.md index c854cbe6e10e..1c0ace179c78 100644 --- a/keyboards/kelowna/rgb64/readme.md +++ b/keyboards/kelowna/rgb64/readme.md @@ -12,6 +12,4 @@ Make example for this keyboard (after setting up your build environment): make kelowna/rgb64:default -The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written. - 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). From 24435f7617a9ecedb55c26b9c1517bd29e03a724 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 16:29:03 +0800 Subject: [PATCH 117/120] updata --- keyboards/kelowna/rgb64/info.json | 2 +- keyboards/kelowna/rgb64/keymaps/default/keymap.c | 4 ++-- keyboards/kelowna/rgb64/keymaps/via/keymap.c | 8 ++++---- keyboards/kelowna/rgb64/rgb64.h | 2 +- keyboards/kelowna/rgb64/rules.mk | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/keyboards/kelowna/rgb64/info.json b/keyboards/kelowna/rgb64/info.json index 10878518fbf8..178c6287b00d 100644 --- a/keyboards/kelowna/rgb64/info.json +++ b/keyboards/kelowna/rgb64/info.json @@ -5,7 +5,7 @@ "width": 15, "height": 5, "layouts": { - "LAYOUT": { + "LAYOUT_64_ansi": { "layout": [ {"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, diff --git a/keyboards/kelowna/rgb64/keymaps/default/keymap.c b/keyboards/kelowna/rgb64/keymaps/default/keymap.c index b350235b8327..1c5acf6bab05 100644 --- a/keyboards/kelowna/rgb64/keymaps/default/keymap.c +++ b/keyboards/kelowna/rgb64/keymaps/default/keymap.c @@ -23,14 +23,14 @@ enum layer_names { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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, + [_BASE] = LAYOUT_64_ansi(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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - [_FN] = LAYOUT(KC_GRV, 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_DEL, + [_FN] = LAYOUT_64_ansi(KC_GRV, 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_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/kelowna/rgb64/keymaps/via/keymap.c b/keyboards/kelowna/rgb64/keymaps/via/keymap.c index 01d0cba548d4..ea282ac08406 100644 --- a/keyboards/kelowna/rgb64/keymaps/via/keymap.c +++ b/keyboards/kelowna/rgb64/keymaps/via/keymap.c @@ -20,26 +20,26 @@ enum layer_names { _BASE, _FN ,_FN1 ,_FN2 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = 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, + [_BASE] = LAYOUT_64_ansi(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_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_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_COMMA, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL, KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - [_FN] = LAYOUT(KC_GRV, 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_DEL, + [_FN] = LAYOUT_64_ansi(KC_GRV, 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_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // - [_FN1] = 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, + [_FN1] = LAYOUT_64_ansi(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_FN2] = 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, + [_FN2] = LAYOUT_64_ansiT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/kelowna/rgb64/rgb64.h b/keyboards/kelowna/rgb64/rgb64.h index a854712228c3..c2277aa2085b 100644 --- a/keyboards/kelowna/rgb64/rgb64.h +++ b/keyboards/kelowna/rgb64/rgb64.h @@ -16,7 +16,7 @@ along with this program. If not, see . #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_64_ansi( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ diff --git a/keyboards/kelowna/rgb64/rules.mk b/keyboards/kelowna/rgb64/rules.mk index c8646b2f9133..b83577f12f3c 100644 --- a/keyboards/kelowna/rgb64/rules.mk +++ b/keyboards/kelowna/rgb64/rules.mk @@ -21,3 +21,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output +LAYOUTS = 64_ansi \ No newline at end of file From a655774fabcd715651ec3adf647ef21ae0f77a1d Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Tue, 24 Aug 2021 17:04:18 +0800 Subject: [PATCH 118/120] Update readme.md --- keyboards/kelowna/rgb64/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/kelowna/rgb64/readme.md b/keyboards/kelowna/rgb64/readme.md index 1c0ace179c78..9300b8281981 100644 --- a/keyboards/kelowna/rgb64/readme.md +++ b/keyboards/kelowna/rgb64/readme.md @@ -12,4 +12,6 @@ Make example for this keyboard (after setting up your build environment): make kelowna/rgb64:default +Use the SWD interface on the board to connect to the STlink (JLink) to directly burn firmware without entering the bootloader. + 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). From 0d2b4b4fec927fbd8a1482ec8d6fb4b31c4953ef Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Wed, 25 Aug 2021 07:50:48 +0800 Subject: [PATCH 119/120] Update keyboards/kelowna/rgb64/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/kelowna/rgb64/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kelowna/rgb64/rules.mk b/keyboards/kelowna/rgb64/rules.mk index b83577f12f3c..697fa296d229 100644 --- a/keyboards/kelowna/rgb64/rules.mk +++ b/keyboards/kelowna/rgb64/rules.mk @@ -21,4 +21,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -LAYOUTS = 64_ansi \ No newline at end of file +LAYOUTS = 64_ansi From c26db918fa9f4586957105959401df281b7b5f50 Mon Sep 17 00:00:00 2001 From: Weirdo <1248314361@qq.com> Date: Thu, 26 Aug 2021 09:13:15 +0800 Subject: [PATCH 120/120] Update keyboards/kelowna/rgb64/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/kelowna/rgb64/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kelowna/rgb64/keymaps/via/keymap.c b/keyboards/kelowna/rgb64/keymaps/via/keymap.c index ea282ac08406..db6b096b5476 100644 --- a/keyboards/kelowna/rgb64/keymaps/via/keymap.c +++ b/keyboards/kelowna/rgb64/keymaps/via/keymap.c @@ -39,7 +39,7 @@ 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_SPACE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_FN2] = LAYOUT_64_ansiT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + [_FN2] = LAYOUT_64_ansi(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,