aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Chang <william@factual.com>2019-12-08 10:41:53 -0800
committerWilliam Chang <william@factual.com>2019-12-08 10:41:53 -0800
commit051faf4b64e17d43b9ca9b2269bdda3bb03d8549 (patch)
tree616757aa51b451615227ea6fbcb8e284c45b5c1a
parent2d94e02ea1e0c3baf91669e7c326dfc4c503d8c9 (diff)
parent013ac11c958feb1fc9e1fff491bf1ec6807873ac (diff)
downloadfirmware-051faf4b64e17d43b9ca9b2269bdda3bb03d8549.tar.gz
firmware-051faf4b64e17d43b9ca9b2269bdda3bb03d8549.tar.bz2
firmware-051faf4b64e17d43b9ca9b2269bdda3bb03d8549.zip
Merge branch 'feature/billiams_space65' of github.com:billiams/qmk_firmware into feature/billiams_space65
-rw-r--r--keyboards/gray_studio/space65/keymaps/billiams/keymap.c2
-rw-r--r--keyboards/gray_studio/space65/keymaps/billiams/readme.md8
2 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c b/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
index 3ff04708e..e1fd72e35 100644
--- a/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
+++ b/keyboards/gray_studio/space65/keymaps/billiams/keymap.c
@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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, \
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, 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, 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, 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 \
),
};
diff --git a/keyboards/gray_studio/space65/keymaps/billiams/readme.md b/keyboards/gray_studio/space65/keymaps/billiams/readme.md
index daebc2e9d..8941bfcd0 100644
--- a/keyboards/gray_studio/space65/keymaps/billiams/readme.md
+++ b/keyboards/gray_studio/space65/keymaps/billiams/readme.md
@@ -23,15 +23,15 @@ git clone https://github.com/qmk/qmk_firmware.git
```
2. Customize your layout by starting with a [keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/gray_studio/space65/keymaps). I copied the default and changed it to my liking.
3. Before plugging in your keyboard into your computer, hold `SPACE` and `B` keys down
-4. Holding those keys down, plug the keyboard into your computer, which will put the keyboard in bootlegger mode. Note that if you've done this before, it could be that you need to simply press `ESC` prior to plugging in the board to put it in Bootlegger mode.
+4. Holding those keys down, plug the keyboard into your computer, which will put the keyboard in bootloader mode. Note that if you've done this before, it could be that you need to simply press `ESC` prior to plugging in the board to put it in Bootloader mode.
5. Build your hex file and flash your keyboard
```
make gray_studio/space65:billiams:flash # be in the qmk_firmware directory to do this
```
Notes:
-- If you are using QMK Toolbox, use `make gray_studio/space65:<keymap>` in the base qmk_firmware directory instead of step 5 above which will create a hex file like `space65_billiams.hex` which you can then choose in the toolbox and hit flash
-- If you accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootlegger mode again, hold the `ESC` key and plug the board in.
+- If you are using QMK Toolbox, use `make gray_studio/space65:<keymap>` in the base qmk_firmware directory instead of step 5 above which will create a hex file `gray_studio_space65_billiams.hex` which you can then choose in the toolbox and hit flash
+- If you accidentally loaded the default keymap, then to `RESET` the keyboard and kick it into bootloader mode again, hold the `ESC` key and plug the board in.
Hope this helps!
@@ -65,7 +65,7 @@ Hope this helps!
`------------------------------------------------------------------------------------------------'
```
-### 2 Fn Layer - Just for bootleg mode button
+### 2 Fn Layer - Just for bootloader mode button
```
,------------------------------------------------------------------------------------------------.
| | | | | | | | | | | | | | | | |