Merge remote-tracking branch 'origin/master' into develop

keyboards/keebio/bdn9/keymaps/via/keymap.c

@@ -1,42 +1,45 @@
 #include QMK_KEYBOARD_H
 
-enum encoder_names {
-  _LEFT,
-  _RIGHT,
-  _MIDDLE,
-};
-
 enum layer_names {
-  _ZERO,
-  _ONE,
-  _TWO,
-  _THREE
+  _MAIN,
+  _FN1,
+  _FN2,
+  _FN3
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_ZERO] = LAYOUT(
+[_MAIN] = LAYOUT(
     KC_MPLY, KC_HOME, KC_MUTE,
     MO(1),   KC_UP,   RGB_MOD,
     KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
-[_ONE] = LAYOUT(
-    QK_BOOT,   BL_STEP, KC_STOP,
+[_FN1] = LAYOUT(
+    QK_BOOT, BL_STEP, KC_STOP,
     _______, KC_HOME, RGB_MOD,
     KC_MPRV, KC_END , KC_MNXT
 ),
 
-[_TWO] = LAYOUT(
+[_FN2] = LAYOUT(
     _______, _______, _______,
     _______, _______, _______,
     _______, _______, _______
 ),
 
-[_THREE] = LAYOUT(
+[_FN3] = LAYOUT(
     _______, _______, _______,
     _______, _______, _______,
     _______, _______, _______
 )
 
 };
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_MAIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+    [_FN1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+    [_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+    [_FN3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+};
+#endif

keyboards/keebio/bdn9/keymaps/via/rules.mk

@@ -3,3 +3,4 @@ LTO_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 CONSOLE_ENABLE = yes
 COMMAND_ENABLE = no
+ENCODER_MAP_ENABLE = yes

keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c

@@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = {
         {"Break",   KC_PAUS},
         {"C-A-D",   KC_CAD},  // Ctrl-Alt-Del
         {"AltF4",   KC_AF4},
-        {"QK_BOOT",   QK_BOOT},   // firmware flash mode
+        {"RESET",   QK_BOOT},   // firmware flash mode
 };
 
 #define MAX_KEYSELECTION ARRAY_SIZE(keyselection)

users/jonavin/jonavin.h

@@ -17,6 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+// DEFINE MACROS
+#ifndef ARRAYSIZE
+#define ARRAYSIZE(arr)  sizeof(arr)/sizeof(arr[0])
+#endif // !ARRAYSIZE
 
 // LAYERS
 enum custom_user_layers {