From ee4ce6f070f334d7d169f957291a7d0a2d1a9064 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:10:21 +0100 Subject: [PATCH 01/14] Corgi keyboard --- keyboards/keyprez/corgi/config.h | 63 +++++++++ keyboards/keyprez/corgi/corgi.c | 17 +++ keyboards/keyprez/corgi/corgi.h | 46 ++++++ keyboards/keyprez/corgi/info.json | 19 +++ .../keyprez/corgi/keymaps/default/keymap.c | 132 ++++++++++++++++++ .../keyprez/corgi/keymaps/default/readme.md | 1 + keyboards/keyprez/corgi/readme.md | 19 +++ keyboards/keyprez/corgi/rules.mk | 23 +++ 8 files changed, 320 insertions(+) create mode 100644 keyboards/keyprez/corgi/config.h create mode 100644 keyboards/keyprez/corgi/corgi.c create mode 100644 keyboards/keyprez/corgi/corgi.h create mode 100644 keyboards/keyprez/corgi/info.json create mode 100644 keyboards/keyprez/corgi/keymaps/default/keymap.c create mode 100644 keyboards/keyprez/corgi/keymaps/default/readme.md create mode 100644 keyboards/keyprez/corgi/readme.md create mode 100644 keyboards/keyprez/corgi/rules.mk diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h new file mode 100644 index 000000000000..7a304ab70783 --- /dev/null +++ b/keyboards/keyprez/corgi/config.h @@ -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 . +*/ + +#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 diff --git a/keyboards/keyprez/corgi/corgi.c b/keyboards/keyprez/corgi/corgi.c new file mode 100644 index 000000000000..ba64134de99e --- /dev/null +++ b/keyboards/keyprez/corgi/corgi.c @@ -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 . + */ + +#include "corgi.h" diff --git a/keyboards/keyprez/corgi/corgi.h b/keyboards/keyprez/corgi/corgi.h new file mode 100644 index 000000000000..d697e436de34 --- /dev/null +++ b/keyboards/keyprez/corgi/corgi.h @@ -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 . + */ + +#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 } \ +} + diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json new file mode 100644 index 000000000000..693f640d9936 --- /dev/null +++ b/keyboards/keyprez/corgi/info.json @@ -0,0 +1,19 @@ +{ + "keyboard_name": "corgi", + "url": "", + "maintainer": "Christian Sandven", + "width": 3, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + ] + } + } +} diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c new file mode 100644 index 000000000000..9d5e903e08a4 --- /dev/null +++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c @@ -0,0 +1,132 @@ +/* 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 . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _QWERTY, + _BASE, + _FN, + _LOWER, + _RAISE, + _CMD, +}; + +// Defines the keycodes used by our macros in process_record_user +enum custom_keycodes { + QWERTY = SAFE_RANGE, + QMKURL +}; + +#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, _______, + _______ + ), +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QMKURL: + if (record->event.pressed) { + // when keycode QMKURL is pressed + SEND_STRING("https://qmk.fm/\n"); + } else { + // when keycode QMKURL is released + } + break; + } + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + tap_code(clockwise ? KC__VOLUP : KC__VOLDOWN); +} diff --git a/keyboards/keyprez/corgi/keymaps/default/readme.md b/keyboards/keyprez/corgi/keymaps/default/readme.md new file mode 100644 index 000000000000..2d86599374a9 --- /dev/null +++ b/keyboards/keyprez/corgi/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for corgi diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md new file mode 100644 index 000000000000..9883cad2292b --- /dev/null +++ b/keyboards/keyprez/corgi/readme.md @@ -0,0 +1,19 @@ +# corgi + +![corgi](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Christian Sandven](https://github.com/yourusername) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make corgi:default + +Flashing example for this keyboard: + + make corgi: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). diff --git a/keyboards/keyprez/corgi/rules.mk b/keyboards/keyprez/corgi/rules.mk new file mode 100644 index 000000000000..fb12719ce81e --- /dev/null +++ b/keyboards/keyprez/corgi/rules.mk @@ -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 From 71a072d1b008bc438ce85dd25689355b8fad2b9a Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:16:35 +0100 Subject: [PATCH 02/14] Fix documentation --- keyboards/keyprez/corgi/readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md index 9883cad2292b..ca929b98f3bb 100644 --- a/keyboards/keyprez/corgi/readme.md +++ b/keyboards/keyprez/corgi/readme.md @@ -2,18 +2,18 @@ ![corgi](imgur.com image replace me!) -*A short description of the keyboard/project* +*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/yourusername) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* 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 corgi:default + make keyprez/corgi:default Flashing example for this keyboard: - make corgi:default:flash + make keyprez/corgi: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). From e68166683c146e744c84a52379139c34d94dbfe4 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:17:15 +0100 Subject: [PATCH 03/14] Remove default process_record_user function --- keyboards/keyprez/corgi/keymaps/default/keymap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c index 9d5e903e08a4..f10969f0791d 100644 --- a/keyboards/keyprez/corgi/keymaps/default/keymap.c +++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c @@ -113,20 +113,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QMKURL: - if (record->event.pressed) { - // when keycode QMKURL is pressed - SEND_STRING("https://qmk.fm/\n"); - } else { - // when keycode QMKURL is released - } - break; - } - return true; -} - void encoder_update_user(uint8_t index, bool clockwise) { tap_code(clockwise ? KC__VOLUP : KC__VOLDOWN); } From e9bce6d67cbaad91006c6ae75bc66162efe47419 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:23:14 +0100 Subject: [PATCH 04/14] Remove list of alternate bootloaders --- keyboards/keebwerk/nano_slider/rules.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk index 3e1d8fe6292b..9e349cda5b85 100644 --- a/keyboards/keebwerk/nano_slider/rules.mk +++ b/keyboards/keebwerk/nano_slider/rules.mk @@ -1,14 +1,6 @@ # 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 -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From ebd45449b9196462c3f9b0ac7f505cad676010b2 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:24:54 +0100 Subject: [PATCH 05/14] Remove QMKURL --- keyboards/keyprez/corgi/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c index f10969f0791d..13d5ab2f1679 100644 --- a/keyboards/keyprez/corgi/keymaps/default/keymap.c +++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c @@ -27,8 +27,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QWERTY = SAFE_RANGE, - QMKURL + QWERTY = SAFE_RANGE }; #define LOWER MO(_LOWER) From d425aa9cd743ccdf63f9df3744b0b80c26f222d2 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 20 Mar 2021 20:30:44 +0100 Subject: [PATCH 06/14] Do not edit wrong rules mk --- keyboards/keebwerk/nano_slider/rules.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/keebwerk/nano_slider/rules.mk b/keyboards/keebwerk/nano_slider/rules.mk index 9e349cda5b85..3e1d8fe6292b 100644 --- a/keyboards/keebwerk/nano_slider/rules.mk +++ b/keyboards/keebwerk/nano_slider/rules.mk @@ -1,6 +1,14 @@ # 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 +# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From 20caca69888fb0d2a4e65fe3461849bb19988398 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Sat, 20 Mar 2021 20:38:34 +0100 Subject: [PATCH 07/14] Add image of the board in readme --- keyboards/keyprez/corgi/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md index ca929b98f3bb..14b64f16e4bd 100644 --- a/keyboards/keyprez/corgi/readme.md +++ b/keyboards/keyprez/corgi/readme.md @@ -1,6 +1,6 @@ # corgi -![corgi](imgur.com image replace me!) +![corgi](https://i.imgur.com/XctcpVr.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.* From b1401d827a378c7a3dcd22872e9e5cdf1869aed9 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 1 May 2021 13:01:49 +0200 Subject: [PATCH 08/14] Remove unused custom keycodes --- keyboards/keyprez/corgi/keymaps/default/keymap.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c index 13d5ab2f1679..8f50a8628fd5 100644 --- a/keyboards/keyprez/corgi/keymaps/default/keymap.c +++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c @@ -25,11 +25,6 @@ enum layer_names { _CMD, }; -// Defines the keycodes used by our macros in process_record_user -enum custom_keycodes { - QWERTY = SAFE_RANGE -}; - #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) #define CMD MO(_CMD) From ec8764cf336ccbb54fe98f336cbb370099feeb43 Mon Sep 17 00:00:00 2001 From: csandven Date: Sat, 1 May 2021 13:03:34 +0200 Subject: [PATCH 09/14] Update info.json layout --- keyboards/keyprez/corgi/info.json | 59 ++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json index 693f640d9936..ac282f498ece 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/info.json @@ -2,17 +2,60 @@ "keyboard_name": "corgi", "url": "", "maintainer": "Christian Sandven", - "width": 3, - "height": 2, + "width": 12, + "height": 4, "layouts": { "LAYOUT": { + "key_count": 48, "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + { "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 } ] } } From d233d13bcc485135bfb519103813eeb132251791 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Mon, 17 May 2021 11:10:06 +0200 Subject: [PATCH 10/14] Add flashing info to readme --- keyboards/keyprez/corgi/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md index 14b64f16e4bd..f1af18e337f2 100644 --- a/keyboards/keyprez/corgi/readme.md +++ b/keyboards/keyprez/corgi/readme.md @@ -15,5 +15,11 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: make keyprez/corgi:default:flash + +Flashing for Pro micro: + + make keyprez/corgi:default:avrdude + +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). From 4e5e9ed0c146e2e0c511bc3504fd093355963111 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Mon, 17 May 2021 20:43:38 +0200 Subject: [PATCH 11/14] Update keyboards/keyprez/corgi/readme.md Co-authored-by: Drashna Jaelre --- keyboards/keyprez/corgi/readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md index f1af18e337f2..a91c05a915d0 100644 --- a/keyboards/keyprez/corgi/readme.md +++ b/keyboards/keyprez/corgi/readme.md @@ -16,9 +16,6 @@ Flashing example for this keyboard: make keyprez/corgi:default:flash -Flashing for Pro micro: - - make keyprez/corgi:default:avrdude After running the flash command, you need to short reset and ground on your microcontroller to flash it. From d07914431ff85ca60e9c8306ce0762a8e8fe6a48 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Sun, 23 May 2021 08:53:38 +0200 Subject: [PATCH 12/14] Update keyboards/keyprez/corgi/info.json Co-authored-by: Ryan --- keyboards/keyprez/corgi/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json index ac282f498ece..4a40c9c70303 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/info.json @@ -6,7 +6,6 @@ "height": 4, "layouts": { "LAYOUT": { - "key_count": 48, "layout": [ { "w": 1, "x": 0, "y": 0 }, { "w": 1, "x": 1, "y": 0 }, From b1294a4e63a205e378ede5fb05bc95c0483aa696 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Sun, 23 May 2021 08:54:26 +0200 Subject: [PATCH 13/14] Update keyboards/keyprez/corgi/readme.md Co-authored-by: Ryan --- keyboards/keyprez/corgi/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keyprez/corgi/readme.md b/keyboards/keyprez/corgi/readme.md index a91c05a915d0..73387964af5a 100644 --- a/keyboards/keyprez/corgi/readme.md +++ b/keyboards/keyprez/corgi/readme.md @@ -1,12 +1,12 @@ # corgi -![corgi](https://i.imgur.com/XctcpVr.jpeg) +![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.* +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* +* Hardware Supported: Pro Micro or Elite C is required +* Hardware Availability: TBA Make example for this keyboard (after setting up your build environment): From ca41fc754a3eb5ac4b1ddcd4838970fb6e4e2d91 Mon Sep 17 00:00:00 2001 From: Christian Sandven Date: Sun, 23 May 2021 11:19:11 +0200 Subject: [PATCH 14/14] Update keyboards/keyprez/corgi/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/keyprez/corgi/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyprez/corgi/keymaps/default/keymap.c b/keyboards/keyprez/corgi/keymaps/default/keymap.c index 8f50a8628fd5..01f56320b084 100644 --- a/keyboards/keyprez/corgi/keymaps/default/keymap.c +++ b/keyboards/keyprez/corgi/keymaps/default/keymap.c @@ -108,5 +108,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; void encoder_update_user(uint8_t index, bool clockwise) { - tap_code(clockwise ? KC__VOLUP : KC__VOLDOWN); + tap_code(clockwise ? KC_VOLU : KC_VOLD); }