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

Author: qmk-bot

keyboards/sofle/keymaps/via/config.h

@@ -17,10 +17,9 @@
 
 #pragma once
 
-/* The way how "handedness" is decided (which half is which),
+/* By default left side is selected as master, 
 see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
-for more options.
-*/
+for more options. */
 
 #if defined(KEYBOARD_sofle_rev1)
 // Add RGB underglow and top facing lighting

keyboards/sofle/keymaps/via/encoder.c

@@ -17,9 +17,15 @@
 
 #include QMK_KEYBOARD_H
 #include "oled.c"
-#include "encoder.c"
 
-//Default keymap. This can be changed in Via. Use oled.c and encoder.c to change beavior that Via cannot change.
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU),           ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
+    [1] = { ENCODER_CCW_CW(_______, _______),           ENCODER_CCW_CW(_______, _______) },
+    [2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI),           ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+    [3] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI),           ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)}
+};
+#endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*

keyboards/sofle/keymaps/via/keymap.c

@@ -6,3 +6,4 @@ EXTRAKEY_ENABLE = yes
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
+ENCODER_MAP_ENABLE = yes