diff options
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action_layer.c | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c index 58d919a04d..c6a166a823 100644 --- a/tmk_core/common/action_layer.c +++ b/tmk_core/common/action_layer.c @@ -188,10 +188,10 @@ action_t store_or_get_action(bool pressed, keypos_t key) int8_t layer_switch_get_layer(keypos_t key) { +#ifndef NO_ACTION_LAYER action_t action; action.code = ACTION_TRANSPARENT; -#ifndef NO_ACTION_LAYER uint32_t layers = layer_state | default_layer_state; /* check top layer first */ for (int8_t i = 31; i >= 0; i--) { diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h index cde44abc9b..43001c9778 100644 --- a/tmk_core/protocol/lufa/descriptor.h +++ b/tmk_core/protocol/lufa/descriptor.h @@ -238,7 +238,8 @@ typedef struct # define CDC_OUT_EPNUM MIDI_STREAM_OUT_EPNUM #endif -#if defined(__AVR_ATmega32U2__) && CDC_OUT_EPNUM > 4 +#if (defined(__AVR_ATmega32U2__) && CDC_OUT_EPNUM > 4) || \ + (defined(__AVR_ATmega32U4__) && CDC_OUT_EPNUM > 6) # error "Endpoints are not available enough to support all functions. Remove some in Makefile.(MOUSEKEY, EXTRAKEY, CONSOLE, NKRO, MIDI, SERIAL)" #endif |