Merge branch 'master' of https://github.com/qmk/qmk_firmware

6 files changed, 5 insertions, 10 deletions

diff --git a/keyboards/playkbtw/ca66/config.h b/keyboards/playkbtw/ca66/config.h
index c35718042..53bbe95e3 100644
--- a/keyboards/playkbtw/ca66/config.h
+++ b/keyboards/playkbtw/ca66/config.h
@@ -42,8 +42,6 @@
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
-/* prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
 
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
diff --git a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
index f27824e57..ed3d625e4 100644
--- a/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
+++ b/keyboards/playkbtw/ca66/keymaps/olivia/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT(
 	KC_PWR,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL, RESET,
-    KC_CAPS,          RGB_RMOD,RGB_SMOD,RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
+    KC_CAPS,          RGB_RMOD,RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,         KC_TRNS,
     KC_TRNS,          KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_TRNS,         KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_DOWN, 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),
diff --git a/keyboards/playkbtw/ca66/readme.md b/keyboards/playkbtw/ca66/readme.md
index 74f060604..9e1ff7397 100644
--- a/keyboards/playkbtw/ca66/readme.md
+++ b/keyboards/playkbtw/ca66/readme.md
@@ -5,7 +5,7 @@ Custom 65%
 
 Keyboard Maintainer: QMK Community   
 Hardware Supported: CA66   
-Hardware Availability: [Play Keyboard](http://playkeyboard.qdm.com.tw/)
+Hardware Availability: [Play Keyboard](http://play-keyboard.store/)
 
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/playkbtw/pk60/config.h b/keyboards/playkbtw/pk60/config.h
index 06101349c..601e3c8a5 100644
--- a/keyboards/playkbtw/pk60/config.h
+++ b/keyboards/playkbtw/pk60/config.h
@@ -43,9 +43,6 @@
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
-/* prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
@@ -55,4 +52,4 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/playkbtw/pk60/readme.md b/keyboards/playkbtw/pk60/readme.md
index 8b14d4021..f4be12dd4 100644
--- a/keyboards/playkbtw/pk60/readme.md
+++ b/keyboards/playkbtw/pk60/readme.md
@@ -8,7 +8,7 @@ Fitted with all stock GH60 cases, with WS2812 RGB underglow.
 
 Keyboard Maintainer: [Barry Huang](https://github.com/yj7272098)  
 Hardware Supported: Play Keyboard60  
-Hardware Availability: [Play Keyboard](http://playkeyboard.qdm.com.tw/)
+Hardware Availability: [Play Keyboard](http://play-keyboard.store/)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/playkbtw/readme.md b/keyboards/playkbtw/readme.md
index adb1ca8c8..4dd58188e 100644
--- a/keyboards/playkbtw/readme.md
+++ b/keyboards/playkbtw/readme.md
@@ -1,5 +1,5 @@
 # PlayKeyboardTW
 
-[PlayKeyboardTW]((http://playkeyboard.qdm.com.tw/)) is a Taiwan based company responsible for keyboards such as the CA66 and the PK60. 
+[PlayKeyboardTW]((http://play-keyboard.store/)) is a Taiwan based company responsible for keyboards such as the CA66 and the PK60. 
 
 This directory is a collection of all their keyboards.