summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-11-19 18:41:02 +0000
committerGitHub <noreply@github.com>2021-11-19 10:41:02 -0800
commit2728603fe6d73e805a539d337fd01051c46ca806 (patch)
tree5c83ffc7efa112da870bd5d8502a9d91d4792f35
parent43b9e23bae12916d5161f03700c9bfe46737324b (diff)
Move tmk_core/common/<plat> (#13918)
-rw-r--r--build_keyboard.mk7
-rw-r--r--build_test.mk6
-rw-r--r--common_features.mk4
-rw-r--r--docs/feature_layers.md2
-rw-r--r--docs/fr-fr/faq_keymap.md2
-rw-r--r--docs/internals_gpio_control.md2
-rw-r--r--docs/ja/faq_keymap.md2
-rw-r--r--docs/ja/feature_layers.md2
-rw-r--r--docs/ja/pr_checklist.md2
-rw-r--r--docs/pr_checklist.md2
-rw-r--r--docs/zh-cn/faq_keymap.md2
-rw-r--r--keyboards/ai03/orbit/split_util.c2
-rw-r--r--keyboards/cannonkeys/satisfaction75/satisfaction75.c2
-rw-r--r--keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c2
-rw-r--r--keyboards/mxss/mxss.c2
-rw-r--r--keyboards/mxss/mxss_frontled.c2
-rw-r--r--keyboards/wilba_tech/wt_main.c2
-rw-r--r--keyboards/wilba_tech/wt_mono_backlight.c2
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c2
-rw-r--r--paths.mk3
-rw-r--r--platforms/arm_atsam/_timer.h (renamed from tmk_core/common/arm_atsam/_timer.h)0
-rw-r--r--platforms/arm_atsam/_wait.h (renamed from tmk_core/common/arm_atsam/_wait.h)0
-rw-r--r--platforms/arm_atsam/atomic_util.h (renamed from tmk_core/common/arm_atsam/atomic_util.h)0
-rw-r--r--platforms/arm_atsam/bootloader.c (renamed from tmk_core/common/arm_atsam/bootloader.c)0
-rw-r--r--platforms/arm_atsam/eeprom.c (renamed from tmk_core/common/arm_atsam/eeprom.c)0
-rw-r--r--platforms/arm_atsam/gpio.h (renamed from tmk_core/common/arm_atsam/gpio.h)0
-rw-r--r--platforms/arm_atsam/pin_defs.h (renamed from tmk_core/common/arm_atsam/pin_defs.h)0
-rw-r--r--platforms/arm_atsam/platform.c (renamed from tmk_core/common/arm_atsam/platform.c)0
-rw-r--r--platforms/arm_atsam/platform.mk (renamed from tmk_core/arm_atsam.mk)0
-rw-r--r--platforms/arm_atsam/platform_deps.h (renamed from tmk_core/common/arm_atsam/platform_deps.h)0
-rw-r--r--platforms/arm_atsam/suspend.c (renamed from tmk_core/common/arm_atsam/suspend.c)0
-rw-r--r--platforms/arm_atsam/timer.c (renamed from tmk_core/common/arm_atsam/timer.c)0
-rw-r--r--platforms/atomic_util.h (renamed from tmk_core/common/atomic_util.h)0
-rw-r--r--platforms/avr/_print.h (renamed from tmk_core/common/avr/_print.h)0
-rw-r--r--platforms/avr/_timer.h (renamed from tmk_core/common/avr/_timer.h)0
-rw-r--r--platforms/avr/_wait.h (renamed from tmk_core/common/avr/_wait.h)0
-rw-r--r--platforms/avr/atomic_util.h (renamed from tmk_core/common/avr/atomic_util.h)0
-rw-r--r--platforms/avr/bootloader.c (renamed from tmk_core/common/avr/bootloader.c)0
-rw-r--r--platforms/avr/bootloader_size.c (renamed from tmk_core/common/avr/bootloader_size.c)0
-rw-r--r--platforms/avr/gpio.h (renamed from tmk_core/common/avr/gpio.h)0
-rw-r--r--platforms/avr/pin_defs.h (renamed from tmk_core/common/avr/pin_defs.h)0
-rw-r--r--platforms/avr/platform.c (renamed from tmk_core/common/avr/platform.c)0
-rw-r--r--platforms/avr/platform.mk (renamed from tmk_core/avr.mk)2
-rw-r--r--platforms/avr/platform_deps.h (renamed from tmk_core/common/avr/platform_deps.h)0
-rw-r--r--platforms/avr/printf.c (renamed from tmk_core/common/avr/printf.c)0
-rw-r--r--platforms/avr/printf.mk (renamed from tmk_core/common/avr/printf.mk)0
-rw-r--r--platforms/avr/sleep_led.c (renamed from tmk_core/common/avr/sleep_led.c)0
-rw-r--r--platforms/avr/suspend.c (renamed from tmk_core/common/avr/suspend.c)0
-rw-r--r--platforms/avr/timer.c (renamed from tmk_core/common/avr/timer.c)0
-rw-r--r--platforms/avr/timer_avr.h (renamed from tmk_core/common/avr/timer_avr.h)0
-rw-r--r--platforms/avr/xprintf.S (renamed from tmk_core/common/avr/xprintf.S)0
-rw-r--r--platforms/avr/xprintf.h (renamed from tmk_core/common/avr/xprintf.h)0
-rw-r--r--platforms/bootloader.h (renamed from tmk_core/common/bootloader.h)0
-rw-r--r--platforms/chibios/_timer.h (renamed from tmk_core/common/chibios/_timer.h)0
-rw-r--r--platforms/chibios/_wait.c (renamed from tmk_core/common/chibios/_wait.c)0
-rw-r--r--platforms/chibios/_wait.h (renamed from tmk_core/common/chibios/_wait.h)0
-rw-r--r--platforms/chibios/atomic_util.h (renamed from tmk_core/common/chibios/atomic_util.h)0
-rw-r--r--platforms/chibios/bootloader.c (renamed from tmk_core/common/chibios/bootloader.c)0
-rw-r--r--platforms/chibios/chibios_config.h (renamed from tmk_core/common/chibios/chibios_config.h)0
-rw-r--r--platforms/chibios/eeprom_stm32.c (renamed from tmk_core/common/chibios/eeprom_stm32.c)0
-rw-r--r--platforms/chibios/eeprom_stm32.h (renamed from tmk_core/common/chibios/eeprom_stm32.h)0
-rw-r--r--platforms/chibios/eeprom_stm32_defs.h (renamed from tmk_core/common/chibios/eeprom_stm32_defs.h)0
-rw-r--r--platforms/chibios/eeprom_teensy.c (renamed from tmk_core/common/chibios/eeprom_teensy.c)0
-rw-r--r--platforms/chibios/flash_stm32.c (renamed from tmk_core/common/chibios/flash_stm32.c)0
-rw-r--r--platforms/chibios/flash_stm32.h (renamed from tmk_core/common/chibios/flash_stm32.h)0
-rw-r--r--platforms/chibios/gd32v_compatibility.h (renamed from tmk_core/common/chibios/gd32v_compatibility.h)0
-rw-r--r--platforms/chibios/gpio.h (renamed from tmk_core/common/chibios/gpio.h)0
-rw-r--r--platforms/chibios/pin_defs.h (renamed from tmk_core/common/chibios/pin_defs.h)0
-rw-r--r--platforms/chibios/platform.c (renamed from tmk_core/common/chibios/platform.c)0
-rw-r--r--platforms/chibios/platform.mk (renamed from tmk_core/chibios.mk)0
-rw-r--r--platforms/chibios/platform_deps.h (renamed from tmk_core/common/chibios/platform_deps.h)0
-rw-r--r--platforms/chibios/sleep_led.c (renamed from tmk_core/common/chibios/sleep_led.c)0
-rw-r--r--platforms/chibios/suspend.c (renamed from tmk_core/common/chibios/suspend.c)0
-rw-r--r--platforms/chibios/syscall-fallbacks.c (renamed from tmk_core/common/chibios/syscall-fallbacks.c)0
-rw-r--r--platforms/chibios/timer.c (renamed from tmk_core/common/chibios/timer.c)0
-rw-r--r--platforms/chibios/wait.c (renamed from tmk_core/common/chibios/wait.c)0
-rw-r--r--platforms/common.mk12
-rw-r--r--platforms/eeprom.h (renamed from tmk_core/common/eeprom.h)0
-rw-r--r--platforms/gpio.h (renamed from tmk_core/common/gpio.h)0
-rw-r--r--platforms/pin_defs.h (renamed from tmk_core/common/pin_defs.h)0
-rw-r--r--platforms/progmem.h (renamed from tmk_core/common/progmem.h)0
-rw-r--r--platforms/sleep_led.h (renamed from tmk_core/common/sleep_led.h)0
-rw-r--r--platforms/suspend.h (renamed from tmk_core/common/suspend.h)0
-rw-r--r--platforms/test/_wait.h (renamed from tmk_core/common/test/_wait.h)0
-rw-r--r--platforms/test/bootloader.c (renamed from tmk_core/common/test/bootloader.c)0
-rw-r--r--platforms/test/eeprom.c (renamed from tmk_core/common/test/eeprom.c)0
-rw-r--r--platforms/test/eeprom_stm32_tests.cpp (renamed from tmk_core/common/test/eeprom_stm32_tests.cpp)0
-rw-r--r--platforms/test/flash_stm32_mock.c (renamed from tmk_core/common/test/flash_stm32_mock.c)0
-rw-r--r--platforms/test/hal.h (renamed from tmk_core/common/test/hal.h)0
-rw-r--r--platforms/test/platform.c (renamed from tmk_core/common/test/platform.c)0
-rw-r--r--platforms/test/platform.h (renamed from tmk_core/common/test/platform.h)0
-rw-r--r--platforms/test/platform.mk (renamed from tmk_core/native.mk)0
-rw-r--r--platforms/test/platform_deps.h (renamed from tmk_core/common/test/platform_deps.h)0
-rw-r--r--platforms/test/rules.mk (renamed from tmk_core/common/test/rules.mk)8
-rw-r--r--platforms/test/suspend.c (renamed from tmk_core/common/test/suspend.c)0
-rw-r--r--platforms/test/testlist.mk (renamed from tmk_core/common/test/testlist.mk)0
-rw-r--r--platforms/test/timer.c (renamed from tmk_core/common/test/timer.c)0
-rw-r--r--platforms/timer.h (renamed from tmk_core/common/timer.h)0
-rw-r--r--platforms/wait.h (renamed from tmk_core/common/wait.h)0
-rw-r--r--quantum/debounce/tests/rules.mk2
-rw-r--r--quantum/dynamic_keymap.c2
-rw-r--r--quantum/sequencer/tests/rules.mk2
-rw-r--r--quantum/via.c2
-rw-r--r--testlist.mk6
-rw-r--r--tmk_core/common.mk16
-rw-r--r--tmk_core/protocol.mk2
-rw-r--r--tmk_core/rules.mk2
107 files changed, 54 insertions, 54 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 36c628c7ce..c12aa0fce0 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -388,7 +388,7 @@ VPATH += $(COMMON_VPATH)
include common_features.mk
include $(BUILDDEFS_PATH)/generic_features.mk
include $(TMK_PATH)/protocol.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
include $(BUILDDEFS_PATH)/bootloader.mk
SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
@@ -404,13 +404,14 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
endif
endif
-include $(TMK_PATH)/$(PLATFORM_KEY).mk
+include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
+-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
+
ifneq ($(strip $(PROTOCOL)),)
include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
else
include $(TMK_PATH)/protocol/$(PLATFORM_KEY).mk
endif
--include $(TOP_DIR)/platforms/$(PLATFORM_KEY)/flash.mk
# TODO: remove this bodge?
PROJECT_DEFS := $(OPT_DEFS)
diff --git a/build_test.mk b/build_test.mk
index 6e4494d77f..3553125a04 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -54,11 +54,11 @@ endif
include common_features.mk
include $(BUILDDEFS_PATH)/generic_features.mk
-include $(TMK_PATH)/common.mk
+include $(PLATFORM_PATH)/common.mk
include $(TMK_PATH)/protocol.mk
include $(QUANTUM_PATH)/debounce/tests/rules.mk
include $(QUANTUM_PATH)/sequencer/tests/rules.mk
-include $(TMK_PATH)/common/test/rules.mk
+include $(PLATFORM_PATH)/test/rules.mk
ifneq ($(filter $(FULL_TESTS),$(TEST)),)
include build_full_test.mk
endif
@@ -73,7 +73,7 @@ $(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
$(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
-include $(TMK_PATH)/native.mk
+include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
include $(TMK_PATH)/rules.mk
diff --git a/common_features.mk b/common_features.mk
index 896fbb0129..8c593024f0 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -33,8 +33,10 @@ QUANTUM_SRC += \
VPATH += $(QUANTUM_DIR)/logging
# Fall back to lib/printf if there is no platform provided print
-ifeq ("$(wildcard $(TMK_PATH)/common/$(PLATFORM_KEY)/printf.mk)","")
+ifeq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk)","")
include $(QUANTUM_PATH)/logging/print.mk
+else
+ include $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk
endif
ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
diff --git a/docs/feature_layers.md b/docs/feature_layers.md
index 78d950dc49..e30c540a79 100644
--- a/docs/feature_layers.md
+++ b/docs/feature_layers.md
@@ -45,7 +45,7 @@ Once you have a good feel for how layers work and what you can do, you can get m
Layers stack on top of each other in numerical order. When determining what a keypress does, QMK scans the layers from the top down, stopping when it reaches the first active layer that is not set to `KC_TRNS`. As a result if you activate a layer that is numerically lower than your current layer, and your current layer (or another layer that is active and higher than your target layer) has something other than `KC_TRNS`, that is the key that will be sent, not the key on the layer you just activated. This is the cause of most people's "why doesn't my layer get switched" problem.
-Sometimes, you might want to switch between layers in a macro or as part of a tap dance routine. `layer_on` activates a layer, and `layer_off` deactivates it. More layer-related functions can be found in [action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/action_layer.h).
+Sometimes, you might want to switch between layers in a macro or as part of a tap dance routine. `layer_on` activates a layer, and `layer_off` deactivates it. More layer-related functions can be found in [action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/action_layer.h).
## Functions :id=functions
diff --git a/docs/fr-fr/faq_keymap.md b/docs/fr-fr/faq_keymap.md
index 374a005227..cc0700ab8e 100644
--- a/docs/fr-fr/faq_keymap.md
+++ b/docs/fr-fr/faq_keymap.md
@@ -6,7 +6,7 @@ Cette page couvre les questions souvent posées à propos des keymaps. Si vous n
Regardez [Keycodes](keycodes.md) pour une liste des keycodes disponibles. Certains keycodes spécifiques ont des documentations plus complètes de disponible.
-Les keycodes sont définies dans [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/keycode.h).
+Les keycodes sont définies dans [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
## Quels sont les keycodes par défaut ?
diff --git a/docs/internals_gpio_control.md b/docs/internals_gpio_control.md
index 21a3bd661e..ccd3f8c74d 100644
--- a/docs/internals_gpio_control.md
+++ b/docs/internals_gpio_control.md
@@ -4,7 +4,7 @@ QMK has a GPIO control abstraction layer which is microcontroller agnostic. This
## Functions :id=functions
-The following functions provide basic control of GPIOs and are found in `tmk_core/common/<platform>/gpio.h`.
+The following functions provide basic control of GPIOs and are found in `platforms/<platform>/gpio.h`.
|Function |Description | Old AVR Examples | Old ChibiOS/ARM Examples |
|------------------------|--------------------------------------------------|-------------------------------------------------|-------------------------------------------------|
diff --git a/docs/ja/faq_keymap.md b/docs/ja/faq_keymap.md
index fb44e316b7..59c7d206a1 100644
--- a/docs/ja/faq_keymap.md
+++ b/docs/ja/faq_keymap.md
@@ -10,7 +10,7 @@
## どのキーコードを使えますか?
あなたが利用可能なキーコードのインデックスについては、[キーコード](ja/keycodes.md)を見てください。より広範なドキュメントがある場合は、そこからリンクしてあります。
-キーコードは実際には [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/keycode.h) で定義されています。
+キーコードは実際には [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h) で定義されています。
## デフォルトのキーコードとは何か?
diff --git a/docs/ja/feature_layers.md b/docs/ja/feature_layers.md
index 011f0e0ef1..ca3e055835 100644
--- a/docs/ja/feature_layers.md
+++ b/docs/ja/feature_layers.md
@@ -50,7 +50,7 @@ QMK を使い始めたばかりの場合は、全てを単純にしたいでし
レイヤーは番号順に上に積み重なっています。キーの押下の動作を決定する時に、QMK は上から順にレイヤーを走査し、`KC_TRNS` に設定されていない最初のアクティブなレイヤーに到達すると停止します。結果として、現在のレイヤーよりも数値的に低いレイヤーをアクティブにし、現在のレイヤー(あるいはアクティブでターゲットレイヤーよりも高い別のレイヤー)に `KC_TRNS` 以外のものがある場合、それが送信されるキーであり、アクティブ化したばかりのレイヤー上のキーではありません。これが、ほとんどの人の "なぜレイヤーが切り替わらないのか" 問題の原因です。
-場合によっては、マクロ内あるいはタップダンスルーチンの一部としてレイヤーを切り替えほうが良いかもしれません。`layer_on` はレイヤーをアクティブにし、`layer_off` はそれを非アクティブにします。もっと多くのレイヤーに関する関数は、[action_layer.h](https://github.com/qmk/qmk_firmware/blob/master/tmk_core/common/action_layer.h) で見つけることができます。
+場合によっては、マクロ内あるいはタップダンスルーチンの一部としてレイヤーを切り替えほうが良いかもしれ