summaryrefslogtreecommitdiff
path: root/keyboards/misonoworks
diff options
context:
space:
mode:
authorInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
committerInigoGutierrez <inigogf.95@gmail.com>2022-09-25 16:02:54 +0200
commit6afdd9d74da250e47ac64d6690bd19d037045e99 (patch)
tree661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/misonoworks
parent93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff)
parent1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff)
downloadqmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz
qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/misonoworks')
-rw-r--r--keyboards/misonoworks/chocolatebar/config.h8
-rw-r--r--keyboards/misonoworks/chocolatebar/info.json6
-rw-r--r--keyboards/misonoworks/karina/config.h8
-rw-r--r--keyboards/misonoworks/karina/info.json6
4 files changed, 12 insertions, 16 deletions
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index a1da636fd9..438ed237e7 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/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 0x6D77 // "mW" - misonoWorks
-#define PRODUCT_ID 0xC456
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MisonoWorks
-#define PRODUCT Chocolate Bar
-
/* key matrix size */
#define MATRIX_ROWS 4
#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 { B0, B7, D2, D3 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 }
-#define UNUSED_PINS
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index d22d9da7ac..409b1119b7 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Chocolate Bar",
+ "manufacturer": "MisonoWorks",
"url": "https://github.com/misonoworks/chocolate-bar",
"maintainer": "Robin Bayardo",
+ "usb": {
+ "vid": "0x6D77",
+ "pid": "0xC456",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index 6cd5f20e89..9460bff0be 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-// descriptors
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xC456
-#define DEVICE_VER 0x0001
-#define MANUFACTURER MisonoWorks
-#define PRODUCT Karina
-
// matrix
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
@@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// pins
#define MATRIX_ROW_PINS { D2, D3, D5, F0 }
#define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6}
-#define UNUSED_PINS
// diode mode
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index bfa4944c74..b76a16e7e7 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Karina",
+ "manufacturer": "MisonoWorks",
"url": "https://github.com/autumnisacutie/karina",
"maintainer": "MisonoWorks",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xC456",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [