~ruther/qmk_firmware

995c9dff49c884bc6261ea7a9880e9e259778d7a — QMK Bot 4 years ago 69604e1 + 088c71b
Merge remote-tracking branch 'origin/master' into develop
A keyboards/keyprez/corgi/config.h => keyboards/keyprez/corgi/config.h +63 -0
@@ 0,0 1,63 @@
/*
Copyright 2021 Christian Sandven

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 Christian Sandven
#define PRODUCT      corgi

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 7

/*
 * Keyboard Matrix Assignments
 *
 */
#define MATRIX_ROW_PINS { F5, F7, B2, B6, F4, F6, B1, B3 }
#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D2, B7 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/*
 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
 */
#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6

#define ENCODERS_PAD_A { D3 }
#define ENCODERS_PAD_B { D4 }
#define ENCODER_RESOLUTION 4

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 0

/* 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

/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION

A keyboards/keyprez/corgi/corgi.c => keyboards/keyprez/corgi/corgi.c +17 -0
@@ 0,0 1,17 @@
/* Copyright 2021 Christian Sandven
 *
 * 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 "corgi.h"

A keyboards/keyprez/corgi/corgi.h => keyboards/keyprez/corgi/corgi.h +46 -0
@@ 0,0 1,46 @@
/* Copyright 2021 Christian Sandven
 *
 * 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"

/* This is 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, \
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
    r1t \
) \
{ \
    { k00, k01, k02, k03, k04, k05, KC_NO }, \
    { k10, k11, k12, k13, k14, k15, KC_NO }, \
    { k20, k21, k22, k23, k24, k25, KC_NO }, \
    { k30, k31, k32, k33, k34, k35, r1t   }, \
    { k06, k07, k08, k09, k0a, k0b, KC_NO }, \
    { k16, k17, k18, k19, k1a, k1b, KC_NO }, \
    { k26, k27, k28, k29, k2a, k2b, KC_NO }, \
    { k36, k37, k38, k39, k3a, k3b, KC_NO } \
}


A keyboards/keyprez/corgi/info.json => keyboards/keyprez/corgi/info.json +61 -0
@@ 0,0 1,61 @@
{
    "keyboard_name": "corgi",
    "url": "",
    "maintainer": "Christian Sandven",
    "width": 12,
    "height": 4,
    "layouts": {
        "LAYOUT": {
            "layout": [
                { "w": 1, "x": 0, "y": 0 },
                { "w": 1, "x": 1, "y": 0 },
                { "w": 1, "x": 2, "y": 0 },
                { "w": 1, "x": 3, "y": 0 },
                { "w": 1, "x": 4, "y": 0 },
                { "w": 1, "x": 5, "y": 0 },
                { "w": 1, "x": 6, "y": 0 },
                { "w": 1, "x": 7, "y": 0 },
                { "w": 1, "x": 8, "y": 0 },
                { "w": 1, "x": 9, "y": 0 },
                { "w": 1, "x": 10, "y": 0 },
                { "w": 1, "x": 11, "y": 0 },
                { "w": 1, "x": 0, "y": 1 },
                { "w": 1, "x": 1, "y": 1 },
                { "w": 1, "x": 2, "y": 1 },
                { "w": 1, "x": 3, "y": 1 },
                { "w": 1, "x": 4, "y": 1 },
                { "w": 1, "x": 5, "y": 1 },
                { "w": 1, "x": 6, "y": 1 },
                { "w": 1, "x": 7, "y": 1 },
                { "w": 1, "x": 8, "y": 1 },
                { "w": 1, "x": 9, "y": 1 },
                { "w": 1, "x": 10, "y": 1 },
                { "w": 1, "x": 11, "y": 1 },
                { "w": 1, "x": 0, "y": 2 },
                { "w": 1, "x": 1, "y": 2 },
                { "w": 1, "x": 2, "y": 2 },
                { "w": 1, "x": 3, "y": 2 },
                { "w": 1, "x": 4, "y": 2 },
                { "w": 1, "x": 5, "y": 2 },
                { "w": 1, "x": 6, "y": 2 },
                { "w": 1, "x": 7, "y": 2 },
                { "w": 1, "x": 8, "y": 2 },
                { "w": 1, "x": 9, "y": 2 },
                { "w": 1, "x": 10, "y": 2 },
                { "w": 1, "x": 11, "y": 2 },
                { "w": 1, "x": 0, "y": 3 },
                { "w": 1, "x": 1, "y": 3 },
                { "w": 1, "x": 2, "y": 3 },
                { "w": 1, "x": 3, "y": 3 },
                { "w": 1, "x": 4, "y": 3 },
                { "w": 1, "x": 5, "y": 3 },
                { "w": 1, "x": 6, "y": 3 },
                { "w": 1, "x": 7, "y": 3 },
                { "w": 1, "x": 8, "y": 3 },
                { "w": 1, "x": 9, "y": 3 },
                { "w": 1, "x": 10, "y": 3 },
                { "w": 1, "x": 11, "y": 3 }
            ]
        }
    }
}

A keyboards/keyprez/corgi/keymaps/default/keymap.c => keyboards/keyprez/corgi/keymaps/default/keymap.c +112 -0
@@ 0,0 1,112 @@
/* Copyright 2021 Christian Sandven
 *
 * 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

// Defines names for use in layer keycodes and the keymap
enum layer_names {
    _QWERTY,
    _BASE,
    _FN,
    _LOWER,
    _RAISE,
    _CMD,
};

#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)
#define CMD   MO(_CMD)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Qwerty
     * ,-----------------------------------------------------------------------------------.
     * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
     * `-----------------------------------------------------------------------------------'
    */
    [_QWERTY] = LAYOUT(
        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
        KC_LCTL, KC_LGUI, KC_LALT, CMD,     LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
        KC_MUTE
    ),

    /* Lower
     * ,-----------------------------------------------------------------------------------.
     * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
     * `-----------------------------------------------------------------------------------'
    */
    [_RAISE] = LAYOUT(
        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
        _______, _______, _______, _______, KC_RALT, _______, _______, KC_RALT,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY,
        _______
    ),

    /* Raise
     * ,-----------------------------------------------------------------------------------.
     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
     * `-----------------------------------------------------------------------------------'
    */
    [_LOWER] = LAYOUT(
        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
        _______, _______, _______, _______, KC_RALT, _______, _______, KC_RALT, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
        _______
    ),

    /* CMD
     * ,-----------------------------------------------------------------------------------.
     * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   1  |   2  |   3  |  -   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   4  |   5  |   6  |  +   |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |   7  |   8  |   9  |      |
     * |------+------+------+------+------+------+------+------+------+------+------+------|
     * |      |      |      |      |      |             |      |      |   0  |   .  |      |
     * `-----------------------------------------------------------------------------------'
    */
    [_CMD] = LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
        _______, _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
        _______, _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, _______,
        _______
    ),
};

