aboutsummaryrefslogtreecommitdiff
path: root/keyboards/planck/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/planck/keymaps')
-rw-r--r--keyboards/planck/keymaps/altgr/config.h1
-rw-r--r--keyboards/planck/keymaps/andylikescandy/rules.mk0
-rw-r--r--keyboards/planck/keymaps/antosha417/config.h1
-rw-r--r--keyboards/planck/keymaps/antosha417/keymap.c7
-rw-r--r--keyboards/planck/keymaps/ariccb/config.h2
-rw-r--r--keyboards/planck/keymaps/ariccb/keymap.c4
-rw-r--r--keyboards/planck/keymaps/coloneljesus/rules.mk0
-rw-r--r--keyboards/planck/keymaps/dvz/config.h2
-rw-r--r--keyboards/planck/keymaps/dvz/keymap.c2
-rw-r--r--keyboards/planck/keymaps/experimental/config.h2
-rw-r--r--keyboards/planck/keymaps/hiea/config.h1
-rw-r--r--keyboards/planck/keymaps/hieax/config.h1
-rw-r--r--keyboards/planck/keymaps/hvp/config.h1
-rw-r--r--keyboards/planck/keymaps/ishtob/keymap.c7
-rw-r--r--keyboards/planck/keymaps/jirgn/rules.mk0
-rw-r--r--keyboards/planck/keymaps/jweickm/config.h1
-rw-r--r--keyboards/planck/keymaps/kelorean/rules.mk0
-rw-r--r--keyboards/planck/keymaps/mattly/config.h1
-rw-r--r--keyboards/planck/keymaps/mitch/rules.mk2
-rw-r--r--keyboards/planck/keymaps/mjt/rules.mk0
-rw-r--r--keyboards/planck/keymaps/mjtnumsym/rules.mk0
-rw-r--r--keyboards/planck/keymaps/motform/rules.mk0
-rw-r--r--keyboards/planck/keymaps/muppetjones/config.h3
-rw-r--r--keyboards/planck/keymaps/mwpeterson/config.h1
-rw-r--r--keyboards/planck/keymaps/myoung34/config.h2
-rw-r--r--keyboards/planck/keymaps/narze/config.h2
-rw-r--r--keyboards/planck/keymaps/originerd/rules.mk0
-rwxr-xr-xkeyboards/planck/keymaps/paget/rules.mk0
-rw-r--r--keyboards/planck/keymaps/phreed/rules.mk0
-rw-r--r--keyboards/planck/keymaps/piemod/rules.mk2
-rw-r--r--keyboards/planck/keymaps/rootiest/config.h1
-rw-r--r--keyboards/planck/keymaps/rootiest/keymap.c2
-rw-r--r--keyboards/planck/keymaps/sdothum/config.h1
-rw-r--r--keyboards/planck/keymaps/smt/rules.mk0
-rw-r--r--keyboards/planck/keymaps/snowkuma/config.h1
-rw-r--r--keyboards/planck/keymaps/tehwalris/rules.mk0
-rw-r--r--keyboards/planck/keymaps/tk/keymap.c2
-rw-r--r--keyboards/planck/keymaps/tylerwince/config.h1
38 files changed, 7 insertions, 46 deletions
diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h
index e517a8b24b..b6c010a825 100644
--- a/keyboards/planck/keymaps/altgr/config.h
+++ b/keyboards/planck/keymaps/altgr/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define BEAKLGR
diff --git a/keyboards/planck/keymaps/andylikescandy/rules.mk b/keyboards/planck/keymaps/andylikescandy/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/andylikescandy/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/antosha417/config.h b/keyboards/planck/keymaps/antosha417/config.h
index 9bbb1192c7..3ad322687a 100644
--- a/keyboards/planck/keymaps/antosha417/config.h
+++ b/keyboards/planck/keymaps/antosha417/config.h
@@ -29,6 +29,5 @@
#define ENCODER_RESOLUTION 4
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define COMBO_TERM 30
diff --git a/keyboards/planck/keymaps/antosha417/keymap.c b/keyboards/planck/keymaps/antosha417/keymap.c
index 2a6caca201..06bc0b8657 100644
--- a/keyboards/planck/keymaps/antosha417/keymap.c
+++ b/keyboards/planck/keymaps/antosha417/keymap.c
@@ -397,11 +397,8 @@ enum combo_events {
DELQ_COMBO,
SAVEQ_COMBO,
BSPCQ_COMBO,
- BSPCWQ_COMBO,
-
- COMBO_LENGTH
+ BSPCWQ_COMBO
};
-uint16_t COMBO_LEN = COMBO_LENGTH;
const uint16_t PROGMEM ru_combo[] = {KC_R, U_CTRL, COMBO_END};
const uint16_t PROGMEM en_combo[] = {U_CTRL, S_ALT, COMBO_END};
@@ -448,5 +445,3 @@ combo_t key_combos[] = {
[SAVEQ_COMBO] = COMBO(saveq_combo, VIM_SAVE),
[BSPCWQ_COMBO] = COMBO(bspcwq_combo, A(KC_BSPC)),
};
-
-
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
index 464a8cd5db..e9fcc865fa 100644
--- a/keyboards/planck/keymaps/ariccb/config.h
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -41,8 +41,6 @@
#define TAPPING_TERM 150
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-// #define IGNORE_MOD_TAP_INTERRUPT
// #define HOLD_ON_OTHER_KEY_PRESS
#define COMBO_TERM 20
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
index 4237955bb5..5caaf1922e 100644
--- a/keyboards/planck/keymaps/ariccb/keymap.c
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -511,10 +511,8 @@ enum combo_events {
CSS_STYLE,
HTML_GENERIC_TAG,
CTLRGHT,
- CTLLEFT,
- COMBO_LENGTH
+ CTLLEFT
};
-uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead!
const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END};
const uint16_t PROGMEM email_work_combo[] = {KC_E, KC_K, COMBO_END};
diff --git a/keyboards/planck/keymaps/coloneljesus/rules.mk b/keyboards/planck/keymaps/coloneljesus/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/coloneljesus/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/dvz/config.h b/keyboards/planck/keymaps/dvz/config.h
index bcdc3e57d6..ab925009ed 100644
--- a/keyboards/planck/keymaps/dvz/config.h
+++ b/keyboards/planck/keymaps/dvz/config.h
@@ -50,8 +50,6 @@
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4
-#define COMBO_COUNT 4
-
#ifdef AUDIO_ENABLE
#define DAC_SAMPLE_MAX 65535/2
#endif
diff --git a/keyboards/planck/keymaps/dvz/keymap.c b/keyboards/planck/keymaps/dvz/keymap.c
index d69bf18620..ff57d28cf8 100644
--- a/keyboards/planck/keymaps/dvz/keymap.c
+++ b/keyboards/planck/keymaps/dvz/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM oe_combo[] = {KC_O, KC_E, COMBO_END};
const uint16_t PROGMEM ue_combo[] = {KC_U, KC_E, COMBO_END};
const uint16_t PROGMEM sz_combo[] = {KC_S, DE_Z, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[AE] = COMBO(ae_combo, DE_AE),
[OE] = COMBO(oe_combo, DE_OE),
[UE] = COMBO(ue_combo, DE_UE),
diff --git a/keyboards/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h
index 450addbd99..9ee7d9fac4 100644
--- a/keyboards/planck/keymaps/experimental/config.h
+++ b/keyboards/planck/keymaps/experimental/config.h
@@ -7,7 +7,7 @@
#define BACKLIGHT_BREATHING
/* ws2812 RGB LED */
-#define RGB_DI_PIN B1
+#define WS2812_DI_PIN B1
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hiea/config.h
+++ b/keyboards/planck/keymaps/hiea/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define DEFAULT
diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hieax/config.h
+++ b/keyboards/planck/keymaps/hieax/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define DEFAULT
diff --git a/keyboards/planck/keymaps/hvp/config.h b/keyboards/planck/keymaps/hvp/config.h
index 009a8f7122..472320ed68 100644
--- a/keyboards/planck/keymaps/hvp/config.h
+++ b/keyboards/planck/keymaps/hvp/config.h
@@ -1,6 +1,5 @@
#pragma once
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c
index eebafddbed..75c581de19 100644
--- a/keyboards/planck/keymaps/ishtob/keymap.c
+++ b/keyboards/planck/keymaps/ishtob/keymap.c
@@ -1,13 +1,6 @@
// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
// this is the style you want to emulate.
-#include "planck.h"
-#include "action_layer.h"
-// #include "dynamic_macro.h"
-#ifdef AUDIO_ENABLE
- #include "audio.h"
-#endif
-#include "eeconfig.h"
#include "ishtob.h"
extern keymap_config_t keymap_config;
diff --git a/keyboards/planck/keymaps/jirgn/rules.mk b/keyboards/planck/keymaps/jirgn/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/jirgn/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h
index bd34fca202..2b7a3b02d6 100644
--- a/keyboards/planck/keymaps/jweickm/config.h
+++ b/keyboards/planck/keymaps/jweickm/config.h
@@ -57,7 +57,6 @@
#define TAPPING_TERM 160 // 200 ms is the default value
#define TAPPING_TERM_PER_KEY
//#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM_PER_KEY
// settings for LEADER key
diff --git a/keyboards/planck/keymaps/kelorean/rules.mk b/keyboards/planck/keymaps/kelorean/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/kelorean/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/mattly/config.h b/keyboards/planck/keymaps/mattly/config.h
index 46fe973417..31c47c85b4 100644
--- a/keyboards/planck/keymaps/mattly/config.h
+++ b/keyboards/planck/keymaps/mattly/config.h
@@ -34,7 +34,6 @@
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
diff --git a/keyboards/planck/keymaps/mitch/rules.mk b/keyboards/planck/keymaps/mitch/rules.mk
index 32dc2acc67..e69de29bb2 100644
--- a/keyboards/planck/keymaps/mitch/rules.mk
+++ b/keyboards/planck/keymaps/mitch/rules.mk
@@ -1,2 +0,0 @@
-SUBPROJECT = rev3
-
diff --git a/keyboards/planck/keymaps/mjt/rules.mk b/keyboards/planck/keymaps/mjt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/mjt/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/mjtnumsym/rules.mk b/keyboards/planck/keymaps/mjtnumsym/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/mjtnumsym/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/motform/rules.mk b/keyboards/planck/keymaps/motform/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/motform/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h
index 1a05bfc837..88331e71f6 100644
--- a/keyboards/planck/keymaps/muppetjones/config.h
+++ b/keyboards/planck/keymaps/muppetjones/config.h
@@ -49,8 +49,5 @@
// Change "hold" time (default is 200 ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/planck/keymaps/mwpeterson/config.h b/keyboards/planck/keymaps/mwpeterson/config.h
index 2665bd7c56..657ffda599 100644
--- a/keyboards/planck/keymaps/mwpeterson/config.h
+++ b/keyboards/planck/keymaps/mwpeterson/config.h
@@ -1,7 +1,6 @@
#pragma once
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(ONE_UP_SOUND)
diff --git a/keyboards/planck/keymaps/myoung34/config.h b/keyboards/planck/keymaps/myoung34/config.h
index 92ad42f0fa..f69cb62280 100644
--- a/keyboards/planck/keymaps/myoung34/config.h
+++ b/keyboards/planck/keymaps/myoung34/config.h
@@ -39,7 +39,7 @@
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 2
-#define RGB_DI_PIN B2 // The pin the LED strip is connected to (PB2 by default)
+#define WS2812_DI_PIN B2 // The pin the LED strip is connected to (PB2 by default)
#define RGBLED_NUM 3 // Number of LEDs in your strip
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h
index 9ab1637306..a7fccc4187 100644
--- a/keyboards/planck/keymaps/narze/config.h
+++ b/keyboards/planck/keymaps/narze/config.h
@@ -24,9 +24,7 @@
#define TAPPING_TERM 100
#define COMBO_TERM 20
-#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define SUPER_DUPER_SOUND S__NOTE(_B1)
diff --git a/keyboards/planck/keymaps/originerd/rules.mk b/keyboards/planck/keymaps/originerd/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/originerd/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/paget/rules.mk b/keyboards/planck/keymaps/paget/rules.mk
deleted file mode 100755
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/paget/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/phreed/rules.mk b/keyboards/planck/keymaps/phreed/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/phreed/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk
index 3126ba9dc4..4f83056a80 100644
--- a/keyboards/planck/keymaps/piemod/rules.mk
+++ b/keyboards/planck/keymaps/piemod/rules.mk
@@ -1,5 +1,3 @@
-SUBPROJECT_DEFAULT = rev4
-
MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes
AUDIO_ENABLE = yes
diff --git a/keyboards/planck/keymaps/rootiest/config.h b/keyboards/planck/keymaps/rootiest/config.h
index 1cca7e5ba9..3d2d3f38a6 100644
--- a/keyboards/planck/keymaps/rootiest/config.h
+++ b/keyboards/planck/keymaps/rootiest/config.h
@@ -111,7 +111,6 @@
/*
* COMBO-KEY options
*/
-#define COMBO_COUNT 2
#define COMBO_TERM 300
/*
* MACRO per-key options
diff --git a/keyboards/planck/keymaps/rootiest/keymap.c b/keyboards/planck/keymaps/rootiest/keymap.c
index ce3b69ed1f..7e3b8af367 100644
--- a/keyboards/planck/keymaps/rootiest/keymap.c
+++ b/keyboards/planck/keymaps/rootiest/keymap.c
@@ -168,7 +168,7 @@ enum combo_events { ZC_COPY, XV_PASTE };
const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END};
const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
[ZC_COPY] = COMBO_ACTION(copy_combo),
[XV_PASTE] = COMBO_ACTION(paste_combo),
};
diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h
index 903bbe8095..6afcc69064 100644
--- a/keyboards/planck/keymaps/sdothum/config.h
+++ b/keyboards/planck/keymaps/sdothum/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define BEAKLSP
diff --git a/keyboards/planck/keymaps/smt/rules.mk b/keyboards/planck/keymaps/smt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/smt/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/snowkuma/config.h b/keyboards/planck/keymaps/snowkuma/config.h
index 694245582d..c61d252804 100644
--- a/keyboards/planck/keymaps/snowkuma/config.h
+++ b/keyboards/planck/keymaps/snowkuma/config.h
@@ -36,7 +36,6 @@
// Settings for homerow mods
#define TAPPING_TERM 250
-#define IGNORE_MOD_TAP_INTERRUPT
// Add the leader key feature
diff --git a/keyboards/planck/keymaps/tehwalris/rules.mk b/keyboards/planck/keymaps/tehwalris/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/planck/keymaps/tehwalris/rules.mk
+++ /dev/null
diff --git a/keyboards/planck/keymaps/tk/keymap.c b/keyboards/planck/keymaps/tk/keymap.c
index 68f0f82a3d..cb512b73a3 100644
--- a/keyboards/planck/keymaps/tk/keymap.c
+++ b/keyboards/planck/keymaps/tk/keymap.c
@@ -318,7 +318,7 @@ void keyboard_post_init_user(void) {
static bool prerecord_clicky = false;
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
prerecord_clicky = is_clicky_on();
if (!prerecord_clicky) {
clicky_on();
diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h
index 52c1494a1d..d0fb8680e3 100644
--- a/keyboards/planck/keymaps/tylerwince/config.h
+++ b/keyboards/planck/keymaps/tylerwince/config.h
@@ -13,6 +13,5 @@
See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
*/
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
#define EECONFIG_RGB_MATRIX (uint32_t *)16