From d84a7351ea965010ea51a2c9410add0f4e0306de Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 30 Jan 2023 20:40:12 +0000 Subject: Strip out more of config_common (#19722) --- keyboards/baion_808/config.h | 2 -- keyboards/nullbitsco/scramble/v2/config.h | 2 -- quantum/config_common.h | 8 +------- quantum/quantum.h | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/keyboards/baion_808/config.h b/keyboards/baion_808/config.h index f3fe8ae799..df4e9c1a25 100755 --- a/keyboards/baion_808/config.h +++ b/keyboards/baion_808/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - #define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 } #define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 } diff --git a/keyboards/nullbitsco/scramble/v2/config.h b/keyboards/nullbitsco/scramble/v2/config.h index a2eb9712f9..83e44e6f47 100644 --- a/keyboards/nullbitsco/scramble/v2/config.h +++ b/keyboards/nullbitsco/scramble/v2/config.h @@ -19,8 +19,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 3 diff --git a/quantum/config_common.h b/quantum/config_common.h index 18560f3a07..6c70b00b53 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h @@ -16,10 +16,4 @@ #pragma once -#ifndef __ASSEMBLER__ -# include "pin_defs.h" -#endif - -#ifdef AUDIO_ENABLE -# include "song_list.h" -#endif +#pragma message("'config_common.h' should no longer be included!") diff --git a/quantum/quantum.h b/quantum/quantum.h index c8dfdeca75..615ec2382c 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -42,7 +42,6 @@ #include "bootmagic.h" #include "timer.h" #include "sync_timer.h" -#include "config_common.h" #include "gpio.h" #include "atomic_util.h" #include "led.h" @@ -75,6 +74,7 @@ extern layer_state_t layer_state; #ifdef AUDIO_ENABLE # include "audio.h" # include "process_audio.h" +# include "song_list.h" # ifdef AUDIO_CLICKY # include "process_clicky.h" # endif -- cgit v1.2.3