1
0
Fork 0

Dactyl Manuform cleanup (#13686)

This commit is contained in:
Ryan 2021-07-27 22:00:38 +10:00 committed by GitHub
parent 95de60513d
commit 468f705455
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1399 additions and 1544 deletions

View file

@ -1,23 +1 @@
#include "4x5.h" #include "4x5.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) {
// // green led on
// DDRD |= (1<<5);
// PORTD &= ~(1<<5);
// // orange led on
// DDRB |= (1<<0);
// PORTB &= ~(1<<0);
matrix_init_user();
};

View file

@ -2,15 +2,7 @@
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#include "quantum.h" #define XXX KC_NO
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#ifndef FLIP_HALF #ifndef FLIP_HALF
#define LAYOUT( \ #define LAYOUT( \
@ -21,24 +13,20 @@
L33, L34, R30, R31, \ L33, L34, R30, R31, \
L44, L43, R41, R40, \ L44, L43, R41, R40, \
L42, L41, R43, R42 \ L42, L41, R43, R42 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04 }, \ { L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \ { L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \ { L20, L21, L22, L23, L24 }, \
{ KC_NO, L31, L32, L33, L34 }, \ { XXX, L31, L32, L33, L34 }, \
{ KC_NO, L41, L42, L43, L44 }, \ { XXX, L41, L42, L43, L44 }, \
\ \
{ R04, R03, R02, R01, R00 }, \ { R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \ { R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \ { R24, R23, R22, R21, R20 }, \
{ KC_NO, R33, R32, R31, R30 }, \ { XXX, R33, R32, R31, R30 }, \
{ KC_NO, R43, R42, R41, R40 } \ { XXX, R43, R42, R41, R40 } \
} }
#else #else
#define LAYOUT( \ #define LAYOUT( \
L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \
L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \
@ -47,20 +35,17 @@
L33, L34, R30, R31, \ L33, L34, R30, R31, \
L43, L44, R40, R41, \ L43, L44, R40, R41, \
L41, L42, R42, R43 \ L41, L42, R42, R43 \
) \ ) { \
{ \
{ R04, R03, R02, R01, R00 }, \ { R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \ { R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \ { R24, R23, R22, R21, R20 }, \
{ KC_NO, R33, R32, R31, R30 }, \ { XXX, R33, R32, R31, R30 }, \
{ KC_NO, R43, R42, R41, R40 }, \ { XXX, R43, R42, R41, R40 }, \
\ \
{ L00, L01, L02, L03, L04 }, \ { L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \ { L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \ { L20, L21, L22, L23, L24 }, \
{ KC_NO, L31, L32, L33, L34 }, \ { XXX, L31, L32, L33, L34 }, \
{ KC_NO, L41, L42, L43, L44 } \ { XXX, L41, L42, L43, L44 } \
\
} }
#endif #endif

View file

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define PRODUCT_ID 0x3435 #define PRODUCT_ID 0x3435
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER tshort #define MANUFACTURER tshort
/* key matrix size */ /* key matrix size */

View file

@ -7,52 +7,65 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"R00", "x":10, "y":0},
{"label":"R01", "x":11, "y":0}, {"x": 10, "y": 0},
{"label":"R02", "x":12, "y":0}, {"x": 11, "y": 0},
{"label":"R03", "x":13, "y":0}, {"x": 12, "y":0},
{"label":"R04", "x":14, "y":0}, {"x": 13, "y": 0},
{"label":"L10", "x":0, "y":1}, {"x": 14, "y": 0},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1}, {"x": 0, "y": 1},
{"label":"L13", "x":3, "y":1}, {"x": 1, "y": 1},
{"label":"L14", "x":4, "y":1}, {"x": 2, "y": 1},
{"label":"R10", "x":10, "y":1}, {"x": 3, "y": 1},
{"label":"R11", "x":11, "y":1}, {"x": 4, "y": 1},
{"label":"R12", "x":12, "y":1},
{"label":"R13", "x":13, "y":1}, {"x": 10, "y": 1},
{"label":"R14", "x":14, "y":1}, {"x": 11, "y": 1},
{"label":"L20", "x":0, "y":2}, {"x": 12, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 13, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 14, "y": 1},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2}, {"x": 0, "y": 2},
{"label":"R20", "x":10, "y":2}, {"x": 1, "y": 2},
{"label":"R21", "x":11, "y":2}, {"x": 2, "y": 2},
{"label":"R22", "x":12, "y":2}, {"x": 3, "y": 2},
{"label":"R23", "x":13, "y":2}, {"x": 4, "y": 2},
{"label":"R24", "x":14, "y":2},
{"label":"L31", "x":1, "y":3}, {"x": 10, "y": 2},
{"label":"L32", "x":2, "y":3}, {"x": 11, "y": 2},
{"label":"R32", "x":12, "y":3}, {"x": 12, "y": 2},
{"label":"R33", "x":13, "y":3}, {"x": 13, "y": 2},
{"label":"L33", "x":3, "y":4}, {"x": 14, "y": 2},
{"label":"L34", "x":4, "y":4},
{"label":"R30", "x":10, "y":4}, {"x": 1, "y": 3},
{"label":"R31", "x":11, "y":4}, {"x": 2, "y": 3},
{"label":"L44", "x":5, "y":5},
{"label":"L43", "x":6, "y":5}, {"x": 12, "y": 3},
{"label":"R41", "x":8, "y":5}, {"x": 13, "y": 3},
{"label":"R40", "x":9, "y":5},
{"label":"L42", "x":5, "y":6}, {"x": 3, "y": 4},
{"label":"L41", "x":6, "y":6}, {"x": 4, "y": 4},
{"label":"R43", "x":8, "y":6},
{"label":"R42", "x":9, "y":6} {"x": 10, "y": 4},
{"x": 11, "y": 4},
{"x": 5, "y": 5},
{"x": 6, "y": 5},
{"x": 8, "y": 5},
{"x": 9, "y": 5},
{"x": 5, "y": 6},
{"x": 6, "y": 6},
{"x": 8, "y": 6},
{"x": 9, "y": 6}
] ]
} }
} }

View file

@ -21,12 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
/* Use I2C or Serial, not both */ /* Use I2C or Serial, not both */
#define USE_SERIAL #define USE_SERIAL
//#define USE_I2C //#define USE_I2C
/* Select hand configuration */ /* Select hand configuration */
//#define MASTER_LEFT //#define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
#define EE_HANDS #define EE_HANDS

View file

@ -1,14 +1,9 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _BASE 0 #define _BASE 0
#define _RAISE 1 #define _RAISE 1
#define _LOWER 2 #define _LOWER 2
// Fillers to make layering more clear
#define ____ KC_TRNS
#define SFT_ESC SFT_T(KC_ESC) #define SFT_ESC SFT_T(KC_ESC)
#define CTL_BSPC CTL_T(KC_BSPC) #define CTL_BSPC CTL_T(KC_BSPC)
#define ALT_SPC ALT_T(KC_SPC) #define ALT_SPC ALT_T(KC_SPC)
@ -25,7 +20,6 @@
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base (qwerty) /* Base (qwerty)
* ,----------------------------------, ,----------------------------------, * ,----------------------------------, ,----------------------------------,
* | q | w | e | r | t | | y | u | i | o | p | * | q | w | e | r | t | | y | u | i | o | p |
@ -46,14 +40,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | Raise| ~ | | GUI | Lower| * | Raise| ~ | | GUI | Lower|
* '------+------' '------+------' * '------+------' '------+------'
*/ */
[_BASE] = LAYOUT(
[_BASE] = LAYOUT( \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
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_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_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,
KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, \ SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT,
SFT_ESC, CTL_BSPC, ALT_SPC, SFT_ENT, \ KC_TAB, KC_HOME, KC_END, KC_DEL,
KC_TAB, KC_HOME, KC_END, KC_DEL, \
RAISE, KC_GRV, KC_LGUI, LOWER RAISE, KC_GRV, KC_LGUI, LOWER
), ),
@ -77,16 +70,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | * | | | | | |
* '------+------' '------+------' * '------+------' '------+------'
*/ */
[_RAISE] = LAYOUT(
[_RAISE] = LAYOUT( \ _______, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP,
____, ____, KC_MU, ____, ____, KC_VOLU, ____, KC_UP, ____, KC_PGUP, \ _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
____, 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_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, \ _______, _______, KC_MB1, KC_MB2,
____, ____, KC_MB1, KC_MB2, \ _______, _______, _______, _______,
____, ____, ____, ____, \ _______, _______, _______, _______,
____, ____, ____, ____, \ _______, _______, _______, _______
____, ____, ____, ____ \
), ),
/* Lower /* Lower
* ,----------------------------------, ,----------------------------------, * ,----------------------------------, ,----------------------------------,
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
@ -107,15 +100,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | * | | | | | |
* '------+------' '------+------' * '------+------' '------+------'
*/ */
[_LOWER] = LAYOUT(
[_LOWER] = LAYOUT( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
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_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_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, \ KC_F11, KC_F12, _______, _______,
KC_F11, KC_F12, ____, ____, \ _______, _______, _______, _______,
____, ____, ____, ____, \ _______, _______, _______, _______,
____, ____, ____, ____, \ _______, _______, _______, _______
____, ____, ____, ____ \
) )
}; };

View file

@ -1,20 +1,23 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change yes to no to disable
# the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration 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 # 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

View file

@ -1,14 +1 @@
#include "4x6.h" #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();
};

View file

@ -1,15 +1,8 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#include "quantum.h"
#ifdef USE_I2C #define XXX KC_NO
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define LAYOUT( \ #define LAYOUT( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
@ -19,18 +12,16 @@
L34, L35, R30, R31, \ L34, L35, R30, R31, \
L44, L45, R40, R41, \ L44, L45, R40, R41, \
L42, L43, R42, R43 \ L42, L43, R42, R43 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04, L05 }, \ { L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \ { L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \ { L20, L21, L22, L23, L24, L25 }, \
{ KC_NO, KC_NO, L32, L33, L34, L35 }, \ { XXX, XXX, L32, L33, L34, L35 }, \
{ KC_NO, KC_NO, L42, L43, L44, L45 }, \ { XXX, XXX, L42, L43, L44, L45 }, \
\ \
{ R00, R01, R02, R03, R04, R05 }, \ { R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \ { R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \ { R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, KC_NO, KC_NO }, \ { R30, R31, R32, R33, XXX, XXX }, \
{ R40, R41, R42, R43, KC_NO, KC_NO } \ { R40, R41, R42, R43, XXX, XXX } \
\
} }

View file

@ -7,58 +7,71 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"R00", "x":11, "y":0},
{"label":"R01", "x":12, "y":0}, {"x": 11, "y": 0},
{"label":"R02", "x":13, "y":0}, {"x": 12, "y": 0},
{"label":"R03", "x":14, "y":0}, {"x": 13, "y": 0},
{"label":"R04", "x":15, "y":0}, {"x": 14, "y": 0},
{"label":"R05", "x":16, "y":0}, {"x": 15, "y": 0},
{"label":"L10", "x":0, "y":1}, {"x": 16, "y": 0},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1}, {"x": 0, "y": 1},
{"label":"L13", "x":3, "y":1}, {"x": 1, "y": 1},
{"label":"L14", "x":4, "y":1}, {"x": 2, "y": 1},
{"label":"L15", "x":5, "y":1}, {"x": 3, "y": 1},
{"label":"R10", "x":11, "y":1}, {"x": 4, "y": 1},
{"label":"R11", "x":12, "y":1}, {"x": 5, "y": 1},
{"label":"R12", "x":13, "y":1},
{"label":"R13", "x":14, "y":1}, {"x": 11, "y": 1},
{"label":"R14", "x":15, "y":1}, {"x": 12, "y": 1},
{"label":"R15", "x":16, "y":1}, {"x": 13, "y": 1},
{"label":"L20", "x":0, "y":2}, {"x": 14, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 15, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 16, "y": 1},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2}, {"x": 0, "y": 2},
{"label":"L25", "x":5, "y":2}, {"x": 1, "y": 2},
{"label":"R20", "x":11, "y":2}, {"x": 2, "y": 2},
{"label":"R21", "x":12, "y":2}, {"x": 3, "y": 2},
{"label":"R22", "x":13, "y":2}, {"x": 4, "y": 2},
{"label":"R23", "x":14, "y":2}, {"x": 5, "y": 2},
{"label":"R24", "x":15, "y":2},
{"label":"R25", "x":16, "y":2}, {"x": 11, "y": 2},
{"label":"L32", "x":2, "y":3}, {"x": 12, "y": 2},
{"label":"L33", "x":3, "y":3}, {"x": 13, "y": 2},
{"label":"R32", "x":13, "y":3}, {"x": 14, "y": 2},
{"label":"R33", "x":14, "y":3}, {"x": 15, "y": 2},
{"label":"L34", "x":4, "y":4}, {"x": 16, "y": 2},
{"label":"L35", "x":5, "y":4},
{"label":"R30", "x":11, "y":4}, {"x": 2, "y": 3},
{"label":"R31", "x":12, "y":4}, {"x": 3, "y": 3},
{"label":"L44", "x":6, "y":5},
{"label":"L45", "x":7, "y":5}, {"x": 13, "y": 3},
{"label":"R40", "x":9, "y":5}, {"x": 14, "y": 3},
{"label":"R41", "x":10, "y":5},
{"label":"L42", "x":6, "y":6}, {"x": 4, "y": 4},
{"label":"L43", "x":7, "y":6}, {"x": 5, "y": 4},
{"label":"R42", "x":9, "y":6},
{"label":"R43", "x":10, "y":6} {"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}
] ]
} }
} }

View file

@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define USE_I2C //#define USE_I2C
/* Select hand configuration */ /* Select hand configuration */
//#define MASTER_LEFT //#define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
#define EE_HANDS #define EE_HANDS

View file

@ -1,14 +1,9 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _BASE 0 #define _BASE 0
#define _RAISE 1 #define _RAISE 1
#define _LOWER 2 #define _LOWER 2
// Fillers to make layering more clear
#define ____ KC_TRNS
#define SFT_ESC SFT_T(KC_ESC) #define SFT_ESC SFT_T(KC_ESC)
#define CTL_BSPC CTL_T(KC_BSPC) #define CTL_BSPC CTL_T(KC_BSPC)
#define ALT_SPC ALT_T(KC_SPC) #define ALT_SPC ALT_T(KC_SPC)
@ -25,7 +20,6 @@
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base (qwerty) /* Base (qwerty)
* +-----------------------------------------+ +-----------------------------------------+ * +-----------------------------------------+ +-----------------------------------------+
* | ESC | q | w | e | r | t | | y | u | i | o | p | | * | ESC | q | w | e | r | t | | y | u | i | o | p | |
@ -46,39 +40,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | * | | | | | |
* +-------------+ +-------------+ * +-------------+ +-------------+
*/ */
[_BASE] = LAYOUT(
[_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_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_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_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,
KC_LBRC,KC_RBRC, KC_PLUS,KC_EQL, \ RAISE, KC_SPC, KC_ENT, LOWER,
RAISE, KC_SPC, KC_ENT, LOWER, \ KC_TAB, KC_HOME, KC_END, KC_DEL,
KC_TAB, KC_HOME, KC_END, KC_DEL, \ KC_BSPC, KC_GRV, KC_LGUI, KC_LALT
KC_BSPC,KC_GRV, KC_LGUI,KC_LALT \
), ),
[_LOWER] = LAYOUT( [_LOWER] = LAYOUT(
_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, RESET, KC_PLUS, \ _______, _______, _______, _______, _______, 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_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_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
_______,KC_PSCR, _______, KC_P0, \ _______, KC_PSCR, _______, KC_P0,
_______,_______, _______,_______, \ _______, _______, _______, _______,
_______,_______, _______,_______, \ _______, _______, _______, _______,
_______,_______, _______,_______ \ _______, _______, _______, _______
), ),
[_RAISE] = LAYOUT( [_RAISE] = LAYOUT(
_______,RESET, _______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NLCK,KC_INS, KC_SLCK,KC_MUTE, \ _______, 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_LEFT, KC_UP , KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
_______,_______, KC_EQL, _______, \ _______, _______, KC_EQL, _______,
_______,_______, _______,_______, \ _______, _______, _______, _______,
_______,_______, _______,_______, \ _______, _______, _______, _______,
_______,_______, _______,_______ \ _______, _______, _______, _______
) )
}; };
void persistent_default_layer_set(uint16_t default_layer) { void persistent_default_layer_set(uint16_t default_layer) {
eeconfig_update_default_layer(default_layer); eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer); default_layer_set(default_layer);

View file

@ -1,20 +1,23 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change yes to no to disable
# the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration 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 # 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

View file

@ -1,23 +1 @@
#include "5x6.h" #include "5x6.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) {
// // green led on
// DDRD |= (1<<5);
// PORTD &= ~(1<<5);
// // orange led on
// DDRB |= (1<<0);
// PORTB &= ~(1<<0);
matrix_init_user();
};

View file

@ -1,15 +1,8 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#include "quantum.h"
#ifdef USE_I2C #define XXX KC_NO
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define LAYOUT_5x6( \ #define LAYOUT_5x6( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
@ -20,19 +13,18 @@
L44, L45, R40, R41, \ L44, L45, R40, R41, \
L54, L55, R50, R51, \ L54, L55, R50, R51, \
L52, L53, R52, R53 \ L52, L53, R52, R53 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04, L05 }, \ { L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \ { L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \ { L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \ { L30, L31, L32, L33, L34, L35 }, \
{ KC_NO, KC_NO, L42, L43, L44, L45 }, \ { XXX, XXX, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \ { XXX, XXX, L52, L53, L54, L55 }, \
\ \
{ R00, R01, R02, R03, R04, R05 }, \ { R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \ { R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \ { R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \ { R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, KC_NO, KC_NO }, \ { R40, R41, R42, R43, XXX, XXX }, \
{ R50, R51, R52, R53, KC_NO, KC_NO } \ { R50, R51, R52, R53, XXX, XXX } \
} }

View file

@ -7,70 +7,85 @@
"layouts": { "layouts": {
"LAYOUT_5x6": { "LAYOUT_5x6": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"R00", "x":11, "y":0},
{"label":"R01", "x":12, "y":0}, {"x": 11, "y": 0},
{"label":"R02", "x":13, "y":0}, {"x": 12, "y": 0},
{"label":"R03", "x":14, "y":0}, {"x": 13, "y": 0},
{"label":"R04", "x":15, "y":0}, {"x": 14, "y": 0},
{"label":"R05", "x":16, "y":0}, {"x": 15, "y": 0},
{"label":"L10", "x":0, "y":1}, {"x": 16, "y": 0},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1}, {"x": 0, "y": 1},
{"label":"L13", "x":3, "y":1}, {"x": 1, "y": 1},
{"label":"L14", "x":4, "y":1}, {"x": 2, "y": 1},
{"label":"L15", "x":5, "y":1}, {"x": 3, "y": 1},
{"label":"R10", "x":11, "y":1}, {"x": 4, "y": 1},
{"label":"R11", "x":12, "y":1}, {"x": 5, "y": 1},
{"label":"R12", "x":13, "y":1},
{"label":"R13", "x":14, "y":1}, {"x": 11, "y": 1},
{"label":"R14", "x":15, "y":1}, {"x": 12, "y": 1},
{"label":"R15", "x":16, "y":1}, {"x": 13, "y": 1},
{"label":"L20", "x":0, "y":2}, {"x": 14, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 15, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 16, "y": 1},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2}, {"x": 0, "y": 2},
{"label":"L25", "x":5, "y":2}, {"x": 1, "y": 2},
{"label":"R20", "x":11, "y":2}, {"x": 2, "y": 2},
{"label":"R21", "x":12, "y":2}, {"x": 3, "y": 2},
{"label":"R22", "x":13, "y":2}, {"x": 4, "y": 2},
{"label":"R23", "x":14, "y":2}, {"x": 5, "y": 2},
{"label":"R24", "x":15, "y":2},
{"label":"R25", "x":16, "y":2}, {"x": 11, "y": 2},
{"label":"L30", "x":0, "y":3}, {"x": 12, "y": 2},
{"label":"L31", "x":1, "y":3}, {"x": 13, "y": 2},
{"label":"L32", "x":2, "y":3}, {"x": 14, "y": 2},
{"label":"L33", "x":3, "y":3}, {"x": 15, "y": 2},
{"label":"L34", "x":4, "y":3}, {"x": 16, "y": 2},
{"label":"L35", "x":5, "y":3},
{"label":"R30", "x":11, "y":3}, {"x": 0, "y": 3},
{"label":"R31", "x":12, "y":3}, {"x": 1, "y": 3},
{"label":"R32", "x":13, "y":3}, {"x": 2, "y": 3},
{"label":"R33", "x":14, "y":3}, {"x": 3, "y": 3},
{"label":"R34", "x":15, "y":3}, {"x": 4, "y": 3},
{"label":"R35", "x":16, "y":3}, {"x": 5, "y": 3},
{"label":"L42", "x":2, "y":4},
{"label":"L43", "x":3, "y":4}, {"x": 11, "y": 3},
{"label":"R42", "x":13, "y":4}, {"x": 12, "y": 3},
{"label":"R43", "x":14, "y":4}, {"x": 13, "y": 3},
{"label":"L44", "x":4, "y":5}, {"x": 14, "y": 3},
{"label":"L45", "x":5, "y":5}, {"x": 15, "y": 3},
{"label":"R40", "x":11, "y":5}, {"x": 16, "y": 3},
{"label":"R41", "x":12, "y":5},
{"label":"L54", "x":6, "y":6}, {"x": 2, "y": 4},
{"label":"L55", "x":7, "y":6}, {"x": 3, "y": 4},
{"label":"R50", "x":9, "y":6},
{"label":"R51", "x":10, "y":6}, {"x": 13, "y": 4},
{"label":"L52", "x":6, "y":7}, {"x": 14, "y": 4},
{"label":"L53", "x":7, "y":7},
{"label":"R52", "x":9, "y":7}, {"x": 4, "y": 5},
{"label":"R53", "x":10, "y":7} {"x": 5, "y": 5},
{"x": 11, "y": 5},
{"x": 12, "y": 5},
{"x": 6, "y": 6},
{"x": 7, "y": 6},
{"x": 9, "y": 6},
{"x": 10, "y": 6},
{"x": 6, "y": 7},
{"x": 7, "y": 7},
{"x": 9, "y": 7},
{"x": 10, "y": 7}
] ]
} }
} }

View file

@ -15,13 +15,11 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define USE_SERIAL #define USE_SERIAL
#define MASTER_LEFT #define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
//#define EE_HANDS //#define EE_HANDS
// Rows are doubled-up

View file

@ -1,8 +1,5 @@
/* A standard layout for the Dactyl Manuform 5x6 Keyboard */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 #define _QWERTY 0
#define _LOWER 1 #define _LOWER 1
#define _RAISE 2 #define _RAISE 2
@ -11,7 +8,6 @@
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_5x6( [_QWERTY] = LAYOUT_5x6(
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC,
KC_TAB , 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_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS,
@ -24,7 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[_LOWER] = LAYOUT_5x6( [_LOWER] = LAYOUT_5x6(
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_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, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,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_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
@ -45,5 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______, _______,_______, _______,_______, _______,_______,
_______,_______, _______,_______, _______,_______, _______,_______,
_______,_______, _______,_______ _______,_______, _______,_______
), )
}; };

View file

@ -1,20 +1,23 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change yes to no to disable
# the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration 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 # 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

View file

@ -18,6 +18,8 @@
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#define XXX KC_NO
#define LAYOUT_5x6_2_5( \ #define LAYOUT_5x6_2_5( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
@ -25,19 +27,18 @@
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L40, L41, L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, R44, R45, \ L40, L41, L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, R44, R45, \
L54, L52, R53, R51 \ L54, L52, R53, R51 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04, L05 }, \ { L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \ { L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \ { L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \ { L30, L31, L32, L33, L34, L35 }, \
{ L40, L41, L42, L43, L44, KC_NO }, \ { L40, L41, L42, L43, L44, XXX }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \ { XXX, XXX, L52, L53, L54, L55 }, \
\ \
{ R00, R01, R02, R03, R04, R05 }, \ { R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \ { R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \ { R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \ { R30, R31, R32, R33, R34, R35 }, \
{ KC_NO, R41, R42, R43, R44, R45 }, \ { XXX, R41, R42, R43, R44, R45 }, \
{ R50, R51, R52, R53, KC_NO, KC_NO } \ { R50, R51, R52, R53, XXX, XXX } \
} }

View file

@ -22,15 +22,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x3536 #define PRODUCT_ID 0x3536
#define DEVICE_VER 0x0003 #define DEVICE_VER 0x0003
#define PRODUCT Dactyl-Manuform (5x6+2) #define PRODUCT Dactyl-Manuform (5x6+2)
// #define PRODUCT Dactyl-Manuform (5x6+2) BLE
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 12 #define MATRIX_ROWS 12
#define MATRIX_COLS 6 #define MATRIX_COLS 6
// wiring of each half
// ../../../../docs/proton_c_conversion.md
// left half pro-mirco // left half pro-mirco
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }

View file

@ -7,79 +7,85 @@
"layouts": { "layouts": {
"LAYOUT_5x6_2_5": { "LAYOUT_5x6_2_5": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L05", "x":5, "y":0}, {"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}, {"x": 11, "y": 0},
{"label":"L11", "x":1, "y":1}, {"x": 12, "y": 0},
{"label":"L12", "x":2, "y":1}, {"x": 13, "y": 0},
{"label":"L13", "x":3, "y":1}, {"x": 14, "y": 0},
{"label":"L14", "x":4, "y":1}, {"x": 15, "y": 0},
{"label":"L15", "x":5, "y":1}, {"x": 16, "y": 0},
{"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}, {"x": 0, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 1, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 2, "y": 1},
{"label":"L23", "x":3, "y":2}, {"x": 3, "y": 1},
{"label":"L24", "x":4, "y":2}, {"x": 4, "y": 1},
{"label":"L25", "x":5, "y":2}, {"x": 5, "y": 1},
{"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":"L30", "x":0, "y":3}, {"x": 11, "y": 1},
{"label":"L31", "x":1, "y":3}, {"x": 12, "y": 1},
{"label":"L32", "x":2, "y":3}, {"x": 13, "y": 1},
{"label":"L33", "x":3, "y":3}, {"x": 14, "y": 1},
{"label":"L34", "x":4, "y":3}, {"x": 15, "y": 1},
{"label":"L35", "x":5, "y":3}, {"x": 16, "y": 1},
{"label":"R30", "x":11, "y":3},
{"label":"R31", "x":12, "y":3},
{"label":"R32", "x":13, "y":3},
{"label":"R33", "x":14, "y":3},
{"label":"R34", "x":15, "y":3},
{"label":"R35", "x":16, "y":3},
{"label":"L40", "x":0, "y":4}, {"x": 0, "y": 2},
{"label":"L41", "x":1, "y":4}, {"x": 1, "y": 2},
{"label":"L42", "x":2, "y":4}, {"x": 2, "y": 2},
{"label":"L43", "x":3, "y":4}, {"x": 3, "y": 2},
{"label":"L44", "x":5, "y":4}, {"x": 4, "y": 2},
{"label":"L45", "x":6, "y":4}, {"x": 5, "y": 2},
{"label":"L53", "x":7, "y":4},
{"label":"R52", "x":9, "y":4}, {"x": 11, "y": 2},
{"label":"R40", "x":10, "y":4}, {"x": 12, "y": 2},
{"label":"R41", "x":11, "y":4}, {"x": 13, "y": 2},
{"label":"R42", "x":13, "y":4}, {"x": 14, "y": 2},
{"label":"R43", "x":14, "y":4}, {"x": 15, "y": 2},
{"label":"R44", "x":15, "y":4}, {"x": 16, "y": 2},
{"label":"R45", "x":16, "y":4},
{"label":"L54", "x":6, "y":5}, {"x": 0, "y": 3},
{"label":"L52", "x":7, "y":5}, {"x": 1, "y": 3},
{"x": 2, "y": 3},
{"x": 3, "y": 3},
{"x": 4, "y": 3},
{"x": 5, "y": 3},
{"label":"R53", "x":9, "y":5}, {"x": 11, "y": 3},
{"label":"R51", "x":10, "y":5} {"x": 12, "y": 3},
{"x": 13, "y": 3},
{"x": 14, "y": 3},
{"x": 15, "y": 3},
{"x": 16, "y": 3},
{"x": 0, "y": 4},
{"x": 1, "y": 4},
{"x": 2, "y": 4},
{"x": 3, "y": 4},
{"x": 5, "y": 4},
{"x": 6, "y": 4},
{"x": 7, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4},
{"x": 13, "y":4},
{"x": 14, "y":4},
{"x": 15, "y":4},
{"x": 16, "y":4},
{"x": 6, "y": 5},
{"x": 7, "y": 5},
{"x": 9, "y": 5},
{"x": 10, "y": 5}
] ]
} }
} }

View file

@ -1,14 +1,23 @@
BOOTMAGIC_ENABLE = lite # MCU name
COMMAND_ENABLE = no MCU = atmega32u4
# # Pro-Micro # Bootloader selection
# NKRO_ENABLE = yes BOOTLOADER = caterina
# # # Adafruit Feather # Build Options
# # NKRO_ENABLE = no # change yes to no to disable
# # # Processor frequency #
# F_CPU = 8000000 BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
# F_USB = $(F_CPU) MOUSEKEY_ENABLE = yes # Mouse keys
# # # BLUETOOTH_ENABLE = no EXTRAKEY_ENABLE = yes # Audio control and System control
# # BLUETOOTH = AdafruitBLE CONSOLE_ENABLE = no # Console for debug
# # CONSOLE_DEBUG = yes COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
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

View file

@ -1,2 +1 @@
#include "5x6_5.h" #include "5x6_5.h"

View file

@ -2,6 +2,8 @@
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#define XXX KC_NO
#define LAYOUT_5x6_5( \ #define LAYOUT_5x6_5( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
@ -9,19 +11,18 @@
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, \ L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, \
L54, L52, R53, R51 \ L54, L52, R53, R51 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04, L05 }, \ { L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \ { L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \ { L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \ { L30, L31, L32, L33, L34, L35 }, \
{ KC_NO, KC_NO, L42, L43, L44, KC_NO }, \ { XXX, XXX, L42, L43, L44, XXX }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \ { XXX, XXX, L52, L53, L54, L55 }, \
\ \
{ R00, R01, R02, R03, R04, R05 }, \ { R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \ { R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \ { R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \ { R30, R31, R32, R33, R34, R35 }, \
{ KC_NO, R41, R42, R43, KC_NO, KC_NO }, \ { XXX, R41, R42, R43, XXX, XXX }, \
{ R50, R51, R52, R53, KC_NO, KC_NO } \ { R50, R51, R52, R53, XXX, XXX } \
} }

View file

@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COLS 6 #define MATRIX_COLS 6
// wiring of each half // wiring of each half
// ../../../../docs/proton_c_conversion.md
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } #define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }

View file

@ -7,75 +7,81 @@
"layouts": { "layouts": {
"LAYOUT_5x6_5": { "LAYOUT_5x6_5": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L05", "x":5, "y":0}, {"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}, {"x": 11, "y": 0},
{"label":"L11", "x":1, "y":1}, {"x": 12, "y": 0},
{"label":"L12", "x":2, "y":1}, {"x": 13, "y": 0},
{"label":"L13", "x":3, "y":1}, {"x": 14, "y": 0},
{"label":"L14", "x":4, "y":1}, {"x": 15, "y": 0},
{"label":"L15", "x":5, "y":1}, {"x": 16, "y": 0},
{"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}, {"x": 0, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 1, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 2, "y": 1},
{"label":"L23", "x":3, "y":2}, {"x": 3, "y": 1},
{"label":"L24", "x":4, "y":2}, {"x": 4, "y": 1},
{"label":"L25", "x":5, "y":2}, {"x": 5, "y": 1},
{"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":"L30", "x":0, "y":3}, {"x": 11, "y": 1},
{"label":"L31", "x":1, "y":3}, {"x": 12, "y": 1},
{"label":"L32", "x":2, "y":3}, {"x": 13, "y": 1},
{"label":"L33", "x":3, "y":3}, {"x": 14, "y": 1},
{"label":"L34", "x":4, "y":3}, {"x": 15, "y": 1},
{"label":"L35", "x":5, "y":3}, {"x": 16, "y": 1},
{"label":"R30", "x":11, "y":3},
{"label":"R31", "x":12, "y":3},
{"label":"R32", "x":13, "y":3},
{"label":"R33", "x":14, "y":3},
{"label":"R34", "x":15, "y":3},
{"label":"R35", "x":16, "y":3},
{"label":"L42", "x":2, "y":4}, {"x": 0, "y": 2},
{"label":"L43", "x":3, "y":4}, {"x": 1, "y": 2},
{"label":"L44", "x":5, "y":4}, {"x": 2, "y": 2},
{"label":"L45", "x":6, "y":4}, {"x": 3, "y": 2},
{"label":"L53", "x":7, "y":4}, {"x": 4, "y": 2},
{"x": 5, "y": 2},
{"label":"R52", "x":9, "y":4}, {"x": 11, "y": 2},
{"label":"R40", "x":10, "y":4}, {"x": 12, "y": 2},
{"label":"R41", "x":11, "y":4}, {"x": 13, "y": 2},
{"label":"R42", "x":13, "y":4}, {"x": 14, "y": 2},
{"label":"R43", "x":14, "y":4}, {"x": 15, "y": 2},
{"x": 16, "y": 2},
{"label":"L54", "x":6, "y":5}, {"x": 0, "y": 3},
{"label":"L52", "x":7, "y":5}, {"x": 1, "y": 3},
{"x": 2, "y": 3},
{"x": 3, "y": 3},
{"x": 4, "y": 3},
{"x": 5, "y": 3},
{"label":"R53", "x":9, "y":5}, {"x": 11, "y": 3},
{"label":"R51", "x":10, "y":5} {"x": 12, "y": 3},
{"x": 13, "y": 3},
{"x": 14, "y": 3},
{"x": 15, "y": 3},
{"x": 16, "y": 3},
{"x": 2, "y": 4},
{"x": 3, "y": 4},
{"x": 5, "y": 4},
{"x": 6, "y": 4},
{"x": 7, "y": 4},
{"x": 9, "y": 4},
{"x": 10, "y": 4},
{"x": 11, "y": 4},
{"x": 13, "y": 4},
{"x": 14, "y": 4},
{"x": 6, "y": 5},
{"x": 7, "y": 5},
{"x": 9, "y": 5},
{"x": 10, "y": 5}
] ]
} }
} }

View file

@ -1,3 +1,23 @@
BOOTMAGIC_ENABLE = lite # MCU name
COMMAND_ENABLE = no MCU = atmega32u4
NKRO_ENABLE = yes
# Bootloader selection
BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = lite # 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 = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
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 = yes # 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

View file

@ -1,23 +1 @@
#include "5x7.h" #include "5x7.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) {
// // green led on
// DDRD |= (1<<5);
// PORTD &= ~(1<<5);
// // orange led on
// DDRB |= (1<<0);
// PORTB &= ~(1<<0);
matrix_init_user();
};

View file

@ -1,15 +1,8 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#include "quantum.h"
#ifdef USE_I2C #define XXX KC_NO
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define LAYOUT_5x7( \ #define LAYOUT_5x7( \
L11, L12, L13, L14, L15, L16, L17, \ L11, L12, L13, L14, L15, L16, L17, \
@ -28,18 +21,17 @@
R52, R53, \ R52, R53, \
R62, R63, \ R62, R63, \
R64, R65 \ R64, R65 \
) \ ) { \
{ \
{ L11, L12, L13, L14, L15, L16, L17 }, \ { L11, L12, L13, L14, L15, L16, L17 }, \
{ L21, L22, L23, L24, L25, L26, L27 }, \ { L21, L22, L23, L24, L25, L26, L27 }, \
{ L31, L32, L33, L34, L35, L36, L37 }, \ { L31, L32, L33, L34, L35, L36, L37 }, \
{ L41, L42, L43, L44, L45, L46, KC_NO }, \ { L41, L42, L43, L44, L45, L46, XXX }, \
{ L51, L52, L53, L54, L55, L56, KC_NO }, \ { L51, L52, L53, L54, L55, L56, XXX }, \
{ KC_NO, KC_NO, L63, L64, L65, L66, KC_NO }, \ { XXX, XXX, L63, L64, L65, L66, XXX }, \
{ R11, R12, R13, R14, R15, R16, R17 }, \ { R11, R12, R13, R14, R15, R16, R17 }, \
{ R21, R22, R23, R24, R25, R26, R27 }, \ { R21, R22, R23, R24, R25, R26, R27 }, \
{ R31, R32, R33, R34, R35, R36, R37 }, \ { R31, R32, R33, R34, R35, R36, R37 }, \
{ KC_NO, R42, R43, R44, R45, R46, R47 }, \ { XXX, R42, R43, R44, R45, R46, R47 }, \
{ KC_NO, R52, R53, R54, R55, R56, R57 }, \ { XXX, R52, R53, R54, R55, R56, R57 }, \
{ KC_NO, R62, R63, R64, R65, KC_NO, KC_NO } \ { XXX, R62, R63, R64, R65, XXX, XXX } \
} }

View file

@ -7,80 +7,95 @@
"layouts": { "layouts": {
"LAYOUT_5x7": { "LAYOUT_5x7": {
"layout": [ "layout": [
{"label":"L11", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L12", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L13", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L14", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L15", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L16", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"L17", "x":6, "y":0}, {"x": 6, "y": 0},
{"label":"L21", "x":0, "y":1},
{"label":"L22", "x":1, "y":1}, {"x": 0, "y": 1},
{"label":"L23", "x":2, "y":1}, {"x": 1, "y": 1},
{"label":"L24", "x":3, "y":1}, {"x": 2, "y": 1},
{"label":"L25", "x":4, "y":1}, {"x": 3, "y": 1},
{"label":"L26", "x":5, "y":1}, {"x": 4, "y": 1},
{"label":"L27", "x":6, "y":1}, {"x": 5, "y": 1},
{"label":"L31", "x":0, "y":2}, {"x": 6, "y": 1},
{"label":"L32", "x":1, "y":2},
{"label":"L33", "x":2, "y":2}, {"x": 0, "y": 2},
{"label":"L34", "x":3, "y":2}, {"x": 1, "y": 2},
{"label":"L35", "x":4, "y":2}, {"x": 2, "y": 2},
{"label":"L36", "x":5, "y":2}, {"x": 3, "y": 2},
{"label":"L37", "x":6, "y":2}, {"x": 4, "y": 2},
{"label":"L41", "x":0, "y":3}, {"x": 5, "y": 2},
{"label":"L42", "x":1, "y":3}, {"x": 6, "y": 2},
{"label":"L43", "x":2, "y":3},
{"label":"L44", "x":3, "y":3}, {"x": 0, "y": 3},
{"label":"L45", "x":4, "y":3}, {"x": 1, "y": 3},
{"label":"L46", "x":5, "y":3}, {"x": 2, "y": 3},
{"label":"L51", "x":0, "y":4}, {"x": 3, "y": 3},
{"label":"L52", "x":1, "y":4}, {"x": 4, "y": 3},
{"label":"L53", "x":2, "y":4}, {"x": 5, "y": 3},
{"label":"L54", "x":3, "y":4},
{"label":"L55", "x":4, "y":5}, {"x": 0, "y": 4},
{"label":"L56", "x":5, "y":5}, {"x": 1, "y": 4},
{"label":"L65", "x":6, "y":6}, {"x": 2, "y": 4},
{"label":"L66", "x":7, "y":6}, {"x": 3, "y": 4},
{"label":"L63", "x":6, "y":7},
{"label":"L64", "x":7, "y":7}, {"x": 4, "y": 5},
{"label":"R11", "x":10, "y":0}, {"x": 5, "y": 5},
{"label":"R12", "x":11, "y":0},
{"label":"R13", "x":12, "y":0}, {"x": 6, "y": 6},
{"label":"R14", "x":13, "y":0}, {"x": 7, "y": 6},
{"label":"R15", "x":14, "y":0},
{"label":"R16", "x":15, "y":0}, {"x": 6, "y": 7},
{"label":"R17", "x":16, "y":0}, {"x": 7, "y": 7},
{"label":"R21", "x":10, "y":1},
{"label":"R22", "x":11, "y":1}, {"x": 10, "y": 0},
{"label":"R23", "x":12, "y":1}, {"x": 11, "y": 0},
{"label":"R24", "x":13, "y":1}, {"x": 12, "y": 0},
{"label":"R25", "x":14, "y":1}, {"x": 13, "y": 0},
{"label":"R26", "x":15, "y":1}, {"x": 14, "y": 0},
{"label":"R27", "x":16, "y":1}, {"x": 15, "y": 0},
{"label":"R31", "x":10, "y":2}, {"x": 16, "y": 0},
{"label":"R32", "x":11, "y":2},
{"label":"R33", "x":12, "y":2}, {"x": 10, "y": 1},
{"label":"R34", "x":13, "y":2}, {"x": 11, "y": 1},
{"label":"R35", "x":14, "y":2}, {"x": 12, "y": 1},
{"label":"R36", "x":15, "y":2}, {"x": 13, "y": 1},
{"label":"R37", "x":16, "y":2}, {"x": 14, "y": 1},
{"label":"R42", "x":11, "y":3}, {"x": 15, "y": 1},
{"label":"R43", "x":12, "y":3}, {"x": 16, "y": 1},
{"label":"R44", "x":13, "y":3},
{"label":"R45", "x":14, "y":3}, {"x": 10, "y": 2},
{"label":"R46", "x":15, "y":3}, {"x": 11, "y": 2},
{"label":"R47", "x":16, "y":3}, {"x": 12, "y": 2},
{"label":"R54", "x":13, "y":4}, {"x": 13, "y": 2},
{"label":"R55", "x":14, "y":4}, {"x": 14, "y": 2},
{"label":"R56", "x":15, "y":4}, {"x": 15, "y": 2},
{"label":"R57", "x":16, "y":4}, {"x": 16, "y": 2},
{"label":"R52", "x":11, "y":5},
{"label":"R53", "x":12, "y":5}, {"x": 11, "y": 3},
{"label":"R62", "x":9, "y":6}, {"x": 12, "y": 3},
{"label":"R63", "x":10, "y":6}, {"x": 13, "y": 3},
{"label":"R64", "x":9, "y":7}, {"x": 14, "y": 3},
{"label":"R65", "x":10, "y":7} {"x": 15, "y": 3},
{"x": 16, "y": 3},
{"x": 13, "y": 4},
{"x": 14, "y": 4},
{"x": 15, "y": 4},
{"x": 16, "y": 4},
{"x": 11, "y": 5},
{"x": 12, "y": 5},
{"x": 9, "y": 6},
{"x": 10, "y": 6},
{"x":9, "y":7},
{"x":10, "y":7}
] ]
} }
} }

View file

@ -15,13 +15,11 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define USE_SERIAL #define USE_SERIAL
#define MASTER_LEFT #define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
//#define EE_HANDS //#define EE_HANDS
// Rows are doubled-up

View file

@ -1,6 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below. // Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
@ -16,7 +15,6 @@
#define TAB_RO LCTL(LSFT(KC_T)) #define TAB_RO LCTL(LSFT(KC_T))
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_5x7( [_QWERTY] = LAYOUT_5x7(
// left hand // left hand
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
@ -35,7 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
KC_BSPC, KC_ENT, KC_BSPC, KC_ENT,
KC_PGUP, KC_PGDN, KC_PGUP, KC_PGDN,
KC_LCTL, KC_LALT), KC_LCTL, KC_LALT
),
[_FN] = LAYOUT_5x7( [_FN] = LAYOUT_5x7(
// left hand // left hand
@ -55,7 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______,
KC_DEL, _______, KC_DEL, _______,
_______, _______, _______, _______,
_______, _______), _______, _______
),
[_NUMPAD] = LAYOUT_5x7( [_NUMPAD] = LAYOUT_5x7(
// left hand // left hand
@ -75,6 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P0, KC_PDOT, _______, _______, KC_P0, KC_PDOT, _______, _______,
_______, KC_PENT, _______, KC_PENT,
_______, _______, _______, _______,
_______, _______), _______, _______
),
}; };

View file

@ -15,13 +15,11 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define USE_SERIAL #define USE_SERIAL
#define MASTER_LEFT #define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
//#define EE_HANDS //#define EE_HANDS
// Rows are doubled-up

View file

@ -1,6 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below. // Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
@ -17,7 +16,6 @@
#define TAB_RO LCTL(LSFT(KC_T)) #define TAB_RO LCTL(LSFT(KC_T))
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_5x7( [_QWERTY] = LAYOUT_5x7(
// left hand // left hand
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,
@ -36,7 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
KC_BSPC, KC_ENT, KC_BSPC, KC_ENT,
KC_PGUP, KC_PGDN, KC_PGUP, KC_PGDN,
KC_LCTL, KC_LALT), KC_LCTL, KC_LALT
),
[_FN] = LAYOUT_5x7( [_FN] = LAYOUT_5x7(
// left hand // left hand
@ -56,7 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______,
KC_DEL, _______, KC_DEL, _______,
_______, _______, _______, _______,
_______, _______), _______, _______
),
[_NUMPAD] = LAYOUT_5x7( [_NUMPAD] = LAYOUT_5x7(
// left hand // left hand
@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P0, KC_PDOT, _______, _______, KC_P0, KC_PDOT, _______, _______,
_______, KC_PENT, _______, KC_PENT,
_______, _______, _______, _______,
_______, _______), _______, _______
),
[_NUMPAD] = LAYOUT_5x7( [_NUMPAD] = LAYOUT_5x7(
// left hand // left hand
@ -97,7 +97,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P0, KC_PDOT, _______, _______, KC_P0, KC_PDOT, _______, _______,
_______, KC_PENT, _______, KC_PENT,
_______, _______, _______, _______,
_______, _______), _______, _______
),
[_BLANK] = LAYOUT_5x7( [_BLANK] = LAYOUT_5x7(
// left hand // left hand
@ -117,7 +118,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______), _______, _______
)
}; };

View file

@ -1,20 +1,23 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change yes to no to disable
# the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration 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 # 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

View file

@ -1,23 +1 @@
#include "6x6.h" #include "6x6.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) {
// // green led on
// DDRD |= (1<<5);
// PORTD &= ~(1<<5);
// // orange led on
// DDRB |= (1<<0);
// PORTB &= ~(1<<0);
matrix_init_user();
};

View file

@ -1,16 +1,8 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "dactyl_manuform.h"
#include "quantum.h"
#define XXX KC_NO
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif
#define LAYOUT_6x6( \ #define LAYOUT_6x6( \
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
@ -22,21 +14,20 @@
L54, L55, R50, R51, \ L54, L55, R50, R51, \
L64, L65, R60, R61, \ L64, L65, R60, R61, \
L62, L63, R62, R63 \ L62, L63, R62, R63 \
) \ ) { \
{ \
{ L00, L01, L02, L03, L04, L05 }, \ { L00, L01, L02, L03, L04, L05 }, \
{ L10, L11, L12, L13, L14, L15 }, \ { L10, L11, L12, L13, L14, L15 }, \
{ L20, L21, L22, L23, L24, L25 }, \ { L20, L21, L22, L23, L24, L25 }, \
{ L30, L31, L32, L33, L34, L35 }, \ { L30, L31, L32, L33, L34, L35 }, \
{ L40, L41, L42, L43, L44, L45 }, \ { L40, L41, L42, L43, L44, L45 }, \
{ KC_NO, KC_NO, L52, L53, L54, L55 }, \ { XXX, XXX, L52, L53, L54, L55 }, \
{ KC_NO, KC_NO, L62, L63, L64, L65 }, \ { XXX, XXX, L62, L63, L64, L65 }, \
\ \
{ R00, R01, R02, R03, R04, R05 }, \ { R00, R01, R02, R03, R04, R05 }, \
{ R10, R11, R12, R13, R14, R15 }, \ { R10, R11, R12, R13, R14, R15 }, \
{ R20, R21, R22, R23, R24, R25 }, \ { R20, R21, R22, R23, R24, R25 }, \
{ R30, R31, R32, R33, R34, R35 }, \ { R30, R31, R32, R33, R34, R35 }, \
{ R40, R41, R42, R43, R44, R45 }, \ { R40, R41, R42, R43, R44, R45 }, \
{ R50, R51, R52, R53, KC_NO, KC_NO }, \ { R50, R51, R52, R53, XXX, XXX }, \
{ R60, R61, R62, R63, KC_NO, KC_NO } \ { R60, R61, R62, R63, XXX, XXX } \
} }

