aboutsummaryrefslogtreecommitdiff
path: root/keyboards/adafruit
diff options
context:
space:
mode:
authorDrashna Jaelre <[email protected]>2024-03-06 03:02:37 -0800
committerGitHub <[email protected]>2024-03-06 22:02:37 +1100
commit83e6ddbbb4c8e715bfe419c4d7fc0ae305ea5bd5 (patch)
tree28fd4e4bbbb83fc41e3800c5b95369592c6e9942 /keyboards/adafruit
parent045e5c9729f22a8ab8a3f22fe9c0e6b51d1940fe (diff)
downloadqmk_firmware-83e6ddbbb4c8e715bfe419c4d7fc0ae305ea5bd5.tar.gz
qmk_firmware-83e6ddbbb4c8e715bfe419c4d7fc0ae305ea5bd5.zip
[Audio] Add support for audio shutdown pin (#22731)
Co-authored-by: Ryan <[email protected]>
Diffstat (limited to 'keyboards/adafruit')
-rw-r--r--keyboards/adafruit/macropad/config.h2
-rw-r--r--keyboards/adafruit/macropad/info.json5
-rw-r--r--keyboards/adafruit/macropad/macropad.c42
3 files changed, 5 insertions, 44 deletions
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 7f2e9ab6f9..725530a512 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -48,5 +48,3 @@
#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
#define AUDIO_INIT_DELAY
#define AUDIO_CLICKY
-
-#define SPEAKER_SHUTDOWN GP14
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 0facf7e0f6..295af78339 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -8,6 +8,11 @@
"pid": "0x0108",
"device_version": "0.0.1"
},
+ "audio": {
+ "power_control": {
+ "pin": "GP14"
+ }
+ },
"encoder": {
"rotary": [
{"pin_a": "GP18", "pin_b": "GP17"}
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
deleted file mode 100644
index 5c1d2ba593..0000000000
--- a/keyboards/adafruit/macropad/macropad.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef AUDIO_ENABLE
-void keyboard_pre_init_kb(void) {
- // ensure pin is set and enabled pre-audio init
- setPinOutput(SPEAKER_SHUTDOWN);
- writePinHigh(SPEAKER_SHUTDOWN);
- keyboard_pre_init_user();
-}
-
-void keyboard_post_init_kb(void) {
- // set pin based on active status
- writePin(SPEAKER_SHUTDOWN, audio_is_on());
- keyboard_post_init_user();
-}
-
-void audio_on_user(void) {
- writePinHigh(SPEAKER_SHUTDOWN);
-}
-
-void audio_off_user(void) {
- // needs a delay or it runs right after play note.
- wait_ms(200);
- writePinLow(SPEAKER_SHUTDOWN);
-}
-#endif