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

* 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

diff --git a/keyboards/dz60/keymaps/LEdiodes/keymap.c b/keyboards/dz60/keymaps/LEdiodes/keymap.c
index dbf2a75f572e4e3a90904a8c9480e9da451759ab..4405b20d3edb2bd66e02343f90fc2e077eb3a14f 100644 (file)
--- 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 f54d9500fbf7ffb91395fbfcc72579dc1574e354..08adc989df3091b9c36c3616e3f41d6039ad7f2b 100644 (file)
--- 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 34e560600921457c8bc48b59595dc4c52fd5a4e7..7bc7fbe43d74dccda7c95be8c56216abbdcae2d3 100644 (file)
--- 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 1e48872e391e85ae77fa4476fb62f5b6f6c12a26..84cb02bd760a4e85fd10d4b8d9327b64f6314f90 100644 (file)
--- 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 f9ca3f15ab80ace7a09b0cf1ed77ae01918c82e0..42f82e1d9b1bfed41734773a8aae6406b37e7759 100644 (file)
--- 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 e6f23c936918611342f78c72e3dd6c3fda0d0fa9..67bcf3546e96b80599762e2475333a10b2e9060d 100644 (file)
--- 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 bc639b189da61e6f32fe0d3160e048e671b0352a..a0a1077852ab544f0ae2008abb49fbdb2e1958d5 100644 (file)
--- 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 7153c6ad0f32833c92e327acb965e81ea559e036..a87325037294ff2c9196024ebfbe7d0d52a2347a 100644 (file)
--- 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 1addd72e5ade966e121e8243a2b77d58f4787e4b..6e9c28e4fc0489cb95a2021cb2c25e8373c3b0d6 100644 (file)
--- 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 b0387f2ad4b6f2123171d9f795400e8f2f158dfa..12b581b4d9f740cf974b928c692cdeee7fc3be88 100644 (file)
--- 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