diff options
author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
---|---|---|
committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
tree | 818436626d49c7f22f325632b2053edba10d4358 /keyboards/salicylic_acid3/setta21 | |
parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) |
merge upstream master
Diffstat (limited to 'keyboards/salicylic_acid3/setta21')
-rw-r--r-- | keyboards/salicylic_acid3/setta21/rev1/config.h | 7 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/setta21/rev1/info.json (renamed from keyboards/salicylic_acid3/setta21/info.json) | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 742a8d73d0..697e7a7d49 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define DEVICE_VER 0x0011 -#define MANUFACTURER Salicylic_Acid -#define PRODUCT setta21 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 6 diff --git a/keyboards/salicylic_acid3/setta21/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index 46c06613a8..aa101e7a13 100644 --- a/keyboards/salicylic_acid3/setta21/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "setta21", + "manufacturer": "Salicylic_Acid", "url": "https://salicylic-acid3.hatenablog.com/", "maintainer": "Salicylic_acid3", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.1.1" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [ |