Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot
2023-01-30 20:40:50 +00:00
4 changed files with 2 additions and 12 deletions
+1 -7
View File
@@ -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
View File
@@ -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