mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-10-01 22:40:11 +02:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
@@ -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!")
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user