diff options
author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
---|---|---|
committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/handwired/sono1 | |
parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/handwired/sono1')
-rw-r--r-- | keyboards/handwired/sono1/config.h | 7 | ||||
-rw-r--r-- | keyboards/handwired/sono1/info.json | 7 | ||||
-rw-r--r-- | keyboards/handwired/sono1/stm32f103/config.h | 4 | ||||
-rw-r--r-- | keyboards/handwired/sono1/stm32f103/info.json | 5 | ||||
-rw-r--r-- | keyboards/handwired/sono1/t2pp/config.h | 4 | ||||
-rw-r--r-- | keyboards/handwired/sono1/t2pp/info.json | 5 |
6 files changed, 16 insertions, 16 deletions
diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h index 91519e884a..f20b77b231 100644 --- a/keyboards/handwired/sono1/config.h +++ b/keyboards/handwired/sono1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x515A // "QZ" -#define PRODUCT_ID 0x5331 // "S1" -#define DEVICE_VER 0x0001 -#define MANUFACTURER ASKeyboard -#define PRODUCT Sono1 - /* key matrix size */ #define MATRIX_ROWS 15 #define MATRIX_COLS 8 diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json index 4d35c67b19..519ed121ed 100644 --- a/keyboards/handwired/sono1/info.json +++ b/keyboards/handwired/sono1/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "sono1", + "keyboard_name": "Sono1", + "manufacturer": "ASKeyboard", "url": "", "maintainer": "DmNosachev", + "usb": { + "vid": "0x515A", + "pid": "0x5331" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h index 8da1256900..33563c3cf7 100644 --- a/keyboards/handwired/sono1/stm32f103/config.h +++ b/keyboards/handwired/sono1/stm32f103/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#undef DEVICE_VER - -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 } #define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 } diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/handwired/sono1/stm32f103/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h index 8a20aeeb1d..3ecf674050 100644 --- a/keyboards/handwired/sono1/t2pp/config.h +++ b/keyboards/handwired/sono1/t2pp/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#undef DEVICE_VER - -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 } #define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 } diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/handwired/sono1/t2pp/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} |