merge from master

This commit is contained in:
Jack Humbert 2018-05-10 15:01:26 -04:00
commit 4a1984d33e
786 changed files with 41749 additions and 6638 deletions

View file

@ -54,6 +54,10 @@ void music_mode_cycle(void);
void matrix_scan_music(void);
bool music_mask(uint16_t keycode);
bool music_mask_kb(uint16_t keycode);
bool music_mask_user(uint16_t keycode);
#ifndef SCALE
#define SCALE (int8_t []){ 0 + (12*0), 2 + (12*0), 4 + (12*0), 5 + (12*0), 7 + (12*0), 9 + (12*0), 11 + (12*0), \
0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \