diff --git a/keyboards/handwired/dactyl_cc/keyboard.json b/keyboards/handwired/dactyl_cc/keyboard.json index 8c2ef8061c..3127ed16b1 100644 --- a/keyboards/handwired/dactyl_cc/keyboard.json +++ b/keyboards/handwired/dactyl_cc/keyboard.json @@ -3,6 +3,8 @@ "manufacturer": "mjohns", "url": "https://github.com/mjohns/dactyl-cc", "maintainer": "qmk", + "bootloader": "rp2040", + "processor": "RP2040", "usb": { "vid": "0x444E", "pid": "0x1407", @@ -16,17 +18,22 @@ "nkro": false }, "matrix_pins": { - "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], - "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + "rows": ["GP29", "GP28", "GP27", "GP26", "GP15", "GP14"], + "cols": ["GP3", "GP4", "GP5", "GP6", "GP7", "GP2"] }, - "diode_direction": "COL2ROW", "split": { "enabled": true, + "handedness": { + "pin": "GP13" + }, "serial": { - "pin": "D0" + "driver": "vendor" + }, + "transport": { + "watchdog": true } }, - "development_board": "promicro", + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ @@ -36,7 +43,7 @@ {"matrix": [0, 3], "x": 3.25, "y": 0}, {"matrix": [0, 4], "x": 4.25, "y": 0.1}, {"matrix": [0, 5], "x": 5.25, "y": 0.1}, - + {"matrix": [6, 0], "x": 11.25, "y": 0.1}, {"matrix": [6, 1], "x": 12.25, "y": 0.1}, {"matrix": [6, 2], "x": 13.25, "y": 0}, diff --git a/keyboards/handwired/dactyl_cc/keymaps/alexng353/config.h b/keyboards/handwired/dactyl_cc/keymaps/alexng353/config.h new file mode 100644 index 0000000000..671dd13ba9 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/alexng353/config.h @@ -0,0 +1,37 @@ +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Enables This makes it easier for fast typists to use dual-function keys */ +#define PERMISSIVE_HOLD + +/* mouse config */ +#define MOUSEKEY_DELAY 0 +// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 7 +#define MOUSEKEY_WHEEL_DELAY 0 + +/* layer config */ +#define TAPPING_TOGGLE 1 + +/* disable action features */ +// #define NO_ACTION_LAYER +// #define NO_ACTION_TAPPING +// #define NO_ACTION_ONESHOT + +// Serial config +// #define SERIAL_USART_TX_PIN GP0 // USART TX pin +// #define SERIAL_USART_RX_PIN GP1 // USART RX pin +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN GP0 +#define SERIAL_USART_RX_PIN GP1 diff --git a/keyboards/handwired/dactyl_cc/keymaps/alexng353/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/alexng353/keymap.c new file mode 100644 index 0000000000..dcb435db55 --- /dev/null +++ b/keyboards/handwired/dactyl_cc/keymaps/alexng353/keymap.c @@ -0,0 +1,42 @@ +// Copyright 2022 mjohns +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +enum layers { + BASE, + NAV +}; + +// TODO: add a "SPECIAL" layer + +#define CTL_ESC LCTL_T(KC_ESC) +#define CTL_CAP LCTL_T(KC_CAPS) +#define ALT_BSP LALT_T(KC_BSPC) +#define LT_SCLN LT(NAV, KC_SCLN) +#define RGUI_SPC RGUI_T(KC_SPC) +#define MINS_LGUI LGUI_T(KC_MINS) +#define EQL_LALT LALT_T(KC_EQL) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + CTL_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + MINS_LGUI, EQL_LALT, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_DOWN, + TT(NAV), KC_DEL, KC_PGUP, KC_RCTL, + KC_BSPC, CTL_ESC, KC_LGUI, KC_PGDN, KC_ENT, RGUI_SPC, + KC_LALT, KC_RALT + ), + [NAV] = LAYOUT( + QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT, + _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, + _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______, + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_PAST, KC_PCMM, KC_P0, KC_PDOT, KC_PENT, _______, + KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + _______, _______, KC_HOME, _______, + KC_BTN1, KC_BTN2, _______, KC_END, _______, _______, + _______, ALT_BSP + ) +}; diff --git a/keyboards/handwired/dactyl_manuform_pi_pico/keyboard.json b/keyboards/handwired/dactyl_manuform_pi_pico/keyboard.json index 6d5949e0bf..a9d93c4323 100644 --- a/keyboards/handwired/dactyl_manuform_pi_pico/keyboard.json +++ b/keyboards/handwired/dactyl_manuform_pi_pico/keyboard.json @@ -19,14 +19,14 @@ "split": { "enabled": true, "handedness": { - "pin": "GP22" - }, - "serial": { - "driver": "vendor" - }, - "transport": { - "watchdog": true - } + "pin": "GP13" + }, + "serial": { + "driver": "vendor" + }, + "transport": { + "watchdog": true + } }, "diode_direction": "COL2ROW", "matrix_pins": {