From 70e9957766e05940d5871182ae925f2933ec69a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Wed, 28 Aug 2024 22:14:37 +0700 Subject: [PATCH 01/21] Update support S6xty5 --- keyboards/trnthsn/s6xty5/chconf.h | 27 ++ keyboards/trnthsn/s6xty5/config.h | 23 + keyboards/trnthsn/s6xty5/halconf.h | 22 + keyboards/trnthsn/s6xty5/keyboard.json | 438 ++++++++++++++++++ .../trnthsn/s6xty5/keymaps/default/keymap.c | 41 ++ keyboards/trnthsn/s6xty5/mcuconf.h | 22 + keyboards/trnthsn/s6xty5/readme.md | 30 ++ 7 files changed, 603 insertions(+) create mode 100644 keyboards/trnthsn/s6xty5/chconf.h create mode 100644 keyboards/trnthsn/s6xty5/config.h create mode 100644 keyboards/trnthsn/s6xty5/halconf.h create mode 100644 keyboards/trnthsn/s6xty5/keyboard.json create mode 100644 keyboards/trnthsn/s6xty5/keymaps/default/keymap.c create mode 100644 keyboards/trnthsn/s6xty5/mcuconf.h create mode 100644 keyboards/trnthsn/s6xty5/readme.md diff --git a/keyboards/trnthsn/s6xty5/chconf.h b/keyboards/trnthsn/s6xty5/chconf.h new file mode 100644 index 000000000000..fb5073c7b265 --- /dev/null +++ b/keyboards/trnthsn/s6xty5/chconf.h @@ -0,0 +1,27 @@ +/* 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 . + */ + + +#pragma once + +#define CH_CFG_ST_FREQUENCY 10000 + +#define CH_CFG_OPTIMIZE_SPEED FALSE + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#include_next + diff --git a/keyboards/trnthsn/s6xty5/config.h b/keyboards/trnthsn/s6xty5/config.h new file mode 100644 index 000000000000..ce94e0d56231 --- /dev/null +++ b/keyboards/trnthsn/s6xty5/config.h @@ -0,0 +1,23 @@ +/* +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 . +*/ + +#pragma once + +#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 \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5/halconf.h b/keyboards/trnthsn/s6xty5/halconf.h new file mode 100644 index 000000000000..aeb7eb738789 --- /dev/null +++ b/keyboards/trnthsn/s6xty5/halconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next + diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json new file mode 100644 index 000000000000..a8190dd9574d --- /dev/null +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -0,0 +1,438 @@ +{ + "manufacturer": "ThanhSon.Mech", + "keyboard_name": "S6xty5", + "maintainer": "trnthsn", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B0", "F1", "F0", "C15", "C14", "C13", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], + "rows": ["B10", "B11", "A2", "A1", "A0"] + }, + "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": "A3", + "on_state": 0 + }, + "processor": "STM32F072", + "url": "", + "usb": { + "vid": "0x5453", + "pid": "0x5335", + "device_version": "0.0.1" + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_all" + }, + "community_layouts": [ + "65_ansi_blocker", + "65_ansi_blocker_split_bs", + "65_ansi_blocker_tsangan", + "65_ansi_blocker_tsangan_split_bs" + ], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [2, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + + {"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": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + + {"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, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [2, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + + {"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, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + + {"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, 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}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [2, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + + {"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, 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}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c new file mode 100644 index 000000000000..9b266d7d6b6b --- /dev/null +++ b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + // │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│Del│ + // ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + // │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ + // ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + // │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ + // ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + // │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ + // ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + // │Ctrl│LGUI│Alt │ │RGUI│ Fn │ │ ← │ ↓ │ → │ + // └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + + + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [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_TRNS, KC_DEL, 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, 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, KC_TRNS, KC_TRNS, + MO(2) , 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT + ), + [2] = LAYOUT_all( + QK_BOOT, 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, 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, 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, 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, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT + ), +}; \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5/mcuconf.h b/keyboards/trnthsn/s6xty5/mcuconf.h new file mode 100644 index 000000000000..3bf940e0bec1 --- /dev/null +++ b/keyboards/trnthsn/s6xty5/mcuconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/trnthsn/s6xty5/readme.md b/keyboards/trnthsn/s6xty5/readme.md new file mode 100644 index 000000000000..a14ef0a5397f --- /dev/null +++ b/keyboards/trnthsn/s6xty5/readme.md @@ -0,0 +1,30 @@ +# S6xty5 + +![S6xty5](https://i.imgur.com/bFKBlnm.jpg) + + +A PCB for 65% keyboards. Uses a Left USB Type C connector or JST SH daughter board. + +![Layout](https://i.imgur.com/6gSoh0e.jpg) + +* Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) +* Hardware Supported: STM32, S6xty5, Bakeneko65, Krush65 +* Hardware Availability: [Trnthsn](https://www.facebook.com/ThanhSon.mech) + +Make example for this keyboard (after setting up your build environment): + + make trnthsn/s6xty5:default + +Flashing example for this keyboard: + + make trnthsn/s6xty5: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 4fae937339894225d00dbb52d9ec1591e4fd36dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Wed, 28 Aug 2024 22:38:33 +0700 Subject: [PATCH 02/21] Delete chconf.h --- keyboards/trnthsn/s6xty5/chconf.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 keyboards/trnthsn/s6xty5/chconf.h diff --git a/keyboards/trnthsn/s6xty5/chconf.h b/keyboards/trnthsn/s6xty5/chconf.h deleted file mode 100644 index fb5073c7b265..000000000000 --- a/keyboards/trnthsn/s6xty5/chconf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* 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 . - */ - - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#define CH_CFG_OPTIMIZE_SPEED FALSE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#include_next - From 674c3255b13b64509c90602e1def50118a209302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Thu, 29 Aug 2024 09:11:18 +0700 Subject: [PATCH 03/21] Update manufacturer, community layout for hhkb --- keyboards/trnthsn/s6xty5/readme.md | 2 +- keyboards/trnthsn/tyson60s/keyboard.json | 10 +++++----- keyboards/trnthsn/tyson60s/readme.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/trnthsn/s6xty5/readme.md b/keyboards/trnthsn/s6xty5/readme.md index a14ef0a5397f..2c8e021089a4 100644 --- a/keyboards/trnthsn/s6xty5/readme.md +++ b/keyboards/trnthsn/s6xty5/readme.md @@ -9,7 +9,7 @@ A PCB for 65% keyboards. Uses a Left USB Type C connector or JST SH daughter boa * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) * Hardware Supported: STM32, S6xty5, Bakeneko65, Krush65 -* Hardware Availability: [Trnthsn](https://www.facebook.com/ThanhSon.mech) +* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/trnthsn/tyson60s/keyboard.json b/keyboards/trnthsn/tyson60s/keyboard.json index a2ec365fa98a..1f56820f9368 100644 --- a/keyboards/trnthsn/tyson60s/keyboard.json +++ b/keyboards/trnthsn/tyson60s/keyboard.json @@ -1,7 +1,7 @@ { - "manufacturer": "TrnThSnMech", + "manufacturer": "ThanhSon.Mech", "keyboard_name": "Tyson60s", - "maintainer": "TrnThSnMech", + "maintainer": "trnthsn", "bootloader": "rp2040", "build": { "debounce_type": "sym_defer_pk" @@ -46,11 +46,11 @@ "pin": "GP29" }, "layout_aliases": { - "LAYOUT_all": "LAYOUT_60_tsangan_hhkb" + "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift" }, "community_layouts": [ "60_ansi_tsangan", - "60_tsangan_hhkb", + "60_ansi_tsangan_split_bs_rshift", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb" @@ -124,7 +124,7 @@ {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_tsangan_hhkb": { + "LAYOUT_60_ansi_tsangan_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/trnthsn/tyson60s/readme.md b/keyboards/trnthsn/tyson60s/readme.md index 6a1261e70c3b..32aa8e8f67ca 100644 --- a/keyboards/trnthsn/tyson60s/readme.md +++ b/keyboards/trnthsn/tyson60s/readme.md @@ -8,7 +8,7 @@ A Hiney H60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) * Hardware Supported: RP2040, Tyson60s PCB, Hiney H60 -* Hardware Availability: [Trnthsn](https://www.facebook.com/TrnThSn.Mech) +* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech) Make example for this keyboard (after setting up your build environment): From ea3093953bc375a0e96c4039c9eca07f011ce74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Thu, 29 Aug 2024 09:26:12 +0700 Subject: [PATCH 04/21] Update layout --- keyboards/trnthsn/tyson60s/keyboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/trnthsn/tyson60s/keyboard.json b/keyboards/trnthsn/tyson60s/keyboard.json index 1f56820f9368..f53f8a8f39b1 100644 --- a/keyboards/trnthsn/tyson60s/keyboard.json +++ b/keyboards/trnthsn/tyson60s/keyboard.json @@ -46,11 +46,11 @@ "pin": "GP29" }, "layout_aliases": { - "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift" + "LAYOUT_all": "LAYOUT_60_tsangan_hhkb" }, "community_layouts": [ "60_ansi_tsangan", - "60_ansi_tsangan_split_bs_rshift", + "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb" @@ -124,7 +124,7 @@ {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_60_ansi_tsangan_split_bs_rshift": { + "LAYOUT_60_tsangan_hhkb": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From 70887c0bb41f210ecdbec365075436d55d448c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Sun, 1 Sep 2024 00:09:56 +0700 Subject: [PATCH 05/21] fix row index --- keyboards/trnthsn/s6xty5/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json index a8190dd9574d..77cb20263107 100644 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -14,7 +14,7 @@ }, "matrix_pins": { "cols": ["B0", "F1", "F0", "C15", "C14", "C13", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], - "rows": ["B10", "B11", "A2", "A1", "A0"] + "rows": ["B10", "B11", "A2", "A0", "A1"] }, "rgblight": { "animations": { From 056adca47d316b14c0bba0d56954755c40f7ba07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 2 Sep 2024 00:01:15 +0700 Subject: [PATCH 06/21] Update tyson60s --- keyboards/trnthsn/tyson60s/keyboard.json | 4 ++-- keyboards/trnthsn/tyson60s/readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/trnthsn/tyson60s/keyboard.json b/keyboards/trnthsn/tyson60s/keyboard.json index f53f8a8f39b1..a2ec365fa98a 100644 --- a/keyboards/trnthsn/tyson60s/keyboard.json +++ b/keyboards/trnthsn/tyson60s/keyboard.json @@ -1,7 +1,7 @@ { - "manufacturer": "ThanhSon.Mech", + "manufacturer": "TrnThSnMech", "keyboard_name": "Tyson60s", - "maintainer": "trnthsn", + "maintainer": "TrnThSnMech", "bootloader": "rp2040", "build": { "debounce_type": "sym_defer_pk" diff --git a/keyboards/trnthsn/tyson60s/readme.md b/keyboards/trnthsn/tyson60s/readme.md index 32aa8e8f67ca..6a1261e70c3b 100644 --- a/keyboards/trnthsn/tyson60s/readme.md +++ b/keyboards/trnthsn/tyson60s/readme.md @@ -8,7 +8,7 @@ A Hiney H60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector * Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) * Hardware Supported: RP2040, Tyson60s PCB, Hiney H60 -* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech) +* Hardware Availability: [Trnthsn](https://www.facebook.com/TrnThSn.Mech) Make example for this keyboard (after setting up your build environment): From 827f626594dfe28da2fae1c509ce66b731293b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 2 Sep 2024 00:22:33 +0700 Subject: [PATCH 07/21] Update community layout and layout name --- keyboards/trnthsn/s6xty5/keyboard.json | 12 ++---------- keyboards/trnthsn/s6xty5/keymaps/default/keymap.c | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json index 77cb20263107..03a57bf7732e 100644 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -48,17 +48,9 @@ "pid": "0x5335", "device_version": "0.0.1" }, - "layout_aliases": { - "LAYOUT": "LAYOUT_all" - }, - "community_layouts": [ - "65_ansi_blocker", - "65_ansi_blocker_split_bs", - "65_ansi_blocker_tsangan", - "65_ansi_blocker_tsangan_split_bs" - ], + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c index 9b266d7d6b6b..f853500e7004 100644 --- a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c @@ -17,21 +17,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - [0] = LAYOUT_all( + [0] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( 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_TRNS, KC_DEL, 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, 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, KC_TRNS, KC_TRNS, MO(2) , 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT ), - [2] = LAYOUT_all( + [2] = LAYOUT( QK_BOOT, 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, 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, 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, KC_TRNS, KC_TRNS, From c7e36f6fba66d74ff3f18da9e534f4bfe075793b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Tue, 3 Sep 2024 21:53:02 +0700 Subject: [PATCH 08/21] Update remove rgb test mode --- keyboards/trnthsn/s6xty5/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json index 03a57bf7732e..f3eb1eb5fc00 100644 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -24,7 +24,6 @@ "knight": true, "rainbow_mood": true, "rainbow_swirl": true, - "rgb_test": true, "snake": true, "static_gradient": true, "twinkle": true From b39c1e0b6c49fe2129f908474ce6d659c3e809f9 Mon Sep 17 00:00:00 2001 From: Thanh Son Tran <62438883+trnthsn@users.noreply.github.com> Date: Tue, 17 Sep 2024 16:28:08 +0700 Subject: [PATCH 09/21] Update capslock led --- keyboards/trnthsn/s6xty5/keyboard.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json index f3eb1eb5fc00..cf91c7cb8965 100644 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -37,8 +37,7 @@ "driver": "spi" }, "indicators": { - "caps_lock": "A3", - "on_state": 0 + "caps_lock": "A3" }, "processor": "STM32F072", "url": "", @@ -426,4 +425,4 @@ ] } } -} \ No newline at end of file +} From c46aef58455850217bf5682b51a671f035215ada Mon Sep 17 00:00:00 2001 From: Thanh Son Tran <62438883+trnthsn@users.noreply.github.com> Date: Sat, 5 Oct 2024 03:17:20 +0700 Subject: [PATCH 10/21] Apply suggestions from code review Co-authored-by: Duncan Sutherland --- keyboards/trnthsn/s6xty5/config.h | 2 +- keyboards/trnthsn/s6xty5/halconf.h | 1 - keyboards/trnthsn/s6xty5/keyboard.json | 79 +------------------ .../trnthsn/s6xty5/keymaps/default/keymap.c | 8 +- 4 files changed, 8 insertions(+), 82 deletions(-) diff --git a/keyboards/trnthsn/s6xty5/config.h b/keyboards/trnthsn/s6xty5/config.h index ce94e0d56231..ae9f251eb6ed 100644 --- a/keyboards/trnthsn/s6xty5/config.h +++ b/keyboards/trnthsn/s6xty5/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . #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 \ No newline at end of file +#define WS2812_SPI_SCK_PIN B13 diff --git a/keyboards/trnthsn/s6xty5/halconf.h b/keyboards/trnthsn/s6xty5/halconf.h index aeb7eb738789..b8f0a217c4b7 100644 --- a/keyboards/trnthsn/s6xty5/halconf.h +++ b/keyboards/trnthsn/s6xty5/halconf.h @@ -19,4 +19,3 @@ #define HAL_USE_SPI TRUE #include_next - diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json index cf91c7cb8965..527da373b2b3 100644 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ b/keyboards/trnthsn/s6xty5/keyboard.json @@ -46,84 +46,11 @@ "pid": "0x5335", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [2, 12], "x": 13, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - - {"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": 6, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - }, "LAYOUT_65_ansi_blocker": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, diff --git a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c index f853500e7004..d26460ddd0bd 100644 --- a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c @@ -17,25 +17,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [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_TRNS, KC_DEL, 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, 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, KC_TRNS, KC_TRNS, MO(2) , 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT ), - [2] = LAYOUT( + [2] = LAYOUT_all( QK_BOOT, 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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT ), -}; \ No newline at end of file +}; From 9c1f41793f20bcbd80e5fd3891d63258d751b41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Fri, 22 Nov 2024 23:25:22 +0700 Subject: [PATCH 11/21] Remove deprecated s6xty5 --- keyboards/trnthsn/s6xty5/config.h | 23 -- keyboards/trnthsn/s6xty5/halconf.h | 21 -- keyboards/trnthsn/s6xty5/keyboard.json | 355 ------------------ .../trnthsn/s6xty5/keymaps/default/keymap.c | 41 -- keyboards/trnthsn/s6xty5/mcuconf.h | 22 -- keyboards/trnthsn/s6xty5/readme.md | 30 -- 6 files changed, 492 deletions(-) delete mode 100644 keyboards/trnthsn/s6xty5/config.h delete mode 100644 keyboards/trnthsn/s6xty5/halconf.h delete mode 100644 keyboards/trnthsn/s6xty5/keyboard.json delete mode 100644 keyboards/trnthsn/s6xty5/keymaps/default/keymap.c delete mode 100644 keyboards/trnthsn/s6xty5/mcuconf.h delete mode 100644 keyboards/trnthsn/s6xty5/readme.md diff --git a/keyboards/trnthsn/s6xty5/config.h b/keyboards/trnthsn/s6xty5/config.h deleted file mode 100644 index ae9f251eb6ed..000000000000 --- a/keyboards/trnthsn/s6xty5/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -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 . -*/ - -#pragma once - -#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 diff --git a/keyboards/trnthsn/s6xty5/halconf.h b/keyboards/trnthsn/s6xty5/halconf.h deleted file mode 100644 index b8f0a217c4b7..000000000000 --- a/keyboards/trnthsn/s6xty5/halconf.h +++ /dev/null @@ -1,21 +0,0 @@ -/* 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 . - */ - -#pragma once - -#define HAL_USE_SPI TRUE - -#include_next diff --git a/keyboards/trnthsn/s6xty5/keyboard.json b/keyboards/trnthsn/s6xty5/keyboard.json deleted file mode 100644 index 527da373b2b3..000000000000 --- a/keyboards/trnthsn/s6xty5/keyboard.json +++ /dev/null @@ -1,355 +0,0 @@ -{ - "manufacturer": "ThanhSon.Mech", - "keyboard_name": "S6xty5", - "maintainer": "trnthsn", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B0", "F1", "F0", "C15", "C14", "C13", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], - "rows": ["B10", "B11", "A2", "A0", "A1"] - }, - "rgblight": { - "animations": { - "alternating": true, - "breathing": true, - "christmas": true, - "knight": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "static_gradient": true, - "twinkle": true - }, - "led_count": 22, - "max_brightness": 240, - "sleep": true - }, - "ws2812": { - "pin": "B15", - "driver": "spi" - }, - "indicators": { - "caps_lock": "A3" - }, - "processor": "STM32F072", - "url": "", - "usb": { - "vid": "0x5453", - "pid": "0x5335", - "device_version": "0.0.1" - }, - "layout_aliases": { - "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" - }, - "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], - "layouts": { - "LAYOUT_65_ansi_blocker": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - - {"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, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - }, - "LAYOUT_65_ansi_blocker_split_bs": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [2, 12], "x": 13, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - - {"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, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - }, - "LAYOUT_65_ansi_blocker_tsangan": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - - {"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, 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}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - }, - "LAYOUT_65_ansi_blocker_tsangan_split_bs": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [2, 12], "x": 13, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - - {"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, 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}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c deleted file mode 100644 index d26460ddd0bd..000000000000 --- a/keyboards/trnthsn/s6xty5/keymaps/default/keymap.c +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2024 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - // ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - // │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│Del│ - // ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ - // │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ - // ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - // │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ - // ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - // │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ - // ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - // │Ctrl│LGUI│Alt │ │RGUI│ Fn │ │ ← │ ↓ │ → │ - // └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - - - [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - [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_TRNS, KC_DEL, 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, 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, KC_TRNS, KC_TRNS, - MO(2) , 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT - ), - [2] = LAYOUT_all( - QK_BOOT, 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, 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, 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, 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, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT - ), -}; diff --git a/keyboards/trnthsn/s6xty5/mcuconf.h b/keyboards/trnthsn/s6xty5/mcuconf.h deleted file mode 100644 index 3bf940e0bec1..000000000000 --- a/keyboards/trnthsn/s6xty5/mcuconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* 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 . - */ - -#pragma once - -#include_next - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/trnthsn/s6xty5/readme.md b/keyboards/trnthsn/s6xty5/readme.md deleted file mode 100644 index 2c8e021089a4..000000000000 --- a/keyboards/trnthsn/s6xty5/readme.md +++ /dev/null @@ -1,30 +0,0 @@ -# S6xty5 - -![S6xty5](https://i.imgur.com/bFKBlnm.jpg) - - -A PCB for 65% keyboards. Uses a Left USB Type C connector or JST SH daughter board. - -![Layout](https://i.imgur.com/6gSoh0e.jpg) - -* Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) -* Hardware Supported: STM32, S6xty5, Bakeneko65, Krush65 -* Hardware Availability: [ThanhSon.Mech](https://www.facebook.com/ThanhSon.mech) - -Make example for this keyboard (after setting up your build environment): - - make trnthsn/s6xty5:default - -Flashing example for this keyboard: - - make trnthsn/s6xty5: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). - -## Bootloader - -Enter the bootloader in 3 ways: - -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From c480d2a41aedb16b8a39741d644d10881ba848fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 28 Oct 2024 16:08:39 +0700 Subject: [PATCH 12/21] [Keyboard] Add support s6xty5 rev.2 --- .../cannonkeys/reverie/hotswap/keyboard.json | 84 +++- keyboards/trnthsn/e8ghty/halconf.h | 1 + keyboards/trnthsn/e8ghtyneo/readme.md | 22 ++ keyboards/trnthsn/s6xty5neor2/config.h | 2 +- keyboards/trnthsn/s6xty5r2/config.h | 23 ++ keyboards/trnthsn/s6xty5r2/halconf.h | 22 ++ keyboards/trnthsn/s6xty5r2/keyboard.json | 374 ++++++++++++++++++ .../trnthsn/s6xty5r2/keymaps/default/keymap.c | 41 ++ keyboards/trnthsn/s6xty5r2/mcuconf.h | 22 ++ keyboards/trnthsn/s6xty5r2/readme.md | 49 +++ 10 files changed, 636 insertions(+), 4 deletions(-) create mode 100644 keyboards/trnthsn/s6xty5r2/config.h create mode 100644 keyboards/trnthsn/s6xty5r2/halconf.h create mode 100644 keyboards/trnthsn/s6xty5r2/keyboard.json create mode 100644 keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c create mode 100644 keyboards/trnthsn/s6xty5r2/mcuconf.h create mode 100644 keyboards/trnthsn/s6xty5r2/readme.md diff --git a/keyboards/cannonkeys/reverie/hotswap/keyboard.json b/keyboards/cannonkeys/reverie/hotswap/keyboard.json index 4a2101f9de29..1dbff29c4045 100644 --- a/keyboards/cannonkeys/reverie/hotswap/keyboard.json +++ b/keyboards/cannonkeys/reverie/hotswap/keyboard.json @@ -1,4 +1,5 @@ { +<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json "keyboard_name": "Reverie HS", "usb": { "pid": "0x0033" @@ -9,6 +10,59 @@ }, "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}, @@ -23,8 +77,15 @@ {"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}, @@ -40,6 +101,10 @@ {"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}, @@ -54,6 +119,10 @@ {"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}, @@ -68,12 +137,21 @@ {"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} @@ -142,7 +220,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, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 7], "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}, @@ -213,7 +291,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, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 7], "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}, @@ -293,4 +371,4 @@ ] } } -} +} \ No newline at end of file diff --git a/keyboards/trnthsn/e8ghty/halconf.h b/keyboards/trnthsn/e8ghty/halconf.h index b8f0a217c4b7..aeb7eb738789 100644 --- a/keyboards/trnthsn/e8ghty/halconf.h +++ b/keyboards/trnthsn/e8ghty/halconf.h @@ -19,3 +19,4 @@ #define HAL_USE_SPI TRUE #include_next + diff --git a/keyboards/trnthsn/e8ghtyneo/readme.md b/keyboards/trnthsn/e8ghtyneo/readme.md index 7c7419e773c2..e29445d86cfc 100644 --- a/keyboards/trnthsn/e8ghtyneo/readme.md +++ b/keyboards/trnthsn/e8ghtyneo/readme.md @@ -1,3 +1,4 @@ +<<<<<<<< HEAD:keyboards/trnthsn/e8ghtyneo/readme.md # E8ghtyNeo ![E8ghtyNeo](https://imgur.com/YXYfqzZ.png) @@ -6,15 +7,36 @@ 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 index ae9f251eb6ed..ce94e0d56231 100644 --- a/keyboards/trnthsn/s6xty5neor2/config.h +++ b/keyboards/trnthsn/s6xty5neor2/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . #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 \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5r2/config.h b/keyboards/trnthsn/s6xty5r2/config.h new file mode 100644 index 000000000000..ce94e0d56231 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/config.h @@ -0,0 +1,23 @@ +/* +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 . +*/ + +#pragma once + +#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 \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5r2/halconf.h b/keyboards/trnthsn/s6xty5r2/halconf.h new file mode 100644 index 000000000000..aeb7eb738789 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/halconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next + diff --git a/keyboards/trnthsn/s6xty5r2/keyboard.json b/keyboards/trnthsn/s6xty5r2/keyboard.json new file mode 100644 index 000000000000..1dbff29c4045 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/keyboard.json @@ -0,0 +1,374 @@ +{ +<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json + "keyboard_name": "Reverie HS", + "usb": { + "pid": "0x0033" + }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], + "layout_aliases": { + "LAYOUT_65_ansi_blocker_split_bs": "LAYOUT_all" + }, + "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}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + {"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}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + {"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}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"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}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"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}, + {"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}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"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}, + {"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}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"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}, + {"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, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c new file mode 100644 index 000000000000..bb1143d611b8 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + // │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Bsp│Del│ + // ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ + // │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ + // ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + // │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ + // ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + // │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ + // ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤ + // │Ctrl │GUI│ Alt │ │ Alt │ │ ← │ ↓ │ → │ + // └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘ + + + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT( + 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_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + MO(2) , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5r2/mcuconf.h b/keyboards/trnthsn/s6xty5r2/mcuconf.h new file mode 100644 index 000000000000..3bf940e0bec1 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/mcuconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE diff --git a/keyboards/trnthsn/s6xty5r2/readme.md b/keyboards/trnthsn/s6xty5r2/readme.md new file mode 100644 index 000000000000..e29445d86cfc --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/readme.md @@ -0,0 +1,49 @@ +<<<<<<<< HEAD:keyboards/trnthsn/e8ghtyneo/readme.md +# E8ghtyNeo + +![E8ghtyNeo](https://imgur.com/YXYfqzZ.png) + +A TKL keyboard PCB compatible with Neo80. Supports Neo80 keyboard like an out-of-the-box PCB without any modification. + +* 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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 5bc67571b0d60f1302ab8544e47eaf766441aabf Mon Sep 17 00:00:00 2001 From: Thanh Son Tran <62438883+trnthsn@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:43:29 +0700 Subject: [PATCH 13/21] Apply suggestions from code review Co-authored-by: Duncan Sutherland --- keyboards/trnthsn/s6xty5r2/config.h | 2 +- keyboards/trnthsn/s6xty5r2/halconf.h | 1 - keyboards/trnthsn/s6xty5r2/keyboard.json | 26 +++---------------- .../trnthsn/s6xty5r2/keymaps/default/keymap.c | 8 +++--- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/keyboards/trnthsn/s6xty5r2/config.h b/keyboards/trnthsn/s6xty5r2/config.h index ce94e0d56231..ae9f251eb6ed 100644 --- a/keyboards/trnthsn/s6xty5r2/config.h +++ b/keyboards/trnthsn/s6xty5r2/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . #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 \ No newline at end of file +#define WS2812_SPI_SCK_PIN B13 diff --git a/keyboards/trnthsn/s6xty5r2/halconf.h b/keyboards/trnthsn/s6xty5r2/halconf.h index aeb7eb738789..b8f0a217c4b7 100644 --- a/keyboards/trnthsn/s6xty5r2/halconf.h +++ b/keyboards/trnthsn/s6xty5r2/halconf.h @@ -19,4 +19,3 @@ #define HAL_USE_SPI TRUE #include_next - diff --git a/keyboards/trnthsn/s6xty5r2/keyboard.json b/keyboards/trnthsn/s6xty5r2/keyboard.json index 1dbff29c4045..2b31a919990a 100644 --- a/keyboards/trnthsn/s6xty5r2/keyboard.json +++ b/keyboards/trnthsn/s6xty5r2/keyboard.json @@ -59,10 +59,12 @@ "pid": "0x3635", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs" + }, "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 +79,10 @@ {"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 +98,7 @@ {"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 +113,7 @@ {"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 +128,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} @@ -371,4 +353,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c index bb1143d611b8..1566bc4dce85 100644 --- a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -17,25 +17,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘ - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [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_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2) , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; \ No newline at end of file +}; From 1e6c796d09f5ca126fd756589148167102effbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 28 Oct 2024 17:09:26 +0700 Subject: [PATCH 14/21] Update support multiple mcu --- keyboards/trnthsn/s6xty5r2/halconf.h | 3 ++- .../s6xty5r2/{keyboard.json => info.json} | 2 -- keyboards/trnthsn/s6xty5r2/rules.mk | 1 + .../trnthsn/s6xty5r2/{ => stm32f072}/config.h | 0 .../trnthsn/s6xty5r2/stm32f072/keyboard.json | 4 ++++ .../s6xty5r2/{ => stm32f072}/mcuconf.h | 0 keyboards/trnthsn/s6xty5r2/stm32f103/config.h | 23 +++++++++++++++++++ .../trnthsn/s6xty5r2/stm32f103/keyboard.json | 4 ++++ .../trnthsn/s6xty5r2/stm32f103/mcuconf.h | 22 ++++++++++++++++++ 9 files changed, 56 insertions(+), 3 deletions(-) rename keyboards/trnthsn/s6xty5r2/{keyboard.json => info.json} (99%) create mode 100644 keyboards/trnthsn/s6xty5r2/rules.mk rename keyboards/trnthsn/s6xty5r2/{ => stm32f072}/config.h (100%) create mode 100644 keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json rename keyboards/trnthsn/s6xty5r2/{ => stm32f072}/mcuconf.h (100%) create mode 100644 keyboards/trnthsn/s6xty5r2/stm32f103/config.h create mode 100644 keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json create mode 100644 keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h diff --git a/keyboards/trnthsn/s6xty5r2/halconf.h b/keyboards/trnthsn/s6xty5r2/halconf.h index b8f0a217c4b7..337ed5da182d 100644 --- a/keyboards/trnthsn/s6xty5r2/halconf.h +++ b/keyboards/trnthsn/s6xty5r2/halconf.h @@ -17,5 +17,6 @@ #pragma once #define HAL_USE_SPI TRUE - +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD #include_next diff --git a/keyboards/trnthsn/s6xty5r2/keyboard.json b/keyboards/trnthsn/s6xty5r2/info.json similarity index 99% rename from keyboards/trnthsn/s6xty5r2/keyboard.json rename to keyboards/trnthsn/s6xty5r2/info.json index 2b31a919990a..64142db261fe 100644 --- a/keyboards/trnthsn/s6xty5r2/keyboard.json +++ b/keyboards/trnthsn/s6xty5r2/info.json @@ -14,7 +14,6 @@ "manufacturer": "ThanhSon.Mech", "keyboard_name": "S6xty5 Rev.2", "maintainer": "trnthsn", - "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { "bootmagic": true, @@ -52,7 +51,6 @@ "indicators": { "caps_lock": "A5" }, - "processor": "STM32F072", "url": "", "usb": { "vid": "0x5453", diff --git a/keyboards/trnthsn/s6xty5r2/rules.mk b/keyboards/trnthsn/s6xty5r2/rules.mk new file mode 100644 index 000000000000..608ec5673b90 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = trnthsn/okayu/stm32f072 \ No newline at end of file diff --git a/keyboards/trnthsn/s6xty5r2/config.h b/keyboards/trnthsn/s6xty5r2/stm32f072/config.h similarity index 100% rename from keyboards/trnthsn/s6xty5r2/config.h rename to keyboards/trnthsn/s6xty5r2/stm32f072/config.h diff --git a/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json b/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json new file mode 100644 index 000000000000..b5d728b1cdf1 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F072", + "bootloader": "stm32-dfu", +} diff --git a/keyboards/trnthsn/s6xty5r2/mcuconf.h b/keyboards/trnthsn/s6xty5r2/stm32f072/mcuconf.h similarity index 100% rename from keyboards/trnthsn/s6xty5r2/mcuconf.h rename to keyboards/trnthsn/s6xty5r2/stm32f072/mcuconf.h diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/config.h b/keyboards/trnthsn/s6xty5r2/stm32f103/config.h new file mode 100644 index 000000000000..ae9f251eb6ed --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/stm32f103/config.h @@ -0,0 +1,23 @@ +/* +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 . +*/ + +#pragma once + +#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 diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json b/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json new file mode 100644 index 000000000000..5b2b6bc7d930 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "uf2boot", +} diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h b/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h new file mode 100644 index 000000000000..3bf940e0bec1 --- /dev/null +++ b/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h @@ -0,0 +1,22 @@ +/* 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 . + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE From 937258584eadef2c8eb37cbdd0a48159e0217594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 28 Oct 2024 17:14:49 +0700 Subject: [PATCH 15/21] correct default folder stm32 --- keyboards/trnthsn/s6xty5r2/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trnthsn/s6xty5r2/rules.mk b/keyboards/trnthsn/s6xty5r2/rules.mk index 608ec5673b90..818a141ff539 100644 --- a/keyboards/trnthsn/s6xty5r2/rules.mk +++ b/keyboards/trnthsn/s6xty5r2/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = trnthsn/okayu/stm32f072 \ No newline at end of file +DEFAULT_FOLDER = trnthsn/s6xty5r2/stm32f072 \ No newline at end of file From 66f7614c2fb76985948cbacf9aaa5216bbd4246e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Tue, 29 Oct 2024 13:53:22 +0700 Subject: [PATCH 16/21] Update keymap --- keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c index 1566bc4dce85..66099b6a46ad 100644 --- a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ // │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ // ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬─┬───┼───┼───┤ - // │Ctrl │GUI│ Alt │ │ Alt │ │ ← │ ↓ │ → │ + // │Ctrl │GUI│ Alt │ │ Fn │ │ ← │ ↓ │ → │ // └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘ From f0520ce1acdaba64c8a907db798700f864418ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Mon, 4 Nov 2024 22:51:03 +0700 Subject: [PATCH 17/21] Update move config.h and mcuconf.h --- .../trnthsn/s6xty5r2/{stm32f072 => }/config.h | 0 .../s6xty5r2/{stm32f072 => }/mcuconf.h | 0 keyboards/trnthsn/s6xty5r2/stm32f103/config.h | 23 ------------------- .../trnthsn/s6xty5r2/stm32f103/mcuconf.h | 22 ------------------ 4 files changed, 45 deletions(-) rename keyboards/trnthsn/s6xty5r2/{stm32f072 => }/config.h (100%) rename keyboards/trnthsn/s6xty5r2/{stm32f072 => }/mcuconf.h (100%) delete mode 100644 keyboards/trnthsn/s6xty5r2/stm32f103/config.h delete mode 100644 keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h diff --git a/keyboards/trnthsn/s6xty5r2/stm32f072/config.h b/keyboards/trnthsn/s6xty5r2/config.h similarity index 100% rename from keyboards/trnthsn/s6xty5r2/stm32f072/config.h rename to keyboards/trnthsn/s6xty5r2/config.h diff --git a/keyboards/trnthsn/s6xty5r2/stm32f072/mcuconf.h b/keyboards/trnthsn/s6xty5r2/mcuconf.h similarity index 100% rename from keyboards/trnthsn/s6xty5r2/stm32f072/mcuconf.h rename to keyboards/trnthsn/s6xty5r2/mcuconf.h diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/config.h b/keyboards/trnthsn/s6xty5r2/stm32f103/config.h deleted file mode 100644 index ae9f251eb6ed..000000000000 --- a/keyboards/trnthsn/s6xty5r2/stm32f103/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -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 . -*/ - -#pragma once - -#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 diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h b/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h deleted file mode 100644 index 3bf940e0bec1..000000000000 --- a/keyboards/trnthsn/s6xty5r2/stm32f103/mcuconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* 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 . - */ - -#pragma once - -#include_next - -#undef STM32_SPI_USE_SPI2 -#define STM32_SPI_USE_SPI2 TRUE From b8862dfa03355a80bcebd86c5d922e4dd091edd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Fri, 22 Nov 2024 21:14:21 +0700 Subject: [PATCH 18/21] Resolve comment --- keyboards/trnthsn/s6xty5r2/info.json | 1 - keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/trnthsn/s6xty5r2/info.json b/keyboards/trnthsn/s6xty5r2/info.json index 64142db261fe..6420858b876e 100644 --- a/keyboards/trnthsn/s6xty5r2/info.json +++ b/keyboards/trnthsn/s6xty5r2/info.json @@ -35,7 +35,6 @@ "knight": true, "rainbow_mood": true, "rainbow_swirl": true, - "rgb_test": true, "snake": true, "static_gradient": true, "twinkle": true diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c index 66099b6a46ad..5da56d19191d 100644 --- a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -27,8 +27,8 @@ 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_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - MO(2) , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, UG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, + MO(2) , _______, _______, _______, _______, _______, _______, UG_NEXT, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_all( From 32d50e1021b16453e4b1c7c8a7c6dc359077e71d Mon Sep 17 00:00:00 2001 From: Thanh Son Tran <62438883+trnthsn@users.noreply.github.com> Date: Fri, 22 Nov 2024 21:34:28 +0700 Subject: [PATCH 19/21] Update keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c index 5da56d19191d..0975bfc47ded 100644 --- a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, - MO(2) , _______, _______, _______, _______, _______, _______, UG_NEXT, RGB_VAD, RGB_VAI, _______, _______, _______, _______, + MO(2) , _______, _______, _______, _______, _______, _______, UG_NEXT, UG_VALD, UG_VALU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_all( From 836530ae62f73f1e114d0079cac0733f28135322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Fri, 3 Jan 2025 14:06:03 +0700 Subject: [PATCH 20/21] remove rules.mk --- keyboards/trnthsn/s6xty5r2/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/trnthsn/s6xty5r2/rules.mk diff --git a/keyboards/trnthsn/s6xty5r2/rules.mk b/keyboards/trnthsn/s6xty5r2/rules.mk deleted file mode 100644 index 818a141ff539..000000000000 --- a/keyboards/trnthsn/s6xty5r2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = trnthsn/s6xty5r2/stm32f072 \ No newline at end of file From 23a7e099da6fcedd62c511e006957eb7756e200b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Thanh=20S=C6=A1n?= Date: Tue, 4 Feb 2025 21:43:43 +0700 Subject: [PATCH 21/21] Remove max brightness --- .../cannonkeys/reverie/hotswap/keyboard.json | 84 +-------- keyboards/trnthsn/e8ghty/halconf.h | 1 - keyboards/trnthsn/e8ghtyneo/readme.md | 22 --- keyboards/trnthsn/s6xty5neor2/config.h | 2 +- keyboards/trnthsn/s6xty5r2/config.h | 2 +- keyboards/trnthsn/s6xty5r2/halconf.h | 31 +-- keyboards/trnthsn/s6xty5r2/info.json | 176 ++---------------- .../trnthsn/s6xty5r2/keymaps/default/keymap.c | 2 +- keyboards/trnthsn/s6xty5r2/mcuconf.h | 31 +-- keyboards/trnthsn/s6xty5r2/readme.md | 29 +-- .../trnthsn/s6xty5r2/stm32f072/keyboard.json | 2 +- .../trnthsn/s6xty5r2/stm32f103/keyboard.json | 2 +- 12 files changed, 58 insertions(+), 326 deletions(-) diff --git a/keyboards/cannonkeys/reverie/hotswap/keyboard.json b/keyboards/cannonkeys/reverie/hotswap/keyboard.json index 1dbff29c4045..4a2101f9de29 100644 --- 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 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/trnthsn/e8ghty/halconf.h b/keyboards/trnthsn/e8ghty/halconf.h index aeb7eb738789..b8f0a217c4b7 100644 --- a/keyboards/trnthsn/e8ghty/halconf.h +++ b/keyboards/trnthsn/e8ghty/halconf.h @@ -19,4 +19,3 @@ #define HAL_USE_SPI TRUE #include_next - diff --git a/keyboards/trnthsn/e8ghtyneo/readme.md b/keyboards/trnthsn/e8ghtyneo/readme.md index e29445d86cfc..7c7419e773c2 100644 --- 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 index ce94e0d56231..ae9f251eb6ed 100644 --- a/keyboards/trnthsn/s6xty5neor2/config.h +++ b/keyboards/trnthsn/s6xty5neor2/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . #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 \ No newline at end of file +#define WS2812_SPI_SCK_PIN B13 diff --git a/keyboards/trnthsn/s6xty5r2/config.h b/keyboards/trnthsn/s6xty5r2/config.h index ae9f251eb6ed..5e5c1eb155c3 100644 --- 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 index 337ed5da182d..52a40e4e7ebf 100644 --- 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 . - */ +/* +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 . +*/ #pragma once diff --git a/keyboards/trnthsn/s6xty5r2/info.json b/keyboards/trnthsn/s6xty5r2/info.json index 6420858b876e..046ce8bafff0 100644 --- a/keyboards/trnthsn/s6xty5r2/info.json +++ b/keyboards/trnthsn/s6xty5r2/info.json @@ -1,17 +1,5 @@ { -<<<<<<<< HEAD:keyboards/cannonkeys/reverie/hotswap/keyboard.json - "keyboard_name": "Reverie HS", - "usb": { - "pid": "0x0033" - }, - "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], - "layout_aliases": { - "LAYOUT_65_ansi_blocker_split_bs": "LAYOUT_all" - }, - "layouts": { - "LAYOUT_65_ansi_blocker": { -======== - "manufacturer": "ThanhSon.Mech", + "manufacturer": "Tyson.Keebs", "keyboard_name": "S6xty5 Rev.2", "maintainer": "trnthsn", "diode_direction": "COL2ROW", @@ -21,7 +9,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "A15", "A3", "B9", "B8", "B7", "B6", "B5", "B4", "B3"], @@ -39,8 +28,10 @@ "static_gradient": true, "twinkle": true }, + "default": { + "animation": "rainbow_swirl" + }, "led_count": 22, - "max_brightness": 240, "sleep": true }, "ws2812": { @@ -61,7 +52,7 @@ }, "community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"], "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -76,8 +67,7 @@ {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [2, 12], "x": 13, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, {"matrix": [0, 14], "x": 15, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, @@ -136,76 +126,6 @@ {"matrix": [4, 14], "x": 15, "y": 4} ] }, - "LAYOUT_65_ansi_blocker_tsangan": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 14], "x": 15, "y": 0}, - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - {"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}, - {"matrix": [4, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] - }, "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, @@ -221,9 +141,10 @@ {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [2, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, {"matrix": [0, 14], "x": 15, "y": 0}, + {"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}, @@ -239,6 +160,7 @@ {"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}, + {"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}, @@ -253,6 +175,7 @@ {"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}, + {"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}, @@ -267,6 +190,7 @@ {"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}, + {"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}, @@ -276,78 +200,6 @@ {"matrix": [4, 13], "x": 14, "y": 4}, {"matrix": [4, 14], "x": 15, "y": 4} ] - }, - "LAYOUT_all": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [2, 12], "x": 14, "y": 0}, - {"matrix": [0, 14], "x": 15, "y": 0}, - {"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}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"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}, - {"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}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"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}, - {"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}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"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}, - {"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, 12], "x": 13, "y": 4}, - {"matrix": [4, 13], "x": 14, "y": 4}, - {"matrix": [4, 14], "x": 15, "y": 4} - ] } } } diff --git a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c index 0975bfc47ded..c2dd98e34d4d 100644 --- a/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c +++ b/keyboards/trnthsn/s6xty5r2/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 QMK +// Copyright 2025 QMK // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H diff --git a/keyboards/trnthsn/s6xty5r2/mcuconf.h b/keyboards/trnthsn/s6xty5r2/mcuconf.h index 3bf940e0bec1..03624a3d2fda 100644 --- a/keyboards/trnthsn/s6xty5r2/mcuconf.h +++ b/keyboards/trnthsn/s6xty5r2/mcuconf.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 . - */ +/* +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 . +*/ #pragma once diff --git a/keyboards/trnthsn/s6xty5r2/readme.md b/keyboards/trnthsn/s6xty5r2/readme.md index e29445d86cfc..427c500a22e3 100644 --- a/keyboards/trnthsn/s6xty5r2/readme.md +++ b/keyboards/trnthsn/s6xty5r2/readme.md @@ -1,42 +1,21 @@ -<<<<<<<< HEAD:keyboards/trnthsn/e8ghtyneo/readme.md -# E8ghtyNeo - -![E8ghtyNeo](https://imgur.com/YXYfqzZ.png) - -A TKL keyboard PCB compatible with Neo80. Supports Neo80 keyboard like an out-of-the-box PCB without any modification. - -* Keyboard Maintainer: [Trnthsn](https://github.com/trnthsn) -* Hardware Supported: STM32, E8ghtyNeo, Neo80 -======== # S6xty5 Rev.2 -![S6xty5 Rev.2](https://i.imgur.com/ag7Y7wp.jpg) +![S6xty5 Rev.2](https://i.imgur.com/9Kyhigq.png) 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 Supported: STM32, S6xty5 Rev.2, Bakeneko65, Krush65, ... * 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 + make trnthsn/s6xty5r2/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/stm32f072:default:flash - 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/s6xty5r2/stm32f072/keyboard.json b/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json index b5d728b1cdf1..8bba6f5d5da0 100644 --- a/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json +++ b/keyboards/trnthsn/s6xty5r2/stm32f072/keyboard.json @@ -1,4 +1,4 @@ { "processor": "STM32F072", - "bootloader": "stm32-dfu", + "bootloader": "stm32-dfu" } diff --git a/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json b/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json index 5b2b6bc7d930..4dc77604c43d 100644 --- a/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json +++ b/keyboards/trnthsn/s6xty5r2/stm32f103/keyboard.json @@ -1,4 +1,4 @@ { "processor": "STM32F103", - "bootloader": "uf2boot", + "bootloader": "uf2boot" }