summaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/dactyl/dactyl.h10
-rw-r--r--keyboards/handwired/dactyl/info.json13
-rw-r--r--keyboards/handwired/dactyl/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/dactyl/keymaps/dvorak/keymap.c4
-rw-r--r--keyboards/handwired/dactyl/keymaps/erincalling/keymap.c4
-rw-r--r--keyboards/handwired/dactyl_manuform/config.h10
-rw-r--r--keyboards/handwired/dactyl_manuform/dactyl_manuform.h52
-rw-r--r--keyboards/handwired/dactyl_manuform/eeprom-lefthand.eep2
-rw-r--r--keyboards/handwired/dactyl_manuform/eeprom-righthand.eep2
-rw-r--r--keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c112
-rw-r--r--keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c100
-rw-r--r--keyboards/handwired/dactyl_manuform/readme.md18
-rw-r--r--keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h1
13 files changed, 192 insertions, 140 deletions
diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h
index 3e33930e32..d4c38dcfb6 100644
--- a/keyboards/handwired/dactyl/dactyl.h
+++ b/keyboards/handwired/dactyl/dactyl.h
@@ -29,9 +29,12 @@ extern bool i2c_initialized;
void init_dactyl(void);
void init_expander(void);
-#define KEYMAP( \
+/*
+ * LEFT HAND: LINES 38-45
+ * RIGHT HAND: LINES 47-54
+ */
+#define LAYOUT_dactyl( \
\
- /* left hand, spatial positions */ \
k00,k01,k02,k03,k04,k05, \
k10,k11,k12,k13,k14,k15, \
k20,k21,k22,k23,k24,k25, \
@@ -41,7 +44,6 @@ void init_expander(void);
k54, \
k53,k52,k51, \
\
- /* right hand, spatial positions */ \
k06,k07,k08,k09,k0A,k0B, \
k16,k17,k18,k19,k1A,k1B, \
k26,k27,k28,k29,k2A,k2B, \
@@ -62,6 +64,4 @@ void init_expander(void);
}
-#define LAYOUT_dactyl KEYMAP
-
#endif
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
new file mode 100644
index 0000000000..37d2e025e2
--- /dev/null
+++ b/keyboards/handwired/dactyl/info.json
@@ -0,0 +1,13 @@
+{
+ "keyboard_name": "Dactyl",
+ "url": "",
+ "maintainer": "qmk",
+ "width": 17,
+ "height": 8,
+ "layouts": {
+ "LAYOUT_dactyl": {
+ "key_count": 70,
+ "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0}, {"label":"k05", "x":5, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1}, {"label":"k15", "x":5, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2}, {"label":"k25", "x":5, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}, {"label":"k34", "x":4, "y":3}, {"label":"k35", "x":5, "y":3}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k43", "x":3, "y":4}, {"label":"k44", "x":4, "y":4}, {"label":"k55", "x":6, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k54", "x":7, "y":6}, {"label":"k53", "x":5, "y":6, "h":2}, {"label":"k52", "x":6, "y":6, "h":2}, {"label":"k51", "x":7, "y":7}, {"label":"k06", "x":11, "y":0}, {"label":"k07", "x":12, "y":0}, {"label":"k08", "x":13, "y":0}, {"label":"k09", "x":14, "y":0}, {"label":"k0A", "x":15, "y":0}, {"label":"k0B", "x":16, "y":0}, {"label":"k16", "x":11, "y":1}, {"label":"k17", "x":12, "y":1}, {"label":"k18", "x":13, "y":1}, {"label":"k19", "x":14, "y":1}, {"label":"k1A", "x":15, "y":1}, {"label":"k1B", "x":16, "y":1}, {"label":"k26", "x":11, "y":2}, {"label":"k27", "x":12, "y":2}, {"label":"k28", "x":13, "y":2}, {"label":"k29", "x":14, "y":2}, {"label":"k2A", "x":15, "y":2}, {"label":"k2B", "x":16, "y":2}, {"label":"k36", "x":11, "y":3}, {"label":"k37", "x":12, "y":3}, {"label":"k38", "x":13, "y":3}, {"label":"k39", "x":14, "y":3}, {"label":"k3A", "x":15, "y":3}, {"label":"k3B", "x":16, "y":3}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":13, "y":4}, {"label":"k49", "x":14, "y":4}, {"label":"k4A", "x":15, "y":4}, {"label":"k4B", "x":16, "y":4}, {"label":"k5B", "x":9, "y":5}, {"label":"k56", "x":10, "y":5}, {"label":"k57", "x":9, "y":6}, {"label":"k5A", "x":9, "y":7}, {"label":"k59", "x":10, "y":6, "h":2}, {"label":"k58", "x":11, "y":6, "h":2}]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c
index 0d414d85b2..c4a638c2a4 100644
--- a/keyboards/handwired/dactyl/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl.h"
-#include "debug.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
#include "version.h"
#define BASE 0 // default layer
diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
index a0b98b993d..56762d1b67 100644
--- a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl.h"
-#include "debug.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
#include "version.h"
#define BASE 0 // default layer
diff --git a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
index d22d138a00..e439af3e54 100644
--- a/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/erincalling/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl.h"
-#include "debug.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
#include "version.h"
#define BASE 0 // default layer
diff --git a/keyboards/handwired/dactyl_manuform/config.h b/keyboards/handwired/dactyl_manuform/config.h
index 093d6680bf..8917630e4a 100644
--- a/keyboards/handwired/dactyl_manuform/config.h
+++ b/keyboards/handwired/dactyl_manuform/config.h
@@ -45,6 +45,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* number of backlight levels */
// #define BACKLIGHT_LEVELS 3
+/* mouse config */
+#define MOUSEKEY_INTERVAL 20
+#define MOUSEKEY_DELAY 0
+#define MOUSEKEY_TIME_TO_MAX 60
+#define MOUSEKEY_MAX_SPEED 7
+#define MOUSEKEY_WHEEL_DELAY 0
+
/* Set 0 if debouncing isn't needed */
#define DEBOUNCING_DELAY 5
@@ -58,6 +65,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
+
/* ws2812 RGB LED */
#define RGB_DI_PIN D3
#define RGBLIGHT_TIMER
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index dc865bf64a..3dc8405ff9 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -18,54 +18,52 @@
//void promicro_bootloader_jmp(bool program);
#ifndef FLIP_HALF
-
#define LAYOUT( \
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L31, L32, R33, R34, \
- L33, L34, R31, R32, \
- L44, L42, R43, R41, \
- L43, L41, R44, R42 \
+ L31, L32, R32, R33, \
+ L33, L34, R30, R31, \
+ L44, L43, R41, R40, \
+ L42, L41, R43, R42 \
) \
{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { KC_NO, L31, L32, L33, L34 }, \
- { KC_NO, L41, L42, L43, L44 }, \
+ { L00, L01, L02, L03, L04 }, \
+ { L10, L11, L12, L13, L14 }, \
+ { L20, L21, L22, L23, L24 }, \
+ { KC_NO, L31, L32, L33, L34 }, \
+ { KC_NO, L41, L42, L43, L44 }, \
\
{ R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \
- { KC_NO, R34, R33, R32, R31 }, \
- { KC_NO, R44, R43, R42, R41 } \
+ { KC_NO, R33, R32, R31, R30 }, \
+ { KC_NO, R43, R42, R41, R40 } \
}
#else
-
#define LAYOUT( \
- L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
- L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
- L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
- L31, L32, L33, L34, \
- R31, R32, R33, R34, \
- L41, L42, L43, L44, \
- R41, R42, R43, R44 \
+ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
+ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
+ L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \
+ L31, L32, R32, R33, \
+ L33, L34, R30, R31, \
+ L44, L43, R41, R40, \
+ L42, L41, R43, R42 \
) \
{ \
+ { R04, R03, R02, R01, R00 }, \
+ { R14, R13, R12, R11, R10 }, \
+ { R24, R23, R22, R21, R20 }, \
+ { KC_NO, R33, R32, R31, R30 }, \
+ { KC_NO, R43, R42, R41, R40 }, \
+\
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ KC_NO, L31, L32, L33, L34 }, \
- { KC_NO, L41, L42, L43, L44 }, \
+ { KC_NO, L41, L42, L43, L44 } \
\
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { KC_NO, R31, R32, R33, R34 }, \
- { KC_NO, R41, R42, R43, R44 } \
}
-
#endif
#endif
diff --git a/keyboards/handwired/dactyl_manuform/eeprom-lefthand.eep b/keyboards/handwired/dactyl_manuform/eeprom-lefthand.eep
new file mode 100644
index 0000000000..bda23cdb6e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/eeprom-lefthand.eep
@@ -0,0 +1,2 @@
+:0F000000000000000000000000000000000001F0
+:00000001FF
diff --git a/keyboards/handwired/dactyl_manuform/eeprom-righthand.eep b/keyboards/handwired/dactyl_manuform/eeprom-righthand.eep
new file mode 100644
index 0000000000..549cd1ef0a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/eeprom-righthand.eep
@@ -0,0 +1,2 @@
+:0F000000000000000000000000000000000000F1
+:00000001FF
diff --git a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
index 8847065f41..24c02215ee 100644
--- a/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/keymaps/default/keymap.c
@@ -5,59 +5,68 @@
extern keymap_config_t keymap_config;
#define _BASE 0
-#define _NAV 1
-#define _NUM 2
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- NAV,
- NUM,
-};
+#define _RAISE 1
+#define _LOWER 2
// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
+
+#define ____ KC_TRNS
+
+#define SFT_ESC SFT_T(KC_ESC)
+#define CTL_BSPC CTL_T(KC_BSPC)
+#define ALT_SPC ALT_T(KC_SPC)
+#define SFT_ENT SFT_T(KC_ENT)
+
+#define KC_ML KC_MS_LEFT
+#define KC_MR KC_MS_RIGHT
+#define KC_MU KC_MS_UP
+#define KC_MD KC_MS_DOWN
+#define KC_MB1 KC_MS_BTN1
+#define KC_MB2 KC_MS_BTN1
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base (qwerty)
* ,----------------------------------, ,----------------------------------,
- * | Q | W | E | R | T | | Y | U | I | O | P |
+ * | q | w | e | r | t | | y | u | i | o | p |
* |------+------+------+------+------| |-------------+------+------+------|
- * | A | S | D | F | G | | H | J | K | L | ; |
+ * | a | s | d | f | g | | h | j | k | l | ; |
* |------+------+------+------+------| |------|------+------+------+------|
- * | Z | X | C | V | B | | N | M | , | . | ' |
+ * | z | x | c | v | b | | n | m | , | . | ' |
* |------+------+------+-------------, ,-------------+------+------+------,
* | [ | ] | | - | = |
* '------+------'-------------' '-------------'------+------'
- * | esc | bs | | space|enter |
+ * | ESC | BS | | SPACE|ENTER |
* | + | + | | + | + |
- * | shift| ctrl | | alt |shift |
+ * | SHIFT| CTRL | | ALT |SHIFT |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
- * |------+------' '------+------|
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | TAB | HOME | | END | DEL |
+ * '------+------' '------+------'
+ * | Lower| ~ | | GUI | Raise|
* '------+------' '------+------'
*/
[_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_QUOT, \
- KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \
- SFT_T(KC_ESC), CTL_T(KC_BSPC), ALT_T(KC_SPC), SFT_T(KC_ENT), \
- KC_TAB, KC_HOME, KC_END, KC_DEL, \
- LT(_NAV, KC_BSLS), KC_GRV, KC_LGUI, LT(_NUM, KC_SLSH) \
+ 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_QUOT, \
+ KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \
+ SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \
+ KC_TAB, KC_HOME, KC_END, KC_DEL, \
+ RAISE, KC_GRV, KC_LGUI, LOWER
),
-/* Navigation layer
+/* Raise
* ,----------------------------------, ,----------------------------------,
- * | | | mup | | | | | | up | | |
+ * | | | mup | | | | VOL+ | | up | | PgUp |
* |------+------+------+------+------| |-------------+------+------+------|
- * | | mleft| mdown|mright| | | | left | down |right | |
+ * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn |
* |------+------+------+------+------| |------|------+------+------+------|
- * | | | | | | | | | | | |
+ * | | | | | | | VOL- | / | \ | ? | | |
* |------+------+------+-------------, ,-------------+------+------+------,
* | | | | mbtn |mbtn2 |
* '------+------'-------------' '-------------'------+------'
@@ -66,22 +75,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
+ * | | | | | |
* '------+------' '------+------'
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | | | | | |
* '------+------' '------+------'
*/
-[_NAV] = LAYOUT( \
- KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_BTN2, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+[_RAISE] = LAYOUT( \
+ ____, ____, KC_MU, ____, ____, KC_VOLU, ____, KC_UP, ____, KC_PGUP, \
+ ____, KC_ML, KC_MD, KC_MR, ____, KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, \
+ ____, ____, ____, ____, ____, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, \
+ ____, ____, KC_MB1, KC_MB2, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
),
-/* Numbers layer
+/* Lower
* ,----------------------------------, ,----------------------------------,
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
* |------+------+------+------+------| |-------------+------+------+------|
@@ -89,26 +98,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------| |------|------+------+------+------|
* | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
* |------+------+------+-------------, ,-------------+------+------+------,
- * | F11 | F12 | | | |
+ * | F11 | F12 | | - | = |
* '------+------'-------------' '-------------'------+------'
* | | | | | |
* | | | | | |
* | | | | | |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
+ * | | | | | |
* '------+------' '------+------'
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | | | | | |
* '------+------' '------+------'
*/
-[_NUM] = LAYOUT( \
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \
- KC_F11, KC_F12, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+
+[_LOWER] = LAYOUT( \
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
+ KC_F11, KC_F12, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
)
};
diff --git a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
index bee15bfbe3..0a1c90b6bf 100644
--- a/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/keymaps/dvorak/keymap.c
@@ -5,24 +5,33 @@
extern keymap_config_t keymap_config;
#define _BASE 0
-#define _NAV 1
-#define _NUM 2
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- NAV,
- NUM,
-};
+#define _RAISE 1
+#define _LOWER 2
// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
+
+#define ____ KC_TRNS
+
+#define SFT_ESC SFT_T(KC_ESC)
+#define CTL_BSPC CTL_T(KC_BSPC)
+#define ALT_SPC ALT_T(KC_SPC)
+#define SFT_ENT SFT_T(KC_ENT)
+
+#define KC_ML KC_MS_LEFT
+#define KC_MR KC_MS_RIGHT
+#define KC_MU KC_MS_UP
+#define KC_MD KC_MS_DOWN
+#define KC_MB1 KC_MS_BTN1
+#define KC_MB2 KC_MS_BTN1
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base (dvorak)
* ,----------------------------------, ,----------------------------------,
- * | ' | , | . | p | y | | f | g | c | r | l |
+ * | ' | , | . | p | y | | f | g | c | r | l |
* |------+------+------+------+------| |-------------+------+------+------|
* | a | o | e | u | i | | d | h | t | n | s |
* |------+------+------+------+------| |------|------+------+------+------|
@@ -30,14 +39,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+-------------, ,-------------+------+------+------,
* | [ | ] | | - | = |
* '------+------'-------------' '-------------'------+------'
- * | esc | bs | | space|enter |
+ * | ESC | BS | | SPACE|ENTER |
* | + | + | | + | + |
- * | shift| ctrl | | alt |shift |
+ * | SHIFT| CTRL | | ALT |SHIFT |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
- * |------+------' '------+------|
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | TAB | HOME | | END | DEL |
+ * '------+------' '------+------'
+ * | Lower| ~ | | GUI | Raise|
* '------+------' '------+------'
*/
@@ -46,18 +55,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, \
KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, \
KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \
- SFT_T(KC_ESC), CTL_T(KC_BSPC), ALT_T(KC_SPC), SFT_T(KC_ENT), \
- KC_TAB, KC_HOME, KC_END, KC_DEL, \
- LT(_NAV, KC_BSLS), KC_GRV, KC_LGUI, LT(_NUM, KC_SLSH) \
+ SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \
+ KC_TAB, KC_HOME, KC_END, KC_DEL, \
+ RAISE, KC_GRV, KC_LGUI, LOWER
),
-/* Navigation layer
+/* Raise
* ,----------------------------------, ,----------------------------------,
- * | | | mup | | | | | | up | | |
+ * | | | mup | | | | VOL+ | | up | | PgUp |
* |------+------+------+------+------| |-------------+------+------+------|
- * | | mleft| mdown|mright| | | | left | down |right | |
+ * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn |
* |------+------+------+------+------| |------|------+------+------+------|
- * | | | | | | | | | | | |
+ * | | | | | | | VOL- | / | \ | ? | | |
* |------+------+------+-------------, ,-------------+------+------+------,
* | | | | mbtn |mbtn2 |
* '------+------'-------------' '-------------'------+------'
@@ -66,22 +75,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
+ * | | | | | |
* '------+------' '------+------'
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | | | | | |
* '------+------' '------+------'
*/
-[_NAV] = LAYOUT( \
- KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_BTN2, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+[_RAISE] = LAYOUT( \
+ ____, ____, KC_MU, ____, ____, KC_VOLU, ____, KC_UP, ____, KC_PGUP, \
+ ____, KC_ML, KC_MD, KC_MR, ____, KC_MUTE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDOWN, \
+ ____, ____, ____, ____, ____, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, \
+ ____, ____, KC_MB1, KC_MB2, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
),
-/* Numbers layer
+/* Lower
* ,----------------------------------, ,----------------------------------,
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
* |------+------+------+------+------| |-------------+------+------+------|
@@ -89,26 +98,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------| |------|------+------+------+------|
* | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
* |------+------+------+-------------, ,-------------+------+------+------,
- * | F11 | F12 | | | |
+ * | F11 | F12 | | - | = |
* '------+------'-------------' '-------------'------+------'
* | | | | | |
* | | | | | |
* | | | | | |
* '------+------' '------+------'
* '------+------' '------+------'
- * | tab | home | | end | del |
+ * | | | | | |
* '------+------' '------+------'
- * |\(NAV)| ~ | | gui |/(NUM)|
+ * | | | | | |
* '------+------' '------+------'
*/
-[_NUM] = LAYOUT( \
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, \
- KC_F11, KC_F12, KC_TRNS, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+
+[_LOWER] = LAYOUT( \
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \
+ KC_F11, KC_F12, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____, \
+ ____, ____, ____, ____ \
)
};
diff --git a/keyboards/handwired/dactyl_manuform/readme.md b/keyboards/handwired/dactyl_manuform/readme.md
index 354e11ee9d..8b28757129 100644
--- a/keyboards/handwired/dactyl_manuform/readme.md
+++ b/keyboards/handwired/dactyl_manuform/readme.md
@@ -1,7 +1,8 @@
-Dactyl manuform
+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)
+
## First Time Setup
@@ -31,6 +32,19 @@ dactyl_manuform_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
+Currently there are only two keymaps: Qwerty and Dvorak, feel free to make changes and contribute your keymap.
+### Qwerty and Dvorak
+Qwerty base layer:
+![Imgur](https://i.imgur.com/Yb5e7dS.png)
+Dvorak base layer:
+![Imgur](https://i.imgur.com/CpuZptB.png)
+Both keymaps have the same Raise and Lower layers:
+Raise Layer
+![Imgur](https://i.imgur.com/nOqePK5.png)
+Lower Layer
+![Imgur](https://i.imgur.com/WSshkYc.png)
+
Required Hardware
-----------------
diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
index fa6151e108..701c2cf353 100644
--- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
+++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h
@@ -5,7 +5,6 @@
#define SOLENOID_ENABLE
#define SOLENOID_PIN F6
-#undef SOLENOID_ACTIVE
#define SOLENOID_ACTIVE true
#endif