Distinguish product id between versions of one kb

Oh-My-Mechanical-Keyboard · Aug 27, 2021 · 0755243 · 0755243
1 parent d7b6051
commit 0755243
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 6 deletions.
diff --git a/keyboards/yandrstudio/M69/config.h b/keyboards/yandrstudio/M69/config.h
@@ -19,7 +19,6 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xAA96
-#define PRODUCT_ID      0xAAA6
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    JasonRen biu
 #define PRODUCT         M69

diff --git a/keyboards/yandrstudio/M69/hotswap/config.h b/keyboards/yandrstudio/M69/hotswap/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+#define PRODUCT_ID      0xAAA6
diff --git a/keyboards/yandrstudio/M69/solder/config.h b/keyboards/yandrstudio/M69/solder/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+#define PRODUCT_ID      0xAAB6
diff --git a/keyboards/yandrstudio/M69/solder/info-via.json b/keyboards/yandrstudio/M69/solder/info-via.json
@@ -1,7 +1,7 @@
 {
     "name": "M69_Y&R",
     "vendorId": "0xAA96",
-    "productId": "0xAAA6",
+    "productId": "0xAAB6",
     "lighting": {
         "extends": "none",
         "keycodes": "qmk"

diff --git a/keyboards/yandrstudio/readme.md b/keyboards/yandrstudio/readme.md
@@ -29,8 +29,10 @@ A creative coder.
 | yp980ble     | 0xAA96    | 0xAAA3     | BLE 5.0 Dual mode         | &quest;           |
 | whiteMouse69 | 0xAA96    | 0xAAA4     | F401, RGB                 | &check;           |
 | x            | 0xAA96    | 0xAAA5     | x                         | x                 |
-| M69          | 0xAA96    | 0xAAA6     | F401,80%, RGB             | &check;           |
-| zhou75       | 0xAA96    | 0xAAA7     | F401, ENCODER             | &check;           |
+| M69          | 0xAA96    | 0xAAA6     | F401,80%, RGB, Hotswap    | &check;           |
+| M69          | 0xAA96    | 0xAAB6     | F401,80%, RGB, Solder     | &check;           |
+| zhou75       | 0xAA96    | 0xAAA7     | F401, ENCODER, Hotswap    | &check;           |
+| zhou75       | 0xAA96    | 0xAAB7     | F401, ENCODER, Solder     | &check;           |
 | yp87ble      | 0xAA96    | 0xAAA8     | BLE 5.0 Dual mode         | &quest;           |
 | hotdox76V2   | 0xAA96    | 0xAAA9     | 32u4, Split KB, OLED, RGB | &check;           |
 | Eureka75     | 0xAA96    | 0xAAAA     | F401,ENCODER              | &check;           |

diff --git a/keyboards/yandrstudio/zhou75/config.h b/keyboards/yandrstudio/zhou75/config.h
@@ -19,7 +19,6 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xAA96
-#define PRODUCT_ID      0xAAA7
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    lkaill-Y&R
 #define PRODUCT         zhou75

diff --git a/keyboards/yandrstudio/zhou75/hotswap/config.h b/keyboards/yandrstudio/zhou75/hotswap/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+#define PRODUCT_ID      0xAAA7
+
diff --git a/keyboards/yandrstudio/zhou75/solder/config.h b/keyboards/yandrstudio/zhou75/solder/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+#define PRODUCT_ID      0xAAB7
+
diff --git a/keyboards/yandrstudio/zhou75/solder/info-via-encoder.json b/keyboards/yandrstudio/zhou75/solder/info-via-encoder.json
@@ -1,7 +1,7 @@
 {
     "name": "zhou75_Y&R",
     "vendorId": "0xAA96",
-    "productId": "0xAAA7",
+    "productId": "0xAAB7",
     "lighting": {
         "extends": "none",
         "keycodes": "qmk"