diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
| commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/gergo/keymaps/default/rules.mk | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
| download | firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.tar.gz firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.tar.bz2 firmware-4b2d3288d013b1a71ea25402224c4a8225a099e9.zip | |
resolved conflicts
Diffstat (limited to 'keyboards/gergo/keymaps/default/rules.mk')
| -rw-r--r-- | keyboards/gergo/keymaps/default/rules.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keyboards/gergo/keymaps/default/rules.mk b/keyboards/gergo/keymaps/default/rules.mk index 507cc97b7..da2d03af2 100644 --- a/keyboards/gergo/keymaps/default/rules.mk +++ b/keyboards/gergo/keymaps/default/rules.mk @@ -3,7 +3,7 @@ # Make sure you have dfu-programmer installed! #---------------------------------------------------------------------------- # Firmware options -BALLER = yes # Enable to ball out +BALLER = no # Enable to ball out BALLSTEP = 20 # Multiple in px to move, multiplied by layer number SCROLLSTEP = 1 # Lines to scroll with ball MOUSEKEY_ENABLE = yes # Mouse keys(+4700), needed for baller @@ -26,6 +26,7 @@ ifneq ($(strip $(SCROLLSTEP)),) OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP)) endif ifeq ($(strip $(BALLER)), yes) + POINTING_DEVICE_ENABLE = yes OPT_DEFS += -DBALLER endif ifeq ($(strip $(DEBUG_BALLER)), yes) |