add yp87ble and fix zhou75 encoder pin error

Oh-My-Mechanical-Keyboard · Aug 6, 2021 · b4e8c50 · b4e8c50
1 parent 2a560b8
commit b4e8c50
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 191 deletions.
diff --git a/keyboards/yandrstudio/yp87ble/M69.c b/keyboards/yandrstudio/yp87ble/M69.c
diff --git a/keyboards/yandrstudio/yp87ble/M69.h b/keyboards/yandrstudio/yp87ble/M69.h
diff --git a/keyboards/yandrstudio/yp87ble/info-via.json b/keyboards/yandrstudio/yp87ble/info-via.json
@@ -1,14 +1,14 @@
 {
-    "name": "M69_Y&R",
+    "name": "YP87BLE_Y&R",
     "vendorId": "0xAA96",
-    "productId": "0xAAA6",
+    "productId": "0xAAA8",
     "lighting": {
         "extends": "none",
         "keycodes": "qmk"
     },
     "matrix": {
-        "rows": 6,
-        "cols": 18
+        "rows": 9,
+        "cols": 10
     },
     "layouts": {
         "keymap": [
@@ -17,60 +17,34 @@
               {
                 "x": 1
               },
+              "0,1",
               "0,2",
               "0,3",
               "0,4",
-              "0,5",
               {
                 "x": 0.5
               },
+              "0,5",
+              "0,6",
               "0,7",
               "0,8",
-              "0,9",
-              "0,10",
               {
                 "x": 0.5
               },
-              "0,11",
-              "0,12",
-              "0,13",
-              "0,14",
-              {
-                "x": 0.25
-              },
-              "0,15",
-              "0,16",
-              "0,17"
-            ],
-            [
-              {
-                "y": 0.5
-              },
+              "0,9",
               "1,0",
               "1,1",
               "1,2",
+              {
+                "x": 0.5
+              },
               "1,3",
               "1,4",
-              "1,5",
-              "1,6",
-              "1,7",
-              "1,8",
-              "1,9",
-              "1,10",
-              "1,11",
-              "1,12",
-              "1,13",
-              "1,14",
-              {
-                "x": 0.25
-              },
-              "1,15",
-              "1,16",
-              "1,17"
+              "1,5"
             ],
             [
               {
-                "w": 1.5
+                "y": 0.5
               },
               "2,0",
               "2,1",
@@ -82,45 +56,23 @@
               "2,7",
               "2,8",
               "2,9",
-              "2,10",
-              "2,11",
-              "2,12",
-              {
-                "w": 1.5
-              },
-              "2,14",
-              {
-                "x": 0.25
-              },
-              "2,15",
-              "2,16",
-              "2,17"
-            ],
-            [
-              {
-                "w": 1.75
-              },
               "3,0",
               "3,1",
               "3,2",
+              {
+                "w": 2
+              },
               "3,3",
-              "3,4",
-              "3,5",
-              "3,6",
-              "3,7",
-              "3,8",
-              "3,9",
-              "3,10",
-              "3,11",
-              "3,12",
               {
-                "w": 1.25
+                "x": 0.5
               },
-              "3,14"
+              "3,4",
+              "3,5",
+              "3,6"
             ],
             [
               {
-                "w": 1.25
+                "w": 1.5
               },
               "4,0",
               "4,1",
@@ -132,57 +84,104 @@
               "4,7",
               "4,8",
               "4,9",
-              "4,10",
-              "4,11",
+              "5,0",
+              "5,1",
+              "5,2",
+              {
+                "w": 1.5
+              },
+              "5,3",
+              {
+                "x": 0.5
+              },
+              "5,4",
+              "5,5",
+              "5,6"
+            ],
+            [
               {
                 "w": 1.75
               },
-              "4,12",
-              "4,14",
+              "6,0",
+              "6,1",
+              "6,2",
+              "6,3",
+              "6,4",
+              "6,5",
+              "6,6",
+              "6,7",
+              "6,8",
+              "6,9",
+              "1,7",
+              "1,8",
+              {
+                "w": 2.25
+              },
+              "1,9"
+            ],
+            [
+              {
+                "w": 2.25
+              },
+              "7,0",
+              "7,1",
+              "7,2",
+              "7,3",
+              "7,4",
+              "7,5",
+              "7,6",
+              "7,7",
+              "7,8",
+              "7,9",
+              "3,8",
+              {
+                "w": 2.75
+              },
+              "3,9",
               {
-                "x": 1.25
+                "x": 1.5
               },
-              "4,16"
+              "8,9"
             ],
             [
               {
                 "w": 1.25
               },
-              "5,0",
+              "8,0",
               {
                 "w": 1.25
               },
-              "5,1",
+              "8,1",
               {
                 "w": 1.25
               },
-              "5,2",
+              "8,2",
               {
                 "w": 6.25
               },
-              "5,6",
+              "8,3",
               {
                 "w": 1.25
               },
-              "5,10",
+              "8,4",
               {
                 "w": 1.25
               },
-              "5,11",
+              "8,5",
               {
                 "w": 1.25
               },
-              "5,12",
+              "8,6",
               {
                 "w": 1.25
               },
-              "5,14",
+              "8,7",
               {
-                "x": 0.25
+                "x": 0.5
               },
-              "5,15",
-              "5,16",
-              "5,17"
+              "5,7",
+              "5,8",
+              "5,9"
             ]
           ]
     }

diff --git a/keyboards/yandrstudio/zhou75/f401/config.h b/keyboards/yandrstudio/zhou75/f401/config.h
@@ -81,8 +81,8 @@
 
 #ifdef ENCODER_ENABLE
 
-#define ENCODERS_PAD_A { B7, A5 }
-#define ENCODERS_PAD_B { B8, A6 }
+#define ENCODERS_PAD_A { B7, A4 }
+#define ENCODERS_PAD_B { B8, A5 }
 
 #define ENCODER_RESOLUTIONS { 4, 4 }
 

diff --git a/keyboards/yandrstudio/zhou75/f401/rules.mk b/keyboards/yandrstudio/zhou75/f401/rules.mk
@@ -29,6 +29,5 @@ OPT_DEFS += -DEEPROM_EMU_STM32F401xC
 COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
 
 
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE