From 860ff6ea30598f28fdeedfa1cc3e22aded61701f Mon Sep 17 00:00:00 2001 From: dztech Date: Wed, 1 Mar 2023 08:17:31 +0800 Subject: [PATCH 1/8] add tiger80 iso layout support --- keyboards/kbdfans/tiger80/config.h | 58 ---- keyboards/kbdfans/tiger80/info.json | 317 ++++++++++++------ .../kbdfans/tiger80/keymaps/iso/keymap.c | 37 ++ keyboards/kbdfans/tiger80/rules.mk | 21 +- keyboards/kbdfans/tiger80/tiger80.c | 17 - keyboards/kbdfans/tiger80/tiger80.h | 35 -- 6 files changed, 255 insertions(+), 230 deletions(-) delete mode 100644 keyboards/kbdfans/tiger80/config.h create mode 100644 keyboards/kbdfans/tiger80/keymaps/iso/keymap.c delete mode 100644 keyboards/kbdfans/tiger80/tiger80.c delete mode 100644 keyboards/kbdfans/tiger80/tiger80.h diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h deleted file mode 100644 index 207f627f7eb6..000000000000 --- a/keyboards/kbdfans/tiger80/config.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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" - -#define MATRIX_ROWS 6 -#define MATRIX_COLS 16 -#define MATRIX_ROW_PINS { B0, E6, B1, B4, D1, D2 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D3, D5, D4, D6, D7, B5, B6, C6, E2, D0 } - -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - -#define LED_CAPS_LOCK_PIN C7 -#define LED_SCROLL_LOCK_PIN B2 -#define LED_PIN_ON_STATE 1 - -#define RGB_DI_PIN B3 -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) -#define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLED_NUM 20 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_SLEEP -#endif - -#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 42ed680b28ff..ad0e30353910 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -1,112 +1,229 @@ { - "keyboard_name": "Tiger80", "manufacturer": "KBDFans", - "url": "", - "maintainer": "kbdfans", + "keyboard_name": "Tiger80", + "maintainer": "kbdfans", + "bootloader": "atmel-dfu", + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "indicators": { + "caps_lock": "C7", + "on_state": 1, + "scroll_lock": "B2" + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B5", "B6", "C6", "E2", "D0"], + "rows": ["B0", "E6", "B1", "B4", "D1", "D2"] + }, + "processor": "atmega32u4", + "rgblight": { + "brightness_steps": 10, + "hue_steps": 10, + "led_count": 20, + "pin": "B3", + "saturation_steps": 10, + "sleep": true + }, + "url": "", "usb": { - "vid": "0x4B42", + "device_version": "0.0.1", "pid": "0x0011", - "device_version": "0.0.1" - }, - "layout_aliases": { - "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan" + "vid": "0x4B42" }, "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"F13", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - - {"label":"`~", "x":0, "y":1.5}, - {"label":"1!", "x":1, "y":1.5}, - {"label":"2@", "x":2, "y":1.5}, - {"label":"3#", "x":3, "y":1.5}, - {"label":"4$", "x":4, "y":1.5}, - {"label":"5%", "x":5, "y":1.5}, - {"label":"6^", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8*", "x":8, "y":1.5}, - {"label":"9(", "x":9, "y":1.5}, - {"label":"0)", "x":10, "y":1.5}, - {"label":"-_", "x":11, "y":1.5}, - {"label":"=+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[{", "x":11.5, "y":2.5}, - {"label":"]}", "x":12.5, "y":2.5}, - {"label":"\\|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";:", "x":10.75, "y":3.5}, - {"label":"'\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",<", "x":9.25, "y":4.5}, - {"label":".>", "x":10.25, "y":4.5}, - {"label":"/?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, - {"label":"Win", "x":1.5, "y":5.5}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, - {"label":"Space", "x":4, "y":5.5, "w":7}, - {"label":"Alt", "x":11, "y":5.5, "w":1.5}, - {"label":"Win", "x":12.5, "y":5.5}, - {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, + { "label": "F13", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [3, 15], "x": 17.25, "y": 0 }, + { "label": "`~", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "1!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "2@", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "3#", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "4$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "5%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "6^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "7", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "8*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "9(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": "0)", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "-_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "=+", "matrix": [1, 12], "x": 12, "y": 1.5 }, + { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [3, 14], "x": 17.25, "y": 1.5 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "label": "\\|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [4, 14], "x": 17.25, "y": 2.5 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "'\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.5 }, + { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, + { "label": "Shift", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5 }, + { "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5 }, + { "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.5 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5 }, + { "label": "Space", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.5 }, + { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.5 }, + { "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.5 }, + { "label": "Ctrl", "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 }, + { "label": "\u2190", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "\u2193", "matrix": [5, 14], "x": 16.25, "y": 5.5 }, + { "label": "\u2192", "matrix": [5, 15], "x": 17.25, "y": 5.5 } + ] + }, + "LAYOUT_tkl_f13_iso_tsangan": { + "layout": [ + { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "K04", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "K05", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "K06", "matrix": [0, 6], "x": 6, "y": 0 }, + { "label": "K07", "matrix": [0, 7], "x": 7, "y": 0 }, + { "label": "K08", "matrix": [0, 8], "x": 8, "y": 0 }, + { "label": "K09", "matrix": [0, 9], "x": 9, "y": 0 }, + { "label": "K0A", "matrix": [0, 10], "x": 10, "y": 0 }, + { "label": "K0B", "matrix": [0, 11], "x": 11, "y": 0 }, + { "label": "K0C", "matrix": [0, 12], "x": 12, "y": 0 }, + { "label": "K0D", "matrix": [0, 13], "x": 13, "y": 0 }, + { "label": "K0E", "matrix": [0, 14], "x": 14, "y": 0 }, + { "label": "K0F", "matrix": [0, 15], "x": 15, "y": 0 }, + { "label": "K3F", "matrix": [3, 15], "x": 16, "y": 0 }, + { "label": "K10", "matrix": [1, 0], "x": 17, "y": 0 }, + { "label": "K11", "matrix": [1, 1], "x": 18, "y": 0 }, + { "label": "K12", "matrix": [1, 2], "x": 19, "y": 0 }, + { "label": "K13", "matrix": [1, 3], "x": 20, "y": 0 }, + { "label": "K14", "matrix": [1, 4], "x": 21, "y": 0 }, + { "label": "K15", "matrix": [1, 5], "x": 22, "y": 0 }, + { "label": "K16", "matrix": [1, 6], "x": 23, "y": 0 }, + { "label": "K17", "matrix": [1, 7], "x": 24, "y": 0 }, + { "label": "K18", "matrix": [1, 8], "x": 25, "y": 0 }, + { "label": "K19", "matrix": [1, 9], "x": 26, "y": 0 }, + { "label": "K1A", "matrix": [1, 10], "x": 27, "y": 0 }, + { "label": "K1B", "matrix": [1, 11], "x": 28, "y": 0 }, + { "label": "K1C", "matrix": [1, 12], "x": 29, "y": 0 }, + { "label": "K1D", "matrix": [1, 13], "x": 30, "y": 0 }, + { "label": "K1E", "matrix": [1, 14], "x": 31, "y": 0 }, + { "label": "K1F", "matrix": [1, 15], "x": 32, "y": 0 }, + { "label": "K3E", "matrix": [3, 14], "x": 33, "y": 0 }, + { "label": "K20", "matrix": [2, 0], "x": 34, "y": 0 }, + { "label": "K21", "matrix": [2, 1], "x": 35, "y": 0 }, + { "label": "K22", "matrix": [2, 2], "x": 36, "y": 0 }, + { "label": "K23", "matrix": [2, 3], "x": 37, "y": 0 }, + { "label": "K24", "matrix": [2, 4], "x": 38, "y": 0 }, + { "label": "K25", "matrix": [2, 5], "x": 39, "y": 0 }, + { "label": "K26", "matrix": [2, 6], "x": 40, "y": 0 }, + { "label": "K27", "matrix": [2, 7], "x": 41, "y": 0 }, + { "label": "K28", "matrix": [2, 8], "x": 42, "y": 0 }, + { "label": "K29", "matrix": [2, 9], "x": 43, "y": 0 }, + { "label": "K2A", "matrix": [2, 10], "x": 44, "y": 0 }, + { "label": "K2B", "matrix": [2, 11], "x": 45, "y": 0 }, + { "label": "K2C", "matrix": [2, 12], "x": 46, "y": 0 }, + { "label": "K2D", "matrix": [2, 13], "x": 47, "y": 0 }, + { "label": "K2E", "matrix": [2, 14], "x": 48, "y": 0 }, + { "label": "K2F", "matrix": [2, 15], "x": 49, "y": 0 }, + { "label": "K4E", "matrix": [4, 14], "x": 50, "y": 0 }, + { "label": "K30", "matrix": [3, 0], "x": 51, "y": 0 }, + { "label": "K31", "matrix": [3, 1], "x": 52, "y": 0 }, + { "label": "K32", "matrix": [3, 2], "x": 53, "y": 0 }, + { "label": "K33", "matrix": [3, 3], "x": 54, "y": 0 }, + { "label": "K34", "matrix": [3, 4], "x": 55, "y": 0 }, + { "label": "K35", "matrix": [3, 5], "x": 56, "y": 0 }, + { "label": "K36", "matrix": [3, 6], "x": 57, "y": 0 }, + { "label": "K37", "matrix": [3, 7], "x": 58, "y": 0 }, + { "label": "K38", "matrix": [3, 8], "x": 59, "y": 0 }, + { "label": "K39", "matrix": [3, 9], "x": 60, "y": 0 }, + { "label": "K3A", "matrix": [3, 10], "x": 61, "y": 0 }, + { "label": "K3B", "matrix": [3, 11], "x": 62, "y": 0 }, + { "label": "K3D", "matrix": [3, 13], "x": 63, "y": 0 }, + { "label": "K40", "matrix": [4, 0], "x": 64, "y": 0 }, + { "label": "K41", "matrix": [4, 1], "x": 65, "y": 0 }, + { "label": "K42", "matrix": [4, 2], "x": 66, "y": 0 }, + { "label": "K43", "matrix": [4, 3], "x": 67, "y": 0 }, + { "label": "K44", "matrix": [4, 4], "x": 68, "y": 0 }, + { "label": "K45", "matrix": [4, 5], "x": 69, "y": 0 }, + { "label": "K46", "matrix": [4, 6], "x": 70, "y": 0 }, + { "label": "K47", "matrix": [4, 7], "x": 71, "y": 0 }, + { "label": "K48", "matrix": [4, 8], "x": 72, "y": 0 }, + { "label": "K49", "matrix": [4, 9], "x": 73, "y": 0 }, + { "label": "K4A", "matrix": [4, 10], "x": 74, "y": 0 }, + { "label": "K4B", "matrix": [4, 11], "x": 75, "y": 0 }, + { "label": "K4D", "matrix": [4, 13], "x": 76, "y": 0 }, + { "label": "K4F", "matrix": [4, 15], "x": 77, "y": 0 }, + { "label": "K50", "matrix": [5, 0], "x": 78, "y": 0 }, + { "label": "K51", "matrix": [5, 1], "x": 79, "y": 0 }, + { "label": "K52", "matrix": [5, 2], "x": 80, "y": 0 }, + { "label": "K56", "matrix": [5, 6], "x": 81, "y": 0 }, + { "label": "K5A", "matrix": [5, 10], "x": 82, "y": 0 }, + { "label": "K5B", "matrix": [5, 11], "x": 83, "y": 0 }, + { "label": "K5C", "matrix": [5, 12], "x": 84, "y": 0 }, + { "label": "K5D", "matrix": [5, 13], "x": 85, "y": 0 }, + { "label": "K5E", "matrix": [5, 14], "x": 86, "y": 0 }, + { "label": "K5F", "matrix": [5, 15], "x": 87, "y": 0 } ] } } } + diff --git a/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c b/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c new file mode 100644 index 000000000000..91041bfb073a --- /dev/null +++ b/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2023 DZTECH + * + * 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 + +enum layers { + _LAYER0, + _LAYER1, + _LAYER2, + _LAYER3, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_LAYER0] = LAYOUT_tkl_f13_iso_tsangan( + KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + +}; diff --git a/keyboards/kbdfans/tiger80/rules.mk b/keyboards/kbdfans/tiger80/rules.mk index 1c5fecc0ed15..6e7633bfe015 100644 --- a/keyboards/kbdfans/tiger80/rules.mk +++ b/keyboards/kbdfans/tiger80/rules.mk @@ -1,20 +1 @@ -# 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 = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LAYOUTS = tkl_f13_ansi_tsangan +# This file intentionally left blank diff --git a/keyboards/kbdfans/tiger80/tiger80.c b/keyboards/kbdfans/tiger80/tiger80.c deleted file mode 100644 index 8348a142a210..000000000000 --- a/keyboards/kbdfans/tiger80/tiger80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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 "tiger80.h" diff --git a/keyboards/kbdfans/tiger80/tiger80.h b/keyboards/kbdfans/tiger80/tiger80.h deleted file mode 100644 index 376759a55d93..000000000000 --- a/keyboards/kbdfans/tiger80/tiger80.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 DZTECH - * - * 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_tkl_f13_ansi_tsangan( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K3F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K3E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K4E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F } \ -} From 55e710ed5fbfd5402c5d3529f1d6639406fc0a8c Mon Sep 17 00:00:00 2001 From: dztech Date: Wed, 1 Mar 2023 08:23:31 +0800 Subject: [PATCH 2/8] Create config.h --- keyboards/kbdfans/tiger80/config.h | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 keyboards/kbdfans/tiger80/config.h diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h new file mode 100644 index 000000000000..31bb7cfc1daf --- /dev/null +++ b/keyboards/kbdfans/tiger80/config.h @@ -0,0 +1,32 @@ +/* Copyright 2022 DZTECH + * + * 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 . + */ + +#ifdef RGB_DI_PIN +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) +#define RGBLIGHT_DEFAULT_SPD 15 +#endif + +#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 From 1c71046b80ef90f6ae4f9b86eee4b1993271b95c Mon Sep 17 00:00:00 2001 From: dztech Date: Wed, 1 Mar 2023 11:26:29 +0800 Subject: [PATCH 3/8] Update keyboards/kbdfans/tiger80/config.h Co-authored-by: Joel Challis --- keyboards/kbdfans/tiger80/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h index 31bb7cfc1daf..10b447342254 100644 --- a/keyboards/kbdfans/tiger80/config.h +++ b/keyboards/kbdfans/tiger80/config.h @@ -13,6 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + + #pragma once #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING From b609fb8c46ac76ecd49dc296092c2d92a8687d68 Mon Sep 17 00:00:00 2001 From: dztech Date: Wed, 1 Mar 2023 16:11:52 +0800 Subject: [PATCH 4/8] Update info.json --- keyboards/kbdfans/tiger80/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 374edae64a66..5e7b0fc91cac 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -38,6 +38,7 @@ "usb": { "device_version": "0.0.1", "pid": "0x0011", + "vid": "0x4B42" }, "community_layouts": ["tkl_f13_ansi_tsangan"], "layouts": { From 4bac716f01cfe696b6b8247e361b2dbabb86c953 Mon Sep 17 00:00:00 2001 From: dztech Date: Thu, 2 Mar 2023 07:13:36 +0800 Subject: [PATCH 5/8] Update keyboards/kbdfans/tiger80/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kbdfans/tiger80/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h index 10b447342254..6b4667513ca2 100644 --- a/keyboards/kbdfans/tiger80/config.h +++ b/keyboards/kbdfans/tiger80/config.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ - #pragma once +#pragma once #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING From 40fb578bcc50962009cb19c78fa782333b8ee275 Mon Sep 17 00:00:00 2001 From: dztech Date: Thu, 2 Mar 2023 07:13:44 +0800 Subject: [PATCH 6/8] Update keyboards/kbdfans/tiger80/keymaps/iso/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kbdfans/tiger80/keymaps/iso/keymap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c b/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c index 91041bfb073a..6e6dd4c48b32 100644 --- a/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c +++ b/keyboards/kbdfans/tiger80/keymaps/iso/keymap.c @@ -16,16 +16,9 @@ #include QMK_KEYBOARD_H -enum layers { - _LAYER0, - _LAYER1, - _LAYER2, - _LAYER3, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_LAYER0] = LAYOUT_tkl_f13_iso_tsangan( + [0] = LAYOUT_tkl_f13_iso_tsangan( KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, From e5a86c9ca9e153304cfa5586a329149a45222f8b Mon Sep 17 00:00:00 2001 From: dztech Date: Thu, 2 Mar 2023 07:13:52 +0800 Subject: [PATCH 7/8] Update keyboards/kbdfans/tiger80/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kbdfans/tiger80/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index 5e7b0fc91cac..e12e1ffe5319 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -3,7 +3,6 @@ "keyboard_name": "Tiger80", "maintainer": "kbdfans", "bootloader": "atmel-dfu", - "debounce": 5, "diode_direction": "COL2ROW", "features": { "audio": false, From 64529ef1cdd22b52a4ab111f459ca1343ab98f15 Mon Sep 17 00:00:00 2001 From: dztech Date: Thu, 2 Mar 2023 07:13:59 +0800 Subject: [PATCH 8/8] Update keyboards/kbdfans/tiger80/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/kbdfans/tiger80/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json index e12e1ffe5319..9741c68cb2e3 100644 --- a/keyboards/kbdfans/tiger80/info.json +++ b/keyboards/kbdfans/tiger80/info.json @@ -39,7 +39,7 @@ "pid": "0x0011", "vid": "0x4B42" }, - "community_layouts": ["tkl_f13_ansi_tsangan"], + "community_layouts": ["tkl_f13_ansi_tsangan", "tkl_f13_iso_tsangan"], "layouts": { "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [