mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-03 16:35:10 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
46ce115e6f
@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#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 }
|
||||
|
||||
|
@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 2
|
||||
#define MATRIX_COLS 3
|
||||
|
@ -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!")
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user