Merge branch 'master' of github.com:qmk/qmk_firmware into planck_rev6

This commit is contained in:
Jack Humbert 2018-04-03 21:00:22 -04:00
commit 03b1904b2e
480 changed files with 22956 additions and 2346 deletions

View file

@ -188,7 +188,14 @@
Q__NOTE(_B5 ), \
Q__NOTE(_CS6), \
Q__NOTE(_D6 ), \
Q__NOTE(_E6 ),
Q__NOTE(_E6 ),
#define MINOR_SOUND \
Q__NOTE(_A5 ), \
Q__NOTE(_B5 ), \
Q__NOTE(_C6 ), \
Q__NOTE(_D6 ), \
Q__NOTE(_E6 ),
#define GUITAR_SOUND \
Q__NOTE(_E5 ), \
@ -272,12 +279,142 @@
HD_NOTE(_C6),
#define ZELDA_TREASURE \
Q__NOTE(_A4), \
Q__NOTE(_A4 ), \
Q__NOTE(_AS4), \
Q__NOTE(_B4), \
HD_NOTE(_C5), \
Q__NOTE(_B4 ), \
HD_NOTE(_C5 ), \
#define TERMINAL_SOUND \
E__NOTE(_C5 )
#define OVERWATCH_THEME \
HD_NOTE(_A4 ), \
Q__NOTE(_E4 ), \
Q__NOTE(_A4 ), \
HD_NOTE(_B4 ), \
Q__NOTE(_E4 ), \
Q__NOTE(_B4 ), \
W__NOTE(_CS5),
#define MARIO_THEME \
Q__NOTE(_E5), \
H__NOTE(_E5), \
H__NOTE(_E5), \
Q__NOTE(_C5), \
H__NOTE(_E5), \
W__NOTE(_G5), \
Q__NOTE(_G4),
#define MARIO_GAMEOVER \
HD_NOTE(_C5 ), \
HD_NOTE(_G4 ), \
H__NOTE(_E4 ), \
H__NOTE(_A4 ), \
H__NOTE(_B4 ), \
H__NOTE(_A4 ), \
H__NOTE(_AF4), \
H__NOTE(_BF4), \
H__NOTE(_AF4), \
WD_NOTE(_G4 ),
#define E1M1_DOOM \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_D4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_C4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_BF3), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_B3 ), \
Q__NOTE(_C4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_D4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_C4 ), \
Q__NOTE(_E3 ), \
Q__NOTE(_E3 ), \
H__NOTE(_BF3),
#define DISNEY_SONG \
H__NOTE(_G3 ), \
H__NOTE(_G4 ), \
H__NOTE(_F4 ), \
H__NOTE(_E4 ), \
H__NOTE(_CS4), \
H__NOTE(_D4 ), \
W__NOTE(_A4 ), \
H__NOTE(_B3 ), \
H__NOTE(_B4 ), \
H__NOTE(_A4 ), \
H__NOTE(_G4 ), \
H__NOTE(_FS4), \
H__NOTE(_G4 ), \
W__NOTE(_C5 ), \
H__NOTE(_D5 ), \
H__NOTE(_C5 ), \
H__NOTE(_B4 ), \
H__NOTE(_A4 ), \
H__NOTE(_G4 ), \
H__NOTE(_F4 ), \
H__NOTE(_E4 ), \
H__NOTE(_D4 ), \
W__NOTE(_A4 ), \
W__NOTE(_B3 ), \
W__NOTE(_C4 ),
#define NUMBER_ONE \
HD_NOTE(_F4 ), \
Q__NOTE(_C5 ), \
E__NOTE(_B4 ), \
E__NOTE(_C5 ), \
E__NOTE(_B4 ), \
E__NOTE(_C5 ), \
Q__NOTE(_B4 ), \
Q__NOTE(_C5 ), \
H__NOTE(_AF4), \
HD_NOTE(_F4 ), \
Q__NOTE(_F4 ), \
Q__NOTE(_AF4), \
Q__NOTE(_C5 ), \
H__NOTE(_DF5), \
H__NOTE(_AF4), \
H__NOTE(_DF5), \
H__NOTE(_EF5), \
Q__NOTE(_C5 ), \
Q__NOTE(_DF5), \
Q__NOTE(_C5 ), \
Q__NOTE(_DF5), \
H__NOTE(_C5 ),
#define CABBAGE_SONG \
H__NOTE(_C4), \
H__NOTE(_A4), \
H__NOTE(_B4), \
H__NOTE(_B4), \
H__NOTE(_A4), \
H__NOTE(_G4), \
H__NOTE(_E4),
#define OLD_SPICE \
Q__NOTE(_A4 ), \
Q__NOTE(_A4 ), \
H__NOTE(_B4 ), \
H__NOTE(_D5 ), \
H__NOTE(_CS5), \
Q__NOTE(_E5 ), \
H__NOTE(_FS5), \
H__NOTE(_D5 ), \
#endif