Dactyl Manuform cleanup (#13686)
This commit is contained in:
Ryan
GitHub
@@ -1,14 +1 @@
|
||||
#include "4x6.h"
|
||||
|
||||
|
||||
#ifdef SSD1306OLED
|
||||
void led_set_kb(uint8_t usb_led) {
|
||||
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
|
||||
led_set_user(usb_led);
|
||||
}
|
||||
#endif
|
||||
|
||||
void matrix_init_kb(void) {
|
||||
matrix_init_user();
|
||||
};
|
||||
|
||||
|
||||
@@ -1,36 +1,27 @@
|
||||
#pragma once
|
||||
|
||||
#include "dactyl_manuform.h"
|
||||
#include "quantum.h"
|
||||
|
||||
#ifdef USE_I2C
|
||||
#include <stddef.h>
|
||||
#ifdef __AVR__
|
||||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#endif
|
||||
#endif
|
||||
#define XXX KC_NO
|
||||
|
||||
#define LAYOUT(\
|
||||
#define LAYOUT( \
|
||||
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, \
|
||||
L32, L33, R32, R33, \
|
||||
L34, L35, R30, R31, \
|
||||
L44, L45, R40, R41, \
|
||||
L42, L43, R42, R43 \
|
||||
) \
|
||||
{ \
|
||||
{ L00, L01, L02, L03, L04, L05 }, \
|
||||
{ L10, L11, L12, L13, L14, L15 }, \
|
||||
{ L20, L21, L22, L23, L24, L25 }, \
|
||||
{ KC_NO, KC_NO, L32, L33, L34, L35 }, \
|
||||
{ KC_NO, KC_NO, L42, L43, L44, L45 }, \
|
||||
L32, L33, R32, R33, \
|
||||
L34, L35, R30, R31, \
|
||||
L44, L45, R40, R41, \
|
||||
L42, L43, R42, R43 \
|
||||
) { \
|
||||
{ L00, L01, L02, L03, L04, L05 }, \
|
||||
{ L10, L11, L12, L13, L14, L15 }, \
|
||||
{ L20, L21, L22, L23, L24, L25 }, \
|
||||
{ XXX, XXX, L32, L33, L34, L35 }, \
|
||||
{ XXX, XXX, L42, L43, L44, L45 }, \
|
||||
\
|
||||
{ R00, R01, R02, R03, R04, R05 }, \
|
||||
{ R10, R11, R12, R13, R14, R15 }, \
|
||||
{ R20, R21, R22, R23, R24, R25 }, \
|
||||
{ R30, R31, R32, R33, KC_NO, KC_NO }, \
|
||||
{ R40, R41, R42, R43, KC_NO, KC_NO } \
|
||||
\
|
||||
}
|
||||
{ R00, R01, R02, R03, R04, R05 }, \
|
||||
{ R10, R11, R12, R13, R14, R15 }, \
|
||||
{ R20, R21, R22, R23, R24, R25 }, \
|
||||
{ R30, R31, R32, R33, XXX, XXX }, \
|
||||
{ R40, R41, R42, R43, XXX, XXX } \
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define PRODUCT_ID 0x3436
|
||||
#define DEVICE_VER 0x0001
|
||||
#define PRODUCT_ID 0x3436
|
||||
#define DEVICE_VER 0x0001
|
||||
|
||||
/* key matrix size */
|
||||
// Rows are doubled-up
|
||||
|
||||
@@ -7,59 +7,72 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"L00", "x":0, "y":0},
|
||||
{"label":"L01", "x":1, "y":0},
|
||||
{"label":"L02", "x":2, "y":0},
|
||||
{"label":"L03", "x":3, "y":0},
|
||||
{"label":"L04", "x":4, "y":0},
|
||||
{"label":"L05", "x":5, "y":0},
|
||||
{"label":"R00", "x":11, "y":0},
|
||||
{"label":"R01", "x":12, "y":0},
|
||||
{"label":"R02", "x":13, "y":0},
|
||||
{"label":"R03", "x":14, "y":0},
|
||||
{"label":"R04", "x":15, "y":0},
|
||||
{"label":"R05", "x":16, "y":0},
|
||||
{"label":"L10", "x":0, "y":1},
|
||||
{"label":"L11", "x":1, "y":1},
|
||||
{"label":"L12", "x":2, "y":1},
|
||||
{"label":"L13", "x":3, "y":1},
|
||||
{"label":"L14", "x":4, "y":1},
|
||||
{"label":"L15", "x":5, "y":1},
|
||||
{"label":"R10", "x":11, "y":1},
|
||||
{"label":"R11", "x":12, "y":1},
|
||||
{"label":"R12", "x":13, "y":1},
|
||||
{"label":"R13", "x":14, "y":1},
|
||||
{"label":"R14", "x":15, "y":1},
|
||||
{"label":"R15", "x":16, "y":1},
|
||||
{"label":"L20", "x":0, "y":2},
|
||||
{"label":"L21", "x":1, "y":2},
|
||||
{"label":"L22", "x":2, "y":2},
|
||||
{"label":"L23", "x":3, "y":2},
|
||||
{"label":"L24", "x":4, "y":2},
|
||||
{"label":"L25", "x":5, "y":2},
|
||||
{"label":"R20", "x":11, "y":2},
|
||||
{"label":"R21", "x":12, "y":2},
|
||||
{"label":"R22", "x":13, "y":2},
|
||||
{"label":"R23", "x":14, "y":2},
|
||||
{"label":"R24", "x":15, "y":2},
|
||||
{"label":"R25", "x":16, "y":2},
|
||||
{"label":"L32", "x":2, "y":3},
|
||||
{"label":"L33", "x":3, "y":3},
|
||||
{"label":"R32", "x":13, "y":3},
|
||||
{"label":"R33", "x":14, "y":3},
|
||||
{"label":"L34", "x":4, "y":4},
|
||||
{"label":"L35", "x":5, "y":4},
|
||||
{"label":"R30", "x":11, "y":4},
|
||||
{"label":"R31", "x":12, "y":4},
|
||||
{"label":"L44", "x":6, "y":5},
|
||||
{"label":"L45", "x":7, "y":5},
|
||||
{"label":"R40", "x":9, "y":5},
|
||||
{"label":"R41", "x":10, "y":5},
|
||||
{"label":"L42", "x":6, "y":6},
|
||||
{"label":"L43", "x":7, "y":6},
|
||||
{"label":"R42", "x":9, "y":6},
|
||||
{"label":"R43", "x":10, "y":6}
|
||||
]
|
||||
{"x": 0, "y": 0},
|
||||
{"x": 1, "y": 0},
|
||||
{"x": 2, "y": 0},
|
||||
{"x": 3, "y": 0},
|
||||
{"x": 4, "y": 0},
|
||||
{"x": 5, "y": 0},
|
||||
|
||||
{"x": 11, "y": 0},
|
||||
{"x": 12, "y": 0},
|
||||
{"x": 13, "y": 0},
|
||||
{"x": 14, "y": 0},
|
||||
{"x": 15, "y": 0},
|
||||
{"x": 16, "y": 0},
|
||||
|
||||
{"x": 0, "y": 1},
|
||||
{"x": 1, "y": 1},
|
||||
{"x": 2, "y": 1},
|
||||
{"x": 3, "y": 1},
|
||||
{"x": 4, "y": 1},
|
||||
{"x": 5, "y": 1},
|
||||
|
||||
{"x": 11, "y": 1},
|
||||
{"x": 12, "y": 1},
|
||||
{"x": 13, "y": 1},
|
||||
{"x": 14, "y": 1},
|
||||
{"x": 15, "y": 1},
|
||||
{"x": 16, "y": 1},
|
||||
|
||||
{"x": 0, "y": 2},
|
||||
{"x": 1, "y": 2},
|
||||
{"x": 2, "y": 2},
|
||||
{"x": 3, "y": 2},
|
||||
{"x": 4, "y": 2},
|
||||
{"x": 5, "y": 2},
|
||||
|
||||
{"x": 11, "y": 2},
|
||||
{"x": 12, "y": 2},
|
||||
{"x": 13, "y": 2},
|
||||
{"x": 14, "y": 2},
|
||||
{"x": 15, "y": 2},
|
||||
{"x": 16, "y": 2},
|
||||
|
||||
{"x": 2, "y": 3},
|
||||
{"x": 3, "y": 3},
|
||||
|
||||
{"x": 13, "y": 3},
|
||||
{"x": 14, "y": 3},
|
||||
|
||||
{"x": 4, "y": 4},
|
||||
{"x": 5, "y": 4},
|
||||
|
||||
{"x": 11, "y": 4},
|
||||
{"x": 12, "y": 4},
|
||||
|
||||
{"x": 6, "y": 5},
|
||||
{"x": 7, "y": 5},
|
||||
|
||||
{"x": 9, "y": 5},
|
||||
{"x": 10, "y": 5},
|
||||
|
||||
{"x": 6, "y": 6},
|
||||
{"x": 7, "y": 6},
|
||||
|
||||
{"x": 9, "y": 6},
|
||||
{"x": 10, "y": 6}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,10 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* Use I2C or Serial, not both */
|
||||
#define USE_SERIAL
|
||||
// #define USE_I2C
|
||||
//#define USE_I2C
|
||||
|
||||
/* Select hand configuration */
|
||||
//#define MASTER_LEFT
|
||||
//#define MASTER_RIGHT
|
||||
|
||||
// #define MASTER_LEFT
|
||||
// #define MASTER_RIGHT
|
||||
#define EE_HANDS
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
|
||||
#define _BASE 0
|
||||
#define _RAISE 1
|
||||
#define _LOWER 2
|
||||
|
||||
// Fillers to make layering more clear
|
||||
|
||||
#define ____ KC_TRNS
|
||||
|
||||
#define SFT_ESC SFT_T(KC_ESC)
|
||||
#define CTL_BSPC CTL_T(KC_BSPC)
|
||||
#define ALT_SPC ALT_T(KC_SPC)
|
||||
@@ -25,61 +20,58 @@
|
||||
#define LOWER MO(_LOWER)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Base (qwerty)
|
||||
* +-----------------------------------------+ +-----------------------------------------+
|
||||
* | ESC | q | w | e | r | t | | y | u | i | o | p | |
|
||||
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
* | TAB | a | s | d | f | g | | h | j | k | l | ; | |
|
||||
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
* | SHFT | z | x | c | v | b | | n | m | , | . | / | |
|
||||
* +------+------+------+------+-------------+ +-------------+------+------+------+------+
|
||||
* | [ | ] | | | |
|
||||
* +-------------+-------------+ +-------------+-------------+
|
||||
* | | | | | |
|
||||
* |------+------| |------+------|
|
||||
* | | | | | |
|
||||
* +-------------+ +-------------+
|
||||
* +-------------+ +-------------+
|
||||
* | | | | | |
|
||||
* |------+------| |------+------|
|
||||
* | | | | | |
|
||||
* +-------------+ +-------------+
|
||||
*/
|
||||
[_BASE] = LAYOUT(
|
||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
|
||||
KC_TAB, 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_BSLS,
|
||||
KC_LBRC, KC_RBRC, KC_PLUS, KC_EQL,
|
||||
RAISE, KC_SPC, KC_ENT, LOWER,
|
||||
KC_TAB, KC_HOME, KC_END, KC_DEL,
|
||||
KC_BSPC, KC_GRV, KC_LGUI, KC_LALT
|
||||
),
|
||||
|
||||
/* Base (qwerty)
|
||||
* +-----------------------------------------+ +-----------------------------------------+
|
||||
* | ESC | q | w | e | r | t | | y | u | i | o | p | |
|
||||
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
* | TAB | a | s | d | f | g | | h | j | k | l | ; | |
|
||||
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||
* | SHFT | z | x | c | v | b | | n | m | , | . | / | |
|
||||
* +------+------+------+------+-------------+ +-------------+------+------+------+------+
|
||||
* | [ | ] | | | |
|
||||
* +-------------+-------------+ +-------------+-------------+
|
||||
* | | | | | |
|
||||
* |------+------| |------+------|
|
||||
* | | | | | |
|
||||
* +-------------+ +-------------+
|
||||
* +-------------+ +-------------+
|
||||
* | | | | | |
|
||||
* |------+------| |------+------|
|
||||
* | | | | | |
|
||||
* +-------------+ +-------------+
|
||||
*/
|
||||
[_LOWER] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, RESET, KC_PLUS,
|
||||
_______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE,
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
|
||||
_______, KC_PSCR, _______, KC_P0,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______
|
||||
),
|
||||
|
||||
[_BASE] = LAYOUT( \
|
||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \
|
||||
KC_TAB, 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_BSLASH, \
|
||||
KC_LBRC,KC_RBRC, KC_PLUS,KC_EQL, \
|
||||
RAISE, KC_SPC, KC_ENT, LOWER, \
|
||||
KC_TAB, KC_HOME, KC_END, KC_DEL, \
|
||||
KC_BSPC,KC_GRV, KC_LGUI,KC_LALT \
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT(
|
||||
_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, RESET, KC_PLUS, \
|
||||
_______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS,KC_PIPE, \
|
||||
_______,_______,_______,_______,_______,_______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS, \
|
||||
_______,KC_PSCR, _______, KC_P0, \
|
||||
_______,_______, _______,_______, \
|
||||
_______,_______, _______,_______, \
|
||||
_______,_______, _______,_______ \
|
||||
),
|
||||
|
||||
[_RAISE] = LAYOUT(
|
||||
_______,RESET, _______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NLCK,KC_INS, KC_SLCK,KC_MUTE, \
|
||||
_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, \
|
||||
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, \
|
||||
_______,_______, KC_EQL, _______, \
|
||||
_______,_______, _______,_______, \
|
||||
_______,_______, _______,_______, \
|
||||
_______,_______, _______,_______ \
|
||||
)
|
||||
[_RAISE] = LAYOUT(
|
||||
_______, RESET, _______, _______, _______, KC_LBRC, KC_RBRC, _______, KC_NLCK, KC_INS, KC_SLCK, KC_MUTE,
|
||||
_______, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
|
||||
_______, _______, KC_EQL, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______,
|
||||
_______, _______, _______, _______
|
||||
)
|
||||
};
|
||||
|
||||
|
||||
void persistent_default_layer_set(uint16_t default_layer) {
|
||||
eeconfig_update_default_layer(default_layer);
|
||||
default_layer_set(default_layer);
|
||||
eeconfig_update_default_layer(default_layer);
|
||||
default_layer_set(default_layer);
|
||||
}
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
# MCU name
|
||||
MCU = atmega32u4
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = caterina
|
||||
|
||||
# Build Options
|
||||
# change to "no" to disable the options, or define them in the Makefile in
|
||||
# the appropriate keymap folder that will get included automatically
|
||||
# change yes to no to disable
|
||||
#
|
||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||
CONSOLE_ENABLE = no # Console for debug(+400)
|
||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
||||
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 # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
MIDI_ENABLE = no # MIDI controls
|
||||
AUDIO_ENABLE = no # Audio output on port C6
|
||||
UNICODE_ENABLE = no # Unicode
|
||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||
|
||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||
NKRO_ENABLE = no # USB Nkey Rollover
|
||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
BLUETOOTH_ENABLE = no # Enable Bluetooth
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
SPLIT_KEYBOARD = yes
|
||||
|
||||
Reference in New Issue
Block a user