aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dews <matthew-dews@users.noreply.github.com>2022-01-10 19:48:49 -0500
committerGitHub <noreply@github.com>2022-01-10 16:48:49 -0800
commit0fc1ae9e9c6184a690858064a618cd413ac779ce (patch)
treeb5d5f1f95abfa07e764a9c82ca71617838fa86db
parentecc06a97001163232e2dd58b3add603636587413 (diff)
downloadqmk_firmware-0fc1ae9e9c6184a690858064a618cd413ac779ce.tar.gz
qmk_firmware-0fc1ae9e9c6184a690858064a618cd413ac779ce.zip
[Keyboard] handwired/dactyl_manuform: add 6x7 version (#15704)
Co-authored-by: Drashna Jaelre <drashna@live.com>
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/6x7.c4
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/6x7.h35
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/config.h40
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/info.json114
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c50
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/rules.mk19
-rw-r--r--keyboards/handwired/dactyl_manuform/dactyl_manuform.h2
-rw-r--r--keyboards/handwired/dactyl_manuform/readme.md7
8 files changed, 270 insertions, 1 deletions
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.c b/keyboards/handwired/dactyl_manuform/6x7/6x7.c
new file mode 100644
index 000000000..eea518da0
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.c
@@ -0,0 +1,4 @@
1// Copyright 2022 Matthew Dews (@matthew-dews)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include "6x7.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
new file mode 100644
index 000000000..8d69ddd09
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
@@ -0,0 +1,35 @@
1// Copyright 2022 Matthew Dews (@matthew-dews)
2// SPDX-License-Identifier: GPL-2.0-or-later
3#pragma once
4
5#include "dactyl_manuform.h"
6
7#define XXX KC_NO
8
9#define LAYOUT_6x7( \
10 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
11 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
12 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
13 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
14 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \
15 L52, L53, R52, R53, \
16 L54, L55, R50, R51, \
17 L64, L65, R60, R61, \
18 L62, L63, R62, R63 \
19) { \
20 { L00, L01, L02, L03, L04, L05, L06 }, \
21 { L10, L11, L12, L13, L14, L15, L16 }, \
22 { L20, L21, L22, L23, L24, L25, L26 }, \
23 { L30, L31, L32, L33, L34, L35, L36 }, \
24 { L40, L41, L42, L43, L44, L45, L46 }, \
25 { XXX, XXX, XXX, L52, L53, L54, L55 }, \
26 { XXX, XXX, XXX, L62, L63, L64, L65 }, \
27\
28 { R00, R01, R02, R03, R04, R05, R06 }, \
29 { R10, R11, R12, R13, R14, R15, R16 }, \
30 { R20, R21, R22, R23, R24, R25, R26 }, \
31 { R30, R31, R32, R33, R34, R35, R36 }, \
32 { R40, R41, R42, R43, R44, R45, R46 }, \
33 { R50, R51, R52, R53, XXX, XXX, XXX }, \
34 { R60, R61, R62, R63, XXX, XXX, XXX } \
35}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
new file mode 100644
index 000000000..f66f4b036
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -0,0 +1,40 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Jack Humbert
4
5This program is free software: you can redistribute it and/or modify
6it under the terms of the GNU General Public License as published by
7the Free Software Foundation, either version 2 of the License, or
8(at your option) any later version.
9
10This program is distributed in the hope that it will be useful,
11but WITHOUT ANY WARRANTY; without even the implied warranty of
12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13GNU General Public License for more details.
14
15You should have received a copy of the GNU General Public License
16along with this program. If not, see <http://www.gnu.org/licenses/>.
17*/
18
19#pragma once
20
21#include "config_common.h"
22
23#define PRODUCT_ID 0x3636
24#define DEVICE_VER 0x0001
25#define PRODUCT Dactyl-Manuform (6x7)
26
27/* key matrix size */
28// Rows are doubled-up
29#define MATRIX_ROWS 14
30#define MATRIX_COLS 7
31
32// wiring of each half
33#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 }
34#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
35
36#define DIODE_DIRECTION COL2ROW
37
38// WS2812 RGB LED strip input and number of LEDs
39#define RGB_DI_PIN D3
40#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
new file mode 100644
index 000000000..7b08dd888
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -0,0 +1,114 @@
1{
2 "keyboard_name": "Dactyl Manuform 6x7",
3 "url": "",
4 "maintainer": "qmk",
5 "layouts": {
6 "LAYOUT_6x7": {
7 "layout": [
8 {"x": 0, "y": 0},
9 {"x": 1, "y": 0},
10 {"x": 2, "y": 0},
11 {"x": 3, "y": 0},
12 {"x": 4, "y": 0},
13 {"x": 5, "y": 0},
14 {"x": 6, "y": 0},
15
16 {"x": 12, "y": 0},
17 {"x": 13, "y": 0},
18 {"x": 14, "y": 0},
19 {"x": 15, "y": 0},
20 {"x": 16, "y": 0},
21 {"x": 17, "y": 0},
22 {"x": 18, "y": 0},
23
24 {"x": 0, "y": 1},
25 {"x": 1, "y": 1},
26 {"x": 2, "y": 1},
27 {"x": 3, "y": 1},
28 {"x": 4, "y": 1},
29 {"x": 5, "y": 1},
30 {"x": 6, "y": 1},
31
32 {"x": 12, "y": 1},
33 {"x": 13, "y": 1},
34 {"x": 14, "y": 1},
35 {"x": 15, "y": 1},
36 {"x": 16, "y": 1},
37 {"x": 17, "y": 1},
38 {"x": 18, "y": 1},
39
40 {"x": 0, "y": 2},
41 {"x": 1, "y": 2},
42 {"x": 2, "y": 2},
43 {"x": 3, "y": 2},
44 {"x": 4, "y": 2},
45 {"x": 5, "y": 2},
46 {"x": 6, "y": 2},
47
48 {"x": 12, "y": 2},
49 {"x": 13, "y": 2},
50 {"x": 14, "y": 2},
51 {"x": 15, "y": 2},
52 {"x": 16, "y": 2},
53 {"x": 17, "y": 2},
54 {"x": 18, "y": 2},
55
56 {"x": 0, "y": 3},
57 {"x": 1, "y": 3},
58 {"x": 2, "y": 3},
59 {"x": 3, "y": 3},
60 {"x": 4, "y": 3},
61 {"x": 5, "y": 3},
62 {"x": 6, "y": 3},
63
64 {"x": 12, "y": 3},
65 {"x": 13, "y": 3},
66 {"x": 14, "y": 3},
67 {"x": 15, "y": 3},
68 {"x": 16, "y": 3},
69 {"x": 17, "y": 3},
70 {"x": 18, "y": 3},
71
72 {"x": 0, "y": 4},
73 {"x": 1, "y": 4},
74 {"x": 2, "y": 4},
75 {"x": 3, "y": 4},
76 {"x": 4, "y": 4},
77 {"x": 5, "y": 4},
78 {"x": 6, "y": 4},
79
80 {"x": 12, "y": 4},
81 {"x": 13, "y": 4},
82 {"x": 14, "y": 4},
83 {"x": 15, "y": 4},
84 {"x": 16, "y": 4},
85 {"x": 17, "y": 4},
86 {"x": 18, "y": 4},
87
88 {"x": 3, "y": 5},
89 {"x": 4, "y": 5},
90
91 {"x": 14, "y": 5},
92 {"x": 15, "y": 5},
93
94 {"x": 5, "y": 6},
95 {"x": 6, "y": 6},
96
97 {"x": 12, "y": 6},
98 {"x": 13, "y": 6},
99
100 {"x": 7, "y": 7},
101 {"x": 8, "y": 7},
102
103 {"x": 10, "y": 7},
104 {"x": 11, "y": 7},
105
106 {"x": 7, "y": 8},
107 {"x": 8, "y": 8},
108
109 {"x": 10, "y": 8},
110 {"x": 11, "y": 8}
111 ]
112 }
113 }
114}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
new file mode 100644
index 000000000..2b699eb68
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
1// Copyright 2022 Matthew Dews (@matthew-dews)
2// SPDX-License-Identifier: GPL-2.0-or-later
3#include QMK_KEYBOARD_H
4
5enum custom_layer {
6 _QWERTY,
7 _LOWER,
8 _RAISE,
9};
10
11#define RAISE MO(_RAISE)
12#define LOWER MO(_LOWER)
13
14const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
15 [_QWERTY] = LAYOUT_6x7(
16 KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12 , _______,
17 _______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_LBRC , KC_RBRC,
18 _______, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_QUOT , KC_BACKSLASH,
19 _______, KC_LSFT , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN, KC_LSFT , _______,
20 _______, KC_LCTL , KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL , _______,
21 KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL,
22 RAISE ,KC_SPC , KC_ENT, LOWER ,
23 KC_TAB,KC_HOME, KC_END, KC_DEL,
24 KC_BSPC,KC_GRV, KC_LGUI, KC_LALT
25 ),
26
27 [_LOWER] = LAYOUT_6x7(
28 KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 , _______,
29 _______, KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL , _______,
30 _______, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______,
31 _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, _______,
32 _______, _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, _______,
33 _______,KC_PSCR, _______, KC_P0,
34 _______,_______, _______,_______,
35 _______,_______, _______,_______,
36 _______,_______, _______,_______
37 ),
38
39 [_RAISE] = LAYOUT_6x7(
40 _______,KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , _______,
41 _______,_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE, _______,
42 _______,_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______,
43 _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______,
44 _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______,
45 _______,_______, KC_EQL ,_______,
46 _______,_______, _______,_______,
47 _______,_______, _______,_______,
48 _______,_______, _______,_______
49 )
50};
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
new file mode 100644
index 000000000..041537982
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
@@ -0,0 +1,19 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = caterina
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = yes # Commands for debug and configuration
15NKRO_ENABLE = no # Enable N-Key Rollover
16BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
17RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
18AUDIO_ENABLE = no # Audio output
19SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index 7a4ca6ea1..c6d71f911 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -16,6 +16,8 @@
16# include "5x7.h" 16# include "5x7.h"
17#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6) 17#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
18# include "6x6.h" 18# include "6x6.h"
19#elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
20# include "6x7.h"
19#elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key) 21#elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
20# include "62key.h" 22# include "62key.h"
21#endif 23#endif
diff --git a/keyboards/handwired/dactyl_manuform/readme.md b/keyboards/handwired/dactyl_manuform/readme.md
index 3221da0e9..4882f4ab4 100644
--- a/keyboards/handwired/dactyl_manuform/readme.md
+++ b/keyboards/handwired/dactyl_manuform/readme.md
@@ -1,4 +1,4 @@
1Dactyl Manuform (4x5, 5x6, 5x7, 6x6) 1Dactyl Manuform (4x5, 5x6, 5x7, 6x6, 6x7)
2====== 2======
3the [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. all information needed for making one is in the first link. 3the [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. all information needed for making one is in the first link.
4![Imgur](https://i.imgur.com/7y0Vbyd.jpg) 4![Imgur](https://i.imgur.com/7y0Vbyd.jpg)
@@ -53,6 +53,11 @@ Keymap of Loligagger from geekhack.
53#### Default 53#### Default
54Simple QWERTY layout with 3 Layers. 54Simple QWERTY layout with 3 Layers.
55 55
56### [Keymaps 6x7](/keyboards/handwired/dactyl_manuform/6x7/keymaps/)
57
58#### Default
59Simple QWERTY layout with 3 Layers.
60
56## Required Hardware 61## Required Hardware
57 62
58Apart from diodes and key switches for the keyboard matrix in each half, you 63Apart from diodes and key switches for the keyboard matrix in each half, you