[Keyboard] Adding support S6xty rev2 and re-organize s6xty keyboard

keyboards/trnthsn/s6xty/keyboard.json → keyboards/trnthsn/s6xty/info.json

@@ -1,25 +1,16 @@
 {
-    "manufacturer": "ThanhSon.Mech",
-    "keyboard_name": "S6xty",
+    "manufacturer": "Tyson.Keebs",
     "maintainer": "trnthsn",
-    "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "rgblight": true
     },
-    "indicators": {
-        "caps_lock": "B12"
-    },
-    "matrix_pins": {
-        "cols": ["B14", "A0", "A10", "C15", "A2", "A1", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
-        "rows": ["B3", "B7", "A3", "A9", "A8"]
-    },
-    "processor": "STM32F072",
     "rgblight": {
         "animations": {
             "alternating": true,
@@ -32,8 +23,10 @@
             "static_gradient": true,
             "twinkle": true
         },
-        "led_count": 22,
-        "sleep": true
+        "sleep": true,
+        "default": {
+            "animation": "rainbow_swirl"
+        }
     },
     "url": "",
     "usb": {

keyboards/trnthsn/s6xty/keymaps/default/keymap.c

@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT_all(
         KC_GRV,  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,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, UG_VALD, UG_VALU, UG_NEXT,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         MO(2)  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______,                            _______,                   _______, _______, _______, _______

keyboards/trnthsn/s6xty/readme.md

@@ -1,6 +1,6 @@
 # S6xty
 
-![trnthsn/s6xty](https://i.imgur.com/YJZxxqY.png)
+![trnthsn/s6xty](https://i.imgur.com/Rny9gh9.png)
 
 A 60% keyboard PCB compatible with various keyboard cases. Supports a left USB Type-C connector or 3 JST SH positions for a daughter board
 
@@ -10,11 +10,11 @@ A 60% keyboard PCB compatible with various keyboard cases. Supports a left USB T
 
 Make example for this keyboard (after setting up your build environment):
 
-    make trnthsn/s6xty:default
+    make trnthsn/s6xty/rev1/stm32f072:default
 
 Flashing example for this keyboard:
 
-    make trnthsn/s6xty:default:flash
+    make trnthsn/s6xty/rev1/stm32f072:default:flash
 
 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).
 

keyboards/trnthsn/s6xty/rev1/info.json

@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "S6xty",
+    "matrix_pins": {
+        "cols": ["B14", "A0", "A10", "C15", "A2", "A1", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+        "rows": ["B3", "B7", "A3", "A9", "A8"]
+    },
+    "rgblight": {
+        "led_count": 22
+    },
+    "indicators": {
+        "caps_lock": "B12"
+    }
+}

keyboards/trnthsn/s6xty/rev1/stm32f072/keyboard.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}

keyboards/trnthsn/s6xty/rev1/stm32f103/keyboard.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F103",
+    "bootloader": "uf2boot"
+}

keyboards/trnthsn/s6xty/rev2/info.json

@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "S6xty Rev.2",
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B14", "B12", "B10", "B1", "B0", "A15", "B5", "C15", "C14", "C13", "B9"],
+        "rows": ["B8", "B7", "B6", "B11", "A6"]
+    },
+    "rgblight": {
+        "led_count": 28
+    },
+    "indicators": {
+      "caps_lock": "B4"
+    }
+}

keyboards/trnthsn/s6xty/rev2/stm32f072/keyboard.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
+}

keyboards/trnthsn/s6xty/rev2/stm32f103/keyboard.json

@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F103",
+    "bootloader": "uf2boot"
+}