summaryrefslogtreecommitdiff
path: root/quantum/audio
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-07-25 12:17:15 +1000
committerNick Brassel <nick@tzarc.org>2021-07-25 12:17:15 +1000
commit4ec8764c70da13366f8cb7f8240e3124ea509da5 (patch)
treee5482bbd1f20e76a5b6dfa03a87d577c3e8d2ed7 /quantum/audio
parentfdf3ce3cd1bbf931660678b0b5e138ce37c84e7c (diff)
parentb69e7431aa2e22b4f4662c64e84ed242caac055e (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum/audio')
-rw-r--r--quantum/audio/luts.h10
-rw-r--r--quantum/audio/voices.h3
2 files changed, 2 insertions, 11 deletions
diff --git a/quantum/audio/luts.h b/quantum/audio/luts.h
index 74980b292e..8bb0454493 100644
--- a/quantum/audio/luts.h
+++ b/quantum/audio/luts.h
@@ -16,14 +16,8 @@
#pragma once
-#if defined(__AVR__)
-# include <avr/io.h>
-# include <avr/interrupt.h>
-# include <avr/pgmspace.h>
-#else
-# include <ch.h>
-# include <hal.h>
-#endif
+#include <float.h>
+#include <stdint.h>
#define VIBRATO_LUT_LENGTH 20
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 578350d337..1f402e7e12 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -18,9 +18,6 @@
#include <stdint.h>
#include <stdbool.h>
-#if defined(__AVR__)
-# include <avr/io.h>
-#endif
#include "wait.h"
#include "luts.h"