summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/dz60/keymaps/LEdiodes/keymap.c15
-rw-r--r--keyboards/dz60/keymaps/LEdiodes/rules.mk3
-rw-r--r--keyboards/knops/mini/keymaps/knops/keymap.c3
-rw-r--r--keyboards/planck/keymaps/piemod/rules.mk10
-rw-r--r--keyboards/s60_x/keymaps/amnesia0287/keymap.c2
-rw-r--r--keyboards/tv44/keymaps/budi/config.h3
-rw-r--r--layouts/community/ergodox/berfarah/keymap.c6
-rw-r--r--layouts/community/ergodox/berfarah/rules.mk3
-rw-r--r--quantum/process_keycode/process_combo.c2
-rw-r--r--users/dudeofawesome/dudeofawesome.h3
10 files changed, 37 insertions, 13 deletions
diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index dbf2a75f57..4405b20d3e 100644
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -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[] = {
diff --git a/keyboards/dz60/keymaps/LEdiodes/rules.mk b/keyboards/dz60/keymaps/LEdiodes/rules.mk
index f54d9500fb..08adc989df 100644
--- a/keyboards/dz60/keymaps/LEdiodes/rules.mk
+++ b/keyboards/dz60/keymaps/LEdiodes/rules.mk
@@ -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 \ No newline at end of file
+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 \ No newline at end of file
diff --git a/keyboards/knops/mini/keymaps/knops/keymap.c b/keyboards/knops/mini/keymaps/knops/keymap.c
index 34e5606009..7bc7fbe43d 100644
--- a/keyboards/knops/mini/keymaps/knops/keymap.c
+++ b/keyboards/knops/mini/keymaps/knops/keymap.c
@@ -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;
}
diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk
index 1e48872e39..84cb02bd76 100644
--- a/keyboards/planck/keymaps/piemod/rules.mk
+++ b/keyboards/planck/keymaps/piemod/rules.mk
@@ -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
diff --git a/keyboards/s60_x/keymaps/amnesia0287/keymap.c b/keyboards/s60_x/keymaps/amnesia0287/keymap.c
index f9ca3f15ab..42f82e1d9b 100644
--- a/keyboards/s60_x/keymaps/amnesia0287/keymap.c
+++ b/keyboards/s60_x/keymaps/amnesia0287/keymap.c
@@ -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.
diff --git a/keyboards/tv44/keymaps/budi/config.h b/keyboards/tv44/keymaps/budi/config.h
index e6f23c9369..67bcf3546e 100644
--- a/keyboards/tv44/keymaps/budi/config.h
+++ b/keyboards/tv44/keymaps/budi/config.h
@@ -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
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index bc639b189d..a0a1077852 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -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.
diff --git a/layouts/community/ergodox/berfarah/rules.mk b/layouts/community/ergodox/berfarah/rules.mk
index 7153c6ad0f..a873250372 100644
--- a/layouts/community/ergodox/berfarah/rules.mk
+++ b/layouts/community/ergodox/berfarah/rules.mk
@@ -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
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 1addd72e5a..6e9c28e4fc 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -22,7 +22,7 @@
__attribute__ ((weak))
-combo_t key_combos[] = {
+combo_t key_combos[COMBO_COUNT] = {
};
diff --git a/users/dudeofawesome/dudeofawesome.h b/users/dudeofawesome/dudeofawesome.h
index b0387f2ad4..12b581b4d9 100644
--- a/users/dudeofawesome/dudeofawesome.h
+++ b/users/dudeofawesome/dudeofawesome.h
@@ -1,6 +1,9 @@
#ifndef USERSPACE
#define USERSPACE
+#ifdef TAPPING_TOGGLE
+#undef TAPPING_TOGGLE
+#endif
#define TAPPING_TOGGLE 2
#ifdef AUDIO_ENABLE
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 02:44:02 +0000