View file

@ -7,82 +7,99 @@
"layouts": { "layouts": {
"LAYOUT_6x6": { "LAYOUT_6x6": {
"layout": [ "layout": [
{"label":"L00", "x":0, "y":0}, {"x": 0, "y": 0},
{"label":"L01", "x":1, "y":0}, {"x": 1, "y": 0},
{"label":"L02", "x":2, "y":0}, {"x": 2, "y": 0},
{"label":"L03", "x":3, "y":0}, {"x": 3, "y": 0},
{"label":"L04", "x":4, "y":0}, {"x": 4, "y": 0},
{"label":"L05", "x":5, "y":0}, {"x": 5, "y": 0},
{"label":"R00", "x":11, "y":0},
{"label":"R01", "x":12, "y":0}, {"x": 11, "y": 0},
{"label":"R02", "x":13, "y":0}, {"x": 12, "y": 0},
{"label":"R03", "x":14, "y":0}, {"x": 13, "y": 0},
{"label":"R04", "x":15, "y":0}, {"x": 14, "y": 0},
{"label":"R05", "x":16, "y":0}, {"x": 15, "y": 0},
{"label":"L10", "x":0, "y":1}, {"x": 16, "y": 0},
{"label":"L11", "x":1, "y":1},
{"label":"L12", "x":2, "y":1}, {"x": 0, "y": 1},
{"label":"L13", "x":3, "y":1}, {"x": 1, "y": 1},
{"label":"L14", "x":4, "y":1}, {"x": 2, "y": 1},
{"label":"L15", "x":5, "y":1}, {"x": 3, "y": 1},
{"label":"R10", "x":11, "y":1}, {"x": 4, "y": 1},
{"label":"R11", "x":12, "y":1}, {"x": 5, "y": 1},
{"label":"R12", "x":13, "y":1},
{"label":"R13", "x":14, "y":1}, {"x": 11, "y": 1},
{"label":"R14", "x":15, "y":1}, {"x": 12, "y": 1},
{"label":"R15", "x":16, "y":1}, {"x": 13, "y": 1},
{"label":"L20", "x":0, "y":2}, {"x": 14, "y": 1},
{"label":"L21", "x":1, "y":2}, {"x": 15, "y": 1},
{"label":"L22", "x":2, "y":2}, {"x": 16, "y": 1},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2}, {"x": 0, "y": 2},
{"label":"L25", "x":5, "y":2}, {"x": 1, "y": 2},
{"label":"R20", "x":11, "y":2}, {"x": 2, "y": 2},
{"label":"R21", "x":12, "y":2}, {"x": 3, "y": 2},
{"label":"R22", "x":13, "y":2}, {"x": 4, "y": 2},
{"label":"R23", "x":14, "y":2}, {"x": 5, "y": 2},
{"label":"R24", "x":15, "y":2},
{"label":"R25", "x":16, "y":2}, {"x": 11, "y": 2},
{"label":"L30", "x":0, "y":3}, {"x": 12, "y": 2},
{"label":"L31", "x":1, "y":3}, {"x": 13, "y": 2},
{"label":"L32", "x":2, "y":3}, {"x": 14, "y": 2},
{"label":"L33", "x":3, "y":3}, {"x": 15, "y": 2},
{"label":"L34", "x":4, "y":3}, {"x": 16, "y": 2},
{"label":"L35", "x":5, "y":3},
{"label":"R30", "x":11, "y":3}, {"x": 0, "y": 3},
{"label":"R31", "x":12, "y":3}, {"x": 1, "y": 3},
{"label":"R32", "x":13, "y":3}, {"x": 2, "y": 3},
{"label":"R33", "x":14, "y":3}, {"x": 3, "y": 3},
{"label":"R34", "x":15, "y":3}, {"x": 4, "y": 3},
{"label":"R35", "x":16, "y":3}, {"x": 5, "y": 3},
{"label":"L40", "x":0, "y":4},
{"label":"L41", "x":1, "y":4}, {"x": 11, "y": 3},
{"label":"L42", "x":2, "y":4}, {"x": 12, "y": 3},
{"label":"L43", "x":3, "y":4}, {"x": 13, "y": 3},
{"label":"L44", "x":4, "y":4}, {"x": 14, "y": 3},
{"label":"L45", "x":5, "y":4}, {"x": 15, "y": 3},
{"label":"R40", "x":11, "y":4}, {"x": 16, "y": 3},
{"label":"R41", "x":12, "y":4},
{"label":"R42", "x":13, "y":4}, {"x": 0, "y": 4},
{"label":"R43", "x":14, "y":4}, {"x": 1, "y": 4},
{"label":"R44", "x":15, "y":4}, {"x": 2, "y": 4},
{"label":"R45", "x":16, "y":4}, {"x": 3, "y": 4},
{"label":"L52", "x":2, "y":5}, {"x": 4, "y": 4},
{"label":"L53", "x":3, "y":5}, {"x": 5, "y": 4},
{"label":"R52", "x":13, "y":5},
{"label":"R53", "x":14, "y":5}, {"x": 11, "y": 4},
{"label":"L54", "x":4, "y":6}, {"x": 12, "y": 4},
{"label":"L55", "x":5, "y":6}, {"x": 13, "y": 4},
{"label":"R50", "x":11, "y":6}, {"x": 14, "y": 4},
{"label":"R51", "x":12, "y":6}, {"x": 15, "y": 4},
{"label":"L64", "x":6, "y":7}, {"x": 16, "y": 4},
{"label":"L65", "x":7, "y":7},
{"label":"R60", "x":9, "y":7}, {"x": 2, "y": 5},
{"label":"R61", "x":10, "y":7}, {"x": 3, "y": 5},
{"label":"L62", "x":6, "y":8},
{"label":"L63", "x":7, "y":8}, {"x": 13, "y": 5},
{"label":"R62", "x":9, "y":8}, {"x": 14, "y": 5},
{"label":"R63", "x":10, "y":8}
{"x": 4, "y": 6},
{"x": 5, "y": 6},
{"x": 11, "y": 6},
{"x": 12, "y": 6},
{"x": 6, "y": 7},
{"x": 7, "y": 7},
{"x": 9, "y": 7},
{"x": 10, "y": 7},
{"x": 6, "y": 8},
{"x": 7, "y": 8},
{"x": 9, "y": 8},
{"x": 10, "y": 8}
] ]
} }
} }

View file

@ -15,13 +15,11 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define USE_SERIAL #define USE_SERIAL
#define MASTER_LEFT #define MASTER_LEFT
//#define MASTER_RIGHT //#define MASTER_RIGHT
//#define EE_HANDS //#define EE_HANDS
// Rows are doubled-up

View file

