Finished 5x6

bullwinkle3000 · Dec 28, 2023 · aaddc81 · aaddc81
1 parent c493888
commit aaddc81
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 72 deletions.
diff --git a/keyboards/handwired/wylderbuilds/5x6/config.h b/keyboards/handwired/wylderbuilds/5x6/config.h
@@ -1,7 +1,7 @@
 // Dactyl Manuform Hotswap
 #pragma once
 
-#include "config_common.h"
+//#include "config_common.h"
 // Basic Config
 
 //#define PRODUCT_ID 0x0002
@@ -15,15 +15,15 @@
 #define SERIAL_PIO_USE_PIO0
 #define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
 #define SERIAL_USART_SPEED 921600
-#define SERIAL_USART_PIN_SWAP
+//#define SERIAL_USART_PIN_SWAP
 
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 6
 
-#define MATRIX_COL_PINS { GP3, GP4, GP5, GP6, GP7, GP8 }
-#define MATRIX_ROW_PINS { GP10, GP11, GP12, GP13, GP14, GP15 }
+#define MATRIX_COL_PINS { GP7, GP6, GP5, GP4, GP3, GP2 }
+#define MATRIX_ROW_PINS { GP12, GP11, GP10, GP9, GP13, GP14 }
 #define DIODE_DIRECTION COL2ROW
 
 // WS2812 RGB LED strip input and number of LEDs

diff --git a/keyboards/handwired/wylderbuilds/5x6/info.json b/keyboards/handwired/wylderbuilds/5x6/info.json
@@ -289,55 +289,55 @@
           "x": 7,
           "y": 3.5
         },
-        {
-          "label": "11,3",
-          "x": 13.25,
-          "y": 3.25
-        },
-        {
-          "label": "11,2",
-          "x": 12.25,
-          "y": 3.25
-        },
-        {
-          "label": "11,0",
-          "x": 12.75,
-          "y": 2
-        },
-        {
-          "label": "11,1",
-          "x": 13.75,
-          "y": 2
-        },
         {
           "label": "5,4",
-          "x": 4.5,
-          "y": 7.25
+          "x": 6.5,
+          "y": 4.5
         },
         {
           "label": "5,5",
-          "x": 5.5,
-          "y": 7.25
+          "x": 7.5,
+          "y": 4.5
         },
         {
           "label": "5,2",
-          "x": 5.25,
-          "y": 8.25
+          "x": 7,
+          "y": 5.5
         },
         {
           "label": "5,3",
-          "x": 6.25,
-          "y": 8.25
+          "x": 8,
+          "y": 5.5
         },
         {
-          "label": "10.0",
+          "label": "10,0",
           "x": 11.75,
           "y": 5.75
         },
         {
-          "label": "10.1",
+          "label": "10,1",
           "x": 12.75,
           "y": 5.75
+        },
+        {
+          "label": "11,0",
+          "x": 11.25,
+          "y": 6.75
+        },
+        {
+          "label": "11,1",
+          "x": 12.25,
+          "y": 6.75
+        },
+        {
+          "label": "11,2",
+          "x": 10.75,
+          "y": 7.75
+        },
+        {
+          "label": "11,3",
+          "x": 11.75,
+          "y": 7.75
         }
       ]
     }

diff --git a/keyboards/handwired/wylderbuilds/5x6/keymaps/vial/keymap.c b/keyboards/handwired/wylderbuilds/5x6/keymaps/vial/keymap.c
@@ -16,15 +16,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                          KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                          RAISE,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                      KC_END,  KC_DEL,
-                                         KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
+                                         KC_BSPC, KC_GRV,                     KC_LGUI, KC_LALT
     ),
 
     [_LOWER] = LAYOUT_5x6(
         KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
         _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
         _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
         _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
-                                                _______,KC_PSCR,            _______, KC_P0,
+                        _______,KC_PSCR,                                                         _______, KC_P0,
                                                 _______,_______,            _______,_______,
                                                 _______,_______,            _______,_______,
                                                 _______,_______,            _______,QK_BOOT
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
           _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
           _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
           _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
-                                                  _______,_______,            KC_EQL ,_______,
+                          _______,_______,                                                        KC_EQL ,_______,
                                                   _______,_______,            _______,_______,
                                                   _______,_______,            _______,_______,
                                                   QK_BOOT,_______,            _______,_______

diff --git a/keyboards/handwired/wylderbuilds/5x6/keymaps/vial/vial.json b/keyboards/handwired/wylderbuilds/5x6/keymaps/vial/vial.json
@@ -1,13 +1,12 @@
 {
   "matrix": {
     "rows": 12,
-    "cols": 7
+    "cols": 6
   },
   "layouts": {
     "keymap": [
       {
-        "name": "Wylderbuilds 5x6 standard",
-        "author": "https://wylderbuilds.com"
+        "name": "Wylderbuilds 5x6 Standard Default"
       },
       [
         {
@@ -158,54 +157,40 @@
       ],
       [
         {
-          "r": 15.3,
-          "y": -1.25,
-          "x": 13.25
+          "x": 6.5
         },
-        "11,3"
-      ],
-      [
-        {
-          "r": 15.4,
-          "y": -1,
-          "x": 12.25
-        },
-        "11,2"
+        "5,4",
+        "5,5"
       ],
       [
         {
-          "r": 15.5,
-          "y": -2.25,
-          "x": 12.75
+          "x": 7
         },
-        "11,0",
-        "11,1"
+        "5,2",
+        "5,3"
       ],
       [
         {
-          "r": -15,
-          "y": 4.25,
-          "x": 4.5
+          "r": -6.5,
+          "y": -0.75,
+          "x": 11.75
         },
-        "5,4",
-        "5,5"
+        "10,0",
+        "10,1"
       ],
       [
         {
-          "r": -13,
-          "x": 5.25
+          "x": 11.25
         },
-        "5,2",
-        "5,3"
+        "11,0",
+        "11,1"
       ],
       [
         {
-          "r": -6.5,
-          "y": -3.5,
-          "x": 11.75
+          "x": 10.75
         },
-        "10.0",
-        "10.1"
+        "11,2",
+        "11,3"
       ]
     ]
   }

diff --git a/keyboards/handwired/wylderbuilds/5x6/rules.mk b/keyboards/handwired/wylderbuilds/5x6/rules.mk
@@ -14,5 +14,5 @@ WPM_ENABLE = no
 RGBLIGHT_ENABLE = no
 
 # Opt defs, comment out you're if not using OLED screen for the dactyl_manuform.
-OPT_DEFS += -DHAL_USE_I2C=TRUE
+# OPT_DEFS += -DHAL_USE_I2C=TRUE