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

1 files changed, 7 insertions, 19 deletions

diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c
index cc12c0268a..90bb982509 100644
--- a/keyboards/macro3/macro3.c
+++ b/keyboards/macro3/macro3.c
@@ -1,18 +1,6 @@
 /* Copyright 2020 David Philip Barr <@davidphilipbarr>
  * Copyright 2021 @filterpaper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include "macro3.h"
@@ -20,17 +8,17 @@
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 1) {
+    if (index == 0) {
         if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
             tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
         }
-    } else if (index == 0) {
+    } else if (index == 1) {
         if (clockwise) {
-            tap_code(KC_WH_D);
+            tap_code(KC_MNXT);
         } else {
-            tap_code(KC_WH_U);
+            tap_code(KC_MPRV);
         }
     }
     return true;