summaryrefslogtreecommitdiff
path: root/keyboards/handwired/dactyl_manuform
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/dactyl_manuform')
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c66
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/config.h30
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/info.json77
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c26
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h105
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c76
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h36
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c386
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk17
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/rules.mk18
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/info.json109
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c151
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c108
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c1
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/info.json160
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c62
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/readme.md6
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/rules.mk14
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/promicro/config.h20
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/promicro/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/info.json3
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json127
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c52
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md85
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/config.h22
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/info.json22
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/config.h2
-rw-r--r--keyboards/handwired/dactyl_manuform/dmote/62key/info.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/readme.md220
46 files changed, 320 insertions, 1896 deletions
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
deleted file mode 100644
index 5afb908d02..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2021 @dlford
-
-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/>.
-*/
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-// LED Layout
-// Columns
-// 0 1 2 3 4 5 6 7 8 9 10 11
-// Physical (Center: 133)
-// 20 41 61 81 102 122 143 163 183 204 224 244
-// Rows Physical (Center: 54)
-// 17 12 11 06 05 23 24 29 30 35 0 21
-// 16 13 10 07 04 22 25 28 31 34 1 43
-// 15 14 09 08 03 21 26 27 32 33 2 64
-// 02 01 00 18 19 20 3 85
-
-led_config_t g_led_config = { {
- // Key matrix to LED index
- // Left 1-18
- {17, 12, 11, 6, 5},
- {16, 13, 10, 7, 4},
- {15, 14, 9, 8, 3},
- {NO_LED, NO_LED, 2, 1, 0},
- // Right 1-18
- {23, 24, 29, 30, 35},
- {22, 25, 28, 31, 34},
- {21, 26, 27, 32, 33},
- {18, 19, 20, NO_LED, NO_LED},
-}, {
- // LED index to physical position
- // Left 1-18
- {122,85},{102,85},{81,85},{102,64},{102,43},{102,21},
- {81,21},{81,43},{81,64},{61,64},{61,43},{61,21},
- {41,21},{41,43},{41,64},{20,64},{20,43},{20,21},
- // Right 1-18
- {143,85},{163,85},{183,85},{163,64},{163,43},{163,21},
- {183,21},{183,43},{183,64},{204,64},{204,43},{204,21},
- {224,21},{224,43},{224,64},{244,64},{244,43},{244,21}
-}, {
- // LED index to flag
- // Left 1-18
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- // Right 1-18
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- 4,4,4,4,4,4
-} };
-
-#endif
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h
deleted file mode 100644
index d84e9b6440..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2021 @dlford
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGB_MATRIX_LED_COUNT 36
-#define RGB_MATRIX_SPLIT { 18, 18 }
-#define RGB_MATRIX_CENTER { 133, 54 }
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#undef LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#undef LOCKING_RESYNC_ENABLE
-
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#undef PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
deleted file mode 100644
index cfe109fb37..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "keyboard_name": "Dactyl Minidox (3x5+3)",
- "manufacturer": "DLFord",
- "url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
- "maintainer": "dlford",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.3"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "WS2812"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["B1", "B3", "B2", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
-
- {"matrix": [4, 0], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [4, 2], "x": 12, "y": 0},
- {"matrix": [4, 3], "x": 13, "y": 0},
- {"matrix": [4, 4], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
-
- {"matrix": [5, 0], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1},
- {"matrix": [5, 2], "x": 12, "y": 1},
- {"matrix": [5, 3], "x": 13, "y": 1},
- {"matrix": [5, 4], "x": 14, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
-
- {"matrix": [6, 0], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2},
- {"matrix": [6, 2], "x": 12, "y": 2},
- {"matrix": [6, 3], "x": 13, "y": 2},
- {"matrix": [6, 4], "x": 14, "y": 2},
-
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
-
- {"matrix": [7, 0], "x": 10, "y": 3},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 2], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c
deleted file mode 100644
index abd6433558..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /*
- * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐
- * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │
- * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤
- * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │
- * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤
- * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │
- * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘
- * ┌───┐ ┌───┐
- * │GUI├───┐ ┌───┤Alt│
- * └───┤Bsp├───┐ ┌───┤Ent├───┘
- * └───┤ │ │ ├───┘
- * └───┘ └───┘
- */
- [0] = LAYOUT_split_3x5_3(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
- )
-};
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
deleted file mode 100644
index 783a2c46b1..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2021 @dlford
-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
-
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS // ./util/docker_build.sh crkbd:dlford:dfu-split-[left|right] (or avrdude-split[left|right])
-
-#define TAPPING_TOGGLE 2 // number of taps to toggle TT
-#define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key
-#define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key
-#define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-#undef MOUSEKEY_WHEEL_DELAY
-#define MK_KINETIC_SPEED
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 35
-#define MOUSEKEY_MOVE_DELTA 5
-#define MOUSEKEY_INITIAL_SPEED 1
-#define MOUSEKEY_DECELERATED_SPEED 10
-#define MOUSEKEY_BASE_SPEED 1200
-#define MOUSEKEY_ACCELERATED_SPEED 4800
-
-#ifdef RGB_MATRIX_ENABLE
-// # define RGB_MATRIX_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
-// # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-# define RGB_MATRIX_HUE_STEP 8
-# define RGB_MATRIX_SAT_STEP 8
-# define RGB_MATRIX_VAL_STEP 8
-# define RGB_MATRIX_SPD_STEP 10
-
-// Enable animations
-// # define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue speed is hue for secondary hue
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom speed controls how much gradient changes
-// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right speed controls how much gradient changes
-// # define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
-// # define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
-// # define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
-// # define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
-// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
-// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
-// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
-// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
-// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
-// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
-// # define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
-// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
-// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
-// # define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
-// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
-// # define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time then shifts back
-// # define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right then back to the left
-# define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
-// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Required for the following two effects
-// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
-// # define RGB_MATRIX_KEYPRESSES // reacts to keypresses, required for the remaining effects
-// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue pulses keys hit to shifted hue then fades to current hue
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
-#endif
-
-// Features I don't want, remove to save space
-// #define NO_ACTION_ONESHOT // Used by caps word
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_MACRO
-#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c
deleted file mode 100644
index ee295c7305..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#include "caps_word.h"
-bool caps_word_enabled = false;
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
- static bool shifted = false;
-
- if (!caps_word_enabled) {
- // Pressing both shift keys at the same time enables caps word.
- if (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT)
- == MOD_MASK_SHIFT) {
- clear_mods();
- clear_oneshot_mods();
- shifted = false;
- caps_word_enabled = true;
- return false;
- }
- return true;
- }
-
- if (!record->event.pressed) { return true; }
-
- if (!((get_mods() | get_oneshot_mods()) & ~MOD_MASK_SHIFT)) {
- switch (keycode) {
- case QK_MOD_TAP ... QK_MOD_TAP_MAX:
- case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
- // Earlier return if this has not been considered tapped yet.
- if (record->tap.count == 0) { return true; }
- // Get the base tapping keycode of a mod- or layer-tap key.
- keycode &= 0xff;
- }
-
- switch (keycode) {
- // Letter keys should be shifted.
- case KC_A ... KC_Z:
- if (!shifted) { register_code(KC_LSFT); }
- shifted = true;
- return true;
-
- // Keycodes that continue caps word but shouldn't get shifted.
- case KC_1 ... KC_0:
- case KC_BSPC:
- case KC_MINS:
- case KC_UNDS:
- if (shifted) { unregister_code(KC_LSFT); }
- shifted = false;
- return true;
-
- // Any other keycode disables caps word.
- }
- }
-
- // Disable caps word.
- caps_word_enabled = false;
- if (shifted) { unregister_code(KC_LSFT); }
- shifted = false;
- return true;
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h
deleted file mode 100644
index a609a32544..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// Caps Word, activated by pressing both shift keys at the same time.
-//
-// This library implements "Caps Word", which is like conventional Caps Lock,
-// but automatically disables itself at the end of the word. This is useful for
-// typing all-caps identifiers like `MOD_MASK_ALT`.
-//
-// Caps Word is activated by pressing the left and right shift keys at the same
-// time. This way you don't need a dedicated key for using Caps Word. I've
-// tested that this works as expected with one-shot mods and Space Cadet Shift.
-// If your shift keys are mod-taps, activate Caps Word by holding both shift
-// mod-tap keys until the tapping term, release them, then begin typing.
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record);
-extern bool caps_word_enabled;
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
deleted file mode 100644
index bdacde1a85..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 @dlford
-
-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/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "features/caps_word.h"
-
-// Layers
-enum layers {
- _QWERTY = 0,
- _COLEMAK,
- _NAVIGATION,
- _SPECIAL,
- _MOUSE,
-};
-
-static uint16_t default_animation = RGB_MATRIX_CYCLE_SPIRAL;
-static int default_speed = 50;
-static uint16_t secondary_animation = RGB_MATRIX_HUE_WAVE;
-static int secondary_speed = 150;
-static bool is_macro_recording = false;
-
-// Init
-void keyboard_post_init_user(void) {
- rgb_matrix_sethsv_noeeprom(HSV_PURPLE);
- rgb_matrix_mode_noeeprom(default_animation);
- rgb_matrix_set_speed_noeeprom(default_speed);
-}
-
-// Permissive hold per key
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case LT(3, KC_SPC):
- return true; // Enable permissive hold
- case LT(2, KC_TAB):
- return true;
- default:
- return false; // Disable permissive hold
- }
-}
-
-// Tapping force hold per key
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case LT(3, KC_SPC):
- return 0; // Enable force hold
- case LT(2, KC_TAB):
- return 0;
- default:
- return QUICK_TAP_TERM; // Disable force hold
- }
-}
-
-// Tapping term per key
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case C_S_T(KC_E):
- case C_S_T(KC_I):
- return 215;
- default:
- return 190;
- }
-}
-
-// RGB timeout
-#define RGB_CUSTOM_TIMEOUT 5 // in minutes
-static uint16_t idle_timer = 0;
-static uint8_t halfmin_counter = 0;
-static bool led_on = true;
-void matrix_scan_user(void) {
- if (is_keyboard_master()) {
- // idle_timer needs to be set one time
- if (idle_timer == 0) idle_timer = timer_read();
-
- if (led_on && timer_elapsed(idle_timer) > 30000) {
- halfmin_counter++;
- idle_timer = timer_read();
- }
-
- if (led_on && halfmin_counter >= RGB_CUSTOM_TIMEOUT * 2) {
- rgb_matrix_disable_noeeprom();
- led_on = false;
- halfmin_counter = 0;
- }
- }
-}
-
-// Macros
-enum macro_events {
- M_KEYMAP = SAFE_RANGE,
- M_COMM,
- M_DOT,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- // RGB resume
- if (is_keyboard_master()) {
- if (record->event.pressed) {
- if (led_on == false) {
- rgb_matrix_enable_noeeprom();
- led_on = true;
- }
- idle_timer = timer_read();
- halfmin_counter = 0;
- }
- }
-
- // Caps word
- if (!process_caps_word(keycode, record)) { return false; }
-
- // Macros
- const uint8_t mods = get_mods();
- static uint8_t backstepCounter = 0;
- static bool keyDown = false;
- switch (keycode) {
- case M_KEYMAP:
- if (record->event.pressed) {
- SEND_STRING("https://raw.githubusercontent.com/dlford/qmk_firmware/master/keyboards/crkbd/keymaps/dlford/legends.svg");
- }
- return false;
- case M_COMM:
- if (record->event.pressed) {
- if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LSFT) && (mods & MOD_BIT(KC_LALT)))) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("<>");
- } else if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LALT))) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("()");
- } else if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LSFT))) {
- backstepCounter = 2;
- clear_mods();
- SEND_STRING("{};");
- } else if (mods & MOD_BIT(KC_LCTL)) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("{}");
- } else if ((mods & MOD_BIT(KC_LALT)) && (mods & MOD_BIT(KC_LSFT))) {
- backstepCounter = 2;
- clear_mods();
- SEND_STRING("[];");
- } else if (mods & MOD_BIT(KC_LALT)) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("[]");
- } else {
- keyDown = true;
- register_code(KC_COMM);
- return true;
- }
- if (backstepCounter) {
- while (backstepCounter > 0) {
- tap_code(KC_LEFT);
- backstepCounter--;
- }
- set_mods(mods);
- }
- } else {
- if (keyDown) {
- unregister_code(KC_COMM);
- keyDown = false;
- return true;
- }
- }
- return false;
- case M_DOT:
- if (record->event.pressed) {
- if (mods & MOD_BIT(KC_LCTL)) {
- clear_mods();
- SEND_STRING("=>");
- } else if (mods & MOD_BIT(KC_LALT)) {
- clear_mods();
- SEND_STRING("->");
- } else {
- keyDown = true;
- register_code(KC_DOT);
- return true;
- }
- } else {
- if (keyDown) {
- unregister_code(KC_DOT);
- keyDown = false;
- return true;
- }
- }
- set_mods(mods);
- return false;
- }
-
- return true;
-}
-
-// RGB Layers (Enable animations in config.h)
-layer_state_t layer_state_set_user(layer_state_t state) {
- switch (get_highest_layer(state)) {
- case _SPECIAL:
- rgb_matrix_sethsv_noeeprom(HSV_ORANGE);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- case _NAVIGATION:
- rgb_matrix_sethsv_noeeprom(HSV_BLUE);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- case _MOUSE:
- rgb_matrix_sethsv_noeeprom(HSV_GREEN);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- default:
- rgb_matrix_sethsv_noeeprom(HSV_PURPLE);
- rgb_matrix_set_speed_noeeprom(default_speed);
- rgb_matrix_mode_noeeprom(default_animation);
- break;
- }
- return state;
-}
-
-// Dynamic Macro Recording Backlight
-void dynamic_macro_record_start_user(int8_t direction) {
- is_macro_recording = true;
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
- is_macro_recording = false;
-}
-
-// Indicators
-bool rgb_matrix_indicators_user(void) {
- if (host_keyboard_led_state().caps_lock || caps_word_enabled) {
- // Left master
- rgb_matrix_set_color(3, RGB_RED);
- // Right master
- rgb_matrix_set_color(21, RGB_RED);
- }
- if (is_macro_recording) {
- // Left master
- rgb_matrix_set_color(4, RGB_ORANGE);
- // Right master
- rgb_matrix_set_color(22, RGB_ORANGE);
- }
- if (default_layer_state - 1 == _COLEMAK) {
- // Left master
- rgb_matrix_set_color(5, RGB_GREEN);
- // Right master
- rgb_matrix_set_color(23, RGB_GREEN);
- }
- return false;
-}
-
-// Quantum keys / Abbreviations
-enum custom_keycodes {
- VVV = KC_TRNS,
- XXX = KC_NO,
- CSA_Q = MEH_T(KC_Q),
- CSA_F1 = MEH_T(KC_F1),
- CSA_1 = MEH_T(KC_1),
- CA_W = LCA_T(KC_W),
- CA_F2 = LCA_T(KC_F2),
- CA_2 = LCA_T(KC_2),
- CS_E = C_S_T(KC_E),
- CS_F = C_S_T(KC_F),
- CS_I = C_S_T(KC_I),
- CS_U = C_S_T(KC_U),
- CS_F3 = C_S_T(KC_F3),
- CS_3 = C_S_T(KC_3),
- CS_F8 = C_S_T(KC_F8),
- CS_8 = C_S_T(KC_8),
- CA_O = LCA_T(KC_O),
- CA_Y = LCA_T(KC_Y),
- CA_F9 = LCA_T(KC_F9),
- CA_9 = LCA_T(KC_9),
- CSA_P = MEH_T(KC_P),
- CSA_SCLN = MEH_T(KC_SCLN),
- CSA_F10 = MEH_T(KC_F10),
- CSA_0 = MEH_T(KC_0),
- LGUI_A = LGUI_T(KC_A),
- LGUI_FIND = LGUI_T(KC_FIND),
- LGUI_GRV = LGUI_T(KC_GRV),
- LALT_S = LALT_T(KC_S),
- LALT_R = LALT_T(KC_R),
- LALT_HOME = LALT_T(KC_HOME),
- LCTL_D = LCTL_T(KC_D),
- LCTL_S = LCTL_T(KC_S),
- LCTL_PGUP = LCTL_T(KC_PGUP),
- LCTL_LBRC = LCTL_T(KC_LBRC),
- LSFT_F = LSFT_T(KC_F),
- _LSFT_T = LSFT_T(KC_T),
- LSFT_PGDN = LSFT_T(KC_PGDN),
- LSFT_RBRC = LSFT_T(KC_RBRC),
- RSFT_J = RSFT_T(KC_J),
- RSFT_N = RSFT_T(KC_N),
- RSFT_DOWN = RSFT_T(KC_DOWN),
- RSFT_MINS = RSFT_T(KC_MINS),
- RCTL_K = RCTL_T(KC_K),
- RCTL_E = RCTL_T(KC_E),
- RCTL_UP = RCTL_T(KC_UP),
- RCTL_EQL = RCTL_T(KC_EQL),
- RALT_L = RALT_T(KC_L),
- RALT_I = RALT_T(KC_I),
- RALT_RGHT = RALT_T(KC_RGHT),
- RALT_BSLS = RALT_T(KC_BSLS),
- RGUI_SCLN = RGUI_T(KC_SCLN),
- RGUI_O = RGUI_T(KC_O),
- RGUI_F11 = RGUI_T(KC_F11),
- RGUI_QUOT = RGUI_T(KC_QUOT),
- LT3_SPC = LT(3,KC_SPC),
- LT2_TAB = LT(2,KC_TAB),
- DF_QWERTY = DF(0),
- DF_COLEMAK = DF(1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_Q, CA_W, CS_E, KC_R, KC_T, KC_Y, KC_U, CS_I, CA_O, CSA_P,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_A, LALT_S, LCTL_D, LSFT_F, KC_G, KC_H, RSFT_J, RCTL_K, RALT_L, RGUI_SCLN,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, M_COMM, M_DOT, KC_SLSH,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_ESC, LT3_SPC, KC_BSPC, KC_DEL, LT2_TAB, KC_ENT
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_COLEMAK] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_Q, CA_W, CS_F, KC_P, KC_G, KC_J, KC_L, CS_U, CA_Y, CSA_SCLN,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_A, LALT_R, LCTL_S, _LSFT_T, KC_D, KC_H, RSFT_N, RCTL_E, RALT_I, RGUI_O,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, M_COMM, M_DOT, KC_SLSH,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_ESC, LT3_SPC, KC_BSPC, KC_DEL, LT2_TAB, KC_ENT
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_NAVIGATION] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_F1, CA_F2, CS_F3, KC_F4, KC_F5, KC_F6, KC_F7, CS_F8, CA_F9, CSA_F10,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_FIND,LALT_HOME,LCTL_PGUP,LSFT_PGDN,KC_END, KC_LEFT,RSFT_DOWN,RCTL_UP,RALT_RGHT,RGUI_F11,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- DF_QWERTY,DF_COLEMAK,KC_VOLD, KC_VOLU, QK_BOOT, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, KC_F12,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, TG(4), VVV, VVV, VVV, VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_SPECIAL] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_1, CA_2, CS_3, KC_4, KC_5, KC_6, KC_7, CS_8, CA_9, CSA_0,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_GRV,KC_LALT,LCTL_LBRC,LSFT_RBRC,KC_LPRN, KC_RPRN,RSFT_MINS,RCTL_EQL,RALT_BSLS,RGUI_QUOT,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_TILD, KC_CAPS, KC_LCBR, KC_RCBR,TG(_MOUSE), EE_CLR, KC_UNDS, KC_PLUS, KC_PIPE, KC_DQUO,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, VVV, VVV, VVV, TG(4), VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_MOUSE] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, DM_REC1, KC_WSTP, KC_ACL2, KC_ACL1, KC_ACL0, KC_WFWD,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, DM_PLY1, KC_WREF, KC_BTN1, KC_BTN2, KC_BTN3, KC_WBAK,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- M_KEYMAP,KC_BTN3, KC_BTN2, KC_BTN1, XXX, XXX, XXX, XXX, XXX, XXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, TG(4), VVV, VVV, TG(4), VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk
deleted file mode 100644
index f40ace9606..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Includes
-SRC += features/caps_word.c
-
-# Build Options
-# change yes to no to disable
-#
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-DYNAMIC_MACRO_ENABLE = yes # Create macros on the fly
-RGB_MATRIX_DRIVER = WS2812
-INDICATOR_LIGHTS = yes # Enable indicator lights for caps lock, etc.
-# TAP_DANCE_ENABLE = yes # Send different keycodes if tapped multiple times
-# KEY_OVERRIDE_ENABLE = yes # Override key combos
-# COMBO_ENABLE = yes # Custom key combos
-
-LTO_ENABLE = yes
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
deleted file mode 100644
index 38ee6f4252..0000000000
--- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-# AUDIO_ENABLE = yes # Audio output
-
-RGB_MATRIX_ENABLE = yes # Enable WS2812 RGB matrix
-SPLIT_KEYBOARD = yes
-
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
index 5fdab01ef4..141bb47717 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,9 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
index 7ad7118ee4..76f13971d4 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "Dactyl Manuform 4x5 5 thumb keys",
+ "keyboard_name": "Dactyl ManuForm 4x5_5",
"manufacturer": "ssedrick",
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
"maintainer": "ssedrick",
@@ -16,9 +16,7 @@
"split": {
"soft_serial_pin": "D0"
},
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["split_3x5_3"],
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
@@ -28,11 +26,11 @@
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [5, 0], "x": 6, "y": 0},
- {"matrix": [5, 1], "x": 7, "y": 0},
- {"matrix": [5, 2], "x": 8, "y": 0},
- {"matrix": [5, 3], "x": 9, "y": 0},
- {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
@@ -40,11 +38,11 @@
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [6, 0], "x": 6, "y": 1},
- {"matrix": [6, 1], "x": 7, "y": 1},
- {"matrix": [6, 2], "x": 8, "y": 1},
- {"matrix": [6, 3], "x": 9, "y": 1},
- {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
@@ -52,82 +50,31 @@
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [7, 0], "x": 6, "y": 2},
- {"matrix": [7, 1], "x": 7, "y": 2},
- {"matrix": [7, 2], "x": 8, "y": 2},
- {"matrix": [7, 3], "x": 9, "y": 2},
- {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [8, 2], "x": 8, "y": 3},
- {"matrix": [8, 3], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
- {"matrix": [8, 1], "x": 7, "y": 4},
+ {"matrix": [8, 1], "x": 9, "y": 4},
+ {"matrix": [9, 0], "x": 7, "y": 4},
+ {"matrix": [8, 0], "x": 8, "y": 4},
- {"matrix": [3, 4], "x": 3, "y": 5},
- {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 2], "x": 4, "y": 5},
+ {"matrix": [4, 3], "x": 5, "y": 5},
- {"matrix": [9, 0], "x": 6, "y": 5},
- {"matrix": [8, 0], "x": 7, "y": 5},
-
- {"matrix": [4, 2], "x": 3, "y": 6},
- {"matrix": [4, 3], "x": 4, "y": 6},
-
- {"matrix": [9, 1], "x": 6, "y": 6},
- {"matrix": [9, 2], "x": 7, "y": 6}
- ]
- },
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
-
- {"matrix": [5, 0], "x": 6, "y": 0},
- {"matrix": [5, 1], "x": 7, "y": 0},
- {"matrix": [5, 2], "x": 8, "y": 0},
- {"matrix": [5, 3], "x": 9, "y": 0},
- {"matrix": [5, 4], "x": 10, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
-
- {"matrix": [6, 0], "x": 6, "y": 1},
- {"matrix": [6, 1], "x": 7, "y": 1},
- {"matrix": [6, 2], "x": 8, "y": 1},
- {"matrix": [6, 3], "x": 9, "y": 1},
- {"matrix": [6, 4], "x": 10, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
-
- {"matrix": [7, 0], "x": 6, "y": 2},
- {"matrix": [7, 1], "x": 7, "y": 2},
- {"matrix": [7, 2], "x": 8, "y": 2},
- {"matrix": [7, 3], "x": 9, "y": 2},
- {"matrix": [7, 4], "x": 10, "y": 2},
-
- {"matrix": [3, 3], "x": 3, "y": 4},
-
- {"matrix": [8, 1], "x": 7, "y": 4},
-
- {"matrix": [3, 4], "x": 3, "y": 5},
- {"matrix": [4, 4], "x": 4, "y": 5},
-
- {"matrix": [9, 0], "x": 6, "y": 5},
- {"matrix": [8, 0], "x": 7, "y": 5}
+ {"matrix": [9, 1], "x": 7, "y": 5},
+ {"matrix": [9, 2], "x": 8, "y": 5}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
index cb78c9fb56..8d38152f96 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/default/keymap.c
@@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
-#include "print.h"
enum key_layers {
_BASE,
@@ -11,145 +10,45 @@ enum key_layers {
_LOWER
};
-enum layer_keycodes {
- QWERTY = SAFE_RANGE,
- COLEMAK,
-};
-
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
#define SH_ESC SFT_T(KC_ESC)
-#define ____ KC_TRANSPARENT
+#define ____ KC_TRNS
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Base (qwerty)
- * ,----------------------------------, ,----------------------------------,
- * | q | w | e | r | t | | y | u | i | o | p |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | s | d | f | g | | h | j | k | l | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | c | v | b | | n | m | , | . | / |
- * '------+------+------+-------------' '------+------+------+------+------'
- * | [ | ] | | ' | `~ |
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
[_BASE] = LAYOUT(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LBRC, KC_RBRC, KC_QUOT, KC_GRV,
- SH_ESC, KC_BSPC,
- KC_LGUI, KC_TAB, KC_RSFT, KC_SPC,
- RAISE, KC_LCTL, LOWER, KC_ENT
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_LBRC, KC_RBRC, KC_QUOT, KC_GRV,
+ SH_ESC, KC_LGUI, KC_TAB, KC_RSFT, KC_SPC, KC_BSPC,
+ RAISE, KC_LCTL, LOWER, KC_ENT
),
- /* Colemak
- * ,----------------------------------, ,----------------------------------,
- * | q | w | f | p | g | | j | l | u | y | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | r | s | t | d | | h | n | e | i | o |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | c | v | b | | k | m | , | . | / |
- * '------+------+------+-------------' '------+------+------+------+------'
- * | [ | ] | | ' | `~ |
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
[_COLEMAK] = LAYOUT(
- KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
- KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LBRC, KC_RBRC, KC_QUOT, KC_GRV,
- KC_ESC, KC_BSPC,
- KC_LGUI, KC_TAB, KC_RSFT, KC_SPC,
- RAISE, KC_LCTL, LOWER, KC_ENT
+ KC_ESC, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
),
- /* RAISE
- * ,----------------------------------, ,----------------------------------,
- * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ( | ) | { | } | = | | - | 4 | 5 | 6 | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | QK_BOOT| BOOT | [ | ] | | | | 1 | 2 | 3 | |
- * |------+------+------+-------------| |------+------+------+------+------,
- * | | | | 0 | . |
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
+
[_RAISE] = LAYOUT(
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- S(KC_9), S(KC_0), KC_LCBR, KC_RCBR, KC_EQL, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
- QK_RBT, QK_BOOT, KC_LBRC, KC_RBRC, ____, ____, KC_1, KC_2, KC_3, ____,
- ____, ____, KC_0, KC_DOT,
- ____, ____,
- ____, ____, ____, ____,
- ____, ____, ____, ____
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ S(KC_9), S(KC_0), KC_LCBR, KC_RCBR, KC_EQL, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
+ QK_RBT, QK_BOOT, KC_LBRC, KC_RBRC, ____, ____, KC_1, KC_2, KC_3, ____,
+ ____, ____, KC_0, KC_DOT,
+ ____, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
),
- /* LOWER
- * ,----------------------------------, ,----------------------------------,
- * | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ( | ) | { | } | = | | | - | + | | | |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | | | | | | | | LEFT | DOWN | UP | RIGHT|
- * |------+------+------+-------------| |------+------+------+------+------,
- * | | | |QWERTY|COLEMA|
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
[_LOWER] = LAYOUT(
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- S(KC_9), S(KC_0), KC_LBRC, KC_RBRC, KC_EQL, ____, KC_MINS, KC_EQL, KC_PIPE, ____,
- ____, ____, ____, ____, ____, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
- ____, ____, QWERTY, COLEMAK,
- ____, ____,
- ____, ____, ____, ____,
- ____, ____, ____, ____
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ S(KC_9), S(KC_0), KC_LBRC, KC_RBRC, KC_EQL, ____, KC_MINS, KC_EQL, KC_PIPE, ____,
+ ____, ____, ____, ____, ____, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ ____, ____, KC_QUOT, KC_GRV,
+ ____, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
)
};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- // If console is enabled, it will print the matrix position and status of each key pressed
-#ifdef CONSOLE_ENABLE
- uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %d, time: %u, interrupt: %d, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_BASE);
- }
- return false;
- break;
- case COLEMAK:
- if (record->event.pressed) {
- set_single_persistent_default_layer(_COLEMAK);
- }
- return false;
- break;
- }
- return true;
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
index 0e96202315..5774ab7f3b 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
@@ -16,7 +16,6 @@ enum layer_keycodes {
COLEMAK,
};
-
#define RAISE TT(_RAISE)
#define LOWER MO(_LOWER)
#define SH_ESC SFT_T(KC_ESC)
@@ -28,111 +27,40 @@ enum layer_keycodes {
#define TAPPING_TOGGLE 2
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Base (qwerty)
- * ,----------------------------------, ,----------------------------------,
- * | q | w | e | r | t | | y | u | i | o | p |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | s | d | f | g | | h | j | k | l | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | c | v | b | | n | m | , | . | / |
- * '------+------+------+-------------' '------+------+------+------+------'
- * | { | } | | ' | `~ |
- * '-------------+------, ,------|-------------'
- * | ESC | | ENTER|
- * |-------------, ,------+------|
- * | GUI | TAB | | BCKSP| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | SHIFT| LOWER|
- * '-------------' '-------------'
- */
[_BASE] = LAYOUT(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LCBR, KC_RCBR, KC_QUOT, KC_GRV,
- SH_ESC, KC_ENT,
- KC_LGUI, KC_TAB, KC_RSFT, KC_SPC,
- RAISE, KC_LCTL, KC_BSPC, LOWER
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_LCBR, KC_RCBR, KC_QUOT, KC_GRV,
+ SH_ESC, KC_LGUI, KC_TAB, KC_RSFT, KC_SPC, KC_ENT,
+ RAISE, KC_LCTL, KC_BSPC, LOWER
),
-
- /* Colemak
- * ,----------------------------------, ,----------------------------------,
- * | q | w | f | p | g | | j | l | u | y | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | a | r | s | t | d | | h | n | e | i | o |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | z | x | c | v | b | | k | m | , | . | / |
- * '------+------+------+-------------' '------+------+------+------+------'
- * | [ | ] | | ' | `~ |
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
+
[_COLEMAK] = LAYOUT(
- KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
- KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LCBR, KC_RCBR, KC_QUOT, KC_GRV,
- SH_ESC, KC_ENT,
- KC_LGUI, KC_TAB, KC_RSFT, KC_SPC,
- RAISE, KC_LCTL, KC_BSPC, LOWER
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_LCBR, KC_RCBR, KC_QUOT, KC_GRV,
+ ____, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
),
- /* RAISE
- * ,----------------------------------, ,----------------------------------,
- * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ( | ) | [ | ] | = | | _ | 4 | 5 | 6 | ; |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | QK_BOOT| BOOT | | | | | | 1 | 2 | 3 | |
- * |------+------+------+-------------| |------+------+------+------+------,
- * |MAC_LC| | | 0 | . |
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
+
[_RAISE] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
S(KC_9), S(KC_0), KC_LBRC, KC_RBRC, KC_EQL, KC_MINS, KC_4, KC_5, KC_6, KC_QUOT,
QK_RBT, QK_BOOT, ____, ____, ____, ____, KC_1, KC_2, KC_3, ____,
MAC_LOCK, ____, KC_0, KC_DOT,
- ____, ____,
- ____, ____, ____, ____,
- ____, ____, ____, ____
+ ____, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
),
- /* LOWER
- * ,----------------------------------, ,----------------------------------,
- * | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | ( | ) | { | } | = | | _ | - | + | \ | | |
- * |------+------+------+------+------| |------+------+------+------+------|
- * | NEXT | PLAY | VOLU | VOLD | | | | LEFT | DOWN | UP | RIGHT|
- * |------+------+------+-------------| |------+------+------+------+------,
- * | | | |QWERTY|COLEMA|
- * '-------------+------, ,------|-------------'
- * | ESC | | BSPC |
- * |-------------, ,------+------|
- * | GUI | TAB | | SHIFT| SPACE|
- * |------+------| |------+------|
- * | RAISE| CTRL | | LOWER| ENTER|
- * '-------------' '-------------'
- */
[_LOWER] = LAYOUT(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
S(KC_9), S(KC_0), KC_LBRC, KC_RBRC, KC_EQL, UNDSC, KC_MINS, KC_EQL, KC_BSLS, KC_PIPE,
KC_MNXT, KC_MPLY, KC_VOLU, KC_VOLD, ____, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
____, ____, QWERTY, COLEMAK,
- ____, ____,
- ____, ____, ____, ____,
- ____, ____, ____, ____
+ ____, ____, ____, ____, ____, ____,
+ ____, ____, ____, ____
)
};
diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
index 7de3ef0b0d..5b415fbd2b 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,9 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
index 2e92d4b86b..24f6b35f57 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
@@ -60,5 +60,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
N_PASTE , N_UNDO , KC_BSPC , KC_DEL
),
-
};
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
index 9991dcad71..53ce5a3190 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
@@ -8,3 +8,4 @@ COMMAND_ENABLE = no
NKRO_ENABLE = yes
RGBLIGHT_ENABLE = yes
DEBOUNCE_TYPE = asym_eager_defer_pk
+USER_NAME := scheiklp
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
index b9ebd6d7df..f54f0d56d2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,9 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
index 89c2c800c6..e6372961d8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,9 @@
"pid": "0x3536",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
index f82f84da9c..78a602cb64 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
@@ -3,14 +3,25 @@
"manufacturer": "kpagratis",
"url": "",
"maintainer": "kpagratis",
- "bootloader": "caterina",
- "processor": "atmega32u4",
+ "development_board": "promicro",
"usb": {
"vid": "0xFEED",
"pid": "0x0016",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "audio": false,
+ "backlight": false,
+ "rgblight": false
+ },
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"matrix_pins": {
@@ -21,80 +32,89 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
- {"x": 1, "y": 0, "matrix": [0, 1]},
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
- {"x": 5, "y": 0, "matrix": [0, 5]},
- {"x": 14, "y": 0, "matrix": [6, 0]},
- {"x": 15, "y": 0, "matrix": [6, 1]},
- {"x": 16, "y": 0, "matrix": [6, 2]},
- {"x": 17, "y": 0, "matrix": [6, 3]},
- {"x": 18, "y": 0, "matrix": [6, 4]},
- {"x": 19, "y": 0, "matrix": [6, 5]},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
- {"x": 0, "y": 1, "matrix": [1, 0]},
- {"x": 1, "y": 1, "matrix": [1, 1]},
- {"x": 2, "y": 1, "matrix": [1, 2]},
- {"x": 3, "y": 1, "matrix": [1, 3]},
- {"x": 4, "y": 1, "matrix": [1, 4]},
- {"x": 5, "y": 1, "matrix": [1, 5]},
- {"x": 14, "y": 1, "matrix": [7, 0]},
- {"x": 15, "y": 1, "matrix": [7, 1]},
- {"x": 16, "y": 1, "matrix": [7, 2]},
- {"x": 17, "y": 1, "matrix": [7, 3]},
- {"x": 18, "y": 1, "matrix": [7, 4]},
- {"x": 19, "y": 1, "matrix": [7, 5]},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
- {"x": 0, "y": 2, "matrix": [2, 0]},
- {"x": 1, "y": 2, "matrix": [2, 1]},
- {"x": 2, "y": 2, "matrix": [2, 2]},
- {"x": 3, "y": 2, "matrix": [2, 3]},
- {"x": 4, "y": 2, "matrix": [2, 4]},
- {"x": 5, "y": 2, "matrix": [2, 5]},
- {"x": 14, "y": 2, "matrix": [8, 0]},
- {"x": 15, "y": 2, "matrix": [8, 1]},
- {"x": 16, "y": 2, "matrix": [8, 2]},
- {"x": 17, "y": 2, "matrix": [8, 3]},
- {"x": 18, "y": 2, "matrix": [8, 4]},
- {"x": 19, "y": 2, "matrix": [8, 5]},
+ {"matrix": [10, 0], "x": 11, "y": 5},
+ {"matrix": [10, 1], "x": 12, "y": 5},
- {"x": 0, "y": 3, "matrix": [3, 0]},
- {"x": 1, "y": 3, "matrix": [3, 1]},
- {"x": 2, "y": 3, "matrix": [3, 2]},
- {"x": 3, "y": 3, "matrix": [3, 3]},
- {"x": 4, "y": 3, "matrix": [3, 4]},
- {"x": 5, "y": 3, "matrix": [3, 5]},
- {"x": 14, "y": 3, "matrix": [9, 0]},
- {"x": 15, "y": 3, "matrix": [9, 1]},
- {"x": 16, "y": 3, "matrix": [9, 2]},
- {"x": 17, "y": 3, "matrix": [9, 3]},
- {"x": 18, "y": 3, "matrix": [9, 4]},
- {"x": 19, "y": 3, "matrix": [9, 5]},
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
- {"x": 0, "y": 4, "matrix": [4, 0]},
- {"x": 1, "y": 4, "matrix": [4, 1]},
- {"x": 2, "y": 4, "matrix": [4, 2]},
- {"x": 3, "y": 4, "matrix": [4, 3]},
- {"x": 16, "y": 4, "matrix": [10, 2]},
- {"x": 17, "y": 4, "matrix": [10, 3]},
- {"x": 18, "y": 4, "matrix": [10, 4]},
- {"x": 19, "y": 4, "matrix": [10, 5]},
+ {"matrix": [11, 0], "x": 9, "y": 6},
+ {"matrix": [11, 1], "x": 10, "y": 6},
- {"x": 5, "y": 5, "matrix": [5, 0]},
- {"x": 6, "y": 5, "matrix": [5, 1]},
- {"x": 7, "y": 5, "matrix": [5, 2]},
- {"x": 13, "y": 5, "matrix": [11, 0]},
- {"x": 14, "y": 5, "matrix": [11, 1]},
- {"x": 15, "y": 5, "matrix": [11, 2]},
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
- {"x": 5, "y": 6, "matrix": [5, 3]},
- {"x": 6, "y": 6, "matrix": [5, 4]},
- {"x": 7, "y": 6, "matrix": [5, 5]},
- {"x": 13, "y": 6, "matrix": [11, 3]},
- {"x": 14, "y": 6, "matrix": [11, 4]},
- {"x": 15, "y": 6, "matrix": [11, 5]}
+ {"matrix": [11, 2], "x": 9, "y": 7},
+ {"matrix": [11, 3], "x": 10, "y": 7}
]
}
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
index 20699ed2e1..4e774ea716 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/keymap.c
@@ -5,39 +5,45 @@
enum custom_layers {
_QWERTY,
- _LAYER2,
+ _LOWER,
+ _RAISE
};
-#define GUI_J RGUI_T(KC_J)
-#define GUI_F LGUI_T(KC_F)
-#define SFT_A LSFT_T(KC_A)
-#define CTL_S LCTL_T(KC_S)
-#define ALT_D LALT_T(KC_D)
-#define ALT_K RALT_T(KC_K)
-#define CTL_L RCTL_T(KC_L)
-#define SFT_SC RSFT_T(KC_SCLN)
-#define IMPORTS LALT(LCTL(KC_O)) //Intellij Organize Imports
-#define LINES LALT(LGUI(KC_L)) //Intellij Reformat Code
-#define USAGES LALT(KC_F7) //Intelllj Find Usages
-#define RENAME LSFT(KC_F6) //Intellij Refactor Rename
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
- KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS,
- KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS,
- KC_ESC , SFT_A , CTL_S , ALT_D , GUI_F , KC_G , KC_H , GUI_J , ALT_K , CTL_L , SFT_SC , 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,
- KC_GRV , KC_INS , KC_LEFT, KC_RGHT, KC_DOWN, KC_UP , KC_LBRC, KC_RBRC,
- KC_LCTL, KC_LALT, KC_HOME, KC_DEL , KC_PGUP, KC_BSPC,
- KC_SPC , KC_DEL , KC_END , MO(_LAYER2), KC_PGDN, KC_ENT
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_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,
+ KC_LCTL, KC_LALT, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_RALT, KC_RCTL,
+ RAISE, KC_SPC, KC_ENT, LOWER,
+ KC_HOME, KC_BSPC, KC_DEL, KC_END,
+ KC_PGUP, KC_LGUI, KC_RGUI, KC_PGDN
),
- [_LAYER2] = LAYOUT(
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
- XXXXXXX, IMPORTS, XXXXXXX, USAGES , RENAME , XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX,
- XXXXXXX, LINES , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, _______,XXXXXXX, XXXXXXX
+
+ [_LOWER] = LAYOUT(
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+ _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, _______,
+ _______, KC_SCRL, KC_INS, KC_PAUS, KC_PSCR, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______,
+ _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______, _______, _______
+
+ ),
+
+ [_RAISE] = LAYOUT(
+ KC_F12, KC_F1, KC_F2, KC_F3 , KC_F4, KC_F5, KC_F6, KC_F7 , KC_F8, KC_F9, KC_F10 , KC_F11,
+ _______, _______, _______, _______, _______, KC_TRNS, KC_TRNS, _______, KC_NUM, _______, _______, KC_MUTE,
+ _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
+ _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______, _______, _______,
+ _______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/readme.md b/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
index 69f68bbfb8..b21270e391 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/readme.md
@@ -1,5 +1,5 @@
-# Dactyl Manuform
+# Dactyl Manuform 5x6_68
-This is a 5x6 manuform with a 4 key bottom row and 6 key thumb clusters.
+This is a Dactyl ManuForm 5x6 with an extended, 4 key, bottom row; totalling 68 keys.
-This results in a 68 key 5x6 \ No newline at end of file
+![diagram](https://i.imgur.com/TGd36fWh.png)
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
index 5ef0d2fdb9..6e7633bfe0 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
@@ -1,13 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
+# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
index b166df22a0..68270606cc 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,9 @@
"pid": "0x3537",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
deleted file mode 100644
index 1da1cb9590..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019
- *
- * 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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
index 2b542a15da..245310fd3c 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -7,6 +7,9 @@
"split": {
"soft_serial_pin": "D0"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
index 567057cf08..955060de7a 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,9 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 12
+ },
"ws2812": {
"pin": "D3"
},
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
deleted file mode 100644
index 8f14c5049e..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (6x6+4)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "dmik",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3636",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_6x6_kinesis": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [7, 2], "x": 13, "y": 0},
- {"matrix": [7, 3], "x": 14, "y": 0},
- {"matrix": [7, 4], "x": 15, "y": 0},
- {"matrix": [7, 5], "x": 16, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
-
- {"matrix": [8, 0], "x": 11, "y": 1},
- {"matrix": [8, 1], "x": 12, "y": 1},
- {"matrix": [8, 2], "x": 13, "y": 1},
- {"matrix": [8, 3], "x": 14, "y": 1},
- {"matrix": [8, 4], "x": 15, "y": 1},
- {"matrix": [8, 5], "x": 16, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2},
-
- {"matrix": [9, 0], "x": 11, "y": 2},
- {"matrix": [9, 1], "x": 12, "y": 2},
- {"matrix": [9, 2], "x": 13, "y": 2},
- {"matrix": [9, 3], "x": 14, "y": 2},
- {"matrix": [9, 4], "x": 15, "y": 2},
- {"matrix": [9, 5], "x": 16, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
-
- {"matrix": [10, 0], "x": 11, "y": 3},
- {"matrix": [10, 1], "x": 12, "y": 3},
- {"matrix": [10, 2], "x": 13, "y": 3},
- {"matrix": [10, 3], "x": 14, "y": 3},
- {"matrix": [10, 4], "x": 15, "y": 3},
- {"matrix": [10, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [11, 0], "x": 11, "y": 4},
- {"matrix": [11, 1], "x": 12, "y": 4},
- {"matrix": [11, 2], "x": 13, "y": 4},
- {"matrix": [11, 3], "x": 14, "y": 4},
- {"matrix": [11, 4], "x": 15, "y": 4},
- {"matrix": [11, 5], "x": 16, "y": 4},
-
- {"matrix": [5, 0], "x": 1, "y": 5},
- {"matrix": [5, 1], "x": 2, "y": 5},
- {"matrix": [5, 2], "x": 3, "y": 5},
- {"matrix": [5, 3], "x": 4, "y": 5},
-
- {"matrix": [12, 2], "x": 12, "y": 5},
- {"matrix": [12, 3], "x": 13, "y": 5},
- {"matrix": [12, 4], "x": 14, "y": 5},
- {"matrix": [12, 5], "x": 15, "y": 5},
-
- {"matrix": [5, 4], "x": 5, "y": 7, "h": 2},
- {"matrix": [5, 5], "x": 6, "y": 7, "h": 2},
-
- {"matrix": [12, 0], "x": 10, "y": 7, "h": 2},
- {"matrix": [12, 1], "x": 11, "y": 7, "h": 2},
-
- {"matrix": [6, 4], "x": 6, "y": 6},
- {"matrix": [6, 5], "x": 7, "y": 6},
-
- {"matrix": [13, 0], "x": 9, "y": 6},
- {"matrix": [13, 1], "x": 10, "y": 6},
-
- {"matrix": [6, 2], "x": 7, "y": 8},
- {"matrix": [6, 3], "x": 7, "y": 7},
-
- {"matrix": [13, 2], "x": 9, "y": 7},
- {"matrix": [13, 3], "x": 9, "y": 8}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
deleted file mode 100644
index 2ef9794d6d..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2012 Jun Wako <wakojun@gmail.com>
-// Copyright 2021 Dmitriy Kuminov (@dmik)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
- _QWERTY,
- _LOWER,
- _RAISE,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_6x6_kinesis(
- KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_CAPS,
- KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS,
- KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS,
- KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_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,
- KC_GRV , LOWER , KC_LEFT, KC_RGHT, KC_UP , KC_DOWN, KC_LBRC, KC_RBRC,
- KC_BSPC, KC_DEL , KC_ENT , KC_SPC ,
- KC_LGUI, KC_LALT, KC_RCTL, KC_RGUI,
- KC_END , KC_HOME, KC_PGUP, KC_PGDN
- ),
-
- [_LOWER] = LAYOUT_6x6_kinesis(
- _______, KC_F11 , KC_F12 , _______, _______, _______, KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_INS , _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
- ),
-
- [_RAISE] = LAYOUT_6x6_kinesis(
- _______, KC_F11 , KC_F12 , _______, _______, _______, KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_INS , _______, _______,
- _______, _______, _______, _______,
- _______, _______, _______, _______
- ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
deleted file mode 100644
index 1e44cc9601..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Kinesis Advantage Keymap
-
-## About this keymap
-
-This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
- - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
- - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
- - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
- - Brigtness and volume control keys are added to LOWER layer.
-
- The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
- not have an activation key mapped. It is intended for possible extensions.
-
-## Mapping details
-
- Main QUERTY layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | CAPS |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | = | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | LCtl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | LShift | Z | X | C | V | B | | N | M | , | . | / | RShift |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | ` | LOWER| Left | Rght | | Up | Dn | [ | ] |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | LGui | LAlt | | RCtl | RGui |
- ,------|------|------| |------+------+------.
- | | | Home | | PgUp | | |
- | BkSp | Del |------| |------|Enter |Space |
- | | | End | | PgDn | | |
- `--------------------' `--------------------'
-
- LOWER layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | | F11 | F12 | | | | |BriDn |BriUp |VMute |VolDn |VolUp | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | | | | | | | | | | | | | |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | | | | | | | | | |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | | | | | |
- ,------|------|------| |------+------+------.
- | | | | | | | |
- | | INS |------| |------| | |
- | | | | | | | |
- `--------------------' `--------------------'
-
-## Soldering details
-
-The below picture shows correspondence between the keys and the row/column wires of the left and
-right halves:
-
- LOWER layer:
- ,-------------------------------------------. ,-------------------------------------------.
- | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 |
- |--------+------+------+------+------+------| |------+------+------+------+------+--------|
- | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 |
- `--------+------+------+------+------+------' `------+------+------+------+------+--------'
- | L50 | L51 | L52 | L53 | | R52 | R53 | R54 | R55 |
- `---------------------------' `---------------------------'
- ,-------------. ,-------------.
- | L64 | L65 | | R60 | R61 |
- ,------|------|------| |------+------+------.
- | | | L63 | | R62 | | |
- | L54 | L55 |------| |------| R50 | R51 |
- | | | L62 | | R63 | | |
- `--------------------' `--------------------'
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
deleted file mode 100644
index 9a4e39dad2..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x7/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-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
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index ea983da9c8..529d92bd3f 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,21 +8,35 @@
"pid": "0x3636",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "audio": false,
+ "backlight": false,
+ "rgblight": false
+ },
"ws2812": {
"pin": "D3"
},
"matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"],
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D1"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "rgblight": {
+ "led_count": 12
+ },
+ "development_board": "promicro",
"layouts": {
- "LAYOUT_6x7": {
+ "LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
index 83fab9409d..5653786dcf 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ enum custom_layer {
#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_6x7(
+ [_QWERTY] = LAYOUT(
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 , _______,
_______, 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,
_______, 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_BSLS,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_BSPC,KC_GRV, KC_LGUI, KC_LALT
),
- [_LOWER] = LAYOUT_6x7(
+ [_LOWER] = LAYOUT(
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 , _______,
_______, 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, _______,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______, _______,_______
),
- [_RAISE] = LAYOUT_6x7(
+ [_RAISE] = LAYOUT(
_______,KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , _______,
_______,_______,_______,_______,_______,_______,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, _______,
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
index 0e8436788e..dbbc54cdca 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
@@ -10,7 +10,7 @@ enum custom_layer {
#define RAISE MO(_RAISE)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTZ] = LAYOUT_6x7(
+ [_QWERTZ] = LAYOUT(
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 , KC_HOME,
KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_END ,
XXXXXXX, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC,
@@ -18,12 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_MPLY,
KC_LEFT, KC_RGHT, KC_UP , KC_DOWN,
KC_SPC , KC_LSFT, KC_RALT, KC_ENT ,
-
KC_LGUI, KC_LALT, KC_BSPC, KC_DEL ,
KC_PGDN, KC_PGUP, KC_TAB , KC_INS
),
- [_RAISE] = LAYOUT_6x7(
+ [_RAISE] = LAYOUT(
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -31,7 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_MPRV, KC_MNXT, KC_VOLU, KC_VOLD,
_______, _______, _______, _______,
-
_______, _______, _______, _______,
_______, _______, _______, _______
)
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
index b893863bb5..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
index 41af664c25..584db341d6 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h
@@ -5,5 +5,3 @@
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-#define RGBLED_NUM 6 // Used when chaining strips
-#define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
index c2a818bde2..99e1739d20 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json
@@ -10,6 +10,10 @@
"pid": "0x3632",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 6,
+ "split_count": [3, 3]
+ },
"ws2812": {
"pin": "D1"
},
diff --git a/keyboards/handwired/dactyl_manuform/readme.md b/keyboards/handwired/dactyl_manuform/readme.md
index 560562f544..dd28184400 100644
--- a/keyboards/handwired/dactyl_manuform/readme.md
+++ b/keyboards/handwired/dactyl_manuform/readme.md
@@ -1,188 +1,112 @@
-# Dactyl Manuform (4x5, 5x6, 5x7, 6x6, 6x7)
+# Dactyl ManuForm
-the [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.
-![Imgur](https://i.imgur.com/7y0Vbyd.jpg)
+![Imgur](https://i.imgur.com/7y0Vbydh.jpg)
+*Pair of Dactyl Manuform 4x6*
-## First Time Setup
+Forked from the [Dactyl](/keyboards/handwired/dactyl), the *Dactyl ManuForm* is a parameterized, handwired, split bodied, tented, concave key-well design that incorporates the thumb cluster from the [ManuForm](https://geekhack.org/index.php?topic=46015.0).
-Download or clone the `qmk_firmware` repo and navigate to its top level directory. Once your build environment is setup, you'll be able to generate the default .hex using:
+* Keyboard Maintainer: [Tom Short](https://github.com/tshort)
+* Hardware Supported: Pro Micro, or clone of
+* Hardware Availability: [Github](https://github.com/tshort/dactyl-keyboard)
-Depending on your Layout chose one of the follwing commands:
+## Variants
-```
-$ make handwired/dactyl_manuform/YOUR_LAYOUT:YOUR_KEYMAP_NAME
-```
-
-example:
-
-```
-$ make handwired/dactyl_manuform/4x5:default
-```
-
-If everything worked correctly you will see a file:
-
-```
-dactyl_manuform_YOUR_LAYOUT_YOUR_KEYMAP_NAME.hex
-```
-
-For more information on customizing keymaps, take a look at the primary documentation for [Customizing Your Keymap](/docs/faq_keymap.md) in the main readme.md.
-
-## Keymaps
-
-### [Keymaps 4x5](/keyboards/handwired/dactyl_manuform/4x5/keymaps/)
-
-#### Default
-
-Simple QWERTY layout with 3 Layers.
-
-#### Dvorak
-
-### [Keymaps 5x6](/keyboards/handwired/dactyl_manuform/5x6/keymaps/)
-
-#### Default
-
-Just a copy of the Impstyle keymap. Feel free to adjust it.
-
-#### Impstyle
-
-A simple QWERTY keymap with 3 Layers. Both sides are connected via serial and the Left ist the master.
-
-### [Keymaps 5x6_5](/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/)
-
-Similar layout to 5x6 but with only 5 thumb keys per side instead of 6.
-
-#### Default
-QWERTY layout with 7 Layers.
+*Dactyl ManuForm's* are built in variations that cater for different row and column counts, and thumb clusters.
-#### Via
-Similar to Default but adds support for the [Via](https://www.caniusevia.com/) keymap configurator. Reduces the number of layers to 4 to comply with Via defaults, and remaps
-some keys to accomodate that constraint.
+As standard:
+- The finger keywell bottom row has 2 keys, 1 each in ring and middle columns
+ - Exception to this rule is the `5x7` variant - that has two additional keys, per half, in this row
+- The thumb cluster has 6 keys, arranged in a staggered 2 columns by 3 rows
-### [Keymaps 5x7 aka almost Ergodox](/keyboards/handwired/dactyl_manuform/5x7/keymaps/)
+Variants are denoted as `RowCount`*x*`ColumnCount`*(_`Alteration`)*
-#### Default
+### Row
+| Count | Description |
+| :---: | :---: |
+| 4 | Three rows, typically for alphabet and some puncuation characters, with 2 key (finger keywell) bottom row |
+| 5 | As *4 row* with number row above |
+| 6 | As *5 row* with function row above |
-Keymap of Loligagger from geekhack.
+### Column
+| Count | Description |
+| :---: | :---: |
+| 5 | A column for each finger with additional column for first finger |
+| 6 | As *5 column* with additional pinky finger column |
+| 7 | As *6 column* with either an additional first finger column (`5x7`) or additional pinky column (`6x7`) |
-### [Keymaps 6x6](/keyboards/handwired/dactyl_manuform/6x6/keymaps/)
+### Alteration
+| Code | Description |
+| :---: | :---: |
+| 5 | Thumb cluster replaced with five key thumb cluster of [Dactyl Manuform Mini](https://github.com/l4u/dactyl-manuform-mini-keyboard) |
+| 2_5 | Same as code *5* with two additional keys added to finger key-well bottom row |
-#### Default
+## Case Files Generator
-Simple QWERTY layout with 3 Layers.
+[Dactyl Generator](https://ryanis.cool/dactyl), created by [rianadon](https://github.com/rianadon), is a web based file generator that negates having to compose case files using programming languages, which was the matter when using the original *Dactyl* and *Dactyl ManuForm* GitHub repos, by instead compiling case files based on options and parameters configured in a web front end.
-### [Keymaps 6x7](/keyboards/handwired/dactyl_manuform/6x7/keymaps/)
+## Compile
-#### Default
+Make example for this keyboard (after setting up your build environment) in the 5x6 variant:
-Simple QWERTY layout with 3 Layers.
+ make handwired/dactyl_manuform/5x6:default
-### [Keymaps 3x5_3](/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/)
+Flashing example for this keyboard:
-#### Dlford
+ make handwired/dactyl_manuform/5x6:default:flash
-QWERTY/Colemak layout with per key RGB and other features
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-## Required Hardware
-
-Apart from diodes and key switches for the keyboard matrix in each half, you
-will need:
-
-- 2 Arduino Pro Micros. You can find these on AliExpress for ≈3.50USD each.
-- 2 TRRS sockets and 1 TRRS cable, or 2 TRS sockets and 1 TRS cable
-
-Alternatively, you can use any sort of cable and socket that has at least 3
-wires. If you want to use I2C to communicate between halves, you will need a
-cable with at least 4 wires and 2x 4.7kΩ pull-up resistors
-
-## Optional Hardware
-
-A speaker can be hooked-up to either side to the `5` (`C6`) pin and `GND`, and turned on via `AUDIO_ENABLE`.
-
-## Wiring
-
-The 3 wires of the TRS/TRRS cable need to connect GND, VCC, and digital pin 3 (i.e.
-PD0 on the ATmega32u4) between the two Pro Micros.
+## Keymaps
-Next, wire your key matrix to any of the remaining 17 IO pins of the pro micro
-and modify the `matrix.c` accordingly.
+### Default
-The wiring for serial:
+The default functional layout, based on QWERTY, and every variant has this keymap; used as a starting point/template for custom keymaps and for debugging purposes when soldering key matrix to controller.
-![serial wiring](https://i.imgur.com/C3D1GAQ.png)
+### VIA
+Similar to *Default* but adds support for the [VIA](https://usevia.app/) keymap configurator. Layer count set to 4 to comply with VIA defaults, and remaps keys to accommodate this constraint, if applicable.
-The wiring for i2c:
+Variants with VIA support:
+- 4x6
+- 5x6_5
+- 5x7
-![i2c wiring](https://i.imgur.com/Hbzhc6E.png)
+### Miryoku
-The pull-up resistors may be placed on either half. It is also possible
-to use 4 resistors and have the pull-ups in both halves, but this is
-unnecessary in simple use cases.
+For more information on this layout schematic, please see the [Miryoku Reference Manual](https://github.com/manna-harbour/miryoku/tree/master/docs/reference).
+For QMK specifics, please see [Miryoku QMK](https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku).
-You can change your configuration between serial and i2c by modifying your `config.h` file.
+Variants with *Miryoku* support:
+- 4x5
+- 4x5_5
+- 4x6
+- 4x6_5
+- 5x6
-## Notes on Software Configuration
+## Non-Pro Micro Controller Compilation
-the keymaps in here are for the 4x5 layout of the keyboard only.
+If building a Dactyl Manuform with controllers that aren't a pro micro, the Converter feature of QMK will allow compilation of firmware for the intended variant and supported controller without having to create a new QMK keyboard/keymap.
+Please see [Converters](https://docs.qmk.fm/#/feature_converters?id=supported-converters) documentation for list of controllers that are supported converting from `pro_micro` and how to implement conversion.
## Flashing
-To flash your firmware take a look at: [Flashing Instructions and Bootloader Information](https://docs.qmk.fm/#/flashing)
-
-## Choosing which board to plug the USB cable into (choosing Master)
-
-Because the two boards are identical, the firmware has logic to differentiate the left and right board.
-
-It uses two strategies to figure things out: looking at the EEPROM (memory on the chip) or looking if the current board has the usb cable.
-
-The EEPROM approach requires additional setup (flashing the eeprom) but allows you to swap the usb cable to either side.
-
-The USB cable approach is easier to setup and if you just want the usb cable on the left board, you do not need to do anything extra.
+To flash your board with generated firmware file, please see [Flashing Instructions and Bootloader Information](https://docs.qmk.fm/#/flashing)
-### Setting the left hand as master
+## Handedness configurations
-If you always plug the usb cable into the left board, nothing extra is needed as this is the default. Comment out `EE_HANDS` and comment out `I2C_MASTER_RIGHT` or `MASTER_RIGHT` if for some reason it was set.
+See [Handedness](https://docs.qmk.fm/#/config_options?id=setting-handedness) documentation for more information on configuring handedness/master half.
-### Setting the right hand as master
-
-If you always plug the usb cable into the right board, add an extra flag to your `config.h`
-
-```
- #define MASTER_RIGHT
-```
-
-### Setting EE_hands to use either hands as master
-
-If you define `EE_HANDS` in your `config.h`, you will need to set the
-EEPROM for the left and right halves.
-
-The EEPROM is used to store whether the
-half is left handed or right handed. This makes it so that the same firmware
-file will run on both hands instead of having to flash left and right handed
-versions of the firmware to each half. To flash the EEPROM file for the left
-half run:
+## VIA Configuration
+Variants with a `via` keymap are VIA capable.
+Compile firmware, for [enabled variant](#via), with it's `via` keymap and flash board with this firmware file.
```
-make handwired/dactyl_promicro:default:dfu-split-left
-make handwired/dactyl_promicro:default:dfu-split-right
+qmk compile -kb handwired/dactyl_manuform/4x6 -km via
```
-After you have flashed the EEPROM, you then need to set `EE_HANDS` in your config.h, rebuild the hex files and reflash.
-
-Note that you need to program both halves, but you have the option of using
-different keymaps for each half. You could program the left half with a QWERTY
-layout and the right half with a Colemak layout using bootmagic's default layout option.
-Then if you connect the left half to a computer by USB the keyboard will use QWERTY and Colemak when the
-right half is connected.
-
-## Notes on Using Pro Micro 3.3V
+## Bootloader
-Do update the `F_CPU` parameter in `rules.mk` to `8000000` which reflects
-the frequency on the 3.3V board.
+Enter the bootloader in 3 ways:
-Also, if the slave board is producing weird characters in certain columns,
-update the following line in `matrix.c` to the following:
-
-```
-// wait_us(30); // without this wait read unstable value.
-wait_us(300); // without this wait read unstable value.
-```
+* **Bootmagic reset**: If enabled, hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB or controller - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available