diff options
Diffstat (limited to 'keyboards/rgbkb/sol/keymaps')
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/keymap.c | 22 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/readme.md | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/keyboards/rgbkb/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c index 51039e48e2..04af5165e7 100644 --- a/keyboards/rgbkb/sol/keymaps/default/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c @@ -107,13 +107,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,------------------------------------------------. ,------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | SAD | VAI | SAI | RESET| | | | | | | | | | | + * | | SAD | VAI | SAI | RESET| | | | | | P7 | P8 | P9 | | | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | HUD | VAD | HUI |RGBRST| | | | | |QWERTY|COLEMK| | | | + * | | HUD | VAD | HUI |RGBRST| | | | | | P4 | P5 | P6 | | | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | SPD | | SPI | | | | | | | |RGBTOG| HUI | SAI | VAI | + * | | SPD | | SPI | | | | | | | P1 | P2 | P3 | | | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | |RGBMOD(| | | | | | | |RGBRMOD| HUD | SAD | VAD | + * | | | |RGBMOD| | | | | | | P0 | PDOT | NLCK |QWERTY|COLEMK| * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' * | | | | | | * `-------------' `-------------' @@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJ] = LAYOUT( \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, \ - _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, RGB_SPI, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ - _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, \ + _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, \ + _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, \ + _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, \ + _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_NLCK, QWERTY, COLEMAK, \ _______, _______, _______, _______ \ ) }; @@ -234,12 +234,12 @@ void encoder_update_user(uint8_t index, bool clockwise) { #endif { uint8_t layer = biton32(layer_state); - uint16_t keycode = encoders[layer][index][clockwise]; + uint16_t keycode = pgm_read_word(&encoders[layer][index][clockwise]); while (keycode == KC_TRANSPARENT && layer > 0) { layer--; if ((layer_state & (1 << layer)) != 0) - keycode = encoders[layer][index][clockwise]; + keycode = pgm_read_word(&encoders[layer][index][clockwise]); } if (keycode != KC_TRANSPARENT) tap_code16(keycode); @@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) return OLED_ROTATION_270; - return rotation; + return OLED_ROTATION_180; } static void render_logo(void) { diff --git a/keyboards/rgbkb/sol/keymaps/default/readme.md b/keyboards/rgbkb/sol/keymaps/default/readme.md index 4a97a7babe..ce5bce19ee 100644 --- a/keyboards/rgbkb/sol/keymaps/default/readme.md +++ b/keyboards/rgbkb/sol/keymaps/default/readme.md @@ -57,13 +57,13 @@ * ,------------------------------------------------. ,------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | SAD | VAI | SAI | RESET| | | | | | | | | | | + * | | SAD | VAI | SAI | RESET| | | | | | P7 | P8 | P9 | | | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | HUD | VAD | HUI |RGBRST| | | | | |QWERTY|COLEMK| | | | + * | | HUD | VAD | HUI |RGBRST| | | | | | P4 | P5 | P6 | | | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | | | | | | | | | |RGBTOG| HUI | SAI | VAI | + * | | | | | | | | | | | P1 | P2 | P3 | | | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | |RGBMOD| | | | | | | |RGBSMOD| HUD | SAD | VAD | + * | | | |RGBMOD| | | | | | | P0 | PDOT | NLCK |QWERTY|COLEMK| * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' * | | | | | | * `-------------' `-------------' |