summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Sutherland <dunk2k_2000@hotmail.com>2023-07-20 21:03:23 +0100
committerGitHub <noreply@github.com>2023-07-20 16:03:23 -0400
commitb20b3604042536640b5f29f85656cd55ef459180 (patch)
treebe3e2de825584c9f0acd80556f0a6efaba3f6209
parent657bddb5c349f4e5ce0ca27da707863ff1d38b2e (diff)
Rename `dactyl_manuform` variant `3x5_3` (#21015)
-rw-r--r--data/mappings/keyboard_aliases.hjson3
-rw-r--r--keyboards/handwired/dactyl_minidox/3x5_3.c (renamed from keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c)0
-rw-r--r--keyboards/handwired/dactyl_minidox/config.h (renamed from keyboards/handwired/dactyl_manuform/3x5_3/config.h)0
-rw-r--r--keyboards/handwired/dactyl_minidox/info.json (renamed from keyboards/handwired/dactyl_manuform/3x5_3/info.json)11
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk (renamed from keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/config.h23
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c37
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_minidox/readme.md27
-rw-r--r--keyboards/handwired/dactyl_minidox/rules.mk (renamed from keyboards/handwired/dactyl_manuform/3x5_3/rules.mk)6
15 files changed, 98 insertions, 10 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 9367b052d4..2d735f18f4 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -212,6 +212,9 @@
"gmmk/pro/iso": {
"target": "gmmk/pro/rev1/iso"
},
+ "handwired/dactyl_manuform/3x5_3": {
+ "target": "handwired/dactyl_minidox"
+ },
"handwired/dactyl_manuform/6x6_kinesis": {
"target": "handwired/dactyl_kinesis"
},
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_minidox/3x5_3.c
index 5afb908d02..5afb908d02 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c
+++ b/keyboards/handwired/dactyl_minidox/3x5_3.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_minidox/config.h
index d84e9b6440..d84e9b6440 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h
+++ b/keyboards/handwired/dactyl_minidox/config.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_minidox/info.json
index cfe109fb37..0a1c6a56bb 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_minidox/info.json
@@ -1,6 +1,6 @@
{
- "keyboard_name": "Dactyl Minidox (3x5+3)",
- "manufacturer": "DLFord",
+ "keyboard_name": "Dactyl Minidox",
+ "manufacturer": "dlford",
"url": "https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/",
"maintainer": "dlford",
"usb": {
@@ -20,10 +20,13 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
index abd6433558..abd6433558 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
index 783a2c46b1..783a2c46b1 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
index ee295c7305..ee295c7305 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.c
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
index a609a32544..a609a32544 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/features/caps_word.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
index bdacde1a85..bdacde1a85 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
index f40ace9606..f40ace9606 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/rules.mk
+++ b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
new file mode 100644
index 0000000000..bb5b0bf6af
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/*
+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
+
+/* Select hand configuration */
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+
+#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
new file mode 100644
index 0000000000..80b9b62b53
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers{
+ _BASE,
+ _RAISE,
+ _LOWER,
+ _BLANK
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = 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
+ ),
+ [_RAISE] = LAYOUT_split_3x5_3(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+ [_LOWER] = LAYOUT_split_3x5_3(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+ [_BLANK] = LAYOUT_split_3x5_3(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_minidox/readme.md b/keyboards/handwired/dactyl_minidox/readme.md
new file mode 100644
index 0000000000..5826403a80
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/readme.md
@@ -0,0 +1,27 @@
+# Dactyl Minidox
+
+![DactylMinidox](https://i.imgur.com/PqjgeRfh.jpg)
+
+A 36 key (3x5+3), split bodied keyboard derived from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform/).
+
+* Keyboard Maintainer: [Dan Ford](https://github.com/dlford)
+* Hardware Supported: Pro Micro controller, or clone of
+* Hardware Availability: [Build Guide](https://www.dlford.io/keyboard-build-guide-per-key-rgb-leds/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/dactyl_minidox:default
+
+Flashing example for this keyboard:
+
+ make handwired/dactyl_minidox:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: 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 - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_minidox/rules.mk
index 38ee6f4252..e22ac7f3ff 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
+++ b/keyboards/handwired/dactyl_minidox/rules.mk
@@ -10,9 +10,3 @@ 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