Merge branch 'develop'

14 files changed, 19 insertions, 12 deletions

diff --git a/keyboards/preonic/keymaps/blake-newman/rules.mk b/keyboards/preonic/keymaps/blake-newman/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/blake-newman/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/boy314/rules.mk b/keyboards/preonic/keymaps/boy314/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/boy314/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/brauner/config.h b/keyboards/preonic/keymaps/brauner/config.h
index 7c3893ff38..4591d62102 100644
--- a/keyboards/preonic/keymaps/brauner/config.h
+++ b/keyboards/preonic/keymaps/brauner/config.h
@@ -25,6 +25,7 @@
 #define MUSIC_MASK (keycode != KC_NO)
 
 #define PERMISSVE_HOLD
+#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 
 #define LEADER_PER_KEY_TIMING
 
diff --git a/keyboards/preonic/keymaps/brauner/keymap.c b/keyboards/preonic/keymaps/brauner/keymap.c
index fa1c7611cf..398abfa741 100644
--- a/keyboards/preonic/keymaps/brauner/keymap.c
+++ b/keyboards/preonic/keymaps/brauner/keymap.c
@@ -56,17 +56,14 @@ enum combos {
     COMBO_LBRC_RBRC, /* [|] */
     COMBO_LCBR_RCBR, /* {|} */
     COMBO_LT_GT,     /* <|> */
-    COMBO_MAX,
 };
 
-uint16_t COMBO_LEN = COMBO_MAX;
-
 const uint16_t PROGMEM combo_lprn_rprn[] = {KC_LPRN, KC_RPRN, COMBO_END};
 const uint16_t PROGMEM combo_lbrc_rbrc[] = {KC_LBRC, KC_RBRC, COMBO_END};
 const uint16_t PROGMEM combo_lcbr_rcbr[] = {KC_LCBR, KC_RCBR, COMBO_END};
 const uint16_t PROGMEM combo_lt_gt[]     = {KC_LT, KC_GT, COMBO_END};
 
-combo_t key_combos[COMBO_MAX] = {
+combo_t key_combos[] = {
     [COMBO_LPRN_RPRN] = COMBO_ACTION(combo_lprn_rprn),
     [COMBO_LBRC_RBRC] = COMBO_ACTION(combo_lbrc_rbrc),
     [COMBO_LCBR_RCBR] = COMBO_ACTION(combo_lcbr_rcbr),
@@ -279,6 +276,18 @@ static inline bool toggle_layer(enum preonic_layers layer, keyrecord_t *record)
     return false;
 }
 
+bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MOD_TAP_LSFT_ENT:
+        case MOD_TAP_LSFT_ESC:
+            /* Immediately select the hold action when another key is pressed. */
+            return true;
+        default:
+            /* Do not select the hold action when another key is pressed. */
+            return false;
+    }
+}
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case QWERTY:
diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h
index 4f4fbfe05c..16a4c267e5 100644
--- a/keyboards/preonic/keymaps/egstad/config.h
+++ b/keyboards/preonic/keymaps/egstad/config.h
@@ -1,6 +1,5 @@
 #pragma once
 #define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
 
 
 
diff --git a/keyboards/preonic/keymaps/ekis_isa/rules.mk b/keyboards/preonic/keymaps/ekis_isa/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/ekis_isa/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/fig-r/rules.mk b/keyboards/preonic/keymaps/fig-r/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/fig-r/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/guillermoap/keymap.c b/keyboards/preonic/keymaps/guillermoap/keymap.c
index fe17182111..066c986c15 100644
--- a/keyboards/preonic/keymaps/guillermoap/keymap.c
+++ b/keyboards/preonic/keymaps/guillermoap/keymap.c
@@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Currently using ENCONDER_MAP_ENABLE
  */
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_BASE] =   { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },       // Mouse Scroll Down | Mouse Scroll Up
     [_GAMING] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) },       // Mouse Scroll Down | Mouse Scroll Up
     [_LOWER] =  { ENCODER_CCW_CW(LCTL(KC_TAB), LCTL(LSFT(KC_TAB))) }, // Ctrl + Tab        | Ctrl + Shift + Tab
diff --git a/keyboards/preonic/keymaps/laurentlaurent/config.h b/keyboards/preonic/keymaps/laurentlaurent/config.h
index 2c1b1a7059..20ce699a19 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/config.h
+++ b/keyboards/preonic/keymaps/laurentlaurent/config.h
@@ -33,6 +33,4 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 2
 
-// Fix Home Row mod keys
-#define IGNORE_MOD_TAP_INTERRUPT
-//#define RETRO_TAPPING
\ No newline at end of file
+//#define RETRO_TAPPING
diff --git a/keyboards/preonic/keymaps/nikchi/rules.mk b/keyboards/preonic/keymaps/nikchi/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/nikchi/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/pitty/rules.mk b/keyboards/preonic/keymaps/pitty/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/pitty/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/seph/config.h b/keyboards/preonic/keymaps/seph/config.h
index 0267852335..18812886f7 100644
--- a/keyboards/preonic/keymaps/seph/config.h
+++ b/keyboards/preonic/keymaps/seph/config.h
@@ -7,8 +7,8 @@
 #define BACKLIGHT_LEVELS 8
 
 /* ws2812 RGB LED */
-#undef RGB_DI_PIN
-#define RGB_DI_PIN B3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN B3
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/preonic/keymaps/smt/rules.mk b/keyboards/preonic/keymaps/smt/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/preonic/keymaps/smt/rules.mk
+++ /dev/null
diff --git a/keyboards/preonic/keymaps/snowskeleton/keymap.c b/keyboards/preonic/keymaps/snowskeleton/keymap.c
index 030adf8cbb..8af85fde90 100644
--- a/keyboards/preonic/keymaps/snowskeleton/keymap.c
+++ b/keyboards/preonic/keymaps/snowskeleton/keymap.c
@@ -169,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_QWERTY_MACOS] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_LOWER] = { ENCODER_CCW_CW(_______, _______) },
     [_RAISE] = { ENCODER_CCW_CW(KC_BRMU, KC_BRMD) },