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/rart | |
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/rart')
25 files changed, 74 insertions, 94 deletions
diff --git a/keyboards/rart/rart45/config.h b/keyboards/rart/rart45/config.h index 90d584649d..0b8f0b7102 100644 --- a/keyboards/rart/rart45/config.h +++ b/keyboards/rart/rart45/config.h @@ -17,20 +17,12 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x0045 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT Rart45 - /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 6 #define MATRIX_ROW_PINS { D1, C2, C1, B1, D0, C3, C0, D7, B0 } #define MATRIX_COL_PINS { D6, D4, B2, B5, B4, B3 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json index e7b1f241b8..e0f9986eee 100644 --- a/keyboards/rart/rart45/info.json +++ b/keyboards/rart/rart45/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rart45", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0045", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart4x4/config.h b/keyboards/rart/rart4x4/config.h index e203cdaaab..b859a2f552 100644 --- a/keyboards/rart/rart4x4/config.h +++ b/keyboards/rart/rart4x4/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 0x414C -#define PRODUCT_ID 0x0004 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RART4X4 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix pins */ #define MATRIX_ROW_PINS { F4, B6, B3, B1 } #define MATRIX_COL_PINS { F7, B2, B5, B4 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json index 468962aaa6..79be3f9722 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART4X4", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0004", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/rart/rart67/config.h b/keyboards/rart/rart67/config.h index fe96325ac4..a303b42cd2 100644 --- a/keyboards/rart/rart67/config.h +++ b/keyboards/rart/rart67/config.h @@ -19,20 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x414C // "AL" -#define PRODUCT_ID 0x0067 // "67" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RART67 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 #define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 } #define MATRIX_COL_PINS { B3, B2, B1, D5, D4, D6, D7, B4, B5, F0, F7, F6, F5, F4, F1, E6 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json index 1bd24c14f8..8e6a1620f8 100644 --- a/keyboards/rart/rart67/info.json +++ b/keyboards/rart/rart67/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART67", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0067", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart67m/config.h b/keyboards/rart/rart67m/config.h index 02ee4817d9..796b17d5b7 100644 --- a/keyboards/rart/rart67m/config.h +++ b/keyboards/rart/rart67m/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x6067 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RART67M - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 @@ -41,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ #define MATRIX_ROW_PINS { D3, D2, D4, F6, B3, B4, B2, B5 } #define MATRIX_COL_PINS { F4, F5, C6, F7, D7, B1, E6, B6 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json index a8398b041d..6cfd7dcbd6 100644 --- a/keyboards/rart/rart67m/info.json +++ b/keyboards/rart/rart67m/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART67M", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x6067", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75/config.h b/keyboards/rart/rart75/config.h index 1f9a473907..dcc2dff902 100644 --- a/keyboards/rart/rart75/config.h +++ b/keyboards/rart/rart75/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 0x414C // "AL" -#define PRODUCT_ID 0x0075 // "75" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RART75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix pins */ #define MATRIX_ROW_PINS { F1, F4, F6, C7, D4, D0 } #define MATRIX_COL_PINS { D5, D3, D2, D1, C6, B6, B5, B4, D7, D6, B3, B1, F7, F5, B2, B7 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart75/info.json b/keyboards/rart/rart75/info.json index d045da2ac1..ebb8c4044d 100644 --- a/keyboards/rart/rart75/info.json +++ b/keyboards/rart/rart75/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART75", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h index d08e0612a2..7c797b19b2 100644 --- a/keyboards/rart/rart75hs/config.h +++ b/keyboards/rart/rart75hs/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 0x414C // "AL" -#define PRODUCT_ID 0x5575 // "75" -#define DEVICE_VER 0x0003 -#define MANUFACTURER Alabahuy -#define PRODUCT RART75 Hotswap - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix pins */ #define MATRIX_ROW_PINS { D5, D6, D7, D0, C5, C4 } #define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C3 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json index 2a8cae96f8..43822f71f1 100644 --- a/keyboards/rart/rart75hs/info.json +++ b/keyboards/rart/rart75hs/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART75 Hotswap", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x5575", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h index 528082cee0..61173b183b 100644 --- a/keyboards/rart/rart75m/config.h +++ b/keyboards/rart/rart75m/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x6075 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT 75 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 @@ -41,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ #define MATRIX_ROW_PINS { C7, B3, B1, B0, D3, D2 } #define MATRIX_COL_PINS { B2, D4, F0, C6, F1, D7, F4, E6, F5, B4, F6, B5, F7, B6 } -#define UNUSED_PINS #define ENCODERS_PAD_B { B7 } #define ENCODERS_PAD_A { D6 } diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json index 29a948fb8c..5ff8da619f 100644 --- a/keyboards/rart/rart75m/info.json +++ b/keyboards/rart/rart75m/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RART75M", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x6075", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h index 841b63b639..adf7a9ed86 100644 --- a/keyboards/rart/rartand/config.h +++ b/keyboards/rart/rartand/config.h @@ -17,20 +17,12 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x5050 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT Rartand - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 #define MATRIX_ROW_PINS { C3, B2, C2, B1, C1, D7, C0, B0 } #define MATRIX_COL_PINS { D0, D1, B4, B5, B3, D4, D6 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json index e1f885ed46..8faf60cf01 100644 --- a/keyboards/rart/rartand/info.json +++ b/keyboards/rart/rartand/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rartand", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x5050", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartland/config.h b/keyboards/rart/rartland/config.h index 46f08f11a4..5994219592 100644 --- a/keyboards/rart/rartland/config.h +++ b/keyboards/rart/rartland/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x6065 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RARTLAND - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 @@ -41,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14*/ #define MATRIX_ROW_PINS { B4, A7, A5, A6, C3 } #define MATRIX_COL_PINS { B0, A1, B1, A2, B2, A3, B3, A4, C7, C6, D0, C5, D1, C4 } -#define UNUSED_PINS #define LED_CAPS_LOCK_PIN A0 #define LED_PIN_ON_STATE 0 diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json index 2743457e7a..2e46454f85 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RARTLAND", + "manufacturer": "Alabahuy", "url": " ", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x6065", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h index cf02cfedb6..2db1919529 100644 --- a/keyboards/rart/rartlice/config.h +++ b/keyboards/rart/rartlice/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x414C -#define PRODUCT_ID 0x0065 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT Rartlice - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json index cd49dbf03c..d5e8802ee6 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Rartlice", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0065", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartlite/config.h b/keyboards/rart/rartlite/config.h index a11592d392..b73269195a 100644 --- a/keyboards/rart/rartlite/config.h +++ b/keyboards/rart/rartlite/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 0x414C -#define PRODUCT_ID 0x4040 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RARTLITE - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix pins */ #define MATRIX_ROW_PINS { F4, D2, B2, B4, B6, B5, D0, D1 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B3, F7, D3 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json index 96b3d26d70..6403eca743 100644 --- a/keyboards/rart/rartlite/info.json +++ b/keyboards/rart/rartlite/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "RART4X4", + "keyboard_name": "RARTLITE", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x4040", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_right_numpad": { "layout": [ diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h index efb6c7ec29..495f6f99ba 100644 --- a/keyboards/rart/rartpad/config.h +++ b/keyboards/rart/rartpad/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 0x414C // "AL" -#define PRODUCT_ID 0x0050 // "P" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alabahuy -#define PRODUCT RARTPAD - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 4 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key matrix pins */ #define MATRIX_ROW_PINS { B6, F6, D0, D4, C6 } #define MATRIX_COL_PINS { B2, D1, D2, D3 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 48edae5122..2c883cc215 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "RARTPAD", + "manufacturer": "Alabahuy", "url": "", "maintainer": "Alabahuy", + "usb": { + "vid": "0x414C", + "pid": "0x0050", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/rart/rartpad/keymaps/numpad/keymap.c b/keyboards/rart/rartpad/keymaps/numpad/keymap.c index e149dd6b1d..a576f9df9d 100644 --- a/keyboards/rart/rartpad/keymaps/numpad/keymap.c +++ b/keyboards/rart/rartpad/keymaps/numpad/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, MO(1), KC_PENT ), [1] = LAYOUT_numpad_5x4( - KC_TRNS, KC_TRNS, KC_TRNS, RESET, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |