Update keyboard.json

qmk · Feb 4, 2025 · 848b052 · 848b052
1 parent 836530a
commit 848b052
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 326 deletions.
diff --git a/keyboards/cannonkeys/reverie/hotswap/keyboard.json b/keyboards/cannonkeys/reverie/hotswap/keyboard.json
@@ -1,5 +1,4 @@
 {
-<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json
     "keyboard_name": "Reverie HS",
     "usb": {
         "pid": "0x0033"
@@ -10,59 +9,6 @@
     },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
-========
-    "manufacturer": "ThanhSon.Mech",
-    "keyboard_name": "S6xty5 Rev.2",
-    "maintainer": "trnthsn",
-    "bootloader": "stm32-dfu",
-    "diode_direction": "COL2ROW",
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true
-    },
-    "matrix_pins": {
-        "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "A15", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
-        "rows": ["B1", "B0", "A7", "A6", "A4"]
-    },
-    "rgblight": {
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        },
-        "led_count": 22,
-        "max_brightness": 240,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "B15",
-        "driver": "spi"
-    },
-    "indicators": {
-        "caps_lock": "A5"
-    },
-    "processor": "STM32F072",
-    "url": "",
-    "usb": {
-        "vid": "0x5453",
-        "pid": "0x3635",
-        "device_version": "0.0.1"
-    },
-    "community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
-    "layouts": {
-        "LAYOUT": {
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/keyboard.json
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -77,15 +23,8 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
                 {"matrix": [0, 14], "x": 15, "y": 0},
-========
-                {"matrix": [2, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/keyboard.json
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "x": 2.5, "y": 1},
@@ -101,10 +40,6 @@
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
                 {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
                 {"matrix": [1, 14], "x": 15, "y": 1},
-<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json
-========
-
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/keyboard.json
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
@@ -119,10 +54,6 @@
                 {"matrix": [2, 11], "x": 11.75, "y": 2},
                 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
                 {"matrix": [2, 14], "x": 15, "y": 2},
-<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json
-========
-
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/keyboard.json
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                 {"matrix": [3, 2], "x": 2.25, "y": 3},
                 {"matrix": [3, 3], "x": 3.25, "y": 3},
@@ -137,21 +68,12 @@
                 {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"matrix": [3, 13], "x": 14, "y": 3},
                 {"matrix": [3, 14], "x": 15, "y": 3},
-<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
                 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
                 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-========
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/keyboard.json
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
                 {"matrix": [4, 14], "x": 15, "y": 4}
@@ -220,7 +142,7 @@
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"matrix": [4, 1], "x": 1.5, "y": 4},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
                 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
@@ -291,7 +213,7 @@
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                 {"matrix": [4, 1], "x": 1.5, "y": 4},
                 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
                 {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
                 {"matrix": [4, 12], "x": 13, "y": 4},
                 {"matrix": [4, 13], "x": 14, "y": 4},
@@ -371,4 +293,4 @@
             ]
         }
     }
-}
+}
diff --git a/keyboards/trnthsn/e8ghty/halconf.h b/keyboards/trnthsn/e8ghty/halconf.h
@@ -19,4 +19,3 @@
 #define HAL_USE_SPI TRUE
 
 #include_next <halconf.h>
-
diff --git a/keyboards/trnthsn/e8ghtyneo/readme.md b/keyboards/trnthsn/e8ghtyneo/readme.md
@@ -1,4 +1,3 @@
-<<<<<<<< HEAD:keyboards/trnthsn/e8ghtyneo/readme.md
 # E8ghtyNeo
 
 ![E8ghtyNeo](https://imgur.com/YXYfqzZ.png)
@@ -7,36 +6,15 @@ A TKL keyboard PCB compatible with Neo80. Supports Neo80 keyboard like an out-of
 
 * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn)
 * Hardware Supported: STM32, E8ghtyNeo, Neo80
-========
-# S6xty5 Rev.2
-
-![S6xty5 Rev.2](https://i.imgur.com/ag7Y7wp.jpg)
-
-
-A 65% keyboard PCB compatible with various keyboard cases. Supports a left USB Type-C connector, 5 JST SH1.0 and 2 JST ZH1.25 positions for a daughter board
-
-![Layout](https://i.imgur.com/vZrh43p.jpg)
-
-* Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn)
-* Hardware Supported: STM32, S6xty5 Rev.2, Bakeneko65, Krush65
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/readme.md
 * Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech)
 
 Make example for this keyboard (after setting up your build environment):
 
-<<<<<<<< HEAD:keyboards/trnthsn/e8ghtyneo/readme.md
     make trnthsn/e8ghtyneo/stm32f072:default
 
 Flashing example for this keyboard:
 
     make trnthsn/e8ghtyneo/stm32f072:default:flash
-========
-    make trnthsn/s6xty5r2:default
-
-Flashing example for this keyboard:
-
-    make trnthsn/s6xty5r2:default:flash
->>>>>>>> 5a06f63f15 ([Keyboard] Add support s6xty5 rev.2):keyboards/trnthsn/s6xty5r2/readme.md
 
 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/trnthsn/s6xty5neor2/config.h b/keyboards/trnthsn/s6xty5neor2/config.h
@@ -20,4 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_DRIVER SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
-#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PIN B13
diff --git a/keyboards/trnthsn/s6xty5r2/config.h b/keyboards/trnthsn/s6xty5r2/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 ThanhSon.Mech
+Copyright 2025 Tyson.Keebs
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/keyboards/trnthsn/s6xty5r2/halconf.h b/keyboards/trnthsn/s6xty5r2/halconf.h
@@ -1,18 +1,19 @@
-/* Copyright 2024 ThanhSon.Mech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+Copyright 2025 Tyson.Keebs
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #pragma once
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@
		#define HAL_USE_SPI TRUE

		#include_next <halconf.h>