diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-01 13:37:52 +0100 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-01 13:37:52 +0100 |
| commit | 2bef8b5b88547ce28fb056559b058e35109278b3 (patch) | |
| tree | 104a08c011ead3e832af22c9e5cc61967c63003c | |
| parent | 72e95809a1d3da869942441a2ad7107c7a55d688 (diff) | |
| download | qmk_firmware-2bef8b5b88547ce28fb056559b058e35109278b3.tar.gz qmk_firmware-2bef8b5b88547ce28fb056559b058e35109278b3.tar.xz | |
Limit outputselect to AVR only for now
| -rw-r--r-- | quantum/quantum.c | 4 | ||||
| -rw-r--r-- | quantum/quantum.h | 1 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/outputselect.c (renamed from tmk_core/protocol/outputselect.c) | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/outputselect.h (renamed from tmk_core/protocol/outputselect.h) | 0 |
5 files changed, 6 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 1d1a691e2..585692d4a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -1,5 +1,7 @@ #include "quantum.h" +#if defined(__AVR__) #include "outputselect.h" +#endif #ifndef TAPPING_TERM #define TAPPING_TERM 200 @@ -213,6 +215,7 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif + #if defined(__AVR__) case OUT_AUTO: if (record->event.pressed) { set_output(OUTPUT_AUTO); @@ -241,6 +244,7 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif + #endif case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: if (record->event.pressed) { // MAGIC actions (BOOTMAGIC without the boot) diff --git a/quantum/quantum.h b/quantum/quantum.h index e6adf974a..810e9e4bb 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,6 @@ #ifdef RGBLIGHT_ENABLE #include "rgblight.h" #endif - #include "action_layer.h" #include "eeconfig.h" #include <stddef.h> diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 26337cb94..de0cc795f 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -8,7 +8,7 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk)) # New build system from 20120730 LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA - include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk + include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk else include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile endif diff --git a/tmk_core/protocol/outputselect.c b/tmk_core/protocol/lufa/outputselect.c index 5d2457bff..0110928de 100644 --- a/tmk_core/protocol/outputselect.c +++ b/tmk_core/protocol/lufa/outputselect.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lufa.h" +#include "quantum.h" #include "outputselect.h" #ifdef ADAFRUIT_BLE_ENABLE #include "adafruit_ble.h" diff --git a/tmk_core/protocol/outputselect.h b/tmk_core/protocol/lufa/outputselect.h index 79b4dd35d..79b4dd35d 100644 --- a/tmk_core/protocol/outputselect.h +++ b/tmk_core/protocol/lufa/outputselect.h |