void encoder_update_user(uint8_t index, bool clockwise) {
    tap_code(clockwise ? KC_VOLU : KC_VOLD);
}

A keyboards/keyprez/corgi/keymaps/default/readme.md => keyboards/keyprez/corgi/keymaps/default/readme.md +1 -0
@@ 0,0 1,1 @@
# The default keymap for corgi

A keyboards/keyprez/corgi/readme.md => keyboards/keyprez/corgi/readme.md +22 -0
@@ 0,0 1,22 @@
# corgi

![corgi](https://i.imgur.com/XctcpVrh.jpeg)

Corgi is a semi modular 4 x 12 ortho keyboard. The unique thing with Corgi is that you can attach a macropad name "Flea" to use as a num/macro-pad.

* Keyboard Maintainer: [Christian Sandven](https://github.com/csandven)
* Hardware Supported: Pro Micro or Elite C is required
* Hardware Availability: TBA

Make example for this keyboard (after setting up your build environment):

    make keyprez/corgi:default

Flashing example for this keyboard:

    make keyprez/corgi:default:flash
    

After running the flash command, you need to short reset and ground on your microcontroller to flash it.

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).

A keyboards/keyprez/corgi/rules.mk => keyboards/keyprez/corgi/rules.mk +23 -0
@@ 0,0 1,23 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
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 = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no       # Enable Bluetooth
AUDIO_ENABLE = no           # Audio output
ENCODER_ENABLE = yes