Merge remote-tracking branch 'origin/master' into develop

keyboards/spiderisland/winry25tc/config.h

@@ -0,0 +1,41 @@
+/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER SpiderIsland
+#define PRODUCT      Winry 25tc
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 5
+
+#define MATRIX_ROW_PINS { E6, F0, D6, D2, B6 }
+#define MATRIX_COL_PINS { F5, C7, B7, B2, B4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D5
+#define RGBLED_NUM 40
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */

keyboards/spiderisland/winry25tc/info.json

@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "Winry 25tc",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (E6,F5)", "x":0, "y":0},
+                {"label":"K01 (E6,C7)", "x":1, "y":0},
+                {"label":"K02 (E6,B7)", "x":2, "y":0},
+                {"label":"K03 (E6,B2)", "x":3, "y":0},
+                {"label":"K04 (E6,B4)", "x":4, "y":0},
+                {"label":"K10 (F0,F5)", "x":0, "y":1},
+                {"label":"K11 (F0,C7)", "x":1, "y":1},
+                {"label":"K12 (F0,B7)", "x":2, "y":1},
+                {"label":"K13 (F0,B2)", "x":3, "y":1},
+                {"label":"K14 (F0,B4)", "x":4, "y":1},
+                {"label":"K20 (D6,F5)", "x":0, "y":2},
+                {"label":"K21 (D6,C7)", "x":1, "y":2},
+                {"label":"K22 (D6,B7)", "x":2, "y":2},
+                {"label":"K23 (D6,B2)", "x":3, "y":2},
+                {"label":"K24 (D6,B4)", "x":4, "y":2},
+                {"label":"K30 (D2,F5)", "x":0, "y":3},
+                {"label":"K31 (D2,C7)", "x":1, "y":3},
+                {"label":"K32 (D2,B7)", "x":2, "y":3},
+                {"label":"K33 (D2,B2)", "x":3, "y":3},
+                {"label":"K34 (D2,B4)", "x":4, "y":3},
+                {"label":"K40 (B6,F5)", "x":0, "y":4},
+                {"label":"K41 (B6,C7)", "x":1, "y":4},
+                {"label":"K42 (B6,B7)", "x":2, "y":4},
+                {"label":"K43 (B6,B2)", "x":3, "y":4},
+                {"label":"K44 (B6,B4)", "x":4, "y":4}
+            ]
+        }
+    }
+}

keyboards/spiderisland/winry25tc/keymaps/default/keymap.c

@@ -0,0 +1,39 @@
+/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum my_layers {
+    _FIRST_LAYER,
+    _SECOND_LAYER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_FIRST_LAYER] = LAYOUT(
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS, RGB_TOG,
+        KC_P4,   KC_P5,   KC_P6,   KC_PENT, RGB_MOD,
+        KC_P1,   KC_P2,   KC_P3,   KC_UP,   MO(_SECOND_LAYER),
+        KC_P0,   KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_SECOND_LAYER] = LAYOUT(
+        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_MUTE, KC_VOLD, KC_VOLU,
+        KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, _______,
+        KC_RSFT, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+    ),
+};

keyboards/spiderisland/winry25tc/readme.md

@@ -0,0 +1,14 @@
+# SpiderIsland 25-key RGB Backlight Hot Swap Mechanical Keyboard
+
+Keyboard from [SpiderIsland on AliExpress](https://a.aliexpress.com/_dVJsSpR). Seller provides [kbfirmware](https://kbfirmware.com/) JSON config that was converted to QMK.
+
+* Keyboard Maintainer: [andrzejressel](https://github.com/andrzejressel)
+* Hardware Availability: https://aliexpress.com/item/1005001523579896.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make spiderisland/winry25tc:default
+
+**Reset Key**: Located on the other side of the keyboard.
+
+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).

keyboards/spiderisland/winry25tc/rules.mk

@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
+KEY_LOCK_ENABLE = yes     # Enable KC_LOCK support

keyboards/spiderisland/winry25tc/winry25tc.c

@@ -0,0 +1,17 @@
+/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "winry25tc.h"

keyboards/spiderisland/winry25tc/winry25tc.h

@@ -0,0 +1,33 @@
+/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04,   \
+    K10, K11, K12, K13, K14,   \
+    K20, K21, K22, K23, K24,   \
+    K30, K31, K32, K33, K34,   \
+    K40, K41, K42, K43, K44    \
+) { \
+    { K00,   K01,   K02,   K03,   K04   }, \
+    { K10,   K11,   K12,   K13,   K14   }, \
+    { K20,   K21,   K22,   K23,   K24   }, \
+    { K30,   K31,   K32,   K33,   K34   }, \
+    { K40,   K41,   K42,   K43,   K44   }, \
+}