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

This commit is contained in:
QMK Bot 2021-10-11 01:22:19 +00:00
commit 6c720a6538
9 changed files with 597 additions and 0 deletions

View File

@ -0,0 +1,78 @@
/*
Copyright 2020 <me@homedrop.org>
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 0x5453 // TS - ToastyStoemp
#define PRODUCT_ID 0x0050 // TS60
#define DEVICE_VER 0x0001 // Version 1
#define MANUFACTURER ToastyStoemp
#define PRODUCT TS60
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_COLS 8
/*
* Keyboard Matrix Assignments
*
* Change this to how you wired your keyboard
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
// Checked with Eagle Schematic
#define MATRIX_ROW_PINS { D2, D3, D6, D4, F6, F7, F5, F0, F4, F1 }
#define MATRIX_COL_PINS { D1, D5, C7, C6, B6, B5, B4, D7}
#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
/* Define RGB Underglow */
#define RGB_DI_PIN D0
#define RGBLED_NUM 16
#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_SLEEP
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
/* Define Per Key Backlight */
#define BACKLIGHT_PIN B7
#define BACKLIGHT_LEVELS 6
#define BACKLIGHT_DEFAULT_LEVEL 6
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

View File

@ -0,0 +1,273 @@
{
"keyboard_name": "TS60",
"url": "https://www.vwolf.be/",
"maintainer": "ToastyStoemp",
"layouts": {
"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}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"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":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
},
"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
}
]
}
}
}

View File

@ -0,0 +1,39 @@
/*
Copyright 2020 <me@homedrop.org>
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 layers {
_LAYER0,
_LAYER1,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER0] = LAYOUT_60_ansi(
KC_GESC, 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_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL
),
[_LAYER1] = LAYOUT_60_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,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,58 @@
/*
Copyright 2020 <me@homedrop.org>
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 layers {
_LAYER0,
_LAYER1,
_LAYER2,
_LAYER3,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER0] = LAYOUT_60_ansi(
KC_GESC, 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_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL
),
[_LAYER1] = LAYOUT_60_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,
_______, RGB_TOG, KC_UP, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[_LAYER2] = LAYOUT_60_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[_LAYER3] = LAYOUT_60_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -0,0 +1,25 @@
# Wolf - TS 60
The following is the QMK Firmware for the TS60 PCB.
The PCB features:
* QMK & VIA compatibility
* RGB underglow
* Per-Key LEDs
---
* Keyboard Maintainer: [ToastyStoemp](https://github.com/ToastyStoemp)
* Hardware Supported: TF60 ANSI SOLDER
Make example for this keyboard (after setting up your build environment):
make wolf/ts60: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).
## Bootloader Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the Enter key on layer 1 which is mapped to `RESET`

View File

@ -0,0 +1,27 @@
# MCU name
MCU = atmega32u4
# Processor frequency
F_CPU = 8000000
# 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
# 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 = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
KEYBOARD_LOCK_ENABLE = yes
LAYOUTS = 60_ansi

View File

@ -0,0 +1,14 @@
/*
Copyright 2020 <contact@vwolf.be>
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 "ts60.h"

View File

@ -0,0 +1,82 @@
/*
Copyright 2020 <contact@vwolf.be>
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"
/* LAYOUT
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e
*
* 10 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e
*
* 20 22 23 24 25 26 27 28 29 2a 2b 2c 2d
*
* 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e
*
* 40 41 42 44 46 48 4a 4b 4c 4d 4e
*
*/
#define LAYOUT( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, 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, K2d, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, \
K40, K41, K42, K44, K46, K48, K4a, K4b, K4c, K4d, K4e \
) { \
{ K00, K02, K04, K06, K08, K0a, K0c, K0d }, \
{ K01, K03, K05, K07, K09, K0b, KC_NO, K0e }, \
{ K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
{ KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
{ K20, K22, K24, K26, K28, K2a, K2c, K2d }, \
{ KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2e }, \
{ K30, K32, K34, K36, K38, K3a, K3c, K3d }, \
{ K31, K33, K35, K37, K39, K3b, KC_NO, K3e }, \
{ K40, K42, K44, K46, K48, K4a, K4c, K4d }, \
{ K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
}
/* LAYOUT_60_ansi
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0e
*
* 10 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e
*
* 20 22 23 24 25 26 27 28 29 2a 2b 2c 2d
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3d
*
* 40 41 42 46 4a 4b 4d 4e
*
*/
#define LAYOUT_60_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, K2d, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3d, \
K40, K41, K42, K46, K4a, K4b, K4d, K4e \
) { \
{ K00, K02, K04, K06, K08, K0a, K0c, K0e }, \
{ K01, K03, K05, K07, K09, K0b, KC_NO, KC_NO }, \
{ K10, K12, K14, K16, K18, K1a, K1c, K1d }, \
{ KC_NO, K13, K15, K17, K19, K1b, KC_NO, K1e }, \
{ K20, K22, K24, K26, K28, K2a, K2c, KC_NO }, \
{ KC_NO, K23, K25, K27, K29, K2b, KC_NO, K2d }, \
{ K30, K32, K34, K36, K38, K3a, KC_NO, K3d }, \
{ KC_NO, K33, K35, K37, K39, K3b, KC_NO, KC_NO }, \
{ K40, K42, KC_NO, K46, KC_NO, K4a, KC_NO, K4d }, \
{ K41, KC_NO, KC_NO, KC_NO, KC_NO, K4b, KC_NO, K4e } \
}