merging
This commit is contained in:
commit
e0ab1dcf4c
11 changed files with 64 additions and 56 deletions
|
@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "backlight.h"
|
||||
#include "keymap_midi.h"
|
||||
#include "bootloader.h"
|
||||
#include "eeconfig.h"
|
||||
|
||||
extern keymap_config_t keymap_config;
|
||||
|
||||
|
@ -33,15 +34,13 @@ extern keymap_config_t keymap_config;
|
|||
#include <inttypes.h>
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
|
||||
#ifndef TONE_GOODBYE
|
||||
#define TONE_GOODBYE { \
|
||||
{440.0*pow(2.0,(31)/12.0), 8}, \
|
||||
{440.0*pow(2.0,(24)/12.0), 8}, \
|
||||
{440.0*pow(2.0,(19)/12.0), 12}, \
|
||||
}
|
||||
#endif
|
||||
float tone_goodbye[][2] = TONE_GOODBYE;
|
||||
#endif
|
||||
#define TONE_GOODBYE OLKB_GOODBYE
|
||||
#endif /*! TONE_GOODBYE */
|
||||
|
||||
float tone_goodbye[][2] = SONG(TONE_GOODBYE);
|
||||
#endif /* AUDIO_ENABLE */
|
||||
|
||||
static action_t keycode_to_action(uint16_t keycode);
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#define WD_NOTE(n) WHOLE_DOT_NOTE(n)
|
||||
#define HD_NOTE(n) HALF_DOT_NOTE(n)
|
||||
#define QD_NOTE(n) QUARTER_DOT_NOTE(n)
|
||||
#define ED_NOTE(n) EIGTH_DOT_NOTE(n)
|
||||
#define ED_NOTE(n) EIGHTH_DOT_NOTE(n)
|
||||
#define SD_NOTE(n) SIXTEENTH_DOT_NOTE(n)
|
||||
|
||||
// Note Styles
|
||||
|
|
|
@ -15,4 +15,9 @@
|
|||
QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \
|
||||
H__NOTE(_FS5),
|
||||
|
||||
#endif
|
||||
#define OLKB_GOODBYE \
|
||||
E__NOTE(_E7), \
|
||||
E__NOTE(_A6), \
|
||||
ED_NOTE(_E6),
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue