summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-11 03:48:35 +0000
committerQMK Bot <hello@qmk.fm>2021-10-11 03:48:35 +0000
commit00417450547478e71ced0c7ff4e92ff4dc6ffd68 (patch)
tree16444c29a83fd93aaf5def649207c4e5d66ffe9f
parentd0a3fc3067980e8beebc4a3ec59624e23a5bf99f (diff)
parent8045ad711a958410c98eea80bf8d3c52fd9b12e1 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/ferris/sweep/config.h9
-rw-r--r--keyboards/ferris/sweep/readme.md8
-rw-r--r--keyboards/ferris/sweep/rules.mk4
3 files changed, 17 insertions, 4 deletions
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index 34d5030b64..702f31a895 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ B4, B5, NO_PIN, NO_PIN, NO_PIN } \
}
-#define DIRECT_PINS_RIGHT { \
+#define DIRECT_PINS_RIGHT { \
{ F4, F5, F6, F7, E6 }, \
{ D3, B6, B2, B3, B1 }, \
{ D7, C6, D4, D0, D1 }, \
@@ -72,3 +72,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SOFT_SERIAL_PIN D2
#define EE_HANDS
+
+/* Top left key on left half */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+/* Top right key on right half */
+#define BOOTMAGIC_LITE_ROW_RIGHT 4
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md
index d7102aa1a0..f06cfbf266 100644
--- a/keyboards/ferris/sweep/readme.md
+++ b/keyboards/ferris/sweep/readme.md
@@ -10,9 +10,15 @@ A version of the Ferris keyboard that uses a daughterboard, designed by the fant
* Ferris sweep (With pro-micro. Comes in a couple of PCB edge cuts shapes, but with identical pinout)
* Hardware Availability: @iamnotyourbroom in the 40% discord chat server may have some spares for you.
-Make examples for this keyboard (after setting up your build environment):
+Initial [EE_HANDS](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) make examples for this keyboard (after setting up your build environment):
make ferris/sweep:default:avrdude-split-left
make ferris/sweep:default:avrdude-split-right
+Subsequent make example for both sides:
+
+ make ferris/sweep:default
+
+[Bootmagic lite](https://docs.qmk.fm/#/feature_bootmagic?id=bootmagic-lite) is also configured on the top right key for the right halve.
+
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/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
index aa183cd9eb..2ebda6a6aa 100644
--- a/keyboards/ferris/sweep/rules.mk
+++ b/keyboards/ferris/sweep/rules.mk
@@ -7,8 +7,8 @@ BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration