Dactyl Manuform cleanup (#13686)
This commit is contained in:
Ryan
GitHub
@@ -1,9 +1,8 @@
|
||||
#include "62key.h"
|
||||
#include "rgblight.h"
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "keymap_colemak.h"
|
||||
#include "sendstring_colemak.h"
|
||||
|
||||
|
||||
// Automatic Layer ID:
|
||||
enum layer_names {
|
||||
_QWERTY, // OS-side Colemak. Default.
|
||||
@@ -14,71 +13,71 @@ enum layer_names {
|
||||
// Shorthand:
|
||||
#define LAYER_N MO(_NUMERIC)
|
||||
#define LAYER_C TG(_COLEMAK)
|
||||
#define PASTE LSFT(KC_INS) // Terminal-compatible paste.
|
||||
#define SLQ RALT(KC_9) // Single left-side quotation mark (in Colemak).
|
||||
#define SRQ RALT(KC_0)
|
||||
#define EMDASH RALT(LSFT(KC_MINUS)) // Em dash character (in Colemak).
|
||||
#define PASTE LSFT(KC_INS) // Terminal-compatible paste.
|
||||
#define SLQ RALT(KC_9) // Single left-side quotation mark (in Colemak).
|
||||
#define SRQ RALT(KC_0)
|
||||
#define EMDASH RALT(LSFT(KC_MINUS)) // Em dash character (in Colemak).
|
||||
#define BK_LCTL CTL_T(KC_LBRACKET)
|
||||
#define BK_RCTL RCTL_T(KC_RBRACKET)
|
||||
// TODO: Mod-tap ALT with a curvilinear brace.
|
||||
// https://github.com/qmk/qmk_firmware/pull/2055
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_QWERTY] = LAYOUT_62key(
|
||||
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_BSPC, CM_A, CM_X, CM_C, CM_V, CM_B,
|
||||
SLQ, CM_Z, KC_HOME, KC_PGUP, KC_END,
|
||||
KC_PGDN, KC_ENT, KC_SPC,
|
||||
KC_LSPO, KC_LGUI, KC_MINS,
|
||||
BK_LCTL, KC_LALT,
|
||||
|
||||
[_QWERTY] = LAYOUT_62key(
|
||||
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_BSPC, CM_A, CM_X, CM_C, CM_V, CM_B,
|
||||
SLQ, CM_Z, KC_HOME, KC_PGUP, KC_END,
|
||||
KC_PGDN, KC_ENT, KC_SPC,
|
||||
KC_LSPO, KC_LGUI, KC_MINS,
|
||||
BK_LCTL, KC_LALT,
|
||||
CM_J, CM_L, CM_U, CM_Y, KC_MPLY, KC_MUTE,
|
||||
CM_H, CM_N, CM_E, CM_I, CM_SCLN, KC_BSLS,
|
||||
CM_K, CM_M, KC_COMM, KC_DOT, CM_O, KC_QUOT,
|
||||
KC_LEFT, KC_UP, KC_RGHT, KC_SLSH, SRQ,
|
||||
KC_DEL, KC_ESC, KC_DOWN,
|
||||
KC_EQL, LAYER_N, KC_RSPC,
|
||||
KC_RALT, BK_RCTL
|
||||
),
|
||||
|
||||
CM_J, CM_L, CM_U, CM_Y, KC_MPLY, KC_MUTE,
|
||||
CM_H, CM_N, CM_E, CM_I, CM_SCLN, KC_BSLS,
|
||||
CM_K, CM_M, KC_COMM, KC_DOT, CM_O, KC_QUOT,
|
||||
KC_LEFT, KC_UP, KC_RGHT, KC_SLSH, SRQ,
|
||||
KC_DEL, KC_ESC, KC_DOWN,
|
||||
KC_EQL, LAYER_N, KC_RSPC,
|
||||
KC_RALT, BK_RCTL
|
||||
),
|
||||
[_COLEMAK] = LAYOUT_62key(
|
||||
_______, _______, KC_W, KC_F, KC_P, KC_G,
|
||||
_______, KC_Q, KC_R, KC_S, KC_T, KC_D,
|
||||
_______, KC_A, KC_X, KC_C, KC_V, KC_B,
|
||||
_______, KC_Z, _______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______,
|
||||
|
||||
[_COLEMAK] = LAYOUT_62key(
|
||||
_______, _______, KC_W, KC_F, KC_P, KC_G,
|
||||
_______, KC_Q, KC_R, KC_S, KC_T, KC_D,
|
||||
_______, KC_A, KC_X, KC_C, KC_V, KC_B,
|
||||
_______, KC_Z, _______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______,
|
||||
KC_J, KC_L, KC_U, KC_Y, _______, _______,
|
||||
KC_H, KC_N, KC_E, KC_I, KC_SCLN, _______,
|
||||
KC_K, KC_M, _______, _______, KC_O, _______,
|
||||
_______, _______, _______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______
|
||||
),
|
||||
|
||||
KC_J, KC_L, KC_U, KC_Y, _______, _______,
|
||||
KC_H, KC_N, KC_E, KC_I, KC_SCLN, _______,
|
||||
KC_K, KC_M, _______, _______, KC_O, _______,
|
||||
_______, _______, _______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______, _______,
|
||||
_______, _______
|
||||
),
|
||||
[_NUMERIC] = LAYOUT_62key(
|
||||
LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5,
|
||||
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5,
|
||||
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC,
|
||||
KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2,
|
||||
KC_WH_D, RGB_MOD, _______,
|
||||
_______, _______, EMDASH,
|
||||
_______, _______,
|
||||
|
||||
[_NUMERIC] = LAYOUT_62key(
|
||||
LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5,
|
||||
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5,
|
||||
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC,
|
||||
KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2,
|
||||
KC_WH_D, RGB_MOD, _______,
|
||||
_______, _______, EMDASH,
|
||||
_______, _______,
|
||||
|
||||
KC_F6, KC_F7, KC_F8, KC_F9, RESET, KC_WAKE, // *
|
||||
KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
|
||||
KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
|
||||
KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
|
||||
KC_ACL1, KC_ACL2, KC_MS_D,
|
||||
KC_ACL0, _______, _______,
|
||||
_______, _______
|
||||
)
|
||||
KC_F6, KC_F7, KC_F8, KC_F9, RESET, KC_WAKE, // *
|
||||
KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
|
||||
KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
|
||||
KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, RGB_TOG,
|
||||
KC_ACL1, KC_ACL2, KC_MS_D,
|
||||
KC_ACL0, _______, _______,
|
||||
_______, _______
|
||||
)
|
||||
};
|
||||
|
||||
// *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
|
||||
// (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.
|
||||
uint8_t saturation = 255;
|
||||
uint8_t value = 0;
|
||||
if (layer_state_is(_COLEMAK)) { hue -= 50; saturation -= 20; value += 20; };
|
||||
if (layer_state_is(_NUMERIC)) { 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_CTRL) { hue -= 200; saturation -= 20; value += 30; };
|
||||
if (layer_state_is(_COLEMAK)) { hue -= 50; saturation -= 20; value += 20; }
|
||||
if (layer_state_is(_NUMERIC)) { 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_CTRL) { hue -= 200; saturation -= 20; value += 30; }
|
||||
// rgblight_sethsv_eeprom_helper is not a great API function but it does
|
||||
// affect both halves of a split keyboard.
|
||||
rgblight_sethsv_eeprom_helper(hue, saturation, value, false);
|
||||
_leds_dirty = false;
|
||||
}
|
||||
|
||||
void matrix_init_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) {
|
||||
@@ -134,12 +130,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
// Static lighting is amenable to customization.
|
||||
rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
|
||||
_initialized = true;
|
||||
};
|
||||
}
|
||||
if (keycode == KC_WAKE) {
|
||||
// Turn the lights off before going to sleep.
|
||||
rgblight_sethsv_eeprom_helper(0, 0, 0, false);
|
||||
} else {
|
||||
_leds_dirty = true;
|
||||
};
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user