mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

[Keyboard] Fixing drag-and-drop (#5728) 

* Fixing drag-and-drop

* Forgot to rtfm and do a full build. Added colemak

* What
pull/5741/head
Jeremy Bernhardt 5 years ago
committed by Drashna Jaelre
parent
e77e46f4bf
commit
507805cd10
7 changed files with 230 additions and 3 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +174
    -0
      keyboards/gergo/keymaps/colemak/keymap.c
  2. +16
    -0
      keyboards/gergo/keymaps/colemak/readme.md
  3. +36
    -0
      keyboards/gergo/keymaps/colemak/rules.mk
  4. +2
    -1
      keyboards/gergo/keymaps/default/rules.mk
  5. +1
    -0
      keyboards/gergo/keymaps/germ/rules.mk
  6. +1
    -1
      keyboards/gergo/matrix.c
  7. +0
    -1
      keyboards/gergo/rules.mk

+ 174
- 0
keyboards/gergo/keymaps/colemak/keymap.c View File

@ -0,0 +1,174 @@
/* Good on you for modifying your layout! if you don't have
* time to read the QMK docs, a list of keycodes can be found at
*
* https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
*
* There's also a template for adding new layers at the bottom of this file!
*/
#include QMK_KEYBOARD_H
#define IGNORE_MOD_TAP_INTERRUPT
#define BASE 0 // default layer
#define SYMB 1 // symbols
#define NUMB 2 // numbers/motion
enum custom_keycodes {
M1_STRING = SAFE_RANGE,
M2_URL,
};
// Blank template at the bottom
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
* ,-------------------------------------------. ,-------------------------------------------.
* | TAB | Q | W | F | P | G | | J | L | U | Y | ; : | | \ |
* |--------+------+------+------+------+------|------. .------|------+------+------+------+------+--------|
* | Ctrl | A | R | S | T | D |O(CMD)| |O(CTL)| H | N | E | I | O | ' " |
* |--------+------+------+------+------+------|------| |------|------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B |O(ALT)| | | K | M | , < | . > | / ? | RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* .----------. .-------. .------. .--------.
* | alt/del | | BKSP | | Space| |cmd/del |
* '----------' '-------' `------. '--------'
* ,-------. ,-------.
* | MMB | | : |
* ,------|-------| |-------|------.
* | NUMB | SYMB | | SYMB | NUMB |
* | Esc | F13 | | F14 | Enter|
* | | | | | |
* `--------------' `--------------'
*/
[BASE] = LAYOUT_gergo(
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y,KC_SCLN, KC_BSLS,
KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, OSM(MOD_LGUI), OSM(MOD_LCTL), KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, OSM(MOD_LALT), KC_TRNS, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
ALT_T(KC_DEL), KC_BSPC, KC_SPC, CMD_T(KC_DEL),
KC_BTN3, KC_COLON,
LT(SYMB, KC_ESC), LT(NUMB, KC_F13), LT(NUMB, KC_F14), LT(SYMB, KC_ENT)),
/* Keymap 1: Symbols layer
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | ! | @ | # | $ | % | | ^ | & | * | ( | ) | VolUp |
* |--------+------+------+------+------+------|------. .------|------+------+------+------+------+--------|
* | | [ | ] | { | } | ` | M1 | | | | - | _ | + | = | VolDn |
* |--------+------+------+------+------+------|------| |------|------+------+------+------+------+--------|
* | | ` | ~ | | | ~ | M2 | | | | | Prev |Pl/Pau| Next | Mute |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* .------. .------. .------. .-----.
* | | | | | | | |
* '------' '------' `------. '-----'
* ,-------. ,-------.
* | | | |
* ,------|-------| |-------|------.
* | | | | | |
* | | | | | |
* | | | | | |
* `--------------' `--------------'
*/
[SYMB] = LAYOUT_gergo(
KC_TRNS, KC_EXLM, KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC__VOLUP,
KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR,KC_RCBR, KC_PLUS, M1_STRING, KC_TRNS, KC_TRNS, KC_MINS, KC_UNDERSCORE, KC_PLUS, KC_EQL, KC__VOLDOWN,
KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_REWIND, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_FAST_FORWARD, KC__MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
/* Keymap 2: Pad/Function layer
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | PgUp |
* |--------+------+------+------+------+------|------. .------|------+------+------+------+------+--------|
* | F1 | F2 | F3 | F4 | F5 | F6 | BTN1 | | Home | LEFT | DOWN | UP | RIGHT| End | PgDn |
* |--------+------+------+------+------+------|------| |------|------+------+------+------+------+--------|
* | F7 | F8 | F9 | F10 | F11 | F12 | BTN2 | | | MLFT | MDWN | MUP | MRGHT| | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* .------. .------. .------. .-----.
* | | | | | ALT | | |
* '------' '------' `------. '-----'
* ,-------. ,-------.
* | | | |
* ,------|-------| |-------|------.
* | | | | | |
* | | | | | |
* | | | | | |
* `--------------' `--------------'
*/
[NUMB] = LAYOUT_gergo(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BTN1, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_PGDN,
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BTN2, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
/* Keymap template
*
* ,-------------------------------------------. ,-------------------------------------------.
* | | | | | | | | | | | | | |
* |--------+------+------+------+------+------|------. .------|------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+------|------| |------|------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* .------. .------. .------. .-----.
* | | | | | | | |
* '------' '------' `------. '-----'
* ,-------. ,-------.
* | | | |
* ,------|-------| |-------|------.
* | | | | | |
* | | | | | |
* | | | | | |
* `--------------' `--------------'
[SYMB] = LAYOUT_gergo(
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),
*/
// Runs just one time when the keyboard initializes.
void matrix_init_user(void) {
};
// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
//uint8_t layer = biton32(layer_state);
biton32(layer_state);
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case M1_STRING:
if (record->event.pressed) {
// when keycode QMKBEST is pressed
SEND_STRING("Hi!" SS_TAP(X_ENTER));
} else {
// when keycode QMKBEST is released
}
break;
case M2_URL:
if (record->event.pressed) {
SEND_STRING("https://ddg.gg" SS_TAP(X_ENTER));
}
break;
}
return true;
};

+ 16
- 0
keyboards/gergo/keymaps/colemak/readme.md View File

@ -0,0 +1,16 @@
# [Gergo! By g Heavy Industries](http://gboards.ca)
![Gergo image](https://4.bp.blogspot.com/-889nMXxgSM0/XCNxwnO5kUI/AAAAAAAA6mI/tZbWgZVCBW0dyZOCGJDkjN06DVax7j8XwCLcBGAs/s1600/48422820_967732713413298_485744639215665152_n.jpg)
This is a [Colemak](https://colemak.com/) mapping for the Gergo,
Unlike the default mapping, most symbols are at their original place on the number row to ease in the
learning curve.
You can view this layout over at
[keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
## Settings
To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!

+ 36
- 0
keyboards/gergo/keymaps/colemak/rules.mk View File

@ -0,0 +1,36 @@
#----------------------------------------------------------------------------
# make gergo:germ:dfu
# Make sure you have dfu-programmer installed!
#----------------------------------------------------------------------------
# Firmware options
BALLER = no # Enable to ball out
BALLSTEP = 20 # Multiple in px to move, multiplied by layer number
SCROLLSTEP = 1 # Lines to scroll with ball
MOUSEKEY_ENABLE = yes # Mouse keys(+4700), needed for baller
#Debug options
VERBOSE = no
DEBUG_MATRIX_SCAN_RATE = no
DEBUG_BALLER = no
DEBUG_MATRIX = no
# A bunch of stuff that you shouldn't touch unless you
# know what you're doing.
#
# No touchy, capiche?
SRC += matrix.c i2c_master.c
ifneq ($(strip $(BALLSTEP)),)
OPT_DEFS += -DTRKSTEP=$(strip $(BALLSTEP))
endif
ifneq ($(strip $(SCROLLSTEP)),)
OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
endif
ifeq ($(strip $(BALLER)), yes)
OPT_DEFS += -DBALLER
endif
ifeq ($(strip $(DEBUG_BALLER)), yes)
OPT_DEFS += -DDEBUG_BALLER
endif
ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX
endif

+ 2
- 1
keyboards/gergo/keymaps/default/rules.mk View File

@ -3,7 +3,7 @@
# Make sure you have dfu-programmer installed! # Make sure you have dfu-programmer installed!
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Firmware options # Firmware options
BALLER = yes # Enable to ball out
BALLER = no # Enable to ball out
BALLSTEP = 20 # Multiple in px to move, multiplied by layer number BALLSTEP = 20 # Multiple in px to move, multiplied by layer number
SCROLLSTEP = 1 # Lines to scroll with ball SCROLLSTEP = 1 # Lines to scroll with ball
MOUSEKEY_ENABLE = yes # Mouse keys(+4700), needed for baller MOUSEKEY_ENABLE = yes # Mouse keys(+4700), needed for baller
@ -26,6 +26,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP)) OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
endif endif
ifeq ($(strip $(BALLER)), yes) ifeq ($(strip $(BALLER)), yes)
POINTING_DEVICE_ENABLE = yes
OPT_DEFS += -DBALLER OPT_DEFS += -DBALLER
endif endif
ifeq ($(strip $(DEBUG_BALLER)), yes) ifeq ($(strip $(DEBUG_BALLER)), yes)


+ 1
- 0
keyboards/gergo/keymaps/germ/rules.mk View File

@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
endif endif
ifeq ($(strip $(BALLER)), yes) ifeq ($(strip $(BALLER)), yes)
OPT_DEFS += -DBALLER OPT_DEFS += -DBALLER
POINTING_DEVICE_ENABLE = yes
endif endif
ifeq ($(strip $(DEBUG_BALLER)), yes) ifeq ($(strip $(DEBUG_BALLER)), yes)
OPT_DEFS += -DDEBUG_BALLER OPT_DEFS += -DDEBUG_BALLER


+ 1
- 1
keyboards/gergo/matrix.c View File

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "debug.h" #include "debug.h"
#include "util.h" #include "util.h"
#include "debounce.h" #include "debounce.h"
#include "pointing_device.h"
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#ifdef DEBUG_MATRIX_SCAN_RATE #ifdef DEBUG_MATRIX_SCAN_RATE
# include "timer.h" # include "timer.h"
@ -38,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef BALLER #ifdef BALLER
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include "pointing_device.h"
#endif #endif
#ifndef DEBOUNCE #ifndef DEBOUNCE


+ 0
- 1
keyboards/gergo/rules.mk View File

@ -14,7 +14,6 @@ BOOTLOADER = atmel-dfu
F_USB = $(F_CPU) F_USB = $(F_CPU)
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
POINTING_DEVICE_ENABLE = yes
EXTRAKEY_ENABLE = yes EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = yes CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes COMMAND_ENABLE = yes


Write Preview
Loading…
Cancel
Save