diff options
| author | QMK Bot <hello@qmk.fm> | 2021-05-22 06:13:13 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-05-22 06:13:13 +0000 |
| commit | 76c23b15abc824f867b48d8d5100dced2417d336 (patch) | |
| tree | 02a9c940e2073166e871bfc48217b942629269e2 | |
| parent | 4c1ea0a52246f67d7bb75acc099636d638a996a7 (diff) | |
| parent | e17a6c4f8df85ec1e698fcb66fd054778f1e0136 (diff) | |
| download | qmk_firmware-76c23b15abc824f867b48d8d5100dced2417d336.tar.gz qmk_firmware-76c23b15abc824f867b48d8d5100dced2417d336.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/nullbitsco/scramble/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/nullbitsco/scramble/keymaps/oled/keymap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/nullbitsco/scramble/keymaps/default/keymap.c b/keyboards/nullbitsco/scramble/keymaps/default/keymap.c index 81bd732db..2ccffe3d8 100644 --- a/keyboards/nullbitsco/scramble/keymaps/default/keymap.c +++ b/keyboards/nullbitsco/scramble/keymaps/default/keymap.c | |||
| @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define _BASE 1 | 20 | #define _BASE 0 |
| 21 | 21 | ||
| 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 23 | 23 | ||
diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c b/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c index eac0a470f..7168ad9ec 100644 --- a/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c +++ b/keyboards/nullbitsco/scramble/keymaps/oled/keymap.c | |||
| @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #include QMK_KEYBOARD_H | 18 | #include QMK_KEYBOARD_H |
| 19 | 19 | ||
| 20 | #define _BASE 1 | 20 | #define _BASE 0 |
| 21 | 21 | ||
| 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 23 | 23 | ||