aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-24 11:56:53 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-24 11:56:53 -0400
commit287eb7ad148abc8fe3fb014218d71e205fd9131d (patch)
tree59e800a739797cb86d9345d01f73fceee4c32030
parent1ae6011cef2230826a9e6db6c5b638677bc640b7 (diff)
downloadqmk_firmware-287eb7ad148abc8fe3fb014218d71e205fd9131d.tar.gz
qmk_firmware-287eb7ad148abc8fe3fb014218d71e205fd9131d.zip
Converted audio play functions to *_user (#349)
* Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * Added music and audio toggles to Quantum.c * Redid the audio callbacks * Adjusted default planck layout to use the user tone naming * tabs to spaces * Rewrote the ALL recipe to allow for faster parallel make * tabs to spaces * Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around. * Tweaked pvc atomic layout to work with the pvc planck. * updates midi scale calling
Diffstat
-rw-r--r--keyboard/atomic/keymaps/pvc/keymap.c41
-rw-r--r--keyboard/planck/keymaps/default/keymap.c43
-rw-r--r--keyboard/planck/keymaps/pvc/config.h2
-rw-r--r--keyboard/planck/keymaps/pvc/keymap.c291
-rw-r--r--quantum/audio/audio.c17
-rw-r--r--quantum/audio/audio.h6
-rw-r--r--quantum/keymap_common.c3
-rw-r--r--quantum/quantum.c69
-rw-r--r--quantum/quantum.h4
-rw-r--r--tmk_core/common/command.c13
-rw-r--r--tmk_core/rules.mk8
11 files changed, 215 insertions, 282 deletions
diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index 8431654d7..f16ec8a6e 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -62,8 +62,6 @@
62#define M_BDFLT M(MACRO_BREATH_DEFAULT) 62#define M_BDFLT M(MACRO_BREATH_DEFAULT)
63 63
64 64
65//#define MU_TOG M(MACRO_MUSIC_TOGGLE)
66//#define AU_TOG M(MACRO_AUDIO_TOGGLE)
67#define VC_UP M(MACRO_INC_VOICE) 65#define VC_UP M(MACRO_INC_VOICE)
68#define VC_DOWN M(MACRO_DEC_VOICE) 66#define VC_DOWN M(MACRO_DEC_VOICE)
69 67
@@ -156,11 +154,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
156 154
157/* UPPER 155/* UPPER
158 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------. 156 * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
159 * | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | - | NUM LK | SCR LK | XXXXXX . PAUSE | 157 * | PRINT | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | NUM LK | / | * | | NUM LK | SCR LK | XXXXXX . PAUSE |
160 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 158 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
161 * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | + | ~ | | | INS | 159 * | | F1 | F2 | F3 | F4 | | | 7 | 8 | 9 | - | | | | INS |
162 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------| 160 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ------------+--------|
163 * | CAP LK | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | ` | XXXXXX . | HOME | 161 * | CAP LK | F5 | F6 | F7 | F8 | | | 4 | 5 | 6 | + | | XXXXXX . | HOME |
164 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------| 162 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+- 2u ---------------------+--------|
165 * | | F9 | F10 | F11 | F12 | | | 1 | 2 | 3 | ENTER | XXXXXX . | | END | 163 * | | F9 | F10 | F11 | F12 | | | 1 | 2 | 3 | ENTER | XXXXXX . | | END |
166 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------| 164 * |--------+--------+--------+--------+--------+- 2u ------------+--------+--------+--------+--------+-----------------+--------+--------|
@@ -498,31 +496,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
498 496
499#ifdef AUDIO_ENABLE 497#ifdef AUDIO_ENABLE
500 498
501/*
502bool process_action_user(keyrecord_t *record)
503{
504
505 uint8_t starting_note = 0x0C;
506 int offset = 7;
507
508 if (IS_LAYER_ON(LAYER_MUSIC))
509 {
510 if (record->event.pressed)
511 {
512 play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
513 }
514 else
515 {
516 stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
517 }
518 }
519}
520*/
521
522void matrix_init_user(void) 499void matrix_init_user(void)
523{ 500{
524 set_voice(default_voice); 501 set_voice(default_voice);
525 play_startup_tone(); 502 startup_user();
526 println("Matrix Init"); 503 println("Matrix Init");
527} 504}
528 505
@@ -570,30 +547,30 @@ void led_set_user(uint8_t usb_led)
570} 547}
571 548
572 549
573void play_startup_tone() 550void startup_user()
574{ 551{
575 _delay_ms(10); // gets rid of tick 552 _delay_ms(10); // gets rid of tick
576 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); 553 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
577} 554}
578 555
579void play_goodbye_tone() 556void shutdown_user()
580{ 557{
581 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); 558 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
582 _delay_ms(2000); 559 _delay_ms(2000);
583 stop_all_notes(); 560 stop_all_notes();
584} 561}
585 562
586void play_audio_on_tone(void) 563void audio_on_user(void)
587{ 564{
588 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); 565 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
589} 566}
590 567
591void play_music_on_tone(void) 568void music_on_user(void)
592{ 569{
593 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); 570 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
594} 571}
595 572
596void play_music_scale(void) 573void music_scale_user(void)
597{ 574{
598 PLAY_NOTE_ARRAY(music_scale, false, STACCATO); 575 PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
599} 576}
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index 36d496416..3d6289817 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -174,21 +174,16 @@ const uint16_t PROGMEM fn_actions[] = {
174}; 174};
175 175
176#ifdef AUDIO_ENABLE 176#ifdef AUDIO_ENABLE
177float tone_startup[][2] = {
178 {440.0*pow(2.0,(31)/12.0), 12},
179 {440.0*pow(2.0,(28)/12.0), 8},
180 {440.0*pow(2.0,(19)/12.0), 8},
181 {440.0*pow(2.0,(24)/12.0), 8},
182 {440.0*pow(2.0,(28)/12.0), 20}
183};
184 177
178float tone_startup[][2] = SONG(STARTUP_SOUND);
185float tone_qwerty[][2] = SONG(QWERTY_SOUND); 179float tone_qwerty[][2] = SONG(QWERTY_SOUND);
186float tone_dvorak[][2] = SONG(DVORAK_SOUND); 180float tone_dvorak[][2] = SONG(DVORAK_SOUND);
187float tone_colemak[][2] = SONG(COLEMAK_SOUND); 181float tone_colemak[][2] = SONG(COLEMAK_SOUND);
188float tone_plover[][2] = SONG(PLOVER_SOUND); 182float tone_plover[][2] = SONG(PLOVER_SOUND);
189float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); 183float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
184float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
190 185
191float goodbye[][2] = SONG(GOODBYE_SOUND); 186float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
192#endif 187#endif
193 188
194 189
@@ -288,16 +283,34 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
288}; 283};
289 284
290void matrix_init_user(void) { 285void matrix_init_user(void) {
291 #ifdef AUDIO_ENABLE 286 #ifdef AUDIO_ENABLE
292 _delay_ms(20); // stops the tick 287 startup_user();
293 PLAY_NOTE_ARRAY(tone_startup, false, 0); 288 #endif
294 #endif
295} 289}
296 290
297#ifdef AUDIO_ENABLE 291#ifdef AUDIO_ENABLE
298void play_goodbye_tone() 292
293void startup_user()
294{
295 _delay_ms(20); // gets rid of tick
296 PLAY_NOTE_ARRAY(tone_startup, false, 0);
297}
298
299void shutdown_user()
299{ 300{
300 PLAY_NOTE_ARRAY(goodbye, false, 0); 301 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
301 _delay_ms(150); 302 _delay_ms(150);
303 stop_all_notes();
302} 304}
305
306void music_on_user(void)
307{
308 music_scale_user();
309}
310
311void music_scale_user(void)
312{
313 PLAY_NOTE_ARRAY(music_scale, false, 0);
314}
315
303#endif 316#endif
diff --git a/keyboard/planck/keymaps/pvc/config.h b/keyboard/planck/keymaps/pvc/config.h
index b8960038a..b64893108 100644
--- a/keyboard/planck/keymaps/pvc/config.h
+++ b/keyboard/planck/keymaps/pvc/config.h
@@ -74,7 +74,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74 */ 74 */
75 75
76/* disable debug print */ 76/* disable debug print */
77#define NO_DEBUG 77//#define NO_DEBUG
78 78
79/* disable print */ 79/* disable print */
80//#define NO_PRINT 80//#define NO_PRINT
diff --git a/keyboard/planck/keymaps/pvc/keymap.c b/keyboard/planck/keymaps/pvc/keymap.c
index 177f04484..2fc5f0da1 100644
--- a/keyboard/planck/keymaps/pvc/keymap.c
+++ b/keyboard/planck/keymaps/pvc/keymap.c
@@ -8,43 +8,44 @@
8 #include "song_list.h" 8 #include "song_list.h"
9#endif 9#endif
10 10
11#define LAYER_QWERTY 0 11#define LAYER_QWERTY 0
12#define LAYER_COLEMAK 1 12#define LAYER_COLEMAK 1
13#define LAYER_DVORAK 2 13#define LAYER_DVORAK 2
14#define LAYER_LOWER 3 14#define LAYER_UPPER 3
15#define LAYER_RAISE 4 15#define LAYER_LOWER 4
16#define LAYER_FUNCTION 5 16#define LAYER_FUNCTION 5
17#define LAYER_MOUSE 6 17#define LAYER_MOUSE 6
18#define LAYER_MUSIC 7 18#define LAYER_ADJUST 7
19#define LAYER_ADJUST 8 19
20 20#define MACRO_QWERTY 0
21#define MACRO_QWERTY 0 21#define MACRO_COLEMAK 1
22#define MACRO_COLEMAK 1 22#define MACRO_DVORAK 2
23#define MACRO_DVORAK 2 23#define MACRO_UPPER 3
24#define MACRO_LOWER 3 24#define MACRO_LOWER 4
25#define MACRO_RAISE 4 25#define MACRO_FUNCTION 5
26#define MACRO_FUNCTION 5 26#define MACRO_MOUSE 6
27#define MACRO_MOUSE 6 27#define MACRO_TIMBRE_1 7
28#define MACRO_TIMBRE_1 7 28#define MACRO_TIMBRE_2 8
29#define MACRO_TIMBRE_2 8 29#define MACRO_TIMBRE_3 9
30#define MACRO_TIMBRE_3 9 30#define MACRO_TIMBRE_4 10
31#define MACRO_TIMBRE_4 10 31#define MACRO_TEMPO_U 11
32#define MACRO_TEMPO_U 11 32#define MACRO_TEMPO_D 12
33#define MACRO_TEMPO_D 12 33#define MACRO_TONE_DEFAULT 13
34#define MACRO_TONE_DEFAULT 13 34#define MACRO_MUSIC_TOGGLE 14
35#define MACRO_MUSIC_ON 14 35#define MACRO_AUDIO_TOGGLE 16
36#define MACRO_MUSIC_OFF 15 36#define MACRO_INC_VOICE 18
37#define MACRO_AUDIO_ON 16 37#define MACRO_DEC_VOICE 19
38#define MACRO_AUDIO_OFF 17 38#define MACRO_BACKLIGHT 20
39#define MACRO_INC_VOICE 18 39#define MACRO_BREATH_TOGGLE 21
40#define MACRO_DEC_VOICE 19 40#define MACRO_BREATH_SPEED_INC 23
41#define MACRO_BACKLIGHT 20 41#define MACRO_BREATH_SPEED_DEC 24
42#define MACRO_BREATH_DEFAULT 25
42 43
43#define M_QWRTY M(MACRO_QWERTY) 44#define M_QWRTY M(MACRO_QWERTY)
44#define M_COLMK M(MACRO_COLEMAK) 45#define M_COLMK M(MACRO_COLEMAK)
45#define M_DVORK M(MACRO_DVORAK) 46#define M_DVORK M(MACRO_DVORAK)
47#define M_UPPER M(MACRO_UPPER)
46#define M_LOWER M(MACRO_LOWER) 48#define M_LOWER M(MACRO_LOWER)
47#define M_RAISE M(MACRO_RAISE)
48#define M_FUNCT M(MACRO_FUNCTION) 49#define M_FUNCT M(MACRO_FUNCTION)
49#define M_MOUSE M(MACRO_MOUSE) 50#define M_MOUSE M(MACRO_MOUSE)
50#define TIMBR_1 M(MACRO_TIMBRE_1) 51#define TIMBR_1 M(MACRO_TIMBRE_1)
@@ -55,12 +56,12 @@
55#define TMPO_DN M(MACRO_TEMPO_D) 56#define TMPO_DN M(MACRO_TEMPO_D)
56#define TMPO_DF M(MACRO_TONE_DEFAULT) 57#define TMPO_DF M(MACRO_TONE_DEFAULT)
57#define M_BACKL M(MACRO_BACKLIGHT) 58#define M_BACKL M(MACRO_BACKLIGHT)
59#define M_BRTOG M(MACRO_BREATH_TOGGLE)
60#define M_BSPDU M(MACRO_BREATH_SPEED_INC)
61#define M_BSPDD M(MACRO_BREATH_SPEED_DEC)
62#define M_BDFLT M(MACRO_BREATH_DEFAULT)
58 63
59 64
60#define MUS_ON M(MACRO_MUSIC_ON)
61#define MUS_OFF M(MACRO_MUSIC_OFF)
62#define AUD_OFF M(MACRO_AUDIO_OFF)
63#define AUD_ON M(MACRO_AUDIO_ON)
64#define VC_UP M(MACRO_INC_VOICE) 65#define VC_UP M(MACRO_INC_VOICE)
65#define VC_DOWN M(MACRO_DEC_VOICE) 66#define VC_DOWN M(MACRO_DEC_VOICE)
66 67
@@ -76,6 +77,7 @@
76#define SC_ACLS LALT(KC_F4) 77#define SC_ACLS LALT(KC_F4)
77#define SC_CCLS LCTL(KC_F4) 78#define SC_CCLS LCTL(KC_F4)
78 79
80#define OS_SHFT KC_FN0
79 81
80#define _______ KC_TRNS 82#define _______ KC_TRNS
81#define XXXXXXX KC_NO 83#define XXXXXXX KC_NO
@@ -90,17 +92,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
90 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 92 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
91 * | ESC | A | S | D | F | G | H | J | K | L | ; | ' | 93 * | ESC | A | S | D | F | G | H | J | K | L | ; | ' |
92 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 94 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
93 * | LSHIFT | Z | X | C | V | B | N | M | , | . | / | ENTER | 95 * | LSHIFT | Z | X | C | V | B | N | M | , | . | UP | ENTER |
94 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 96 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
95 * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | 97 * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | SHIFT | LEFT | DOWN | RIGHT |
96 * '-----------------------------------------------------------------------------------------------------------' 98 * '-----------------------------------------------------------------------------------------------------------'
97 */ 99 */
98 100
99 [LAYER_QWERTY] = { /* QWERTY */ 101 [LAYER_QWERTY] = { // QWERTY
100 { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC }, 102 { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC },
101 { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT }, 103 { KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT },
102 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, 104 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT },
103 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, 105 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT },
104 }, 106 },
105 107
106/* COLEMAK 108/* COLEMAK
@@ -109,77 +111,77 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
109 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 111 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
110 * | BACKSP | A | R | S | T | D | H | N | E | I | O | ' | 112 * | BACKSP | A | R | S | T | D | H | N | E | I | O | ' |
111 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 113 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
112 * | LSHIFT | Z | X | C | V | B | K | M | , | . | / | ENTER | 114 * | LSHIFT | Z | X | C | V | B | K | M | , | . | UP | ENTER |
113 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 115 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
114 * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | 116 * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | SHIFT | LEFT | DOWN | RIGHT |
115 * '-----------------------------------------------------------------------------------------------------------' 117 * '-----------------------------------------------------------------------------------------------------------'
116 */ 118 */
117 119
118 [LAYER_COLEMAK] = { /* COLEMAK */ 120 [LAYER_COLEMAK] = { // COLEMAK
119 { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_ESC }, 121 { KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_ESC },
120 { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT }, 122 { KC_BSPC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT },
121 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, 123 { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT },
122 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, 124 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, OS_SHFT, KC_LEFT, KC_DOWN, KC_RGHT },
123 }, 125 },
124 126
125/* DVORAK 127/* DVORAK
126 * .-----------------------------------------------------------------------------------------------------------. 128 * .-----------------------------------------------------------------------------------------------------------.
127 * | TAB | ' | , | . | P | Y | F | G | C | R | L | BACKSP | 129 * | TAB | ' | , | . | P | Y | F | G | C | R | L | BACKSP |
128 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 130 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
129 * | ESC | A | O | E | U | I | D | H | T | N | S | ' | 131 * | ESC | A | O | E | U | I | D | H | T | N | S | / |
130 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
131 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | ENTER | 133 * | LSHIFT | ; | Q | J | K | X | B | M | W | V | Z | ENTER |
132 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 134 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
133 * | LCTRL | LWIN | FN | LALT | RAISE | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT | 135 * | LCTRL | LWIN | FN | LALT | UPPER | SPACE | SPACE | LOWER | UP | DOWN | LEFT | RIGHT |
134 * '-----------------------------------------------------------------------------------------------------------' 136 * '-----------------------------------------------------------------------------------------------------------'
135 */ 137 */
136 138
137 [LAYER_DVORAK] = { /* DVORAK */ 139 [LAYER_DVORAK] = { // DVORAK
138 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, 140 { KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC },
139 { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH }, 141 { KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH },
140 { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, 142 { KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT },
141 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_RAISE, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT }, 143 { KC_LCTL, KC_LGUI, M_FUNCT, KC_LALT, M_UPPER, KC_SPC, KC_SPC, M_LOWER, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT },
142 }, 144 },
143 145
144/* Raise 146/* UPPER
145 * .-----------------------------------------------------------------------------------------------------------. 147 * .-----------------------------------------------------------------------------------------------------------.
146 * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | DEL | 148 * | PRINT | F1 | F2 | F3 | F4 | NUM LK | / | 7 | 8 | 9 | - | DEL |
147 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 149 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
148 * | XXXXXX | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | [ | ] | \ | 150 * | CAP LK | F5 | F6 | F7 | F8 | SCR LK | * | 4 | 5 | 6 | + | INS |
149 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 151 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
150 * | LSHIFT | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ENTER | 152 * | | F9 | F10 | F11 | F12 | PAUSE | | 1 | 2 | 3 | ENTER | HOME |
151 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 153 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
152 * | LCTRL | LWIN | FN | LALT | RAISE | BACKSP | BACKSP | LOWER | PG UP | PG DN | HOME | END | 154 * | | | | | | 0 | 0 | | RALT | . | ENTER | END |
153 * '-----------------------------------------------------------------------------------------------------------' 155 * '-----------------------------------------------------------------------------------------------------------'
154 */ 156 */
155 157
156 [LAYER_RAISE] = { /* RAISED */ 158 [LAYER_UPPER] = { // UPPER
157 { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL }, 159 { KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, KC_DEL },
158 { XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, 160 { KC_CAPS, KC_F5, KC_F6, KC_F7, KC_F8, KC_SLCK, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_INS },
159 { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 161 { _______, KC_F9, KC_F10, KC_F11, KC_F12, KC_PAUS, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_HOME },
160 { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END }, 162 { _______, _______, _______, _______, _______, KC_KP_0, KC_KP_0, _______, KC_RALT, KC_PDOT, KC_PENT, KC_END },
161 }, 163 },
162 164
163 165/* LOWER
164/* LOWERED
165 * .-----------------------------------------------------------------------------------------------------------. 166 * .-----------------------------------------------------------------------------------------------------------.
166 * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | INS | 167 * | | $ | { | [ | ( | % | # | ) | ] | } | @ | PG UP |
167 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 168 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
168 * | XXXXXX | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | | 169 * | | ^ | * | + | - | ; | : | _ | ' | " | ` | PG DN |
169 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 170 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
170 * | LSHIFT | F7 | F8 | F9 | F10 | F11 | F12 | XXXXXX | XXXXXX | XXXXXX | XXXXXX | ENTER | 171 * | | | | & | ! | ~ | / | \ | = | < | > | ? | HOME |
171 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 172 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
172 * | LCTRL | LWIN | FN | LALT | RAISE | BACKSP | BACKSP | LOWER | PG UP | PG DN | HOME | END | 173 * | | | | | | | | | | | | END |
173 * '-----------------------------------------------------------------------------------------------------------' 174 * '-----------------------------------------------------------------------------------------------------------'
174 */ 175 */
175 176
176 [LAYER_LOWER] = { /* LOWERED */ 177 [LAYER_LOWER] = { // LOWER
177 { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_INS }, 178 { _______, KC_DLR, KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT, KC_PGUP },
178 { XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS }, 179 { _______, KC_CIRC, KC_ASTR, KC_PPLS, KC_PMNS, KC_SCLN, KC_COLN, KC_UNDS, KC_QUOT, KC_DQT, KC_GRV, KC_PGDN },
179 { _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 180 { _______, KC_PIPE, KC_AMPR, KC_EXLM, KC_TILD, KC_SLSH, KC_BSLS, KC_EQL, KC_LT, KC_GT, KC_QUES, KC_HOME },
180 { _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END }, 181 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END },
181 }, 182 },
182 183
184
183/* FUNCTION 185/* FUNCTION
184 * .-----------------------------------------------------------------------------------------------------------. 186 * .-----------------------------------------------------------------------------------------------------------.
185 * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | PAUSE | 187 * | NUM LK | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | PAUSE |
@@ -188,10 +190,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
188 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 190 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
189 * | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUTE | 191 * | SCR LK | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | MUTE |
190 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 192 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
191 * | LCTRL | LWIN | FN | LALT | RAISE | PLAY | PLAY | LOWER | VOL UP | VOL DN | NEXT | PREV | 193 * | LCTRL | LWIN | FN | LALT | UPPER | PLAY | PLAY | LOWER | VOL UP | VOL DN | NEXT | PREV |
192 * '-----------------------------------------------------------------------------------------------------------' 194 * '-----------------------------------------------------------------------------------------------------------'
193 */ 195 */
194 [LAYER_FUNCTION] = { /* FUNCTION */ 196 [LAYER_FUNCTION] = { // FUNCTION
195 { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS }, 197 { KC_NLCK, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PAUS },
196 { KC_CAPS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSCR }, 198 { KC_CAPS, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_PSCR },
197 { KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE }, 199 { KC_SLCK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE },
@@ -200,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
200 202
201#ifdef MOUSEKEY_ENABLE 203#ifdef MOUSEKEY_ENABLE
202 204
203 [LAYER_MOUSE] = { /* MOUSE */ 205 [LAYER_MOUSE] = { // MOUSE
204 { KC_ESC, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC }, 206 { KC_ESC, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC },
205 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 207 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
206 { _______, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_D }, 208 { _______, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, KC_WH_D },
@@ -209,21 +211,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
209 211
210#endif 212#endif
211 213
212 [LAYER_MUSIC] = { /* MUSIC */ 214 [LAYER_ADJUST] = { // ADJUST
213 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX }, 215 { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, _______, _______, MU_TOG, AU_TOG },
214 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
215 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
216 { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_RAISE, XXXXXXX, XXXXXXX, M_LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
217 },
218
219 [LAYER_ADJUST] = { /* ADJUST */
220 { _______, TIMBR_1, TIMBR_2, TIMBR_3, TIMBR_4, TMPO_UP, TMPO_DN, TMPO_DF, MUS_ON, MUS_OFF, AUD_ON, AUD_OFF },
221 { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______ }, 216 { _______, M_QWRTY, M_COLMK, M_DVORK, _______, _______, _______, _______, _______, _______, _______, _______ },
222 { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, _______, _______ }, 217 { _______, _______, _______, _______, M_BACKL, RESET, _______, M_MOUSE, _______, _______, MUV_IN, _______ },
223 { _______, _______, _______, _______, _______, _______, _______, _______, VC_UP, VC_DOWN, _______, _______ }, 218 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MUV_DE, _______ },
224 }, 219 },
225 220
226
227/* 221/*
228 [LAYER_EMPTY] = { 222 [LAYER_EMPTY] = {
229 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, 223 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, },
@@ -263,6 +257,7 @@ void persistant_default_layer_set(uint16_t default_layer)
263} 257}
264 258
265const uint16_t PROGMEM fn_actions[] = { 259const uint16_t PROGMEM fn_actions[] = {
260 [0] = ACTION_MODS_ONESHOT(MOD_LSFT),
266}; 261};
267 262
268const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 263const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -306,25 +301,25 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
306 if (record->event.pressed) 301 if (record->event.pressed)
307 { 302 {
308 layer_on(LAYER_LOWER); 303 layer_on(LAYER_LOWER);
309 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); 304 update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
310 } 305 }
311 else 306 else
312 { 307 {
313 layer_off(LAYER_LOWER); 308 layer_off(LAYER_LOWER);
314 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); 309 update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
315 } 310 }
316 break; 311 break;
317 312
318 case MACRO_RAISE: 313 case MACRO_UPPER:
319 if (record->event.pressed) 314 if (record->event.pressed)
320 { 315 {
321 layer_on(LAYER_RAISE); 316 layer_on(LAYER_UPPER);
322 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); 317 update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
323 } 318 }
324 else 319 else
325 { 320 {
326 layer_off(LAYER_RAISE); 321 layer_off(LAYER_UPPER);
327 update_tri_layer(LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); 322 update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
328 } 323 }
329 break; 324 break;
330 325
@@ -393,65 +388,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
393 } 388 }
394 break; 389 break;
395 390
396 case MACRO_AUDIO_OFF:
397 if (record->event.pressed)
398 {
399 #ifdef AUDIO_ENABLE
400 audio_off();
401 #endif
402 }
403 break;
404
405 case MACRO_AUDIO_ON:
406 if (record->event.pressed)
407 {
408 #ifdef AUDIO_ENABLE
409 audio_on();
410 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
411 #endif
412 }
413 break;
414
415 case MACRO_MUSIC_ON:
416 if (record->event.pressed)
417 {
418 #ifdef AUDIO_ENABLE
419 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
420 layer_on(LAYER_MUSIC);
421 #endif
422 }
423 break;
424
425 case MACRO_MUSIC_OFF:
426 if (record->event.pressed)
427 {
428 #ifdef AUDIO_ENABLE
429 layer_off(LAYER_MUSIC);
430 stop_all_notes();
431 #endif
432 }
433 break;
434
435 case MACRO_INC_VOICE:
436 if (record->event.pressed)
437 {
438 #ifdef AUDIO_ENABLE
439 voice_iterate();
440 PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
441 #endif
442 }
443 break;
444
445 case MACRO_DEC_VOICE:
446 if (record->event.pressed)
447 {
448 #ifdef AUDIO_ENABLE
449 voice_deiterate();
450 PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
451 #endif
452 }
453 break;
454
455#endif /* AUDIO_ENABLE */ 391#endif /* AUDIO_ENABLE */
456 392
457 default: 393 default:
@@ -464,31 +400,10 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
464 400
465#ifdef AUDIO_ENABLE 401#ifdef AUDIO_ENABLE
466 402
467
468void process_action_user(keyrecord_t *record)
469{
470
471 uint8_t starting_note = 0x0C;
472 int offset = 7;
473
474 if (IS_LAYER_ON(LAYER_MUSIC))
475 {
476 if (record->event.pressed)
477 {
478 play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
479 }
480 else
481 {
482 stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
483 }
484 }
485}
486
487
488void matrix_init_user(void) 403void matrix_init_user(void)
489{ 404{
490 set_voice(default_voice); 405 set_voice(default_voice);
491 play_startup_tone(); 406 startup_user();
492 println("Matrix Init"); 407 println("Matrix Init");
493} 408}
494 409
@@ -532,16 +447,32 @@ void led_set_user(uint8_t usb_led)
532} 447}
533 448
534 449
535void play_startup_tone() 450void startup_user()
536{ 451{
537 _delay_ms(10); // gets rid of tick 452 _delay_ms(10); // gets rid of tick
538 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); 453 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO);
539} 454}
540 455
541void play_goodbye_tone() 456void shutdown_user()
542{ 457{
543 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); 458 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO);
544 _delay_ms(1000); 459 _delay_ms(2000);
460 stop_all_notes();
461}
462
463void audio_on_user(void)
464{
465 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO);
466}
467
468void music_on_user(void)
469{
470 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO);
471}
472
473void music_scale_user(void)
474{
475 PLAY_NOTE_ARRAY(music_scale, false, STACCATO);
545} 476}
546 477
547#endif /* AUDIO_ENABLE */ \ No newline at end of file 478#endif /* AUDIO_ENABLE */ \ No newline at end of file
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 32f64417e..3ca249fdf 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -475,20 +475,3 @@ void increase_tempo(uint8_t tempo_change) {
475 note_tempo -= tempo_change; 475 note_tempo -= tempo_change;
476 } 476 }
477} 477}
478
479
480//------------------------------------------------------------------------------
481// Override these functions in your keymap file to play different tunes on
482// startup and bootloader jump
483__attribute__ ((weak))
484void play_startup_tone() {}
485
486__attribute__ ((weak))
487void play_goodbye_tone() {}
488
489__attribute__ ((weak))
490void audio_on_user() {}
491
492__attribute__ ((weak))
493void play_music_scale() {}
494//------------------------------------------------------------------------------
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index b46f587bb..00d45f7ac 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -5,6 +5,7 @@
5#include "musical_notes.h" 5#include "musical_notes.h"
6#include "song_list.h" 6#include "song_list.h"
7#include "voices.h" 7#include "voices.h"
8#include "quantum.h"
8 9
9#ifndef AUDIO_H 10#ifndef AUDIO_H
10#define AUDIO_H 11#define AUDIO_H
@@ -87,9 +88,4 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest)
87 88
88bool is_playing_notes(void); 89bool is_playing_notes(void);
89 90
90void play_goodbye_tone(void);
91void play_startup_tone(void);
92void audio_on_user(void);
93void play_music_scale(void);
94
95#endif \ No newline at end of file 91#endif \ No newline at end of file
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 1d9ab2e05..ba7269388 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
26#include "backlight.h" 26#include "backlight.h"
27#include "bootloader.h" 27#include "bootloader.h"
28#include "eeconfig.h" 28#include "eeconfig.h"
29#include "quantum.h"
29 30
30#ifdef MIDI_ENABLE 31#ifdef MIDI_ENABLE
31 #include "keymap_midi.h" 32 #include "keymap_midi.h"
@@ -190,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode)
190 clear_keyboard(); 191 clear_keyboard();
191 #ifdef AUDIO_ENABLE 192 #ifdef AUDIO_ENABLE
192 stop_all_notes(); 193 stop_all_notes();
193 play_goodbye_tone(); 194 shutdown_user();
194 #endif 195 #endif
195 _delay_ms(250); 196 _delay_ms(250);
196 #ifdef ATREUS_ASTAR 197 #ifdef ATREUS_ASTAR
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 34c575af4..eb64a99a4 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -23,17 +23,16 @@ int offset = 7;
23 23
24#ifdef AUDIO_ENABLE 24#ifdef AUDIO_ENABLE
25 bool music_activated = false; 25 bool music_activated = false;
26 float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
27 26
28 // music sequencer 27// music sequencer
29 static bool music_sequence_recording = false; 28static bool music_sequence_recording = false;
30 static bool music_sequence_playing = false; 29static bool music_sequence_playing = false;
31 static float music_sequence[16] = {0}; 30static float music_sequence[16] = {0};
32 static uint8_t music_sequence_count = 0; 31static uint8_t music_sequence_count = 0;
33 static uint8_t music_sequence_position = 0; 32static uint8_t music_sequence_position = 0;
34 33
35 static uint16_t music_sequence_timer = 0; 34static uint16_t music_sequence_timer = 0;
36 static uint16_t music_sequence_interval = 100; 35static uint16_t music_sequence_interval = 100;
37 36
38#endif 37#endif
39 38
@@ -133,7 +132,7 @@ bool process_record_quantum(keyrecord_t *record) {
133 #ifdef MIDI_ENABLE 132 #ifdef MIDI_ENABLE
134 if (keycode == MI_ON && record->event.pressed) { 133 if (keycode == MI_ON && record->event.pressed) {
135 midi_activated = true; 134 midi_activated = true;
136 play_music_scale(); 135 music_scale_user();
137 return false; 136 return false;
138 } 137 }
139 138
@@ -230,37 +229,37 @@ bool process_record_quantum(keyrecord_t *record) {
230 } 229 }
231 230
232 if (keycode == MU_ON && record->event.pressed) { 231 if (keycode == MU_ON && record->event.pressed) {
233 music_on(); 232 music_on();
234 return false; 233 return false;
235 } 234 }
236 235
237 if (keycode == MU_OFF && record->event.pressed) { 236 if (keycode == MU_OFF && record->event.pressed) {
238 music_off(); 237 music_off();
239 return false; 238 return false;
240 } 239 }
241 240
242 if (keycode == MU_TOG && record->event.pressed) { 241 if (keycode == MU_TOG && record->event.pressed) {
243 if (music_activated) 242 if (music_activated)
244 { 243 {
245 music_off(); 244 music_off();
246 } 245 }
247 else 246 else
248 { 247 {
249 music_on(); 248 music_on();
250 } 249 }
251 return false; 250 return false;
252 } 251 }
253 252
254 if (keycode == MUV_IN && record->event.pressed) { 253 if (keycode == MUV_IN && record->event.pressed) {
255 voice_iterate(); 254 voice_iterate();
256 play_music_scale(); 255 music_scale_user();
257 return false; 256 return false;
258 } 257 }
259 258
260 if (keycode == MUV_DE && record->event.pressed) { 259 if (keycode == MUV_DE && record->event.pressed) {
261 voice_deiterate(); 260 voice_deiterate();
262 play_music_scale(); 261 music_scale_user();
263 return false; 262 return false;
264 } 263 }
265 264
266 if (music_activated) { 265 if (music_activated) {
@@ -272,12 +271,14 @@ bool process_record_quantum(keyrecord_t *record) {
272 music_sequence_count = 0; 271 music_sequence_count = 0;
273 return false; 272 return false;
274 } 273 }
274
275 if (keycode == KC_LALT && record->event.pressed) { // Stop recording/playing 275 if (keycode == KC_LALT && record->event.pressed) { // Stop recording/playing
276 stop_all_notes(); 276 stop_all_notes();
277 music_sequence_recording = false; 277 music_sequence_recording = false;
278 music_sequence_playing = false; 278 music_sequence_playing = false;
279 return false; 279 return false;
280 } 280 }
281
281 if (keycode == KC_LGUI && record->event.pressed) { // Start playing 282 if (keycode == KC_LGUI && record->event.pressed) { // Start playing
282 stop_all_notes(); 283 stop_all_notes();
283 music_sequence_recording = false; 284 music_sequence_recording = false;
@@ -289,12 +290,13 @@ bool process_record_quantum(keyrecord_t *record) {
289 290
290 if (keycode == KC_UP) { 291 if (keycode == KC_UP) {
291 if (record->event.pressed) 292 if (record->event.pressed)
292 music_sequence_interval-=10; 293 music_sequence_interval-=10;
293 return false; 294 return false;
294 } 295 }
296
295 if (keycode == KC_DOWN) { 297 if (keycode == KC_DOWN) {
296 if (record->event.pressed) 298 if (record->event.pressed)
297 music_sequence_interval+=10; 299 music_sequence_interval+=10;
298 return false; 300 return false;
299 } 301 }
300 302
@@ -459,5 +461,24 @@ void matrix_scan_quantum() {
459 } 461 }
460 462
461#endif 463#endif
464
465//------------------------------------------------------------------------------
466// Override these functions in your keymap file to play different tunes on
467// different events such as startup and bootloader jump
468
469__attribute__ ((weak))
470void startup_user() {}
471
472__attribute__ ((weak))
473void shutdown_user() {}
474
462__attribute__ ((weak)) 475__attribute__ ((weak))
463void music_on_user() {} 476void music_on_user() {}
477
478__attribute__ ((weak))
479void audio_on_user() {}
480
481__attribute__ ((weak))
482void music_scale_user() {}
483
484//------------------------------------------------------------------------------ \ No newline at end of file
diff --git a/quantum/quantum.h b/quantum/quantum.h
index d4da77289..69a0d8126 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -67,6 +67,10 @@ void music_toggle(void);
67void music_on(void); 67void music_on(void);
68void music_off(void); 68void music_off(void);
69 69
70void startup_user(void);
71void shutdown_user(void);
72void audio_on_user(void);
70void music_on_user(void); 73void music_on_user(void);
74void music_scale_user(void);
71 75
72#endif \ No newline at end of file 76#endif \ No newline at end of file
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 9edcc42a0..024d7c67a 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -33,20 +33,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33#include "led.h" 33#include "led.h"
34#include "command.h" 34#include "command.h"
35#include "backlight.h" 35#include "backlight.h"
36#include "quantum.h"
36 37
37#ifdef MOUSEKEY_ENABLE 38#ifdef MOUSEKEY_ENABLE
38#include "mousekey.h" 39#include "mousekey.h"
39#endif 40#endif
40 41
41#ifdef PROTOCOL_PJRC 42#ifdef PROTOCOL_PJRC
42# include "usb_keyboard.h" 43 #include "usb_keyboard.h"
43# ifdef EXTRAKEY_ENABLE 44 #ifdef EXTRAKEY_ENABLE
44# include "usb_extra.h" 45 #include "usb_extra.h"
45# endif 46 #endif
46#endif 47#endif
47 48
48#ifdef PROTOCOL_VUSB 49#ifdef PROTOCOL_VUSB
49# include "usbdrv.h" 50 #include "usbdrv.h"
50#endif 51#endif
51 52
52#ifdef AUDIO_ENABLE 53#ifdef AUDIO_ENABLE
@@ -358,7 +359,7 @@ static bool command_common(uint8_t code)
358 print("\n\nJumping to bootloader... "); 359 print("\n\nJumping to bootloader... ");
359 #ifdef AUDIO_ENABLE 360 #ifdef AUDIO_ENABLE
360 stop_all_notes(); 361 stop_all_notes();
361 play_goodbye_tone(); 362 shutdown_user();
362 #else 363 #else
363 _delay_ms(1000); 364 _delay_ms(1000);
364 #endif 365 #endif
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 552f32331..1d384574f 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -366,7 +366,13 @@ ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
366 366
367 367
368# Default target. 368# Default target.
369all: begin gccversion sizebefore build sizeafter end 369all:
370 $(MAKE) begin
371 $(MAKE) gccversion
372 $(MAKE) sizebefore
373 $(MAKE) build
374 $(MAKE) sizeafter
375 $(MAKE) end
370 376
371# Change the build target to build a HEX file or a library. 377# Change the build target to build a HEX file or a library.
372build: elf hex eep lss sym 378build: elf hex eep lss sym
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 23:27:46 +0000