jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak moonlander

Browse Source
This commit is contained in:
Drashna Jael're
2020-01-28 20:46:15 -08:00
committed by Florian Didron
parent 66d48534b1
commit 4c6c17e68b
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/moonlander/keymaps/default/keymap.c
View File

@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HYPR, KC_MEH, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HYPR, KC_MEH, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT),
KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LCTL_T(KC_SLSH), KC_LSFT, KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LCTL_T(KC_SLSH), KC_LSFT,
LT(SYMB,KC_GRV),KC_QUOT,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), LT(SYMB,KC_GRV),WEBUSB_PAIR,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
KC_SPC, KC_BSPC, KC_LGUI, KC_RALT, KC_TAB, KC_ENT KC_SPC, KC_BSPC, KC_LGUI, KC_RALT, KC_TAB, KC_ENT
), ),

30
keyboards/moonlander/moonlander.c
View File

@@ -62,7 +62,7 @@ void moonlander_led_task(void) {
layer_state_set_kb(layer_state); layer_state_set_kb(layer_state);
} }
#ifdef WEBUSB_ENABLE #ifdef WEBUSB_ENABLE
if (webusb_state.pairing == true) { else if (webusb_state.pairing == true) {
static uint8_t led_mask; static uint8_t led_mask;
ML_LED_1(false); ML_LED_1(false);
@@ -76,29 +76,31 @@ void moonlander_led_task(void) {
led_mask = 1; led_mask = 1;
} else { } else {
led_mask++; led_mask++;
if (led_mask > 10) led_mask = 1; if (led_mask > 12) led_mask = 1;
} }
switch (led_mask) { switch (led_mask) {
case 1: case 1:
case 12:
ML_LED_1(true); ML_LED_1(true);
break; break;
case 2: case 2:
case 10: case 11:
ML_LED_2(true); ML_LED_2(true);
break; break;
case 3: case 3:
case 9: case 10:
ML_LED_3(true); ML_LED_3(true);
break; break;
case 4: case 4:
case 8: case 9:
ML_LED_4(true); ML_LED_4(true);
break; break;
case 5: case 5:
case 7: case 8:
ML_LED_5(true); ML_LED_5(true);
break; break;
case 6: case 6:
case 7:
ML_LED_6(true); ML_LED_6(true);
break; break;
} }
@@ -141,12 +143,12 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
state = layer_state_set_user(state); state = layer_state_set_user(state);
if (is_launching) return state; if (is_launching) return state;
ML_LED_1(0); ML_LED_1(false);
ML_LED_2(0); ML_LED_2(false);
ML_LED_3(0); ML_LED_3(false);
ML_LED_4(0); ML_LED_4(false);
ML_LED_5(0); ML_LED_5(false);
ML_LED_6(0); ML_LED_6(false);
uint8_t layer = get_highest_layer(state); uint8_t layer = get_highest_layer(state);
switch (layer) { switch (layer) {
@@ -381,6 +383,10 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case WEBUSB_PAIR:
if (!record->event.pressed && !webusb_state.pairing)
layer_state_set_kb(layer_state);
break;
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
case TOGGLE_LAYER_COLOR: case TOGGLE_LAYER_COLOR:
if (record->event.pressed) { if (record->event.pressed) {