summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-17 04:58:19 +0000
committerQMK Bot <hello@qmk.fm>2021-03-17 04:58:19 +0000
commitb4b3be4f05d09a44c6ff2852373bdfc139dc468b (patch)
treefc4aba3db8063d406cbbee958f944cec485bf51e
parent6817771df7ae3934ede9d9fcd3d4ee2f351c16ae (diff)
parent563be8ca2a1445120fce79b0fc0c991af697d7bc (diff)
downloadqmk_firmware-b4b3be4f05d09a44c6ff2852373bdfc139dc468b.tar.gz
qmk_firmware-b4b3be4f05d09a44c6ff2852373bdfc139dc468b.zip
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-xkeyboards/hub16/readme.md9
-rwxr-xr-xkeyboards/hub16/rules.mk2
-rwxr-xr-xkeyboards/hub20/readme.md5
-rw-r--r--keyboards/hub20/rules.mk2
4 files changed, 16 insertions, 2 deletions
diff --git a/keyboards/hub16/readme.md b/keyboards/hub16/readme.md
index db2822c872..f2bcf4b0a7 100755
--- a/keyboards/hub16/readme.md
+++ b/keyboards/hub16/readme.md
@@ -10,6 +10,15 @@ For more information regarding the keyboard, please visit the [Hub16 Website](ht
Make example for this keyboard (after setting up your build environment):
+ make hub16:default
+
+Flashing example for this keyboard:
+
make hub16:default:flash
+To reset the board into bootloader mode, do one of the following:
+
+* Press the reset switch between the center two USB-C ports while the board is plugged in
+* Hold the top left key while connecting the USB cable (also erases persistent settings)
+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hub16/rules.mk b/keyboards/hub16/rules.mk
index b7f940198f..07d286c17f 100755
--- a/keyboards/hub16/rules.mk
+++ b/keyboards/hub16/rules.mk
@@ -4,7 +4,7 @@ BOOTLOADER = caterina
# Build Options
CUSTOM_MATRIX = lite # Custom scanning of matrix
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/hub20/readme.md b/keyboards/hub20/readme.md
index e2477b012d..1abfa0dea8 100755
--- a/keyboards/hub20/readme.md
+++ b/keyboards/hub20/readme.md
@@ -16,4 +16,9 @@ Flashing example for this keyboard:
make hub20:default:flash
+To reset the board into bootloader mode, do one of the following:
+
+* Press the reset switch between the center two USB-C ports while the board is plugged in
+* Hold the top left key while connecting the USB cable (also erases persistent settings)
+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hub20/rules.mk b/keyboards/hub20/rules.mk
index b520ee35af..9abb4f80a7 100644
--- a/keyboards/hub20/rules.mk
+++ b/keyboards/hub20/rules.mk
@@ -4,7 +4,7 @@ MCU = STM32F072
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug