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

This commit is contained in:
QMK Bot 2022-07-02 12:41:39 +00:00
commit fd883890af
9 changed files with 330 additions and 0 deletions

View File

@ -0,0 +1,66 @@
/* Copyright 2021 Steven Phillips (Spooknik)
*
* 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 0xBBEB
#define PRODUCT_ID 0xD4C4
#define DEVICE_VER 0x0001
#define MANUFACTURER AlfredsLab
#define PRODUCT Swift65
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
/*
* 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)
*
*/
#define MATRIX_ROW_PINS { B1, B2, B3, D6, D4 }
#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1 }
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 22
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
#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
#endif

View File

@ -0,0 +1,19 @@
/* Copyright 2021 Steven Phillips (spooknik)
*
* 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 "hotswap.h"

View File

@ -0,0 +1,35 @@
/* Copyright 2022 Steven Phillips (spooknik)
*
* 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 XXX KC_NO
#define LAYOUT_7u_space( \
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, K2D, K2E, \
K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
K40, K41, K42, K46, 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, XXX, K2D, K2E }, \
{ XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E }, \
}

View File

@ -0,0 +1,81 @@
{
"keyboard_name": "hotswap",
"url": "https://swiftcables.net/",
"maintainer": "Spooknik",
"layout_aliases": {
"LAYOUT": "LAYOUT_7u_space",
"LAYOUT_all": "LAYOUT_7u_space"
},
"layouts": {
"LAYOUT_7u_space": {
"layout": [
{ "label": "K00 (B1,F7)", "x": 0, "y": 0 },
{ "label": "K01 (B1,F6)", "x": 1, "y": 0 },
{ "label": "K02 (B1,F5)", "x": 2, "y": 0 },
{ "label": "K03 (B1,F4)", "x": 3, "y": 0 },
{ "label": "K04 (B1,F1)", "x": 4, "y": 0 },
{ "label": "K05 (B1,F0)", "x": 5, "y": 0 },
{ "label": "K06 (B1,C7)", "x": 6, "y": 0 },
{ "label": "K07 (B1,C6)", "x": 7, "y": 0 },
{ "label": "K08 (B1,B6)", "x": 8, "y": 0 },
{ "label": "K09 (B1,B5)", "x": 9, "y": 0 },
{ "label": "K0A (B1,B4)", "x": 10, "y": 0 },
{ "label": "K0B (B1,D7)", "x": 11, "y": 0 },
{ "label": "K0C (B1,D5)", "x": 12, "y": 0 },
{ "label": "K0D (B1,D3)", "x": 13, "y": 0, "w": 2 },
{ "label": "K0E (B1,D1)", "x": 15.25, "y": 0 },
{ "label": "K10 (B2,F7)", "x": 0, "y": 1, "w": 1.5 },
{ "label": "K11 (B2,F6)", "x": 1.5, "y": 1 },
{ "label": "K12 (B2,F5)", "x": 2.5, "y": 1 },
{ "label": "K13 (B2,F4)", "x": 3.5, "y": 1 },
{ "label": "K14 (B2,F1)", "x": 4.5, "y": 1 },
{ "label": "K15 (B2,F0)", "x": 5.5, "y": 1 },
{ "label": "K16 (B2,C7)", "x": 6.5, "y": 1 },
{ "label": "K17 (B2,C6)", "x": 7.5, "y": 1 },
{ "label": "K18 (B2,B6)", "x": 8.5, "y": 1 },
{ "label": "K19 (B2,B5)", "x": 9.5, "y": 1 },
{ "label": "K1A (B2,B4)", "x": 10.5, "y": 1 },
{ "label": "K1B (B2,D7)", "x": 11.5, "y": 1 },
{ "label": "K1C (B2,D5)", "x": 12.5, "y": 1 },
{ "label": "K1D (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "K1E (B2,D1)", "x": 15.25, "y": 1 },
{ "label": "K20 (B3,F7)", "x": 0, "y": 2, "w": 1.75 },
{ "label": "K21 (B3,F6)", "x": 1.75, "y": 2 },
{ "label": "K22 (B3,F5)", "x": 2.75, "y": 2 },
{ "label": "K23 (B3,F4)", "x": 3.75, "y": 2 },
{ "label": "K24 (B3,F1)", "x": 4.75, "y": 2 },
{ "label": "K25 (B3,F0)", "x": 5.75, "y": 2 },
{ "label": "K26 (B3,C7)", "x": 6.75, "y": 2 },
{ "label": "K27 (B3,C6)", "x": 7.75, "y": 2 },
{ "label": "K28 (B3,B6)", "x": 8.75, "y": 2 },
{ "label": "K29 (B3,B5)", "x": 9.75, "y": 2 },
{ "label": "K2A (B3,B4)", "x": 10.75, "y": 2 },
{ "label": "K2B (B3,D7)", "x": 11.75, "y": 2 },
{ "label": "K2D (B3,D3)", "x": 12.75, "y": 2, "w": 2.25 },
{ "label": "K2E (B3,D1)", "x": 15.25, "y": 2 },
{ "label": "K31 (D6,F6)", "x": 0, "y": 3, "w": 2.25 },
{ "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
{ "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
{ "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
{ "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
{ "label": "K36 (D6,C7)", "x": 6.25, "y": 3 },
{ "label": "K37 (D6,C6)", "x": 7.25, "y": 3 },
{ "label": "K38 (D6,B6)", "x": 8.25, "y": 3 },
{ "label": "K39 (D6,B5)", "x": 9.25, "y": 3 },
{ "label": "K3A (D6,B4)", "x": 10.25, "y": 3 },
{ "label": "K3B (D6,D7)", "x": 11.25, "y": 3 },
{ "label": "K3C (D6,D5)", "x": 12.25, "y": 3, "w": 1.75 },
{ "label": "K3D (D6,D3)", "x": 14, "y": 3 },
{ "label": "K40 (D4,F7)", "x": 0, "y": 4, "w": 1.25 },
{ "label": "K41 (D4,F6)", "x": 1.25, "y": 4, "w": 1.25 },
{ "label": "K42 (D4,F5)", "x": 2.5, "y": 4, "w": 1.25 },
{ "label": "K46 (D4,C7)", "x": 3.75, "y": 4, "w": 7.25 },
{ "label": "K4B (D4,D7)", "x": 11, "y": 4, "w": 1.5 },
{ "label": "K4C (D4,D5)", "x": 13, "y": 4 },
{ "label": "K4D (D4,D3)", "x": 14, "y": 4 },
{ "label": "K4E (D4,D1)", "x": 15, "y": 4 }
]
}
}
}

View File

@ -0,0 +1,37 @@
/* Copyright 2022 Steven Phillips (spooknik)
*
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_7u_space(
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_HOME,
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_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_7u_space(
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_PGDN,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
_______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
),
};

View File

@ -0,0 +1,53 @@
/* Copyright 2021 Steven Phillips (spooknik)
*
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_7u_space(
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_HOME,
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_ENT, KC_PGUP,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, _______, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_7u_space(
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_PGDN,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
_______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
),
[2] = LAYOUT_7u_space(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[3] = LAYOUT_7u_space(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};

View File

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

View File

@ -0,0 +1,19 @@
# Swift65
A 65% Keyboard from Swiftcables
* Keyboard Maintainer: [Steven Phillips (spooknik)](https://github.com/keyboardcollective)
* Hardware Supported: Swift65 Hotswap
* Hardware Availability: Soom from Swiftcables
To enter bootloader for flashing firmware, press layer change key (MO(1)) and Right Shift simultaneously.
Make example for this keyboard (after setting up your build environment):
make alfredslab/swift65/hotswap:default
Flashing example for this keyboard:
make alfredslab/swift65/hotswap:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

View File

@ -0,0 +1,19 @@
# 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