diff options
| -rw-r--r-- | common_features.mk | 7 | ||||
| -rw-r--r-- | quantum/action.c (renamed from tmk_core/common/action.c) | 0 | ||||
| -rw-r--r-- | quantum/action.h (renamed from tmk_core/common/action.h) | 0 | ||||
| -rw-r--r-- | quantum/action_code.h (renamed from tmk_core/common/action_code.h) | 0 | ||||
| -rw-r--r-- | quantum/action_layer.c (renamed from tmk_core/common/action_layer.c) | 0 | ||||
| -rw-r--r-- | quantum/action_layer.h (renamed from tmk_core/common/action_layer.h) | 0 | ||||
| -rw-r--r-- | quantum/action_macro.c (renamed from tmk_core/common/action_macro.c) | 0 | ||||
| -rw-r--r-- | quantum/action_macro.h (renamed from tmk_core/common/action_macro.h) | 0 | ||||
| -rw-r--r-- | quantum/action_tapping.c (renamed from tmk_core/common/action_tapping.c) | 0 | ||||
| -rw-r--r-- | quantum/action_tapping.h (renamed from tmk_core/common/action_tapping.h) | 0 | ||||
| -rw-r--r-- | quantum/action_util.c (renamed from tmk_core/common/action_util.c) | 0 | ||||
| -rw-r--r-- | quantum/action_util.h (renamed from tmk_core/common/action_util.h) | 0 | ||||
| -rw-r--r-- | quantum/eeconfig.c (renamed from tmk_core/common/eeconfig.c) | 0 | ||||
| -rw-r--r-- | quantum/eeconfig.h (renamed from tmk_core/common/eeconfig.h) | 0 | ||||
| -rw-r--r-- | quantum/keyboard.c (renamed from tmk_core/common/keyboard.c) | 4 | ||||
| -rw-r--r-- | quantum/keyboard.h (renamed from tmk_core/common/keyboard.h) | 0 | ||||
| -rw-r--r-- | quantum/keycode.h (renamed from tmk_core/common/keycode.h) | 0 | ||||
| -rw-r--r-- | quantum/via.h | 2 | ||||
| -rw-r--r-- | tmk_core/common.mk | 10 |
19 files changed, 14 insertions, 9 deletions
diff --git a/common_features.mk b/common_features.mk index 1eece0242e..d09d4f1eff 100644 --- a/common_features.mk +++ b/common_features.mk @@ -20,6 +20,13 @@ QUANTUM_SRC += \ $(QUANTUM_DIR)/send_string.c \ $(QUANTUM_DIR)/bitwise.c \ $(QUANTUM_DIR)/led.c \ + $(QUANTUM_DIR)/action.c \ + $(QUANTUM_DIR)/action_layer.c \ + $(QUANTUM_DIR)/action_macro.c \ + $(QUANTUM_DIR)/action_tapping.c \ + $(QUANTUM_DIR)/action_util.c \ + $(QUANTUM_DIR)/eeconfig.c \ + $(QUANTUM_DIR)/keyboard.c \ $(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/keycode_config.c \ $(QUANTUM_DIR)/logging/debug.c \ diff --git a/tmk_core/common/action.c b/quantum/action.c index d19fd2a045..d19fd2a045 100644 --- a/tmk_core/common/action.c +++ b/quantum/action.c diff --git a/tmk_core/common/action.h b/quantum/action.h index 3d357b33b8..3d357b33b8 100644 --- a/tmk_core/common/action.h +++ b/quantum/action.h diff --git a/tmk_core/common/action_code.h b/quantum/action_code.h index eb18c36ae8..eb18c36ae8 100644 --- a/tmk_core/common/action_code.h +++ b/quantum/action_code.h diff --git a/tmk_core/common/action_layer.c b/quantum/action_layer.c index ed1a4bd20d..ed1a4bd20d 100644 --- a/tmk_core/common/action_layer.c +++ b/quantum/action_layer.c diff --git a/tmk_core/common/action_layer.h b/quantum/action_layer.h index b87d096eed..b87d096eed 100644 --- a/tmk_core/common/action_layer.h +++ b/quantum/action_layer.h diff --git a/tmk_core/common/action_macro.c b/quantum/action_macro.c index 92228c0ba8..92228c0ba8 100644 --- a/tmk_core/common/action_macro.c +++ b/quantum/action_macro.c diff --git a/tmk_core/common/action_macro.h b/quantum/action_macro.h index 685e2c6ffc..685e2c6ffc 100644 --- a/tmk_core/common/action_macro.h +++ b/quantum/action_macro.h diff --git a/tmk_core/common/action_tapping.c b/quantum/action_tapping.c index 36839f9faf..36839f9faf 100644 --- a/tmk_core/common/action_tapping.c +++ b/quantum/action_tapping.c diff --git a/tmk_core/common/action_tapping.h b/quantum/action_tapping.h index 7de8049c7f..7de8049c7f 100644 --- a/tmk_core/common/action_tapping.h +++ b/quantum/action_tapping.h diff --git a/tmk_core/common/action_util.c b/quantum/action_util.c index 2b3c00cba0..2b3c00cba0 100644 --- a/tmk_core/common/action_util.c +++ b/quantum/action_util.c diff --git a/tmk_core/common/action_util.h b/quantum/action_util.h index f2b3897ae5..f2b3897ae5 100644 --- a/tmk_core/common/action_util.h +++ b/quantum/action_util.h diff --git a/tmk_core/common/eeconfig.c b/quantum/eeconfig.c index ffa56ab56d..ffa56ab56d 100644 --- a/tmk_core/common/eeconfig.c +++ b/quantum/eeconfig.c diff --git a/tmk_core/common/eeconfig.h b/quantum/eeconfig.h index a88071729d..a88071729d 100644 --- a/tmk_core/common/eeconfig.h +++ b/quantum/eeconfig.h diff --git a/tmk_core/common/keyboard.c b/quantum/keyboard.c index fcc51973fd..0eb41e7d30 100644 --- a/tmk_core/common/keyboard.c +++ b/quantum/keyboard.c @@ -256,6 +256,8 @@ void keyboard_setup(void) { keyboard_pre_init_kb(); } +#ifndef SPLIT_KEYBOARD + /** \brief is_keyboard_master * * FIXME: needs doc @@ -268,6 +270,8 @@ __attribute__((weak)) bool is_keyboard_master(void) { return true; } */ __attribute__((weak)) bool is_keyboard_left(void) { return true; } +#endif + /** \brief should_process_keypress * * Override this function if you have a condition where keypresses processing should change: diff --git a/tmk_core/common/keyboard.h b/quantum/keyboard.h index 08f4e84f94..08f4e84f94 100644 --- a/tmk_core/common/keyboard.h +++ b/quantum/keyboard.h diff --git a/tmk_core/common/keycode.h b/quantum/keycode.h index 8facabd818..8facabd818 100644 --- a/tmk_core/common/keycode.h +++ b/quantum/keycode.h diff --git a/quantum/via.h b/quantum/via.h index d0510fcabd..de0a21da20 100644 --- a/quantum/via.h +++ b/quantum/via.h @@ -16,7 +16,7 @@ #pragma once -#include "tmk_core/common/eeconfig.h" // for EECONFIG_SIZE +#include "eeconfig.h" // for EECONFIG_SIZE // Keyboard level code can change where VIA stores the magic. // The magic is the build date YYMMDD encoded as BCD in 3 bytes, diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 57de8d95e8..69d27e6c0b 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -1,14 +1,8 @@ COMMON_DIR = common PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) -TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ - $(COMMON_DIR)/keyboard.c \ - $(COMMON_DIR)/action.c \ - $(COMMON_DIR)/action_tapping.c \ - $(COMMON_DIR)/action_macro.c \ - $(COMMON_DIR)/action_layer.c \ - $(COMMON_DIR)/action_util.c \ - $(COMMON_DIR)/eeconfig.c \ +TMK_COMMON_SRC += \ + $(COMMON_DIR)/host.c \ $(COMMON_DIR)/report.c \ $(COMMON_DIR)/sync_timer.c \ $(COMMON_DIR)/usb_util.c \ |