aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gh60
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2021-07-03 16:38:05 +1000
committerfauxpark <fauxpark@gmail.com>2021-07-03 16:38:05 +1000
commit03807c2c6e470a3046c1ff40ac7ab74f76b94f74 (patch)
tree41b605163e5c7b9726128d267e310024bc46fcfc /keyboards/gh60
parent7629b7f52a89be171c6427ad2849d50ccd347335 (diff)
parent06e0643541493220fb7413e33f3fc6972a9384b8 (diff)
downloadqmk_firmware-03807c2c6e470a3046c1ff40ac7ab74f76b94f74.tar.gz
qmk_firmware-03807c2c6e470a3046c1ff40ac7ab74f76b94f74.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/gh60')
-rw-r--r--keyboards/gh60/satan/keymaps/bri/keymap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/gh60/satan/keymaps/bri/keymap.c b/keyboards/gh60/satan/keymaps/bri/keymap.c
index 1f9430a9f..2f742411d 100644
--- a/keyboards/gh60/satan/keymaps/bri/keymap.c
+++ b/keyboards/gh60/satan/keymaps/bri/keymap.c
@@ -5,8 +5,8 @@
5#define _FL 1 5#define _FL 1
6#define _NAV 2 6#define _NAV 2
7 7
8#define A_LEFT LALT(KC_LEFT) 8#define ALEFT LALT(KC_LEFT)
9#define A_RGHT LALT(KC_RGHT) 9#define ARGHT LALT(KC_RGHT)
10 10
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 /* Keymap _BL: (Base Layer) Default Layer 12 /* Keymap _BL: (Base Layer) Default Layer
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 59
60[_NAV] = LAYOUT_60_ansi( 60[_NAV] = LAYOUT_60_ansi(
61 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ 61 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
62 _______,_______,_______,_______,_______,_______,_______,A_LEFT , KC_UP ,A_RGHT ,_______,_______,_______,_______, \ 62 _______,_______,_______,_______,_______,_______,_______,ALEFT , KC_UP ,ARGHT ,_______,_______,_______,_______, \
63 _______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______, _______, \ 63 _______,_______,_______,_______,_______,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______, _______, \
64 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \ 64 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
65 _______,_______,_______, _______, _______,_______,_______,_______), 65 _______,_______,_______, _______, _______,_______,_______,_______),