@ -1,6 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 #define _QWERTY 0
#define _LOWER 1 #define _LOWER 1
#define _RAISE 2 #define _RAISE 2
@ -9,9 +8,7 @@
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_6x6( [_QWERTY] = LAYOUT_6x6(
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_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC, KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC,
KC_TAB , 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_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS,
@ -24,7 +21,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[_LOWER] = LAYOUT_6x6( [_LOWER] = LAYOUT_6x6(
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_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_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, _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
@ -37,17 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[_RAISE] = LAYOUT_6x6( [_RAISE] = LAYOUT_6x6(
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_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_NLCK,KC_INS ,KC_SLCK,KC_MUTE, _______,_______,_______,_______,_______,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_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
_______,_______, KC_EQL ,_______, _______,_______, KC_EQL ,_______,
_______,_______, _______,_______, _______,_______, _______,_______,
_______,_______, _______,_______, _______,_______, _______,_______,
_______,_______, _______,_______ _______,_______, _______,_______
), )
}; };

View file

@ -1,20 +1,23 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = caterina
# Build Options # Build Options
# change to "no" to disable the options, or define them in the Makefile in # change yes to no to disable
# the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration 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 # 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

View file

@ -44,21 +44,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Enables This makes it easier for fast typists to use dual-function keys */ /* Enables This makes it easier for fast typists to use dual-function keys */
#define PERMISSIVE_HOLD #define PERMISSIVE_HOLD
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
// #define NO_DEBUG
/* disable print */
// #define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

View file

@ -1,30 +1,21 @@
#pragma once #pragma once
#ifdef KEYBOARD_handwired_dactyl_manuform_4x5 #ifdef defined(KEYBOARD_handwired_dactyl_manuform_4x5)
# include "4x5.h" # include "4x5.h"
#elif KEYBOARD_handwired_dactyl_manuform_4x6 #elif defined(KEYBOARD_handwired_dactyl_manuform_4x6)
# include "4x6.h" # include "4x6.h"
#elif KEYBOARD_handwired_dactyl_manuform_5x6 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x6)
# include "5x6.h" # include "5x6.h"
#elif KEYBOARD_handwired_dactyl_manuform_5x6_5 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_5)
# include "5x6_5.h" # include "5x6_5.h"
#elif KEYBOARD_handwired_dactyl_manuform_5x6_2_5 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_2_5)
# include "5x6_2_5.h" # include "5x6_2_5.h"
#elif KEYBOARD_handwired_dactyl_manuform_5x7 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x7)
# include "5x7.h" # include "5x7.h"
#elif KEYBOARD_handwired_dactyl_manuform_6x6 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
# include "6x6.h" # include "6x6.h"
#elif KEYBOARD_handwired_dactyl_manuform_dmote_62key #elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
# include "62key.h" # include "62key.h"
#endif #endif
#include "quantum.h" #include "quantum.h"
#ifdef USE_I2C
#include <stddef.h>
#ifdef __AVR__
#include <avr/io.h>
#include <avr/interrupt.h>
#endif
#endif

View file

@ -1,5 +1 @@
#include "62key.h" #include "62key.h"
void matrix_init_kb(void) {
matrix_init_user();
};

View file

@ -1,15 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #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
// This uses the same coordinate system as the program that defines // This uses the same coordinate system as the program that defines
// the case model, but not the same coordinates. // the case model, but not the same coordinates.
@ -36,8 +27,7 @@
RT_22, RT_21, RF_21, \ RT_22, RT_21, RF_21, \
RT_12, RT_11, RT_10, \ RT_12, RT_11, RT_10, \
RT_02, RT_01 \ RT_02, RT_01 \
) \ ) { \
{ \
{ LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \ { LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \
{ LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \ { LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \
{ LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \ { LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \
@ -50,5 +40,5 @@
{ RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \ { RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \
{ RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \ { RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \
{ KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \ { KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \
{ KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 }, \ { KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 } \
} }

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "config_common.h" #include "config_common.h"
#define PRODUCT_ID 0x3632 #define PRODUCT_ID 0x3632
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define PRODUCT DMOTE (62-key) #define PRODUCT DMOTE (62-key)
@ -48,5 +49,3 @@
#define RGB_DI_PIN D1 #define RGB_DI_PIN D1
#define RGBLED_NUM 6 // Used when chaining strips #define RGBLED_NUM 6 // Used when chaining strips
#define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips #define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips
#define ws2812_PORTREG PORTD
#define ws2812_DDRREG DDRD

View file

@ -45,7 +45,6 @@
{"x": 4.5, "y": 6.5}, {"x": 4.5, "y": 6.5},
{"x": 5.5, "y": 6.5}, {"x": 5.5, "y": 6.5},
{"x": 9, "y": 0}, {"x": 9, "y": 0},
{"x": 10, "y": 0}, {"x": 10, "y": 0},
{"x": 11, "y": 0}, {"x": 11, "y": 0},
@ -87,4 +86,3 @@
} }
} }
} }

View file

@ -1,9 +1,8 @@
#include "62key.h" #include QMK_KEYBOARD_H
#include "rgblight.h"
#include "keymap_colemak.h" #include "keymap_colemak.h"
#include "sendstring_colemak.h" #include "sendstring_colemak.h"
// Automatic Layer ID: // Automatic Layer ID:
enum layer_names { enum layer_names {
_QWERTY, // OS-side Colemak. Default. _QWERTY, // OS-side Colemak. Default.
@ -24,7 +23,6 @@ enum layer_names {
// https://github.com/qmk/qmk_firmware/pull/2055 // https://github.com/qmk/qmk_firmware/pull/2055
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_62key( [_QWERTY] = LAYOUT_62key(
KC_VOLD, KC_VOLU, CM_W, CM_F, CM_P, CM_G, KC_VOLD, KC_VOLU, CM_W, CM_F, CM_P, CM_G,
KC_TAB, CM_Q, CM_R, CM_S, CM_T, CM_D, KC_TAB, CM_Q, CM_R, CM_S, CM_T, CM_D,
@ -79,6 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______ _______, _______
) )
}; };
// *KC_WAKE: Used in place of KC_SLEP because X11 with i3 on prerelease // *KC_WAKE: Used in place of KC_SLEP because X11 with i3 on prerelease
// Debian 10 was seeing duplicate keypress and release events for sleep // Debian 10 was seeing duplicate keypress and release events for sleep
// (regardless of i3 binding), which ruined the function. // (regardless of i3 binding), which ruined the function.
@ -111,22 +110,19 @@ void modal_leds(void) {
uint16_t hue = 355; // Rough match to printed case. uint16_t hue = 355; // Rough match to printed case.
uint8_t saturation = 255; uint8_t saturation = 255;
uint8_t value = 0; uint8_t value = 0;
if (layer_state_is(_COLEMAK)) { hue -= 50; saturation -= 20; value += 20; }; if (layer_state_is(_COLEMAK)) { hue -= 50; saturation -= 20; value += 20; }
if (layer_state_is(_NUMERIC)) { value += 30; }; if (layer_state_is(_NUMERIC)) { value += 30; }
if (mods & MOD_MASK_SHIFT) { saturation -= 20; value += 30; }; if (mods & MOD_MASK_SHIFT) { saturation -= 20; value += 30; }
if (mods & MOD_MASK_ALT) { hue -= 100; saturation -= 20; value += 30; }; if (mods & MOD_MASK_ALT) { hue -= 100; saturation -= 20; value += 30; }
if (mods & MOD_MASK_CTRL) { hue -= 200; saturation -= 20; value += 30; }; if (mods & MOD_MASK_CTRL) { hue -= 200; saturation -= 20; value += 30; }
// rgblight_sethsv_eeprom_helper is not a great API function but it does // rgblight_sethsv_eeprom_helper is not a great API function but it does
// affect both halves of a split keyboard. // affect both halves of a split keyboard.
rgblight_sethsv_eeprom_helper(hue, saturation, value, false); rgblight_sethsv_eeprom_helper(hue, saturation, value, false);
_leds_dirty = false; _leds_dirty = false;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) { void matrix_scan_user(void) {
if (_leds_dirty) { modal_leds(); }; if (_leds_dirty) { modal_leds(); }
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@ -134,12 +130,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// Static lighting is amenable to customization. // Static lighting is amenable to customization.
rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT); rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
_initialized = true; _initialized = true;
}; }
if (keycode == KC_WAKE) { if (keycode == KC_WAKE) {
// Turn the lights off before going to sleep. // Turn the lights off before going to sleep.
rgblight_sethsv_eeprom_helper(0, 0, 0, false); rgblight_sethsv_eeprom_helper(0, 0, 0, false);
} else { } else {
_leds_dirty = true; _leds_dirty = true;
}; }
return true; return true;
} }

View file

@ -1,34 +0,0 @@
# MCU name
MCU = atmega32u4
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
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
#
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)
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
SPLIT_KEYBOARD = yes