Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

num, func, punc 3state layer done right

Browse source
This commit is contained in:
Priyadi Iman Nurcahyo 2017-02-15 05:01:03 +07:00
parent 3758cfd95f
commit df311c7b40
2 changed files with 46 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
keyboards/handwired/promethium/keymaps/priyadi/keymap.c
View file

@ -56,7 +56,7 @@ enum layers {
_GREEKL, _GREEKL,
_NUM, _NUM,
_FUNC, _FUN,
_PUNC, _PUNC,
_EMOJI, _EMOJI,
@ -76,9 +76,9 @@ enum planck_keycodes {
NORMAN, NORMAN,
// layer switchers // layer switchers
PUNC, // PUNC,
NUM, // NUM,
FUNC, // FUN,
EMOJI, EMOJI,
GUI, GUI,
GREEK, GREEK,
@ -92,11 +92,16 @@ enum planck_keycodes {
LSPACE, LSPACE,
RSPACE, RSPACE,
GLOW, GLOW,
FOR0,
// stub // stub
AUDIO AUDIO
}; };
#define NUM MO(_NUM)
#define FUN MO(_FUN)
#define FUN0 LT(_FUN, KC_0)
// unicode map // unicode map
enum unicode_name { enum unicode_name {
@ -369,14 +374,14 @@ const uint8_t PROGMEM LED_MODS[] = {
const uint8_t PROGMEM LED_FN[] = { const uint8_t PROGMEM LED_FN[] = {
LED_PUNC, LED_PUNC,
LED_NUM, LED_NUM,
LED_FUNC, LED_FUN,
LED_EMOJI LED_EMOJI
}; };
const uint8_t PROGMEM LED_INDICATORS[] = { const uint8_t PROGMEM LED_INDICATORS[] = {
LED_IND_EMOJI, LED_IND_EMOJI,
LED_IND_NUM, LED_IND_NUM,
LED_IND_FUNC, LED_IND_FUN,
LED_IND_BATTERY, LED_IND_BATTERY,
LED_IND_USB, LED_IND_USB,
LED_IND_BLUETOOTH, LED_IND_BLUETOOTH,
@ -435,7 +440,7 @@ void led_reset(void) {
void led_set_layer_indicator(void) { void led_set_layer_indicator(void) {
static uint8_t oldlayer = 255; static uint8_t oldlayer = 255;
rgbsps_set(LED_IND_FUNC, 0, 0, 0); rgbsps_set(LED_IND_FUN, 0, 0, 0);
// rgbsps_set(LED_IND_NUM, 0, 0, 0); // rgbsps_set(LED_IND_NUM, 0, 0, 0);
rgbsps_set(LED_IND_EMOJI, 0, 0, 0); rgbsps_set(LED_IND_EMOJI, 0, 0, 0);
@ -454,8 +459,8 @@ void led_set_layer_indicator(void) {
} }
switch(layer) { switch(layer) {
case _FUNC: case _FUN:
rgbsps_set(LED_IND_FUNC, 15, 0, 0); rgbsps_set(LED_IND_FUN, 15, 0, 0);
break; break;
// case _NUM: // case _NUM:
// rgbsps_set(LED_IND_NUM, 0, 0, 15); // rgbsps_set(LED_IND_NUM, 0, 0, 15);
@ -464,7 +469,7 @@ void led_set_layer_indicator(void) {
rgbsps_set(LED_IND_EMOJI, 15, 15, 0); rgbsps_set(LED_IND_EMOJI, 15, 15, 0);
break; break;
default: default:
rgbsps_set(LED_IND_FUNC, 3, 3, 3); rgbsps_set(LED_IND_FUN, 3, 3, 3);
// rgbsps_set(LED_IND_NUM, 3, 3, 3); // rgbsps_set(LED_IND_NUM, 3, 3, 3);
rgbsps_set(LED_IND_EMOJI, 3, 3, 3); rgbsps_set(LED_IND_EMOJI, 3, 3, 3);
} }
@ -520,7 +525,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT , KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT ,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, NUM, LSPACE, RSPACE, FUNC, GREEK, KC_RGUI, KC_RALT, KC_RCTL KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, NUM, LSPACE, RSPACE, FUN, GREEK, KC_RGUI, KC_RALT, KC_RCTL
), ),
/* Dvorak /* Dvorak
@ -639,7 +644,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_7, KC_8, KC_9, S(KC_D), _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, S(KC_A), KC_7, KC_8, KC_9, S(KC_D), _______,
KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______, KC_GRV, KC_ASTR, KC_BSLS, KC_MINS, KC_EQL, KC_SLSH, S(KC_B), KC_4, KC_5, KC_6, S(KC_E), _______,
KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_1, KC_2, KC_3, S(KC_F), KC_COLN, KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, S(KC_C), KC_1, KC_2, KC_3, S(KC_F), KC_COLN,
_______, _______, _______, _______, _______, _______, _______, LT(_PUNC, KC_0), KC_COMM, KC_DOT, KC_X, _______ _______, _______, _______, _______, _______, _______, _______, FUN0 , KC_COMM, KC_DOT, KC_X, _______
), ),
/* Func /* Func
@ -653,11 +658,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------' * `-----------------------------------------------------------------------------------'
*/ */
[_FUNC] = KEYMAP( [_FUN] = KEYMAP(
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_PGUP, KC_UP, KC_PGDN, KC_PGUP, KC_DEL,
XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_INS, XXXXXXX, KC_F5, KC_F6, KC_F7, KC_F8, KC_PSCR, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_INS,
_______, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______, _______, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, XXXXXXX, _______,
_______, _______, _______, _______, PUNC, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
/* Uppercase Greek /* Uppercase Greek
@ -785,10 +790,25 @@ void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *
} }
#endif #endif
uint32_t layer_state_set_kb(uint32_t state)
{
// turn on punc layer if both fun & num are on
if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {
state |= (1UL<<_PUNC);
} else {
state &= ~(1UL<<_PUNC);
}
return state;
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool lshift = keyboard_report->mods & MOD_BIT(KC_LSFT); static bool lshift = false;
bool rshift = keyboard_report->mods & MOD_BIT(KC_RSFT); static bool rshift = false;
uint8_t layer = biton32(layer_state); static uint8_t layer = 0;
lshift = keyboard_report->mods & MOD_BIT(KC_LSFT);
rshift = keyboard_report->mods & MOD_BIT(KC_RSFT);
layer = biton32(layer_state);
#ifdef DOUBLESPACE_LAYER_ENABLE #ifdef DOUBLESPACE_LAYER_ENABLE
// double-space: send space immediately if any other key depressed before space is released // double-space: send space immediately if any other key depressed before space is released
@ -949,17 +969,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif #endif
// layer switcher // layer switcher
case PUNC: //
if (record->event.pressed) {
layer_on(_PUNC);
update_tri_layer(_PUNC, _GREEKL, _EMOJI);
} else {
layer_off(_PUNC);
update_tri_layer(_PUNC, _GREEKL, _EMOJI);
}
return false;
break;
case GREEK: case GREEK:
if (record->event.pressed) { if (record->event.pressed) {
if (lshift || rshift) { if (lshift || rshift) {
@ -968,31 +978,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} else { } else {
layer_on(_GREEKL); layer_on(_GREEKL);
layer_off(_GREEKU); layer_off(_GREEKU);
update_tri_layer(_PUNC, _GREEKL, _EMOJI);
} }
} else { } else {
layer_off(_GREEKU); layer_off(_GREEKU);
layer_off(_GREEKL); layer_off(_GREEKL);
update_tri_layer(_PUNC, _GREEKL, _EMOJI);
}
return false;
break;
case NUM:
if (record->event.pressed) {
turn_off_capslock();
layer_on(_NUM);
} else {
layer_off(_NUM);
}
return false;
break;
case FUNC:
if (record->event.pressed) {
layer_on(_FUNC);
} else {
layer_off(_FUNC);
} }
return false; return false;
break; break;

4
keyboards/handwired/promethium/promethium.h
View file

@ -33,7 +33,7 @@ enum led_sequence {
LED_IND_USB, LED_IND_USB,
LED_IND_BATTERY, LED_IND_BATTERY,
LED_IND_FUNC, LED_IND_FUN,
LED_IND_NUM, LED_IND_NUM,
LED_IND_EMOJI, LED_IND_EMOJI,
@ -60,7 +60,7 @@ enum led_sequence {
LED_U, LED_U,
LED_J, LED_J,
LED_M, LED_M,
LED_FUNC, LED_FUN,
LED_RSPC, LED_RSPC,
LED_N, LED_N,