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

keyboards/atreyu/rev1/info.json

@@ -70,7 +70,7 @@
                 {"x":11, "y":4.25},
                 {"x":12, "y":4.15},
                 {"x":13, "y":4.125},
-                {"x": 14.5, "y": 4.5}
+                {"x": 15.5, "y": 4.5}
             ]
         }
     }

keyboards/atreyu/rev1/rev1.c

@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "rev1.h"
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
@@ -28,18 +30,10 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
       }
     }
     if (index == 0) {
-      if (IS_LAYER_ON(_LOWER)) {
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
+      if (clockwise) {
+          tap_code(KC_WH_U);
       } else {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
+          tap_code(KC_WH_D);
       }
     }
     return true;