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

2 files changed, 18 insertions, 18 deletions

diff --git a/keyboards/yeehaw/keymaps/default/keymap.c b/keyboards/yeehaw/keymaps/default/keymap.c
index 20bdbf581..7f7141d29 100644
--- a/keyboards/yeehaw/keymaps/default/keymap.c
+++ b/keyboards/yeehaw/keymaps/default/keymap.c
@@ -46,9 +46,9 @@ KC_TRNS, RGB_SAD, RGB_M_P, RGB_MOD, RGB_SPD,
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
             tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
         }
     }
     return true;
@@ -64,7 +64,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case SQUASHKB:
         if (record->event.pressed) {
-            SEND_STRING("http://squashkb.com");
+            SEND_STRING("https://squashkb.com");
         }
         break;
     }
diff --git a/keyboards/yeehaw/keymaps/via/keymap.c b/keyboards/yeehaw/keymaps/via/keymap.c
index dfb0bdd56..3beca9c21 100644
--- a/keyboards/yeehaw/keymaps/via/keymap.c
+++ b/keyboards/yeehaw/keymaps/via/keymap.c
@@ -43,21 +43,21 @@ KC_TRNS, RGB_SAD, RGB_M_P, RGB_MOD, RGB_SPD,
     ),
 
       [2] = LAYOUT(
-        _______,
-        _______,
-        _______, _______, _______, _______,
-_______, _______, _______, _______, _______,
-        _______, _______,
-             _______
+        KC_TRNS,
+        KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,
+             KC_TRNS
     ),
 
       [3] = LAYOUT(
-        _______,
-        _______,
-        _______, _______, _______, _______,
-_______, _______, _______, _______, _______,
-        _______, _______,
-             _______
+        KC_TRNS,
+        KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,
+             KC_TRNS
     ),
 
 };
@@ -65,9 +65,9 @@ _______, _______, _______, _______, _______,
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
             tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
         }
     }
     return true;
@@ -83,7 +83,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
     case SQUASHKB:
         if (record->event.pressed) {
-            SEND_STRING("http://squashkb.com");
+            SEND_STRING("https://squashkb.com");
         }
         break;
     }