Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b8e913c

Browse files
authoredAug 17, 2021
Migrate platform independent code from tmk_core -> quantum (#13673)
* Migrate action|keyboard|keycode|eeconfig from tmk_core -> quantum
1 parent 96e2b13 commit b8e913c

19 files changed

+14
-9
lines changed
 

‎common_features.mk

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ QUANTUM_SRC += \
2020
$(QUANTUM_DIR)/send_string.c \
2121
$(QUANTUM_DIR)/bitwise.c \
2222
$(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 \
2330
$(QUANTUM_DIR)/keymap_common.c \
2431
$(QUANTUM_DIR)/keycode_config.c \
2532
$(QUANTUM_DIR)/logging/debug.c \
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎tmk_core/common/keyboard.c ‎quantum/keyboard.c

+4
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ void keyboard_setup(void) {
256256
keyboard_pre_init_kb();
257257
}
258258

259+
#ifndef SPLIT_KEYBOARD
260+
259261
/** \brief is_keyboard_master
260262
*
261263
* FIXME: needs doc
@@ -268,6 +270,8 @@ __attribute__((weak)) bool is_keyboard_master(void) { return true; }
268270
*/
269271
__attribute__((weak)) bool is_keyboard_left(void) { return true; }
270272

273+
#endif
274+
271275
/** \brief should_process_keypress
272276
*
273277
* Override this function if you have a condition where keypresses processing should change:
File renamed without changes.
File renamed without changes.

‎quantum/via.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#pragma once
1818

19-
#include "tmk_core/common/eeconfig.h" // for EECONFIG_SIZE
19+
#include "eeconfig.h" // for EECONFIG_SIZE
2020

2121
// Keyboard level code can change where VIA stores the magic.
2222
// The magic is the build date YYMMDD encoded as BCD in 3 bytes,

‎tmk_core/common.mk

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
COMMON_DIR = common
22
PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY)
33

4-
TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
5-
$(COMMON_DIR)/keyboard.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 \
4+
TMK_COMMON_SRC += \
5+
$(COMMON_DIR)/host.c \
126
$(COMMON_DIR)/report.c \
137
$(COMMON_DIR)/sync_timer.c \
148
$(COMMON_DIR)/usb_util.c \

0 commit comments

Comments
 (0)
Please sign in to comment.