diff options
author | Joel Challis <git@zvecr.com> | 2021-08-18 00:18:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-18 00:18:58 +0100 |
commit | b8e913c8db73ebf890e4604ee41991a34354a600 (patch) | |
tree | 258035f8fda9f83f08a309f6cd608b9c61476678 | |
parent | 96e2b13d1de227cdc2b918fb0292bd832d346a25 (diff) | |
download | qmk_firmware-b8e913c8db73ebf890e4604ee41991a34354a600.tar.gz qmk_firmware-b8e913c8db73ebf890e4604ee41991a34354a600.zip |
Migrate platform independent code from tmk_core -> quantum (#13673)
* Migrate action|keyboard|keycode|eeconfig from tmk_core -> quantum
-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 1eece0242..d09d4f1ef 100644 --- a/common_features.mk +++ b/common_features.mk | |||
@@ -20,6 +20,13 @@ QUANTUM_SRC += \ | |||
20 | $(QUANTUM_DIR)/send_string.c \ | 20 | $(QUANTUM_DIR)/send_string.c \ |
21 | $(QUANTUM_DIR)/bitwise.c \ | 21 | $(QUANTUM_DIR)/bitwise.c \ |
22 | $(QUANTUM_DIR)/led.c \ | 22 | $(QUANTUM_DIR)/led.c \ |
23 | $(QUANTUM_DIR)/action.c \ | ||
24 | $(QUANTUM_DIR)/action_layer.c \ | ||
25 | $(QUANTUM_DIR)/action_macro.c \ | ||
26 | $(QUANTUM_DIR)/action_tapping.c \ | ||
27 | $(QUANTUM_DIR)/action_util.c \ | ||
28 | $(QUANTUM_DIR)/eeconfig.c \ | ||
29 | $(QUANTUM_DIR)/keyboard.c \ | ||
23 | $(QUANTUM_DIR)/keymap_common.c \ | 30 | $(QUANTUM_DIR)/keymap_common.c \ |
24 | $(QUANTUM_DIR)/keycode_config.c \ | 31 | $(QUANTUM_DIR)/keycode_config.c \ |
25 | $(QUANTUM_DIR)/logging/debug.c \ | 32 | $(QUANTUM_DIR)/logging/debug.c \ |
diff --git a/tmk_core/common/action.c b/quantum/action.c index d19fd2a04..d19fd2a04 100644 --- a/tmk_core/common/action.c +++ b/quantum/action.c | |||
diff --git a/tmk_core/common/action.h b/quantum/action.h index 3d357b33b..3d357b33b 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 eb18c36ae..eb18c36ae 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 ed1a4bd20..ed1a4bd20 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 b87d096ee..b87d096ee 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 92228c0ba..92228c0ba 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 685e2c6ff..685e2c6ff 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 36839f9fa..36839f9fa 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 7de8049c7..7de8049c7 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 2b3c00cba..2b3c00cba 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 f2b3897ae..f2b3897ae 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 ffa56ab56..ffa56ab56 100644 --- a/tmk_core/common/eeconfig.c +++ b/quantum/eeconfig.c | |||
diff --git a/tmk_core/common/eeconfig.h b/quantum/eeconfig.h index a88071729..a88071729 100644 --- a/tmk_core/common/eeconfig.h +++ b/quantum/eeconfig.h | |||
diff --git a/tmk_core/common/keyboard.c b/quantum/keyboard.c index fcc51973f..0eb41e7d3 100644 --- a/tmk_core/common/keyboard.c +++ b/quantum/keyboard.c | |||
@@ -256,6 +256,8 @@ void keyboard_setup(void) { | |||
256 | keyboard_pre_init_kb(); | 256 | keyboard_pre_init_kb(); |
257 | } | 257 | } |
258 | 258 | ||
259 | #ifndef SPLIT_KEYBOARD | ||
260 | |||
259 | /** \brief is_keyboard_master | 261 | /** \brief is_keyboard_master |
260 | * | 262 | * |
261 | * FIXME: needs doc | 263 | * FIXME: needs doc |
@@ -268,6 +270,8 @@ __attribute__((weak)) bool is_keyboard_master(void) { return true; } | |||
268 | */ | 270 | */ |
269 | __attribute__((weak)) bool is_keyboard_left(void) { return true; } | 271 | __attribute__((weak)) bool is_keyboard_left(void) { return true; } |
270 | 272 | ||
273 | #endif | ||
274 | |||
271 | /** \brief should_process_keypress | 275 | /** \brief should_process_keypress |
272 | * | 276 | * |
273 | * Override this function if you have a condition where keypresses processing should change: | 277 | * 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 08f4e84f9..08f4e84f9 100644 --- a/tmk_core/common/keyboard.h +++ b/quantum/keyboard.h | |||
diff --git a/tmk_core/common/keycode.h b/quantum/keycode.h index 8facabd81..8facabd81 100644 --- a/tmk_core/common/keycode.h +++ b/quantum/keycode.h | |||
diff --git a/quantum/via.h b/quantum/via.h index d0510fcab..de0a21da2 100644 --- a/quantum/via.h +++ b/quantum/via.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #pragma once | 17 | #pragma once |
18 | 18 | ||
19 | #include "tmk_core/common/eeconfig.h" // for EECONFIG_SIZE | 19 | #include "eeconfig.h" // for EECONFIG_SIZE |
20 | 20 | ||
21 | // Keyboard level code can change where VIA stores the magic. | 21 | // Keyboard level code can change where VIA stores the magic. |
22 | // The magic is the build date YYMMDD encoded as BCD in 3 bytes, | 22 | // 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 57de8d95e..69d27e6c0 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -1,14 +1,8 @@ | |||
1 | COMMON_DIR = common | 1 | COMMON_DIR = common |
2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) | 2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) |
3 | 3 | ||
4 | TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | 4 | TMK_COMMON_SRC += \ |
5 | $(COMMON_DIR)/keyboard.c \ | 5 | $(COMMON_DIR)/host.c \ |
6 | $(COMMON_DIR)/action.c \ | ||
7 | $(COMMON_DIR)/action_tapping.c \ | ||
8 | $(COMMON_DIR)/action_macro.c \ | ||
9 | $(COMMON_DIR)/action_layer.c \ | ||
10 | $(COMMON_DIR)/action_util.c \ | ||
11 | $(COMMON_DIR)/eeconfig.c \ | ||
12 | $(COMMON_DIR)/report.c \ | 6 | $(COMMON_DIR)/report.c \ |
13 | $(COMMON_DIR)/sync_timer.c \ | 7 | $(COMMON_DIR)/sync_timer.c \ |
14 | $(COMMON_DIR)/usb_util.c \ | 8 | $(COMMON_DIR)/usb_util.c \ |