summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-30 20:40:12 +0000
committerGitHub <noreply@github.com>2023-01-30 20:40:12 +0000
commitd84a7351ea965010ea51a2c9410add0f4e0306de (patch)
tree1a7b7e70342324869934be544bbaf66f875cbd0f
parentf6dd8dea2e493dc549a60fee99de871c4088d09a (diff)
Strip out more of config_common (#19722)
-rwxr-xr-xkeyboards/baion_808/config.h2
-rw-r--r--keyboards/nullbitsco/scramble/v2/config.h2
-rw-r--r--quantum/config_common.h8
-rw-r--r--quantum/quantum.h2
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 <http://www.gnu.org/licenses/>.
17 17
18#pragma once 18#pragma once
19 19
20#include "config_common.h"
21
22#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 } 20#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
23#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 } 21#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8 }
24 22
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 <http://www.gnu.org/licenses/>.
19 19
20#pragma once 20#pragma once
21 21
22#include "config_common.h"
23
24/* key matrix size */ 22/* key matrix size */
25#define MATRIX_ROWS 2 23#define MATRIX_ROWS 2
26#define MATRIX_COLS 3 24#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 @@
16 16
17#pragma once 17#pragma once
18 18
19#ifndef __ASSEMBLER__ 19#pragma message("'config_common.h' should no longer be included!")
20# include "pin_defs.h"
21#endif
22
23#ifdef AUDIO_ENABLE
24# include "song_list.h"
25#endif
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 @@
42#include "bootmagic.h" 42#include "bootmagic.h"
43#include "timer.h" 43#include "timer.h"
44#include "sync_timer.h" 44#include "sync_timer.h"
45#include "config_common.h"
46#include "gpio.h" 45#include "gpio.h"
47#include "atomic_util.h" 46#include "atomic_util.h"
48#include "led.h" 47#include "led.h"
@@ -75,6 +74,7 @@ extern layer_state_t layer_state;
75#ifdef AUDIO_ENABLE 74#ifdef AUDIO_ENABLE
76# include "audio.h" 75# include "audio.h"
77# include "process_audio.h" 76# include "process_audio.h"
77# include "song_list.h"
78# ifdef AUDIO_CLICKY 78# ifdef AUDIO_CLICKY
79# include "process_clicky.h" 79# include "process_clicky.h"
80# endif 80# endif