Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates #42

Merged
merged 42 commits into from
Dec 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6e97a4c
Railroad fix (#10935)
nopunin10did Nov 24, 2020
66b5c5e
Add M4cs Keymap for dekunukem/duckyPad (#10900)
M4cs Nov 24, 2020
3fadfb5
add dcompact layout for minivan (#10951)
loksonarius Nov 24, 2020
0a9476b
[Keyboard] Added BKS65 Bolsa Supply PCB (#10933)
mrnoisytiger Nov 25, 2020
24a7416
[Keyboard] Add minim keyboard (#10970)
matthewdias Nov 25, 2020
86b0acb
[Keyboard] add bt66tech60 handwired (#10867)
bt66 Nov 25, 2020
50611bd
[Keyboard] Fixes fox idb_60 keyboard (#10827)
itspngu Nov 25, 2020
8897ab9
[Keymap] Add personal massdrop/ctrl:r-pufky keymap. (#10887)
r-pufky Nov 25, 2020
1bf657b
[Keymap] Updates - Unikorn/Curiosity/Prime_E/Ferris/Corne (#10925)
sidcarter Nov 25, 2020
c78ef39
Boardrun Classic & Bizarre layouts (replaces PR 10934) (#10990)
nopunin10did Nov 25, 2020
d82e002
Added VIA keymap to punk75 keyboard (#10927)
dsanchezseco Nov 25, 2020
e8a65ba
[Keyboard] Added Phantom Keyboard by Lucid (#10988)
mrnoisytiger Nov 25, 2020
35b3290
[Keyboard] Add Viktus Styrka (#10982)
jrfhoutx Nov 25, 2020
feae8f2
VIA support for Lunakey Mini keyboard. (#11014)
yoichiro Nov 25, 2020
f98e983
Added pcurt854 keymap to Preonic keyboard (#10911)
pcurt854 Nov 25, 2020
9c2cfe5
[Keyboard] Add wilba.tech WT65-H1 (#10880)
wilba Nov 25, 2020
d9613e6
[Keyboard] CapsUnlocked CU65 (#11006)
Nov 25, 2020
10d9e8e
Add VIA Support for Dimple Plus (#11026)
jackytrabbit Nov 26, 2020
1c0e8a6
Add keyboard PistachioMacroPad (#10980)
7-rate Nov 26, 2020
3afe0ea
ST7565 tidyup (#10907)
fauxpark Nov 26, 2020
c21d5a0
Refactor qmk_install.sh (#10681)
fauxpark Nov 26, 2020
c41c8ff
Add rainkeeb keyboard (#10875)
rainkeebs Nov 27, 2020
16d55b1
[Docs] Add VBUS hack for teensys (#10986)
drashna Nov 28, 2020
15385d4
rainkeeb info.json fix (#11048)
rainkeebs Nov 28, 2020
c66df16
2020 November 28 Breaking Changes Update (#11053)
noroadsleft Nov 28, 2020
81164c1
Cozykeys Speedo Configurator fix (#11058)
noroadsleft Nov 29, 2020
05ac139
Updated README name (#11033)
mrnoisytiger Nov 29, 2020
67976da
map reset key to the correct location (#11037)
abperiasamy Nov 29, 2020
5909c24
KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039)
mechmerlin Nov 29, 2020
ce91dd4
[Keyboard] Add edc40 keyboard (#11021)
ojthetiny Nov 30, 2020
485e452
Fix int wrapping for timer_expired macros and use MAX defines for con…
XScorpion2 Nov 30, 2020
8724a70
Reduce travis load by replacing an exclusive grep with an inclusive g…
skullydazed Nov 30, 2020
02fb0de
Added VIA keymap to YMDK bface keyboard (#11002)
Desp-Key Nov 30, 2020
cc08e30
nix-shell: add milc dependency (#11086)
andresilva Nov 30, 2020
c7dab4b
Adding bootleg and waffling60 rev b (#10846)
Dec 1, 2020
1124e51
Moved default LALT and LWIN for BKS65 (#11087)
mrnoisytiger Dec 1, 2020
3a77ef5
fix handwired/swiftrax/bebol keymaps (#11072)
swiftrax Dec 1, 2020
eaa8c18
fix handwired/swiftrax/beegboy keymaps (#11071)
swiftrax Dec 1, 2020
33802ab
Add support for Drop + Ryloo Studio "Hello" M0110. (#11050)
newtonapple Dec 1, 2020
41347cd
[Keyboard] Fix compiler issues for handwired/6macro (#11098)
drashna Dec 1, 2020
3aae530
Fix Valor default underglow (#11093)
Xelus22 Dec 1, 2020
bcab02b
[Keyboard] Fix issue with Kyria and RGB Light (#11070)
Dec 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Keymap] Add personal massdrop/ctrl:r-pufky keymap. (qmk#10887)
* Add personal massdrop/ctrl:r-pufky keymap.

* Added personal keymap per: https://docs.qmk.fm/#/contributing?id=keymaps

* Update massdrop/ctrl:r-pufky per review.

* Trimmed config.h
* Remove rules.mk
* Add copyright header to keymap.c
* Rename README.md to readme.md

* Remove files/lines per review.

* Removed keyboard-layout-editor.com json layouts.
* Removed keymap_config line.
r-pufky authored Nov 25, 2020

Verified

This commit was signed with the committer’s verified signature.
SimonBrandner Šimon Brandner
commit 8897ab9b111b107cfcb08478ba0b4176432ea5b6
27 changes: 27 additions & 0 deletions keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright 2015 Jun Wako <[email protected]>
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"

#define FORCE_NKRO

#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_MATRIX_STARTUP_VAL 100
#define RGB_BACKLIGHT_COLOR_1 RGB_BLUE
#define RGB_BACKLIGHT_COLOR_2 RGB_BLUE
138 changes: 138 additions & 0 deletions keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
/* Copyright 2020 Robert Pufky <[email protected]>
*
* 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 ctrl_keycodes {
U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active
U_T_AGCR, // USB Toggle Automatic GCR control
DBG_TOG, // DEBUG Toggle On / Off
DBG_MTRX, // DEBUG Toggle Matrix Prints
DBG_KBD, // DEBUG Toggle Keyboard Prints
DBG_MOU, // DEBUG Toggle Mouse Prints
MD_BOOT, // Restart into bootloader after hold timeout
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_SLCK, KC_PAUS,
KC_GRV, 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_INS, KC_HOME, KC_PGUP,
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_END, KC_PGDN,
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_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_NLCK, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_F24, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
KC_EJCT, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MUTE, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU,
_______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
KC_CAPS, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_BRIU,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_BRID, KC_MFFD
),
};

// Runs just one time when the keyboard initializes.
void matrix_init_user(void) {
// https://old.reddit.com/r/MechanicalKeyboards/comments/by8zv9/editing_rgb_backlighting_with_qmk/
// https://docs.qmk.fm/#/feature_rgblight?id=colors
rgblight_sethsv(HSV_BLUE);
// Disable underglow by default
rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
rgb_matrix_set_color_all(0, 0, 0);
};

// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
};

#define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)
#define MODS_CTRL (get_mods() & MOD_MASK_CTRL)
#define MODS_ALT (get_mods() & MOD_MASK_ALT)

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static uint32_t key_timer;

switch (keycode) {
case U_T_AUTO:
if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
}
return false;
case U_T_AGCR:
if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
}
return false;
case DBG_TOG:
if (record->event.pressed) {
TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
}
return false;
case DBG_MTRX:
if (record->event.pressed) {
TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
}
return false;
case DBG_KBD:
if (record->event.pressed) {
TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
}
return false;
case DBG_MOU:
if (record->event.pressed) {
TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
}
return false;
case MD_BOOT:
if (record->event.pressed) {
key_timer = timer_read32();
} else {
if (timer_elapsed32(key_timer) >= 500) {
reset_keyboard();
}
}
return false;
case RGB_TOG:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {
case LED_FLAG_ALL: {
rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
rgb_matrix_set_color_all(0, 0, 0);
}
break;
case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
rgb_matrix_set_color_all(0, 0, 0);
}
break;
case LED_FLAG_UNDERGLOW: {
rgb_matrix_set_flags(LED_FLAG_NONE);
rgb_matrix_disable_noeeprom();
}
break;
default: {
rgb_matrix_set_flags(LED_FLAG_ALL);
rgb_matrix_enable_noeeprom();
}
break;
}
}
return false;
default:
return true; //Process all other keycodes normally
}
}
33 changes: 33 additions & 0 deletions keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Massdrop Ctrl r-pufky

Gaming QOL improvments; enabling useful keys for left hand & in-game overlay usage.

## Layers

### Typing Layer

![Typing Layer](https://i.imgur.com/qEBaupV.png)

Layer optimized to enable useful keys for gaming without changing typing state, as well as specific
in-game overlay keys.

* Left Ctrl: Easier control key usage without always setting capslock.
* Num Lock: Unique non visible character key for additional left-hand input options in game.
* Fn: Enable layer 1, temporal.
* F24: Unique non-visible F24 key; no windows function. Map to in-game overlays.

### Function Layer

![Function Layer](https://i.imgur.com/UhcS0hV.png)

* Purple: Media keys. Note CD Eject on Escape, and OSX Prev/Next on Arrows.
* Blue: Keyboard adminstration. Toggle NKRO (N Key Rollover) and enable bootloader.
* Orange: RGB Controls.
* Red: Danger can break things! USB autodetect (always on) and USB GCR Auto control.
* Capslock: Now requires the use of the function key.
* F13-F14: Extended function keys.
* Bright+/-: Monitor Brightness.

## GCR
GCR is the Global Current Register. Holds the value for current delivered to the LEDs, it's 165
default and has range 0-255. This should be auto managed.