forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed various keymaps and the allocation of "key_combos" (#2526)

Browse Source 
* Fixed plank keymaps so that they will compile for planck light

* tv44:budi now compiles

* s60_x:amnesia0287 now compiles

* Fixed allocation of key_combos so that narze keymap for planck can compile correctly

* Disabled rgb on ergodone and infinity

* Enabled tap dance so it compiles

* Added return statement so it compiles

* If compiling on light disable extra functionality

* Properly redefined variable so it compiles
pull/2548/head
Brian Choromanski 7 years ago committed by Jack Humbert
parent ad1a868701
commit 6c74d734c2
10 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File

15
keyboards/dz60/keymaps/LEdiodes/keymap.c
Unescape View File

@ -9,6 +9,12 @@
#define _______ KC_TRNS
enum {
TD_SPC_ENT = 0,
TD_KC_LSFT_CAPS,
TD_KC_RSFT_CAPS
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
@ -49,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_CAPS, 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_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(_L1), \
KC_LCTL, KC_LGUI, KC_LALT, TD(LT(_L3,KC_SPACE)),BL_TOGG,TD(TD_SPC_ENT), KC_RGUI, TO(_L2), KC_LEFT, KC_DOWN, KC_RIGHT),
KC_LCTL, KC_LGUI, KC_LALT, LT(_L3,KC_SPACE),BL_TOGG,TD(TD_SPC_ENT), KC_RGUI, TO(_L2), KC_LEFT, KC_DOWN, KC_RIGHT),
/* Keymap _L1: (Layer 1) This is function layer 1
* This layer is activated while the Fn key is being held down.
@ -121,13 +127,6 @@ void matrix_scan_user(void) {
// Empty
};
//Tap Dance Declarations
enum {
TD_SPC_ENT = 0,
TD_KC_LSFT_CAPS = 0,
TD_KC_RSFT_CAPS = 0
};
//Tap Dance Definitions
qk_tap_dance_action_t tap_dance_actions[] = {

3
keyboards/dz60/keymaps/LEdiodes/rules.mk
Unescape View File

@ -54,4 +54,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:/
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes
AUTO_SHIFT_ENABLE = yes # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
AUTO_SHIFT_ENABLE = yes # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
TAP_DANCE_ENABLE = yes

3
keyboards/knops/mini/keymaps/knops/keymap.c
Unescape View File

@ -117,6 +117,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
//keyevent_t event = record->event;
/*KNOPS_MACRO*/
return NULL;
}
@ -133,6 +134,8 @@ void led_set_user(uint8_t usb_led) {
bool process_record_user (uint16_t keycode, keyrecord_t *record) {
/*KNOPS_PROCESS_STATE*/
return NULL;
}

10
keyboards/planck/keymaps/piemod/rules.mk
Unescape View File

@ -1,10 +1,18 @@
SUBPROJECT_DEFAULT = rev4
MOUSEKEY_ENABLE = yes
BLUETOOTH_ENABLE = yes
EXTRAKEY_ENABLE = yes
AUDIO_ENABLE = yes
ifeq ($(MCU),at90usb1286)
BOOTMAGIC_ENABLE = no
CONSOLE_ENABLE = no
COMMAND_ENABLE = no
BLUETOOTH_ENABLE = no
else
BLUETOOTH_ENABLE = yes
endif
ifndef QUANTUM_DIR
include ../../../../Makefile
endif

2
keyboards/s60_x/keymaps/amnesia0287/keymap.c
Unescape View File

@ -1,4 +1,4 @@
#include "rgb.h"
#include "s60_x.h"
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.

3
keyboards/tv44/keymaps/budi/config.h
Unescape View File

@ -4,6 +4,9 @@
#include "../../config.h"
// place overrides here
#ifdef DEBOUNCING_DELAY
#undef DEBOUNCING_DELAY
#endif
#define DEBOUNCING_DELAY 2
#define MOUSEKEY_INTERVAL 10
#define MOUSEKEY_DELAY 0

6
layouts/community/ergodox/berfarah/keymap.c
Unescape View File

@ -183,6 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
#ifdef RGBLIGHT_ENABLE
/*
* Led Configuration
*/
@ -222,6 +223,7 @@ static inline void mod_layer_with_rgb(keyrecord_t *record, uint8_t layer) {
bf_set_led(currentLayer);
};
};
#endif
/*
* Custom keycodes
@ -240,12 +242,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING(" ");
}
return false; break;
#ifdef RGBLIGHT_ENABLE
case BF_NUMS:
mod_layer_with_rgb(record, NUMS);
return false; break;
case BF_MOVE:
mod_layer_with_rgb(record, MOVE);
return false; break;
#endif
}
return true;
@ -255,7 +259,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
* Active Routines
*/
void matrix_init_user(void) {
#ifdef RGBLIGHT_ENABLE
bf_set_led(QWERTY);
#endif
};
// Runs constantly in the background, in a loop.

3
layouts/community/ergodox/berfarah/rules.mk
Unescape View File

@ -6,8 +6,9 @@ DEBUG_ENABLE = no
CONSOLE_ENABLE = no
TAP_DANCE_ENABLE = no
MOUSEKEY_ENABLE = no
RGBLIGHT_ENABLE = yes
ifdef RGBLIGHT_ENABLE
RGBLIGHT_ANIMATION = yes
endif
ifeq (${FORCE_NKRO},yes)
OPT_DEFS += -DFORCE_NKRO

2
quantum/process_keycode/process_combo.c
Unescape View File

@ -22,7 +22,7 @@
__attribute__ ((weak))
combo_t key_combos[] = {
combo_t key_combos[COMBO_COUNT] = {
};

3
users/dudeofawesome/dudeofawesome.h
Unescape View File

@ -1,6 +1,9 @@
#ifndef USERSPACE
#define USERSPACE
#ifdef TAPPING_TOGGLE
#undef TAPPING_TOGGLE
#endif
#define TAPPING_TOGGLE 2
#ifdef AUDIO_ENABLE

Write Preview
Loading…
Cancel
Save