From a1a88b8ac778b2b22be127eb2409ae7b338f7e7e Mon Sep 17 00:00:00 2001 From: worldspawn00 Date: Fri, 7 Feb 2020 21:34:37 -0600 Subject: [PATCH] [Keyboard] adding keyboard: gothic70 (#7982) * gothic70 * Update keyboards/wsk/gothic70/readme.md Co-Authored-By: Drashna Jaelre * Update keyboards/wsk/gothic70/readme.md Co-Authored-By: Drashna Jaelre * Update keyboards/wsk/gothic70/readme.md Co-Authored-By: Drashna Jaelre * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Drashna Jaelre * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/rules.mk Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/config.h Co-Authored-By: ridingqwerty * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/config.h Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Update keyboards/wsk/gothic70/keymaps/default/keymap.c Co-Authored-By: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> * Committed review suggestions * Small indicator LED layer function tweak * Fixing layout for configurator Co-authored-by: Drashna Jaelre Co-authored-by: ridingqwerty Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> --- keyboards/wsk/gothic70/config.h | 46 +++++++++++++ keyboards/wsk/gothic70/gothic70.c | 1 + keyboards/wsk/gothic70/gothic70.h | 41 +++++++++++ keyboards/wsk/gothic70/info.json | 12 ++++ .../wsk/gothic70/keymaps/default/keymap.c | 69 +++++++++++++++++++ .../wsk/gothic70/keymaps/default/rules.mk | 1 + keyboards/wsk/gothic70/readme.md | 15 ++++ keyboards/wsk/gothic70/rules.mk | 32 +++++++++ 8 files changed, 217 insertions(+) create mode 100644 keyboards/wsk/gothic70/config.h create mode 100644 keyboards/wsk/gothic70/gothic70.c create mode 100644 keyboards/wsk/gothic70/gothic70.h create mode 100644 keyboards/wsk/gothic70/info.json create mode 100644 keyboards/wsk/gothic70/keymaps/default/keymap.c create mode 100644 keyboards/wsk/gothic70/keymaps/default/rules.mk create mode 100644 keyboards/wsk/gothic70/readme.md create mode 100644 keyboards/wsk/gothic70/rules.mk diff --git a/keyboards/wsk/gothic70/config.h b/keyboards/wsk/gothic70/config.h new file mode 100644 index 000000000..98e70e615 --- /dev/null +++ b/keyboards/wsk/gothic70/config.h @@ -0,0 +1,46 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x63CC +#define DEVICE_VER 0x0001 +#define MANUFACTURER Worldspawn00 +#define PRODUCT Gothic70 +#define DESCRIPTION Expanded Ergo Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* key matrix pins */ + +#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } +#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define RGB_DI_PIN F4 +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 7 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif + +/* 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 + diff --git a/keyboards/wsk/gothic70/gothic70.c b/keyboards/wsk/gothic70/gothic70.c new file mode 100644 index 000000000..dde147117 --- /dev/null +++ b/keyboards/wsk/gothic70/gothic70.c @@ -0,0 +1 @@ +#include "gothic70.h" diff --git a/keyboards/wsk/gothic70/gothic70.h b/keyboards/wsk/gothic70/gothic70.h new file mode 100644 index 000000000..532eca880 --- /dev/null +++ b/keyboards/wsk/gothic70/gothic70.h @@ -0,0 +1,41 @@ +/* Copyright 2019 Fate + * + * 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" + +/* This a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ + k30, k31, k32, k33, k34, k35, k46, k36, k37, k38, k39, k3A, k3B, k3D, \ + k40, k41, k42, k44, k45, k47, k49, k4A, 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, KC_NO, k2E }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E }, \ + { k40, k41, k42, KC_NO, k44, k45, k46, k47, KC_NO, k49, k4A, KC_NO, k4C, k4D, k4E } \ +} diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json new file mode 100644 index 000000000..230f0ecdd --- /dev/null +++ b/keyboards/wsk/gothic70/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Gothic70", + "url": "https://qmk.fm/keyboards", + "maintainer": "worldspawn00", + "width": 18, + "height": 5.25, + "layouts": { + "LAYOUT": { + "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] + } + } +} diff --git a/keyboards/wsk/gothic70/keymaps/default/keymap.c b/keyboards/wsk/gothic70/keymaps/default/keymap.c new file mode 100644 index 000000000..5e73ec419 --- /dev/null +++ b/keyboards/wsk/gothic70/keymaps/default/keymap.c @@ -0,0 +1,69 @@ + +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN, + _MEDIA }; + +// Tap Dance Declarations +enum { + TD_SCAPS = 0 +}; + +#define SCAPS_LG TD(TD_SCAPS) + +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_GRV, KC_BSPC, KC_PSCR, \ + 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_INS, \ + KC_LCTL, 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_DEL, \ + SCAPS_LG, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(_MEDIA), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_BSPC, KC_RALT, KC_RCTL, 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_PAUS, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END \ + ), + + [_MEDIA] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT \ + ) +}; + +void matrix_init_user(void) { + // set CapsLock LED to output and off (active low) + setPinOutput(F5); + writePinHigh(F5); + // set NumLock LED to output and off (active low) + setPinOutput(F6); + writePinHigh(F6); + // set ScrollLock LED to output and off (active low) + setPinOutput(F7); + writePinHigh(F7); +} + +// write to above indicators in a binary fashion based on current layer +layer_state_t layer_state_set_user(layer_state_t state) +{ + writePin(F5, (state & 0x1)); + writePin(F6, (state & 0x2)); + writePin(F7, (state & 0x4)); + return state; +} + + +// Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + // Tap once for + [TD_SCAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), +}; diff --git a/keyboards/wsk/gothic70/keymaps/default/rules.mk b/keyboards/wsk/gothic70/keymaps/default/rules.mk new file mode 100644 index 000000000..e5ddcae8d --- /dev/null +++ b/keyboards/wsk/gothic70/keymaps/default/rules.mk @@ -0,0 +1 @@ +TAP_DANCE_ENABLE = yes diff --git a/keyboards/wsk/gothic70/readme.md b/keyboards/wsk/gothic70/readme.md new file mode 100644 index 000000000..42c5f9197 --- /dev/null +++ b/keyboards/wsk/gothic70/readme.md @@ -0,0 +1,15 @@ +# Gothic70 + +![Gothic70](https://i.imgur.com/v84tpIQ.png) + +An Alice style board with arrowkeys, based on the Fate Arisu layout. + +* Keyboard Maintainer: [Worldspawn00](https://github.com/Worldspawn00) +* Hardware Supported: Gothic70 PCB +* Hardware Availability: https://geekhack.org/index.php?topic=102180.0 + +Make example for this keyboard (after setting up your build environment): + + make wsk/gothic70: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) diff --git a/keyboards/wsk/gothic70/rules.mk b/keyboards/wsk/gothic70/rules.mk new file mode 100644 index 000000000..6a1221aa1 --- /dev/null +++ b/keyboards/wsk/gothic70/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# atmega32a bootloadHID +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # 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 = 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 on B7 by default +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +HD44780_ENABLE = no # Enable support for HD44780 based LCDs