~ruther/qmk_firmware

818ef07c248933e895a3ea1a7521dda32d1caeb8 — QMK Bot 2 years ago 2c5cecc + 2d25b89 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
8 files changed, 8 insertions(+), 8 deletions(-)

M keyboards/cannonkeys/moment/keymaps/default/keymap.c
M keyboards/cannonkeys/moment/keymaps/via/keymap.c
M keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c
M keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c
M keyboards/cannonkeys/vector/keymaps/default/keymap.c
M keyboards/cannonkeys/vector/keymaps/via/keymap.c
M keyboards/novelkeys/nk65b/keymaps/default/keymap.c
M keyboards/novelkeys/nk65b/keymaps/via/keymap.c

M keyboards/cannonkeys/moment/keymaps/default/keymap.c => keyboards/cannonkeys/moment/keymaps/default/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                           _______,                                     _______, _______, RESET
    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/cannonkeys/moment/keymaps/via/keymap.c => keyboards/cannonkeys/moment/keymaps/via/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_INC,  BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                           _______,                                     _______, _______, RESET
    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c => keyboards/cannonkeys/moment_hs/keymaps/default/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_INC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                           _______,                                     _______, _______, RESET
    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c => keyboards/cannonkeys/moment_hs/keymaps/via/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                           _______,                                     _______, _______, RESET
    _______,  _______, _______,                           _______,                                     _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/cannonkeys/vector/keymaps/default/keymap.c => keyboards/cannonkeys/vector/keymaps/default/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    RGB_TOG, RGB_MOD, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    BL_INC,  BL_DEC,  BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/cannonkeys/vector/keymaps/via/keymap.c => keyboards/cannonkeys/vector/keymaps/via/keymap.c +1 -1
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, RESET
    _______,  _______, _______,                  _______, _______, _______,                            _______, _______, QK_BOOT
  ),

  [_FN2] = LAYOUT_all(


M keyboards/novelkeys/nk65b/keymaps/default/keymap.c => keyboards/novelkeys/nk65b/keymaps/default/keymap.c +1 -1
@@ 25,7 25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[1] = LAYOUT_65_ansi( /* FN */
    KC_GRV,  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_DEL,  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, RESET,   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, QK_BOOT, 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,
    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),


M keyboards/novelkeys/nk65b/keymaps/via/keymap.c => keyboards/novelkeys/nk65b/keymaps/via/keymap.c +1 -1
@@ 25,7 25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[1] = LAYOUT_65_ansi( /* FN */
    KC_GRV,  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_DEL,  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, RESET,   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, QK_BOOT, 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,
    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),