Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

6 files changed, 84 insertions, 9 deletions

diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index 37b69e93a1..a762c5ffea 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT         Mint60
 #define DESCRIPTION     A row staggered split keyboard
 
-#define PREVENT_STUCK_MODIFIERS
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
@@ -153,10 +152,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-#define RGBLIGHT_TIMER
+
 #define RGBLED_NUM 8
-#define ws2812_PORTREG  PORTD
-#define ws2812_DDRREG   DDRD
 
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index e69de29bb2..f03e6371b1 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -0,0 +1,78 @@
+{
+  "keyboard_name": "Mint60",
+  "url": "",
+  "maintainer": "eucalyn",
+  "width": 16,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"~", "x":0, "y":0},
+        {"label":"!", "x":1, "y":0},
+        {"label":"@", "x":2, "y":0},
+        {"label":"#", "x":3, "y":0},
+        {"label":"$", "x":4, "y":0},
+        {"label":"%", "x":5, "y":0},
+        {"label":"^", "x":7, "y":0},
+        {"label":"&", "x":8, "y":0},
+        {"label":"*", "x":9, "y":0},
+        {"label":"(", "x":10, "y":0},
+        {"label":")", "x":11, "y":0},
+        {"label":"_", "x":12, "y":0},
+        {"label":"+", "x":13, "y":0},
+        {"label":"Backspace", "x":14, "y":0, "w":2},
+        {"label":"Tab", "x":0, "y":1, "w":1.5},
+        {"label":"Q", "x":1.5, "y":1},
+        {"label":"W", "x":2.5, "y":1},
+        {"label":"E", "x":3.5, "y":1},
+        {"label":"R", "x":4.5, "y":1},
+        {"label":"T", "x":5.5, "y":1},
+        {"label":"Y", "x":7.5, "y":1},
+        {"label":"U", "x":8.5, "y":1},
+        {"label":"I", "x":9.5, "y":1},
+        {"label":"O", "x":10.5, "y":1},
+        {"label":"P", "x":11.5, "y":1},
+        {"label":"{", "x":12.5, "y":1},
+        {"label":"}", "x":13.5, "y":1},
+        {"label":"|", "x":14.5, "y":1, "w":1.5},
+        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+        {"label":"A", "x":1.75, "y":2},
+        {"label":"S", "x":2.75, "y":2},
+        {"label":"D", "x":3.75, "y":2},
+        {"label":"F", "x":4.75, "y":2},
+        {"label":"G", "x":5.75, "y":2},
+        {"label":"H", "x":7.75, "y":2},
+        {"label":"J", "x":8.75, "y":2},
+        {"label":"K", "x":9.75, "y":2},
+        {"label":"L", "x":10.75, "y":2},
+        {"label":":", "x":11.75, "y":2},
+        {"label":"\"", "x":12.75, "y":2},
+        {"label":"Enter", "x":13.75, "y":2, "w":2.25},
+        {"label":"Shift", "x":0, "y":3, "w":2},
+        {"label":"Z", "x":2, "y":3},
+        {"label":"X", "x":3, "y":3},
+        {"label":"C", "x":4, "y":3},
+        {"label":"V", "x":5, "y":3},
+        {"label":"B", "x":6, "y":3},
+        {"label":"N", "x":8, "y":3},
+        {"label":"M", "x":9, "y":3},
+        {"label":"<", "x":10, "y":3},
+        {"label":">", "x":11, "y":3},
+        {"label":"?", "x":12, "y":3},
+        {"label":"Shift", "x":13, "y":3},
+        {"label":"Up", "x":14, "y":3},
+        {"label":"Fn", "x":15, "y":3},
+        {"label":"Esc", "x":0, "y":4},
+        {"label":"Ctrl", "x":1, "y":4, "w":1.25},
+        {"label":"Win", "x":2.25, "y":4, "w":1.25},
+        {"label":"Alt", "x":3.5, "y":4, "w":1.25},
+        {"label":"Space", "x":4.75, "y":4, "w":2.25},
+        {"label":"Space", "x":7.75, "y":4, "w":2.75},
+        {"label":"Win", "x":10.5, "y":4, "w":1.25},
+        {"label":"Ctrl", "x":11.75, "y":4, "w":1.25},
+        {"label":"Left", "x":13, "y":4},
+        {"label":"Down", "x":14, "y":4},
+        {"label":"Right", "x":15, "y":4}]
+    }
+  }
+}
diff --git a/keyboards/mint60/keymaps/default/keymap.c b/keyboards/mint60/keymaps/default/keymap.c
index 42c61ffaad..36895cb474 100644
--- a/keyboards/mint60/keymaps/default/keymap.c
+++ b/keyboards/mint60/keymaps/default/keymap.c
@@ -31,7 +31,7 @@ extern rgblight_config_t rgblight_config;
 #define XXXXXXX KC_NO
 
 enum custom_keycodes {
-  RGBRST
+  RGBRST = SAFE_RANGE
 };
 
 
diff --git a/keyboards/mint60/keymaps/eucalyn/keymap.c b/keyboards/mint60/keymaps/eucalyn/keymap.c
index 09b30730ad..566d734a52 100644
--- a/keyboards/mint60/keymaps/eucalyn/keymap.c
+++ b/keyboards/mint60/keymaps/eucalyn/keymap.c
@@ -31,7 +31,7 @@ extern rgblight_config_t rgblight_config;
 #define XXXXXXX KC_NO
 
 enum custom_keycodes {
-  RGBRST
+  RGBRST = SAFE_RANGE
 };
 
 
diff --git a/keyboards/mint60/readme.md b/keyboards/mint60/readme.md
index b8ae720f5b..1824c682f8 100644
--- a/keyboards/mint60/readme.md
+++ b/keyboards/mint60/readme.md
@@ -1,6 +1,6 @@
 # Mint60
 
-![Mint60](https://imgur.com/a/8xnTS4U)
+![Mint60](https://i.imgur.com/suOE8HN.jpg)
 
 A short description of the keyboard/project
 
@@ -12,4 +12,4 @@ Make example for this keyboard (after setting up your build environment):
 
     make mint60:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk
index b4d4bddd33..b4472153bc 100644
--- a/keyboards/mint60/rules.mk
+++ b/keyboards/mint60/rules.mk
@@ -75,4 +75,4 @@ HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 
 CUSTOM_MATRIX = yes
 USE_I2C = yes
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.