diff options
author | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
---|---|---|
committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/jj40 | |
parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
download | firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.bz2 firmware-d977daa8dc9136746425f9e1414e1f93cb161877.zip |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/jj40')
-rw-r--r-- | keyboards/jj40/README.md | 2 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/ajp10304/rules.mk | 5 | ||||
-rw-r--r-- | keyboards/jj40/keymaps/fun40/rules.mk | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/keyboards/jj40/README.md b/keyboards/jj40/README.md index 39e871d87..26d551cf7 100644 --- a/keyboards/jj40/README.md +++ b/keyboards/jj40/README.md @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment): make jj40:default:program -See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Note that this is a complete replacement for the firmware, so you won't be using Bootmapper Client to change any keyboard settings, since not all the diff --git a/keyboards/jj40/keymaps/ajp10304/rules.mk b/keyboards/jj40/keymaps/ajp10304/rules.mk index dc6ab13e8..4dee01cd5 100644 --- a/keyboards/jj40/keymaps/ajp10304/rules.mk +++ b/keyboards/jj40/keymaps/ajp10304/rules.mk @@ -1,6 +1,3 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif - AUDIO_ENABLE = no MOUSEKEY_ENABLE = yes + diff --git a/keyboards/jj40/keymaps/fun40/rules.mk b/keyboards/jj40/keymaps/fun40/rules.mk index 6fe3b0515..92f168a16 100644 --- a/keyboards/jj40/keymaps/fun40/rules.mk +++ b/keyboards/jj40/keymaps/fun40/rules.mk @@ -19,6 +19,3 @@ DISABLE_WS2812 = yes SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -ifndef QUANTUM_DIR - include ../../../../Makefile -endif |