merge upstream master

10 files changed, 26 insertions, 23 deletions

diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
index f858685b8f..6463505000 100644
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -2,11 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75 // OU
-#define MANUFACTURER    1up Keyboards
-#define PRODUCT         Sweet16
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
index 7755c8efb0..320c96bac8 100644
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -1,7 +1,11 @@
 {
-  "keyboard_name": "Sweet 16",
+  "keyboard_name": "Sweet16",
+  "manufacturer": "1up Keyboards",
   "url": "",
   "maintainer": "skullydazed",
+  "usb": {
+    "vid": "0x6F75"
+  },
   "layouts": {
       "LAYOUT_ortho_4x4": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
index c835440076..161b46c814 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
+++ b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
@@ -3,6 +3,7 @@
 /* tap dance stuff*/
 #undef TAPPING_TERM
 #define TAPPING_TERM 500
+#define PERMISSIVE_HOLD
 
 #define TAPPING_TOGGLE 2
 
@@ -12,4 +13,4 @@
 #define EXAMPLESTRING4 "tapdance_4"
 
 #undef RGBLED_NUM
-#define RGBLED_NUM 16
\ No newline at end of file
+#define RGBLED_NUM 16
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
index 6b7b36cbb2..eeca552657 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
@@ -196,7 +196,7 @@ void matrix_scan_user(void) {
   }
 }
 layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (biton32(state)) {
+    switch (get_highest_layer(state)) {
     case _TAPLAND:
         rgblight_setrgb(0, 16, 0); //green
         break;
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 4020f4fdc0..a107a1899a 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -2,14 +2,9 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0161
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
new file mode 100644
index 0000000000..11a0d97d89
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0161",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
index d344b0750d..8bacff2f6e 100644
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
@@ -2,14 +2,9 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0162
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D4, D1, E6, B5 }
 #define MATRIX_COL_PINS { F7, F6, D2, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json
new file mode 100644
index 0000000000..bed6579e82
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0162",
+        "device_version": "0.0.1"
+    }
+}
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
index 286af1857f..e1d66894b3 100644
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
@@ -2,14 +2,9 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0162
-#define DEVICE_VER      0x0001
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B5, B7, B2, B0 }
 #define MATRIX_COL_PINS { B8, A0, A10, A9 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
new file mode 100644
index 0000000000..bed6579e82
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json
@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0162",
+        "device_version": "0.0.1"
+    }
+}