hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
python_optimizations
QMK Bot 4 years ago
parent 554c36a055 5a06813b10
commit d64a853b55
7 changed files with 106 additions and 68 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
  2. 2
      keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
  3. 3
      keyboards/mt64rgb/keymaps/via/keymap.c
  4. 6
      keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
  5. 31
      keyboards/rubi/keymaps/default/keymap.c
  6. 31
      keyboards/rubi/keymaps/via/keymap.c
  7. 35
      keyboards/rubi/rubi.c

2
keyboards/capsunlocked/cu80/v2_ansi/rgb/rules.mk
Unescape View File

@ -1,2 +1,4 @@
RGB_MATRIX_ENABLE = yes # Enable RGB matrix
RGB_MATRIX_DRIVER = WS2812 # Set Driver to WS2812
LTO_ENABLE = yes

2
keyboards/capsunlocked/cu80/v2_iso/rgb/rules.mk
Unescape View File

@ -1,2 +1,4 @@
RGB_MATRIX_ENABLE = yes # Enable RGB matrix
RGB_MATRIX_DRIVER = WS2812 # Set Driver to WS2812
LTO_ENABLE = yes

3
keyboards/mt64rgb/keymaps/via/keymap.c
Unescape View File

@ -44,8 +44,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC, BL_TOGG, BL_INC, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
void rgb_matrix_indicators_user(void) {
if (!g_suspend_state && layer_state_is(1)) {
if (layer_state_is(1)) {
rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
}
if (host_keyboard_led_state().caps_lock) {

6
keyboards/nopunin10did/jabberwocky/keymaps/via/keymap.c
Unescape View File

@ -18,7 +18,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_RH_ANY(
[0] = LAYOUT_rh_any(
KC_ESC ,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_PSCR,KC_SLCK,KC_INS ,KC_DEL ,KC_HOME,KC_END ,KC_PGUP,KC_PGDN,
KC_GRV ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_MINS,KC_EQL ,KC_INT3,KC_BSPC, KC_NLCK,KC_PSLS,KC_PAST,KC_PAUS,
@ -28,7 +28,7 @@ KC_LSFT,KC_NUBS,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,MO(1), MO(1), KC_N ,
KC_LCTL,KC_LGUI, KC_LALT,KC_MENU,KC_SPC , KC_SPC , KC_ALGR, KC_RGUI,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT, KC_P0 ,KC_P0 ,KC_PDOT,KC_PENT),
[1] = LAYOUT_RH_ANY(
[1] = LAYOUT_rh_any(
RESET ,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,
_______,_______,_______,_______,RESET ,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,
@ -36,7 +36,7 @@ RESET ,_______,_______,_______,_______,_______,_______, _______,
_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,
_______,_______, _______,_______,_______, _______, _______, _______,_______,_______,_______,_______, _______,_______,_______,_______),
[2] = LAYOUT_RH_ANY(
[2] = LAYOUT_rh_any(
_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,

31
keyboards/rubi/keymaps/default/keymap.c
Unescape View File

@ -56,3 +56,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS
),
};
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (get_highest_layer(layer_state) == 0) {
uint16_t mapped_code = 0;
if (clockwise) {
mapped_code = handle_encoder_cw();
} else {
mapped_code = handle_encoder_ccw();
}
if (mapped_code != 0) {
tap_code16(mapped_code);
}
} else {
if (clockwise) {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_cw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(false);
}
} else {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_ccw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(true);
}
}
}
}
return true;
}

31
keyboards/rubi/keymaps/via/keymap.c
Unescape View File

@ -51,3 +51,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS
),
};
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (get_highest_layer(layer_state) == 0) {
uint16_t mapped_code = 0;
if (clockwise) {
mapped_code = handle_encoder_cw();
} else {
mapped_code = handle_encoder_ccw();
}
if (mapped_code != 0) {
tap_code16(mapped_code);
}
} else {
if (clockwise) {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_cw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(false);
}
} else {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_ccw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(true);
}
}
}
}
return true;
}

35
keyboards/rubi/rubi.c
Unescape View File

@ -73,36 +73,7 @@ bool led_update_kb(led_t led_state) {
return true;
}
__attribute__ ((weak)) void encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (get_highest_layer(layer_state) == 0) {
uint16_t mapped_code = 0;
if (clockwise) {
mapped_code = handle_encoder_cw();
} else {
mapped_code = handle_encoder_ccw();
}
if (mapped_code != 0) {
tap_code16(mapped_code);
}
} else {
if (clockwise) {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_cw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(false);
}
} else {
if (oled_mode == OLED_MODE_CALC) {
handle_encoder_ccw();
} else if (oled_mode == OLED_MODE_DEFAULT) {
change_encoder_mode(true);
}
}
}
}
}
void encoder_update_kb(uint8_t index, bool clockwise) {
encoder_update_user(index, clockwise);
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
return true;
}

Write Preview
Loading…
Cancel
Save