diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2022-07-13 11:05:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 11:05:47 +0900 |
| commit | d3c3625aaf4dc93159f1a4180c85224c318db208 (patch) | |
| tree | cfc795f6882f66880450a6dec8a5985267487d6a | |
| parent | 764ac89d8db728175996ffb1830895d3b9fd83c8 (diff) | |
feat: new startup / reset chimes (#352)
* feat: new startup / reset chimes
* Remove sound defines in default keymap
* fix: check for startup/goodbye song definition
* fix: move chimes definition to keyboard's post_config.h
Co-authored-by: Drashna Jael're <drashna@live.com>
| -rw-r--r-- | keyboards/moonlander/config.h | 1 | ||||
| -rw-r--r-- | keyboards/moonlander/keymaps/default/config.h | 1 | ||||
| -rw-r--r-- | keyboards/moonlander/post_config.h | 9 | ||||
| -rw-r--r-- | keyboards/planck/ez/config.h | 1 | ||||
| -rw-r--r-- | keyboards/planck/ez/post_config.h | 10 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/default/config.h | 3 |
6 files changed, 21 insertions, 4 deletions
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h index 1e29f81e8f..5951a485d3 100644 --- a/keyboards/moonlander/config.h +++ b/keyboards/moonlander/config.h @@ -166,3 +166,4 @@ #define AUDIO_INIT_DELAY #define TAPPING_TOGGLE 1 + diff --git a/keyboards/moonlander/keymaps/default/config.h b/keyboards/moonlander/keymaps/default/config.h index 1d19dd2632..83ea2a1b58 100644 --- a/keyboards/moonlander/keymaps/default/config.h +++ b/keyboards/moonlander/keymaps/default/config.h @@ -19,4 +19,3 @@ #pragma once #define ORYX_CONFIGURATOR -#define STARTUP_SONG SONG(ODE_TO_JOY) diff --git a/keyboards/moonlander/post_config.h b/keyboards/moonlander/post_config.h new file mode 100644 index 0000000000..d594c93413 --- /dev/null +++ b/keyboards/moonlander/post_config.h @@ -0,0 +1,9 @@ +#ifdef AUDIO_ENABLE +#ifndef STARTUP_SONG +# define STARTUP_SONG SONG(E__NOTE(_DS5), E__NOTE(_D5), E__NOTE(_AS4), Q__NOTE(_F5)) +#endif + +#ifndef GOODBYE_SONG +# define GOODBYE_SONG SONG(E__NOTE(_D5), E__NOTE(_F5), E__NOTE(_C5), Q__NOTE(_AS4)) +#endif +#endif diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 9a75030e10..a79f49aa38 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -181,3 +181,4 @@ #define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX + diff --git a/keyboards/planck/ez/post_config.h b/keyboards/planck/ez/post_config.h new file mode 100644 index 0000000000..52d84d8218 --- /dev/null +++ b/keyboards/planck/ez/post_config.h @@ -0,0 +1,10 @@ +#ifdef AUDIO_ENABLE +#ifndef STARTUP_SONG +# define STARTUP_SONG SONG(E__NOTE(_DS5), E__NOTE(_D5), E__NOTE(_AS4), Q__NOTE(_F5)) +#endif + +#ifndef GOODBYE_SONG +# define GOODBYE_SONG SONG(E__NOTE(_D5), E__NOTE(_F5), E__NOTE(_C5), Q__NOTE(_AS4)) +#endif +#endif + diff --git a/keyboards/planck/keymaps/default/config.h b/keyboards/planck/keymaps/default/config.h index 464b7b29f8..cf27a1d4b1 100644 --- a/keyboards/planck/keymaps/default/config.h +++ b/keyboards/planck/keymaps/default/config.h @@ -17,9 +17,6 @@ #pragma once #ifdef AUDIO_ENABLE -# define STARTUP_SONG SONG(PLANCK_SOUND) -// #define STARTUP_SONG SONG(NO_SOUND) - # define DEFAULT_LAYER_SONGS \ { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) } #endif |