Skip to content

Commit

Permalink
Updates for breaking changes in qmk_firmware/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@p00ya
p00ya committed Jan 16, 2023
1 parent 4e60456 commit 7ce62c4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions keyboards/ergodox_ez/keymaps/p00ya_dvorak/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Simulates a numpad with the 5-key aligned with QWERTY's J-key.
// Num-zero and enter keys are duplicated to the thumb clusters.
[L_NUM] = LAYOUT_ergodox_pretty(
_______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, XXXXXXX, _______,
Expand All @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
// Dirpad / navigation pad on the right hand with a standard US layout.
[L_NAV] = LAYOUT_ergodox_pretty(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_LBRC, KC_RBRC, _______,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_LBRC, KC_RBRC, _______,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, _______, KC_INS, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL, KC_END, KC_PGDN, KC_UP, XXXXXXX, _______,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_CAPS, _______, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, _______,
Expand Down
16 changes: 9 additions & 7 deletions keyboards/keebio/iris/keymaps/p00ya_dvorak/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// p00ya_dvorak for Iris

#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define RGB_MATRIX_DISABLE_KEYCODES

// Requires an EEPROM reset to take effect.
#undef RGB_MATRIX_STARTUP_HUE
#undef RGB_MATRIX_STARTUP_SAT
#undef RGB_MATRIX_STARTUP_VAL
#define RGB_MATRIX_STARTUP_HUE 0
#define RGB_MATRIX_STARTUP_SAT 0
#define RGB_MATRIX_STARTUP_VAL 63
#undef RGB_MATRIX_DEFAULT_HUE
#undef RGB_MATRIX_DEFAULT_SAT
#undef RGB_MATRIX_DEFAULT_VAL
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 0
#define RGB_MATRIX_DEFAULT_VAL 63

// Disable unused RGBLIGHT/RGB_MATRIX effects.
#undef RGBLIGHT_EFFECT_BREATHING
Expand Down Expand Up @@ -58,6 +58,8 @@
#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE

// Sync state for RGB matrix.
#define SPLIT_LAYER_STATE_ENABLE
#define SPLIT_LED_STATE_ENABLE
Expand Down
8 changes: 5 additions & 3 deletions keyboards/keebio/iris/keymaps/p00ya_dvorak/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Simulates a numpad with the 5-key aligned with QWERTY's J-key.
// Num-zero and enter keys are duplicated to the thumb clusters.
[L_NUM] = LAYOUT(
_______, _______, _______, _______, _______, _______, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, XXXXXXX, _______,
KC_LALT, _______, _______, KC_PENT, KC_KP_0, KC_PDOT
),
// Dirpad / navigation pad on the right hand with a standard US layout.
[L_NAV] = LAYOUT(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_PSCR, KC_SLCK, KC_PAUS, KC_LBRC, KC_RBRC, _______,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_PSCR, KC_SCRL, KC_PAUS, KC_LBRC, KC_RBRC, _______,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_INS, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, _______,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_DEL, KC_END, KC_PGDN, KC_UP, XXXXXXX, _______,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_CAPS, _______, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, _______,
Expand Down Expand Up @@ -200,6 +200,7 @@ void keyboard_post_init_user(void) {
// The STARTUP values require an EEPROM reset to take effect; this method
// will take effect immediately after flashing.
rgb_matrix_sethsv_noeeprom(0, 0, 63); // dull white
rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);

// Sync user_config and keymap_confing so that custom RGB indicators
// function on both halves.
Expand Down Expand Up @@ -233,7 +234,7 @@ enum {
rgb_matrix_set_color(led, color); \
}

void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// Show various status indicators on the fn layer.
if (layer_state_is(L_FN)) {
MAYBE_SET_COLOR(LED_FN, 1, RGB_WHITE);
Expand Down Expand Up @@ -261,6 +262,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
if (user_config.oneshot_next) {
MAYBE_SET_COLOR(LED_1NXT, 1, RGB_BLUE);
}
return false;
}

layer_state_t layer_state_set_user(layer_state_t state) {
Expand Down

0 comments on commit 7ce62c4

Please sign in to comment.