From 99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 7 Feb 2021 23:16:15 +0000 Subject: [PATCH] Migrate some tmk_core files to quantum (#11791) * Migrate some tmk_core files to quantum * Fix build errors --- common_features.mk | 6 ++++ keyboards/ai03/orbit/matrix.h | 3 -- keyboards/ai03/orbit/transport.h | 2 +- tmk_core/common/util.c => quantum/bitwise.c | 0 tmk_core/common/util.h => quantum/bitwise.h | 7 ---- {tmk_core/common => quantum}/command.c | 0 {tmk_core/common => quantum}/command.h | 0 {tmk_core/common => quantum}/led.h | 0 {tmk_core/common => quantum}/matrix.h | 0 {tmk_core => quantum}/ring_buffer.h | 11 +++---- quantum/split_common/transport.h | 2 +- .../converter/adb_usb/led.h => quantum/util.h | 33 +++++-------------- tmk_core/common.mk | 6 ---- tmk_core/protocol/arm_atsam/md_rgb_matrix.c | 2 +- 14 files changed, 22 insertions(+), 50 deletions(-) delete mode 100644 keyboards/ai03/orbit/matrix.h rename tmk_core/common/util.c => quantum/bitwise.c (100%) rename tmk_core/common/util.h => quantum/bitwise.h (88%) rename {tmk_core/common => quantum}/command.c (100%) rename {tmk_core/common => quantum}/command.h (100%) rename {tmk_core/common => quantum}/led.h (100%) rename {tmk_core/common => quantum}/matrix.h (100%) rename {tmk_core => quantum}/ring_buffer.h (85%) rename keyboards/converter/adb_usb/led.h => quantum/util.h (60%) diff --git a/common_features.mk b/common_features.mk index b9cd084d293..f98a788ca2a 100644 --- a/common_features.mk +++ b/common_features.mk @@ -17,6 +17,7 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link QUANTUM_SRC += \ $(QUANTUM_DIR)/quantum.c \ + $(QUANTUM_DIR)/bitwise.c \ $(QUANTUM_DIR)/led.c \ $(QUANTUM_DIR)/keymap_common.c \ $(QUANTUM_DIR)/keycode_config.c @@ -36,6 +37,11 @@ ifeq ($(strip $(API_SYSEX_ENABLE)), yes) SRC += $(QUANTUM_DIR)/api.c endif +ifeq ($(strip $(COMMAND_ENABLE)), yes) + SRC += $(QUANTUM_DIR)/command.c + OPT_DEFS += -DCOMMAND_ENABLE +endif + ifeq ($(strip $(AUDIO_ENABLE)), yes) OPT_DEFS += -DAUDIO_ENABLE MUSIC_ENABLE = yes diff --git a/keyboards/ai03/orbit/matrix.h b/keyboards/ai03/orbit/matrix.h deleted file mode 100644 index 664372b7699..00000000000 --- a/keyboards/ai03/orbit/matrix.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "common/matrix.h" diff --git a/keyboards/ai03/orbit/transport.h b/keyboards/ai03/orbit/transport.h index 67597652fdb..757eae6f5c4 100644 --- a/keyboards/ai03/orbit/transport.h +++ b/keyboards/ai03/orbit/transport.h @@ -1,6 +1,6 @@ #pragma once -#include "common/matrix.h" +#include "matrix.h" #define ROWS_PER_HAND (MATRIX_ROWS/2) diff --git a/tmk_core/common/util.c b/quantum/bitwise.c similarity index 100% rename from tmk_core/common/util.c rename to quantum/bitwise.c diff --git a/tmk_core/common/util.h b/quantum/bitwise.h similarity index 88% rename from tmk_core/common/util.h rename to quantum/bitwise.h index db57f268c30..276bc7437b3 100644 --- a/tmk_core/common/util.h +++ b/quantum/bitwise.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include -// convert to L string -#define LSTR(s) XLSTR(s) -#define XLSTR(s) L## #s -// convert to string -#define STR(s) XSTR(s) -#define XSTR(s) #s - #ifdef __cplusplus extern "C" { #endif diff --git a/tmk_core/common/command.c b/quantum/command.c similarity index 100% rename from tmk_core/common/command.c rename to quantum/command.c diff --git a/tmk_core/common/command.h b/quantum/command.h similarity index 100% rename from tmk_core/common/command.h rename to quantum/command.h diff --git a/tmk_core/common/led.h b/quantum/led.h similarity index 100% rename from tmk_core/common/led.h rename to quantum/led.h diff --git a/tmk_core/common/matrix.h b/quantum/matrix.h similarity index 100% rename from tmk_core/common/matrix.h rename to quantum/matrix.h diff --git a/tmk_core/ring_buffer.h b/quantum/ring_buffer.h similarity index 85% rename from tmk_core/ring_buffer.h rename to quantum/ring_buffer.h index 8f887c8f74a..284745ca8e0 100644 --- a/tmk_core/ring_buffer.h +++ b/quantum/ring_buffer.h @@ -1,14 +1,13 @@ #pragma once -/*-------------------------------------------------------------------- - * Ring buffer to store scan codes from keyboard - *------------------------------------------------------------------*/ -#ifndef RBUF_SIZE -# define RBUF_SIZE 32 -#endif #include #include #include + +#ifndef RBUF_SIZE +# define RBUF_SIZE 32 +#endif + static uint8_t rbuf[RBUF_SIZE]; static uint8_t rbuf_head = 0; static uint8_t rbuf_tail = 0; diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index f3e752bf9bf..c667bfab853 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h @@ -1,6 +1,6 @@ #pragma once -#include "common/matrix.h" +#include "matrix.h" void transport_master_init(void); void transport_slave_init(void); diff --git a/keyboards/converter/adb_usb/led.h b/quantum/util.h similarity index 60% rename from keyboards/converter/adb_usb/led.h rename to quantum/util.h index b33b6894e51..bef3b9abe36 100644 --- a/keyboards/converter/adb_usb/led.h +++ b/quantum/util.h @@ -13,31 +13,14 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -Ported to QMK by Peter Roe */ +#pragma once -#ifndef LED_H -#define LED_H -#include +#include "bitwise.h" - -/* keyboard LEDs */ -#define USB_LED_NUM_LOCK 0 -#define USB_LED_CAPS_LOCK 1 -#define USB_LED_SCROLL_LOCK 2 -#define USB_LED_COMPOSE 3 -#define USB_LED_KANA 4 - - -#ifdef __cplusplus -extern "C" { -#endif - -void led_set(uint8_t usb_led); - -#ifdef __cplusplus -} -#endif - -#endif +// convert to L string +#define LSTR(s) XLSTR(s) +#define XLSTR(s) L## #s +// convert to string +#define STR(s) XSTR(s) +#define XSTR(s) #s diff --git a/tmk_core/common.mk b/tmk_core/common.mk index fdf2aa09727..55af71ed6fa 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -13,7 +13,6 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/print.c \ $(COMMON_DIR)/debug.c \ $(COMMON_DIR)/sendchar_null.c \ - $(COMMON_DIR)/util.c \ $(COMMON_DIR)/eeconfig.c \ $(COMMON_DIR)/report.c \ $(PLATFORM_COMMON_DIR)/suspend.c \ @@ -93,11 +92,6 @@ else TMK_COMMON_DEFS += -DNO_DEBUG endif -ifeq ($(strip $(COMMAND_ENABLE)), yes) - TMK_COMMON_SRC += $(COMMON_DIR)/command.c - TMK_COMMON_DEFS += -DCOMMAND_ENABLE -endif - ifeq ($(strip $(NKRO_ENABLE)), yes) ifeq ($(PROTOCOL), VUSB) $(info NKRO is not currently supported on V-USB, and has been disabled.) diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c index 439aaf8b380..0ea7e383955 100644 --- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c +++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include "arm_atsam_protocol.h" -#include "tmk_core/common/led.h" +#include "led.h" #include "rgb_matrix.h" #include #include