diff options
Diffstat (limited to 'keyboards/planck')
25 files changed, 46 insertions, 871 deletions
diff --git a/keyboards/planck/keymaps/altgr/common/init.h b/keyboards/planck/keymaps/altgr/common/init.h index 6d0b4392fb..e6bb7101e9 100644 --- a/keyboards/planck/keymaps/altgr/common/init.h +++ b/keyboards/planck/keymaps/altgr/common/init.h | |||
| @@ -6,9 +6,6 @@ void matrix_init_user(void) | |||
| 6 | #ifdef STENO_ENABLE | 6 | #ifdef STENO_ENABLE |
| 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI | 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI |
| 8 | #endif | 8 | #endif |
| 9 | #ifdef AUDIO_ENABLE | ||
| 10 | startup_user(); | ||
| 11 | #endif | ||
| 12 | } | 9 | } |
| 13 | 10 | ||
| 14 | #ifdef AUDIO_ENABLE | 11 | #ifdef AUDIO_ENABLE |
| @@ -31,27 +28,4 @@ bool led_update_user(led_t led_state) | |||
| 31 | return false; | 28 | return false; |
| 32 | } | 29 | } |
| 33 | #endif | 30 | #endif |
| 34 | |||
| 35 | void startup_user(void) | ||
| 36 | { | ||
| 37 | _delay_ms(20); // gets rid of tick | ||
| 38 | PLAY_SONG(song_startup); | ||
| 39 | } | ||
| 40 | |||
| 41 | void shutdown_user(void) | ||
| 42 | { | ||
| 43 | PLAY_SONG(song_goodbye); | ||
| 44 | _delay_ms(150); | ||
| 45 | stop_all_notes(); | ||
| 46 | } | ||
| 47 | |||
| 48 | void music_on_user(void) | ||
| 49 | { | ||
| 50 | music_scale_user(); | ||
| 51 | } | ||
| 52 | |||
| 53 | void music_scale_user(void) | ||
| 54 | { | ||
| 55 | PLAY_SONG(music_scale); | ||
| 56 | } | ||
| 57 | #endif | 31 | #endif |
diff --git a/keyboards/planck/keymaps/circuit/keymap.c b/keyboards/planck/keymaps/circuit/keymap.c index d150905dc8..b7d2b121b9 100644 --- a/keyboards/planck/keymaps/circuit/keymap.c +++ b/keyboards/planck/keymaps/circuit/keymap.c | |||
| @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 131 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL , | 131 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL , |
| 132 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | 132 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, |
| 133 | KC_CAPS, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_ENT , | 133 | KC_CAPS, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_ENT , |
| 134 | _______, _______, _______, KC_MUTE, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END | 134 | _______, _______, _______, KC_MUTE, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END |
| 135 | ), | 135 | ), |
| 136 | 136 | ||
| 137 | /* FUNCTIONS | 137 | /* FUNCTIONS |
| @@ -155,11 +155,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| 157 | #ifdef AUDIO_ENABLE | 157 | #ifdef AUDIO_ENABLE |
| 158 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 159 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 158 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 160 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 159 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 161 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 162 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 163 | #endif | 160 | #endif |
| 164 | 161 | ||
| 165 | 162 | ||
| @@ -210,36 +207,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 210 | } | 207 | } |
| 211 | return true; | 208 | return true; |
| 212 | } | 209 | } |
| 213 | |||
| 214 | void matrix_init_user(void) { | ||
| 215 | #ifdef AUDIO_ENABLE | ||
| 216 | startup_user(); | ||
| 217 | #endif | ||
| 218 | } | ||
| 219 | |||
| 220 | #ifdef AUDIO_ENABLE | ||
| 221 | |||
| 222 | void startup_user(void) | ||
| 223 | { | ||
| 224 | _delay_ms(20); // gets rid of tick | ||
| 225 | PLAY_SONG(tone_startup); | ||
| 226 | } | ||
| 227 | |||
| 228 | void shutdown_user(void) | ||
| 229 | { | ||
| 230 | PLAY_SONG(tone_goodbye); | ||
| 231 | _delay_ms(150); | ||
| 232 | stop_all_notes(); | ||
| 233 | } | ||
| 234 | |||
| 235 | void music_on_user(void) | ||
| 236 | { | ||
| 237 | music_scale_user(); | ||
| 238 | } | ||
| 239 | |||
| 240 | void music_scale_user(void) | ||
| 241 | { | ||
| 242 | PLAY_SONG(music_scale); | ||
| 243 | } | ||
| 244 | |||
| 245 | #endif | ||
diff --git a/keyboards/planck/keymaps/dbroqua/keymap.c b/keyboards/planck/keymaps/dbroqua/keymap.c index 95d0b85408..f7d1575dad 100644 --- a/keyboards/planck/keymaps/dbroqua/keymap.c +++ b/keyboards/planck/keymaps/dbroqua/keymap.c | |||
| @@ -120,16 +120,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 120 | }; | 120 | }; |
| 121 | 121 | ||
| 122 | #ifdef AUDIO_ENABLE | 122 | #ifdef AUDIO_ENABLE |
| 123 | |||
| 124 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 125 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 123 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 126 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 124 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 127 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 125 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 128 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 126 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 129 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 127 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 130 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 131 | |||
| 132 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 133 | #endif | 128 | #endif |
| 134 | 129 | ||
| 135 | 130 | ||
| @@ -183,36 +178,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 183 | } | 178 | } |
| 184 | return true; | 179 | return true; |
| 185 | } | 180 | } |
| 186 | |||
| 187 | void matrix_init_user(void) { | ||
| 188 | #ifdef AUDIO_ENABLE | ||
| 189 | startup_user(); | ||
| 190 | #endif | ||
| 191 | } | ||
| 192 | |||
| 193 | #ifdef AUDIO_ENABLE | ||
| 194 | |||
| 195 | void startup_user(void) | ||
| 196 | { | ||
| 197 | _delay_ms(20); // gets rid of tick | ||
| 198 | PLAY_SONG(tone_startup); | ||
| 199 | } | ||
| 200 | |||
| 201 | void shutdown_user(void) | ||
| 202 | { | ||
| 203 | PLAY_SONG(tone_goodbye); | ||
| 204 | _delay_ms(150); | ||
| 205 | stop_all_notes(); | ||
| 206 | } | ||
| 207 | |||
| 208 | void music_on_user(void) | ||
| 209 | { | ||
| 210 | music_scale_user(); | ||
| 211 | } | ||
| 212 | |||
| 213 | void music_scale_user(void) | ||
| 214 | { | ||
| 215 | PLAY_SONG(music_scale); | ||
| 216 | } | ||
| 217 | |||
| 218 | #endif | ||
diff --git a/keyboards/planck/keymaps/dr_notsokind/keymap.c b/keyboards/planck/keymaps/dr_notsokind/keymap.c index ffceef11cc..f4fb3e0074 100644 --- a/keyboards/planck/keymaps/dr_notsokind/keymap.c +++ b/keyboards/planck/keymaps/dr_notsokind/keymap.c | |||
| @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 127 | KC_GRV , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, | 127 | KC_GRV , KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, |
| 128 | KC_DEL , KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, | 128 | KC_DEL , KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, |
| 129 | KC_LSFT, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT, | 129 | KC_LSFT, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______, KC_NUHS, KC_NUBS, XXXXXXX, KC_PGUP, KC_ENT, |
| 130 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | 130 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END |
| 131 | ), | 131 | ), |
| 132 | 132 | ||
| 133 | /* LOWER | 133 | /* LOWER |
| @@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 145 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL , | 145 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL , |
| 146 | KC_DEL , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, | 146 | KC_DEL , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, |
| 147 | KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT , | 147 | KC_LSFT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, S(KC_NUHS), S(KC_NUBS), XXXXXXX, KC_PGUP, KC_ENT , |
| 148 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | 148 | _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END |
| 149 | ), | 149 | ), |
| 150 | 150 | ||
| 151 | /* MEDIA AND COMMANDS | 151 | /* MEDIA AND COMMANDS |
| @@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 163 | XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, | 163 | XXXXXXX, XXXXXXX, KC_WHOM, XXXXXXX, XXXXXXX, XXXXXXX, KC_AGAIN, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, |
| 164 | XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DM_PLY1, DM_PLY2, | 164 | XXXXXXX, XXXXXXX, KC_WSCH, XXXXXXX, KC_FIND, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DM_PLY1, DM_PLY2, |
| 165 | KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DM_RSTP, | 165 | KC_LSFT, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ZOOM_OUT, ZOOM_IN, KC_MPRV, DM_RSTP, |
| 166 | ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE, KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY | 166 | ONESHOT, XXXXXXX, XXXXXXX, _______, KC_VOLD, KC_MUTE, KC_MUTE, KC_VOLU, ZOOM_NML, KC_MSTP, KC_MNXT, KC_MPLY |
| 167 | ), | 167 | ), |
| 168 | 168 | ||
| 169 | /* ONESHOT | 169 | /* ONESHOT |
| @@ -205,14 +205,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 205 | }; | 205 | }; |
| 206 | 206 | ||
| 207 | #ifdef AUDIO_ENABLE | 207 | #ifdef AUDIO_ENABLE |
| 208 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 209 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 208 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 210 | float tone_numpad[][2] = SONG(NUM_LOCK_ON_SOUND); | 209 | float tone_numpad[][2] = SONG(NUM_LOCK_ON_SOUND); |
| 211 | float tone_oneshot[][2] = SONG(TERMINAL_SOUND); | 210 | float tone_oneshot[][2] = SONG(TERMINAL_SOUND); |
| 212 | float tone_dyn_macro_rec[][2] = SONG(SONIC_RING); | 211 | float tone_dyn_macro_rec[][2] = SONG(SONIC_RING); |
| 213 | float tone_dyn_macro_stop[][2] = SONG(COIN_SOUND); | 212 | float tone_dyn_macro_stop[][2] = SONG(COIN_SOUND); |
| 214 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 215 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 216 | #endif | 213 | #endif |
| 217 | 214 | ||
| 218 | void press_key(uint16_t key) { | 215 | void press_key(uint16_t key) { |
| @@ -303,36 +300,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 303 | } | 300 | } |
| 304 | return true; | 301 | return true; |
| 305 | } | 302 | } |
| 306 | |||
| 307 | void matrix_init_user(void) { | ||
| 308 | #ifdef AUDIO_ENABLE | ||
| 309 | startup_user(); | ||
| 310 | #endif | ||
| 311 | } | ||
| 312 | |||
| 313 | #ifdef AUDIO_ENABLE | ||
| 314 | |||
| 315 | void startup_user(void) | ||
| 316 | { | ||
| 317 | _delay_ms(20); // gets rid of tick | ||
| 318 | PLAY_SONG(tone_startup); | ||
| 319 | } | ||
| 320 | |||
| 321 | void shutdown_user(void) | ||
| 322 | { | ||
| 323 | PLAY_SONG(tone_goodbye); | ||
| 324 | _delay_ms(150); | ||
| 325 | stop_all_notes(); | ||
| 326 | } | ||
| 327 | |||
| 328 | void music_on_user(void) | ||
| 329 | { | ||
| 330 | music_scale_user(); | ||
| 331 | } | ||
| 332 | |||
| 333 | void music_scale_user(void) | ||
| 334 | { | ||
| 335 | PLAY_SONG(music_scale); | ||
| 336 | } | ||
| 337 | |||
| 338 | #endif | ||
diff --git a/keyboards/planck/keymaps/emilyh/keymap.c b/keyboards/planck/keymaps/emilyh/keymap.c index 17bbc98b7e..b226c1f6e7 100644 --- a/keyboards/planck/keymaps/emilyh/keymap.c +++ b/keyboards/planck/keymaps/emilyh/keymap.c | |||
| @@ -164,16 +164,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 164 | }; | 164 | }; |
| 165 | 165 | ||
| 166 | #ifdef AUDIO_ENABLE | 166 | #ifdef AUDIO_ENABLE |
| 167 | |||
| 168 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 169 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 167 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 170 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 168 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 171 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 169 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 172 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 170 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 173 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 171 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 174 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 175 | |||
| 176 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 177 | #endif | 172 | #endif |
| 178 | 173 | ||
| 179 | 174 | ||
| @@ -273,36 +268,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 273 | } | 268 | } |
| 274 | return true; | 269 | return true; |
| 275 | } | 270 | } |
| 276 | |||
| 277 | void matrix_init_user(void) { | ||
| 278 | #ifdef AUDIO_ENABLE | ||
| 279 | startup_user(); | ||
| 280 | #endif | ||
| 281 | } | ||
| 282 | |||
| 283 | #ifdef AUDIO_ENABLE | ||
| 284 | |||
| 285 | void startup_user(void) | ||
| 286 | { | ||
| 287 | _delay_ms(20); // gets rid of tick | ||
| 288 | PLAY_SONG(tone_startup); | ||
| 289 | } | ||
| 290 | |||
| 291 | void shutdown_user(void) | ||
| 292 | { | ||
| 293 | PLAY_SONG(tone_goodbye); | ||
| 294 | _delay_ms(150); | ||
| 295 | stop_all_notes(); | ||
| 296 | } | ||
| 297 | |||
| 298 | void music_on_user(void) | ||
| 299 | { | ||
| 300 | music_scale_user(); | ||
| 301 | } | ||
| 302 | |||
| 303 | void music_scale_user(void) | ||
| 304 | { | ||
| 305 | PLAY_SONG(music_scale); | ||
| 306 | } | ||
| 307 | |||
| 308 | #endif | ||
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c index 6d6752952b..deaf5afb4d 100644 --- a/keyboards/planck/keymaps/experimental/keymap.c +++ b/keyboards/planck/keymaps/experimental/keymap.c | |||
| @@ -176,16 +176,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | #ifdef AUDIO_ENABLE | 178 | #ifdef AUDIO_ENABLE |
| 179 | |||
| 180 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 181 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 179 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 182 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 180 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 183 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 181 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 184 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 182 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 185 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 183 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 186 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 187 | |||
| 188 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 189 | #endif | 184 | #endif |
| 190 | 185 | ||
| 191 | 186 | ||
| @@ -339,38 +334,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 339 | return true; | 334 | return true; |
| 340 | }; | 335 | }; |
| 341 | 336 | ||
| 342 | void matrix_init_user(void) { | ||
| 343 | #ifdef AUDIO_ENABLE | ||
| 344 | startup_user(); | ||
| 345 | #endif | ||
| 346 | } | ||
| 347 | |||
| 348 | #ifdef AUDIO_ENABLE | ||
| 349 | void startup_user(void) | ||
| 350 | { | ||
| 351 | _delay_ms(20); // gets rid of tick | ||
| 352 | PLAY_SONG(tone_startup); | ||
| 353 | } | ||
| 354 | |||
| 355 | void shutdown_user(void) | ||
| 356 | { | ||
| 357 | PLAY_SONG(tone_goodbye); | ||
| 358 | _delay_ms(150); | ||
| 359 | stop_all_notes(); | ||
| 360 | } | ||
| 361 | |||
| 362 | void music_on_user(void) | ||
| 363 | { | ||
| 364 | music_scale_user(); | ||
| 365 | } | ||
| 366 | |||
| 367 | void music_scale_user(void) | ||
| 368 | { | ||
| 369 | PLAY_SONG(music_scale); | ||
| 370 | } | ||
| 371 | |||
| 372 | #endif | ||
| 373 | |||
| 374 | void leader_end_user(void) { | 337 | void leader_end_user(void) { |
| 375 | if (leader_sequence_one_key(KC_R)) { | 338 | if (leader_sequence_one_key(KC_R)) { |
| 376 | tap_random_base64(); | 339 | tap_random_base64(); |
diff --git a/keyboards/planck/keymaps/gunp/keymap.c b/keyboards/planck/keymaps/gunp/keymap.c index 7c2f6c0bd5..9fa05d593a 100644 --- a/keyboards/planck/keymaps/gunp/keymap.c +++ b/keyboards/planck/keymaps/gunp/keymap.c | |||
| @@ -282,26 +282,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 282 | return false; | 282 | return false; |
| 283 | } | 283 | } |
| 284 | #endif | 284 | #endif |
| 285 | |||
| 286 | #ifdef AUDIO_ENABLE | ||
| 287 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 288 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 289 | |||
| 290 | float tone_ly_normal[][2] = SONG(QWERTY_SOUND); | ||
| 291 | float tone_ly_spacial[][2] = SONG(DVORAK_SOUND); | ||
| 292 | |||
| 293 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 294 | #endif | ||
| 295 | |||
| 296 | void startup_user(void) { | ||
| 297 | #ifdef AUDIO_ENABLE | ||
| 298 | PLAY_SONG(tone_startup); | ||
| 299 | #endif | ||
| 300 | } | ||
| 301 | |||
| 302 | void shutdown_user(void) { | ||
| 303 | #ifdef AUDIO_ENABLE | ||
| 304 | PLAY_SONG(tone_goodbye); | ||
| 305 | stop_all_notes(); | ||
| 306 | #endif | ||
| 307 | } | ||
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c index 13917e516d..93e6f9b78e 100644 --- a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c +++ b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c | |||
| @@ -163,15 +163,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 163 | 163 | ||
| 164 | #ifdef AUDIO_ENABLE | 164 | #ifdef AUDIO_ENABLE |
| 165 | 165 | ||
| 166 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 167 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 166 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 168 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 167 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 169 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 168 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 170 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 169 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 171 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 170 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 172 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 173 | |||
| 174 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 175 | #endif | 171 | #endif |
| 176 | 172 | ||
| 177 | 173 | ||
| @@ -271,36 +267,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 271 | } | 267 | } |
| 272 | return true; | 268 | return true; |
| 273 | } | 269 | } |
| 274 | |||
| 275 | void matrix_init_user(void) { | ||
| 276 | #ifdef AUDIO_ENABLE | ||
| 277 | startup_user(); | ||
| 278 | #endif | ||
| 279 | } | ||
| 280 | |||
| 281 | #ifdef AUDIO_ENABLE | ||
| 282 | |||
| 283 | void startup_user(void) | ||
| 284 | { | ||
| 285 | _delay_ms(20); // gets rid of tick | ||
| 286 | PLAY_SONG(tone_startup); | ||
| 287 | } | ||
| 288 | |||
| 289 | void shutdown_user(void) | ||
| 290 | { | ||
| 291 | PLAY_SONG(tone_goodbye); | ||
| 292 | _delay_ms(150); | ||
| 293 | stop_all_notes(); | ||
| 294 | } | ||
| 295 | |||
| 296 | void music_on_user(void) | ||
| 297 | { | ||
| 298 | music_scale_user(); | ||
| 299 | } | ||
| 300 | |||
| 301 | void music_scale_user(void) | ||
| 302 | { | ||
| 303 | PLAY_SONG(music_scale); | ||
| 304 | } | ||
| 305 | |||
| 306 | #endif | ||
diff --git a/keyboards/planck/keymaps/hiea/common/init.h b/keyboards/planck/keymaps/hiea/common/init.h index 6d0b4392fb..e6bb7101e9 100644 --- a/keyboards/planck/keymaps/hiea/common/init.h +++ b/keyboards/planck/keymaps/hiea/common/init.h | |||
| @@ -6,9 +6,6 @@ void matrix_init_user(void) | |||
| 6 | #ifdef STENO_ENABLE | 6 | #ifdef STENO_ENABLE |
| 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI | 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI |
| 8 | #endif | 8 | #endif |
| 9 | #ifdef AUDIO_ENABLE | ||
| 10 | startup_user(); | ||
| 11 | #endif | ||
| 12 | } | 9 | } |
| 13 | 10 | ||
| 14 | #ifdef AUDIO_ENABLE | 11 | #ifdef AUDIO_ENABLE |
| @@ -31,27 +28,4 @@ bool led_update_user(led_t led_state) | |||
| 31 | return false; | 28 | return false; |
| 32 | } | 29 | } |
| 33 | #endif | 30 | #endif |
| 34 | |||
| 35 | void startup_user(void) | ||
| 36 | { | ||
| 37 | _delay_ms(20); // gets rid of tick | ||
| 38 | PLAY_SONG(song_startup); | ||
| 39 | } | ||
| 40 | |||
| 41 | void shutdown_user(void) | ||
| 42 | { | ||
| 43 | PLAY_SONG(song_goodbye); | ||
| 44 | _delay_ms(150); | ||
| 45 | stop_all_notes(); | ||
| 46 | } | ||
| 47 | |||
| 48 | void music_on_user(void) | ||
| 49 | { | ||
| 50 | music_scale_user(); | ||
| 51 | } | ||
| 52 | |||
| 53 | void music_scale_user(void) | ||
| 54 | { | ||
| 55 | PLAY_SONG(music_scale); | ||
| 56 | } | ||
| 57 | #endif | 31 | #endif |
diff --git a/keyboards/planck/keymaps/hieax/common/init.h b/keyboards/planck/keymaps/hieax/common/init.h index 6d0b4392fb..d009bd69a1 100644 --- a/keyboards/planck/keymaps/hieax/common/init.h +++ b/keyboards/planck/keymaps/hieax/common/init.h | |||
| @@ -6,9 +6,6 @@ void matrix_init_user(void) | |||
| 6 | #ifdef STENO_ENABLE | 6 | #ifdef STENO_ENABLE |
| 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI | 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI |
| 8 | #endif | 8 | #endif |
| 9 | #ifdef AUDIO_ENABLE | ||
| 10 | startup_user(); | ||
| 11 | #endif | ||
| 12 | } | 9 | } |
| 13 | 10 | ||
| 14 | #ifdef AUDIO_ENABLE | 11 | #ifdef AUDIO_ENABLE |
| @@ -32,26 +29,4 @@ bool led_update_user(led_t led_state) | |||
| 32 | } | 29 | } |
| 33 | #endif | 30 | #endif |
| 34 | 31 | ||
| 35 | void startup_user(void) | ||
| 36 | { | ||
| 37 | _delay_ms(20); // gets rid of tick | ||
| 38 | PLAY_SONG(song_startup); | ||
| 39 | } | ||
| 40 | |||
| 41 | void shutdown_user(void) | ||
| 42 | { | ||
| 43 | PLAY_SONG(song_goodbye); | ||
| 44 | _delay_ms(150); | ||
| 45 | stop_all_notes(); | ||
| 46 | } | ||
| 47 | |||
| 48 | void music_on_user(void) | ||
| 49 | { | ||
| 50 | music_scale_user(); | ||
| 51 | } | ||
| 52 | |||
| 53 | void music_scale_user(void) | ||
| 54 | { | ||
| 55 | PLAY_SONG(music_scale); | ||
| 56 | } | ||
| 57 | #endif | 32 | #endif |
diff --git a/keyboards/planck/keymaps/impossible/keymap.c b/keyboards/planck/keymaps/impossible/keymap.c index 9145ad79aa..8aa3eb149f 100644 --- a/keyboards/planck/keymaps/impossible/keymap.c +++ b/keyboards/planck/keymaps/impossible/keymap.c | |||
| @@ -140,16 +140,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 140 | }; | 140 | }; |
| 141 | 141 | ||
| 142 | #ifdef AUDIO_ENABLE | 142 | #ifdef AUDIO_ENABLE |
| 143 | |||
| 144 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 145 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 146 | |||
| 147 | float tone_workman[][2] = SONG(QWERTY_SOUND); | 143 | float tone_workman[][2] = SONG(QWERTY_SOUND); |
| 148 | float tone_qwerty[][2] = SONG(COLEMAK_SOUND); | 144 | float tone_qwerty[][2] = SONG(COLEMAK_SOUND); |
| 149 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 145 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 150 | |||
| 151 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 152 | |||
| 153 | #endif | 146 | #endif |
| 154 | 147 | ||
| 155 | 148 | ||
| @@ -196,36 +189,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 196 | } | 189 | } |
| 197 | return true; | 190 | return true; |
| 198 | } | 191 | } |
| 199 | |||
| 200 | void matrix_init_user(void) { | ||
| 201 | #ifdef AUDIO_ENABLE | ||
| 202 | startup_user(); | ||
| 203 | #endif | ||
| 204 | } | ||
| 205 | |||
| 206 | #ifdef AUDIO_ENABLE | ||
| 207 | |||
| 208 | void startup_user(void) | ||
| 209 | { | ||
| 210 | _delay_ms(20); // gets rid of tick | ||
| 211 | PLAY_SONG(tone_startup); | ||
| 212 | } | ||
| 213 | |||
| 214 | void shutdown_user(void) | ||
| 215 | { | ||
| 216 | PLAY_SONG(tone_goodbye); | ||
| 217 | _delay_ms(150); | ||
| 218 | stop_all_notes(); | ||
| 219 | } | ||
| 220 | |||
| 221 | void music_on_user(void) | ||
| 222 | { | ||
| 223 | music_scale_user(); | ||
| 224 | } | ||
| 225 | |||
| 226 | void music_scale_user(void) | ||
| 227 | { | ||
| 228 | PLAY_SONG(music_scale); | ||
| 229 | } | ||
| 230 | |||
| 231 | #endif | ||
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c index 75c581de19..5ec3115830 100644 --- a/keyboards/planck/keymaps/ishtob/keymap.c +++ b/keyboards/planck/keymaps/ishtob/keymap.c | |||
| @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 23 | KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, LT_RAI(KC_MINS), | 23 | KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, LT_RAI(KC_MINS), |
| 24 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL | 24 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL |
| 25 | ), | 25 | ), |
| 26 | 26 | ||
| 27 | /* Colemak | 27 | /* Colemak |
| 28 | * ,-----------------------------------------------------------------------------------. | 28 | * ,-----------------------------------------------------------------------------------. |
| 29 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | | 29 | * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp | |
| @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 41 | KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, LT_RAI(KC_MINS), | 41 | KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, LT_RAI(KC_MINS), |
| 42 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL | 42 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL |
| 43 | ), | 43 | ), |
| 44 | 44 | ||
| 45 | /* Dvorak | 45 | /* Dvorak |
| 46 | * ,-----------------------------------------------------------------------------------. | 46 | * ,-----------------------------------------------------------------------------------. |
| 47 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | | 47 | * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp | |
| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 59 | KC_LSFT, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, LT_RAI(KC_MINS), | 59 | KC_LSFT, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, LT_RAI(KC_MINS), |
| 60 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL | 60 | KC_ESC, KC_CAPS, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, TG_NUMLAY, KC_APP, KC_DEL |
| 61 | ), | 61 | ), |
| 62 | 62 | ||
| 63 | /* Lower | 63 | /* Lower |
| 64 | * ,-----------------------------------------------------------------------------------. | 64 | * ,-----------------------------------------------------------------------------------. |
| 65 | * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ~ | \ | | 65 | * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ~ | \ | |
| @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 77 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, | 77 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, |
| 78 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY | 78 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY |
| 79 | ), | 79 | ), |
| 80 | 80 | ||
| 81 | /* Raise | 81 | /* Raise |
| 82 | * ,-----------------------------------------------------------------------------------. | 82 | * ,-----------------------------------------------------------------------------------. |
| 83 | * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | * | \ | | 83 | * | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | * | \ | |
| @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 95 | _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE, KC_VOLD, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, | 95 | _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC_MUTE, KC_VOLD, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, |
| 96 | _______, _______, _______, _______, _______, KC_SPC, KC_0, _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NUM | 96 | _______, _______, _______, _______, _______, KC_SPC, KC_0, _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NUM |
| 97 | ), | 97 | ), |
| 98 | 98 | ||
| 99 | /* Plover layer (http://opensteno.org) | 99 | /* Plover layer (http://opensteno.org) |
| 100 | * ,-----------------------------------------------------------------------------------. | 100 | * ,-----------------------------------------------------------------------------------. |
| 101 | * | # | # | # | # | # | # | # | # | # | # | # | # | | 101 | * | # | # | # | # | # | # | # | # | # | # | # | # | |
| @@ -107,14 +107,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 107 | * | Exit | | | A | O | | E | U | | | | | 107 | * | Exit | | | A | O | | E | U | | | | |
| 108 | * `-----------------------------------------------------------------------------------' | 108 | * `-----------------------------------------------------------------------------------' |
| 109 | */ | 109 | */ |
| 110 | 110 | ||
| 111 | [_PLOVER] = LAYOUT_ortho_4x12_wrapper( | 111 | [_PLOVER] = LAYOUT_ortho_4x12_wrapper( |
| 112 | KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , | 112 | KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , |
| 113 | XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, | 113 | XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, |
| 114 | XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 114 | XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
| 115 | EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX | 115 | EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX |
| 116 | ), | 116 | ), |
| 117 | 117 | ||
| 118 | /* FN layer on Esc key | 118 | /* FN layer on Esc key |
| 119 | * ,-----------------------------------------------------------------------------------. | 119 | * ,-----------------------------------------------------------------------------------. |
| 120 | * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | + | | 120 | * | | ! | @ | # | $ | % | ^ | & | * | ( | ) | + | |
| @@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 132 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, | 132 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, |
| 133 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY | 133 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY |
| 134 | ), | 134 | ), |
| 135 | 135 | ||
| 136 | /* Num Layer | 136 | /* Num Layer |
| 137 | * ,-----------------------------------------------------------------------------------. | 137 | * ,-----------------------------------------------------------------------------------. |
| 138 | * | | Q | Up | 4 | | | 7 | 8 | 9 | - | + | Bksp | | 138 | * | | Q | Up | 4 | | | 7 | 8 | 9 | - | + | Bksp | |
| @@ -150,7 +150,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 150 | _______, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PSLS, _______, | 150 | _______, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PSLS, _______, |
| 151 | _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, KC_NUM, KC_MPLY | 151 | _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______, _______, KC_NUM, KC_MPLY |
| 152 | ), | 152 | ), |
| 153 | 153 | ||
| 154 | /* Mouse Layer (semi-col) | 154 | /* Mouse Layer (semi-col) |
| 155 | * ,-----------------------------------------------------------------------------------. | 155 | * ,-----------------------------------------------------------------------------------. |
| 156 | * | ACCL0| ACCL1| ACCL2|Email |Email2| Home | Wh_Up| WHL_L| M_Up | WHL_R|PASS| Meta | | 156 | * | ACCL0| ACCL1| ACCL2|Email |Email2| Home | Wh_Up| WHL_L| M_Up | WHL_R|PASS| Meta | |
| @@ -162,14 +162,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 162 | * | | | | | | BTN1 | | | | Citx | | | 162 | * | | | | | | BTN1 | | | | Citx | | |
| 163 | * `-----------------------------------------------------------------------------------' | 163 | * `-----------------------------------------------------------------------------------' |
| 164 | */ | 164 | */ |
| 165 | 165 | ||
| 166 | [_MOUSECURSOR] = LAYOUT_ortho_4x12_wrapper( | 166 | [_MOUSECURSOR] = LAYOUT_ortho_4x12_wrapper( |
| 167 | KC_ACL0, KC_ACL1, KC_ACL2, M_EMAIL,M_EMAIL2, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, P_MPASS, P_META, | 167 | KC_ACL0, KC_ACL1, KC_ACL2, M_EMAIL,M_EMAIL2, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, P_MPASS, P_META, |
| 168 | _______, XXXXXXX, XXXXXXX, XXXXXXX, O_RTQ6H, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, O_DAYRN, | 168 | _______, XXXXXXX, XXXXXXX, XXXXXXX, O_RTQ6H, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, O_DAYRN, |
| 169 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, | 169 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, |
| 170 | _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, P_CITRIX, O_AUTODC | 170 | _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, P_CITRIX, O_AUTODC |
| 171 | ), | 171 | ), |
| 172 | 172 | ||
| 173 | /* Adjust (Lower + Raise) | 173 | /* Adjust (Lower + Raise) |
| 174 | * ,-----------------------------------------------------------------------------------. | 174 | * ,-----------------------------------------------------------------------------------. |
| 175 | * | Reset|RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | Del | | 175 | * | Reset|RGB TG|RGB ST|RGBH -|RGBH +|RGBS -|RGBS +|RGBV -|RGBV +| | | Del | |
| @@ -187,21 +187,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 187 | _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DOWN,BL_UP, BL_STEP, BL_TOGG, | 187 | _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DOWN,BL_UP, BL_STEP, BL_TOGG, |
| 188 | _______, _______, _______, _______, _______, _______, _______, _______, CK_RST, CK_DOWN, CK_UP, CK_TOGG | 188 | _______, _______, _______, _______, _______, _______, _______, _______, CK_RST, CK_DOWN, CK_UP, CK_TOGG |
| 189 | ) | 189 | ) |
| 190 | 190 | ||
| 191 | 191 | ||
| 192 | }; | 192 | }; |
| 193 | 193 | ||
| 194 | #ifdef AUDIO_ENABLE | 194 | #ifdef AUDIO_ENABLE |
| 195 | |||
| 196 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 197 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 195 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 198 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 196 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 199 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 197 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 200 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 198 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 201 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 199 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 202 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 203 | |||
| 204 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 205 | #endif | 200 | #endif |
| 206 | 201 | ||
| 207 | 202 | ||
| @@ -307,38 +302,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 307 | } | 302 | } |
| 308 | 303 | ||
| 309 | void matrix_init_keymap(void) { | 304 | void matrix_init_keymap(void) { |
| 310 | #ifdef AUDIO_ENABLE | ||
| 311 | startup_user(); | ||
| 312 | #endif | ||
| 313 | } | ||
| 314 | |||
| 315 | #ifdef AUDIO_ENABLE | ||
| 316 | |||
| 317 | void startup_user(void) | ||
| 318 | { | ||
| 319 | #ifdef RGB_MATRIX_ENABLE | 305 | #ifdef RGB_MATRIX_ENABLE |
| 320 | rgblight_mode(RGB_MATRIX_CYCLE_ALL); | 306 | rgblight_mode(RGB_MATRIX_CYCLE_ALL); |
| 321 | #endif //RGB_matrix | 307 | #endif //RGB_matrix |
| 322 | wait_ms(20); // gets rid of tick | ||
| 323 | PLAY_SONG(tone_startup); | ||
| 324 | } | 308 | } |
| 325 | |||
| 326 | void shutdown_user(void) | ||
| 327 | { | ||
| 328 | PLAY_SONG(tone_goodbye); | ||
| 329 | wait_ms(150); | ||
| 330 | stop_all_notes(); | ||
| 331 | } | ||
| 332 | |||
| 333 | void music_on_user(void) | ||
| 334 | { | ||
| 335 | music_scale_user(); | ||
| 336 | } | ||
| 337 | |||
| 338 | void music_scale_user(void) | ||
| 339 | { | ||
| 340 | PLAY_SONG(music_scale); | ||
| 341 | } | ||
| 342 | |||
| 343 | #endif | ||
| 344 | |||
diff --git a/keyboards/planck/keymaps/jhenahan/keymap.c b/keyboards/planck/keymaps/jhenahan/keymap.c index 21c489922d..c884e864ac 100644 --- a/keyboards/planck/keymaps/jhenahan/keymap.c +++ b/keyboards/planck/keymaps/jhenahan/keymap.c | |||
| @@ -160,15 +160,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | #ifdef AUDIO_ENABLE | 162 | #ifdef AUDIO_ENABLE |
| 163 | |||
| 164 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 165 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 163 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 166 | float tone_workman[][2] = SONG(WORKMAN_SOUND); | 164 | float tone_workman[][2] = SONG(WORKMAN_SOUND); |
| 167 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 165 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 168 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 166 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 169 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 170 | |||
| 171 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 172 | #endif | 167 | #endif |
| 173 | 168 | ||
| 174 | 169 | ||
| @@ -268,36 +263,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 268 | } | 263 | } |
| 269 | return true; | 264 | return true; |
| 270 | } | 265 | } |
| 271 | |||
| 272 | void matrix_init_user(void) { | ||
| 273 | #ifdef AUDIO_ENABLE | ||
| 274 | startup_user(); | ||
| 275 | #endif | ||
| 276 | } | ||
| 277 | |||
| 278 | #ifdef AUDIO_ENABLE | ||
| 279 | |||
| 280 | void startup_user(void) | ||
| 281 | { | ||
| 282 | _delay_ms(20); // gets rid of tick | ||
| 283 | PLAY_SONG(tone_startup); | ||
| 284 | } | ||
| 285 | |||
| 286 | void shutdown_user(void) | ||
| 287 | { | ||
| 288 | PLAY_SONG(tone_goodbye); | ||
| 289 | _delay_ms(150); | ||
| 290 | stop_all_notes(); | ||
| 291 | } | ||
| 292 | |||
| 293 | void music_on_user(void) | ||
| 294 | { | ||
| 295 | music_scale_user(); | ||
| 296 | } | ||
| 297 | |||
| 298 | void music_scale_user(void) | ||
| 299 | { | ||
| 300 | PLAY_SONG(music_scale); | ||
| 301 | } | ||
| 302 | |||
| 303 | #endif | ||
diff --git a/keyboards/planck/keymaps/lae3/keymap.c b/keyboards/planck/keymaps/lae3/keymap.c index 7b6175d543..86c89a30a4 100644 --- a/keyboards/planck/keymaps/lae3/keymap.c +++ b/keyboards/planck/keymaps/lae3/keymap.c | |||
| @@ -168,17 +168,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 168 | 168 | ||
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| 171 | #ifdef AUDIO_ENABLE | 171 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 172 | |||
| 173 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 174 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 175 | |||
| 176 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 177 | |||
| 178 | #endif | ||
| 179 | |||
| 180 | bool process_record_user(uint16_t keycode, keyrecord_t *record) | ||
| 181 | { | ||
| 182 | switch (keycode) { | 172 | switch (keycode) { |
| 183 | case LOWER: | 173 | case LOWER: |
| 184 | if (record->event.pressed) { | 174 | if (record->event.pressed) { |
| @@ -217,37 +207,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) | |||
| 217 | } | 207 | } |
| 218 | return true; | 208 | return true; |
| 219 | } | 209 | } |
| 220 | |||
| 221 | void matrix_init_user(void) | ||
| 222 | { | ||
| 223 | #ifdef AUDIO_ENABLE | ||
| 224 | startup_user(); | ||
| 225 | #endif | ||
| 226 | } | ||
| 227 | |||
| 228 | #ifdef AUDIO_ENABLE | ||
| 229 | |||
| 230 | void startup_user(void) | ||
| 231 | { | ||
| 232 | _delay_ms(100); // gets rid of tick | ||
| 233 | PLAY_SONG(tone_startup); | ||
| 234 | } | ||
| 235 | |||
| 236 | void shutdown_user(void) | ||
| 237 | { | ||
| 238 | PLAY_SONG(tone_goodbye); | ||
| 239 | _delay_ms(150); | ||
| 240 | stop_all_notes(); | ||
| 241 | } | ||
| 242 | |||
| 243 | void music_on_user(void) | ||
| 244 | { | ||
| 245 | music_scale_user(); | ||
| 246 | } | ||
| 247 | |||
| 248 | void music_scale_user(void) | ||
| 249 | { | ||
| 250 | PLAY_SONG(music_scale); | ||
| 251 | } | ||
| 252 | |||
| 253 | #endif | ||
diff --git a/keyboards/planck/keymaps/mjt/keymap.c b/keyboards/planck/keymaps/mjt/keymap.c index e927627e1f..7ab0fff241 100644 --- a/keyboards/planck/keymaps/mjt/keymap.c +++ b/keyboards/planck/keymaps/mjt/keymap.c | |||
| @@ -133,16 +133,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 133 | }; | 133 | }; |
| 134 | 134 | ||
| 135 | #ifdef AUDIO_ENABLE | 135 | #ifdef AUDIO_ENABLE |
| 136 | |||
| 137 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 138 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 136 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 139 | float tone_dyn_macro_rec[][2] = SONG(DVORAK_SOUND); | 137 | float tone_dyn_macro_rec[][2] = SONG(DVORAK_SOUND); |
| 140 | float tone_dyn_macro_play[][2] = SONG(COLEMAK_SOUND); | 138 | float tone_dyn_macro_play[][2] = SONG(COLEMAK_SOUND); |
| 141 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 139 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 142 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 140 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 143 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 144 | |||
| 145 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 146 | #endif | 141 | #endif |
| 147 | 142 | ||
| 148 | void persistant_default_layer_set(uint16_t default_layer) { | 143 | void persistant_default_layer_set(uint16_t default_layer) { |
| @@ -239,36 +234,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 239 | } | 234 | } |
| 240 | return true; | 235 | return true; |
| 241 | } | 236 | } |
| 242 | |||
| 243 | void matrix_init_user(void) { | ||
| 244 | #ifdef AUDIO_ENABLE | ||
| 245 | startup_user(); | ||
| 246 | #endif | ||
| 247 | } | ||
| 248 | |||
| 249 | #ifdef AUDIO_ENABLE | ||
| 250 | |||
| 251 | void startup_user(void) | ||
| 252 | { | ||
| 253 | _delay_ms(20); // gets rid of tick | ||
| 254 | PLAY_SONG(tone_startup); | ||
| 255 | } | ||
| 256 | |||
| 257 | void shutdown_user(void) | ||
| 258 | { | ||
| 259 | PLAY_SONG(tone_goodbye); | ||
| 260 | _delay_ms(150); | ||
| 261 | stop_all_notes(); | ||
| 262 | } | ||
| 263 | |||
| 264 | void music_on_user(void) | ||
| 265 | { | ||
| 266 | music_scale_user(); | ||
| 267 | } | ||
| 268 | |||
| 269 | void music_scale_user(void) | ||
| 270 | { | ||
| 271 | PLAY_SONG(music_scale); | ||
| 272 | } | ||
| 273 | |||
| 274 | #endif | ||
diff --git a/keyboards/planck/keymaps/mjtnumsym/keymap.c b/keyboards/planck/keymaps/mjtnumsym/keymap.c index 3fa05ad178..4eaafb75d6 100644 --- a/keyboards/planck/keymaps/mjtnumsym/keymap.c +++ b/keyboards/planck/keymaps/mjtnumsym/keymap.c | |||
| @@ -132,16 +132,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 132 | }; | 132 | }; |
| 133 | 133 | ||
| 134 | #ifdef AUDIO_ENABLE | 134 | #ifdef AUDIO_ENABLE |
| 135 | |||
| 136 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 137 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 135 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 138 | float tone_dyn_macro_rec[][2] = SONG(DVORAK_SOUND); | 136 | float tone_dyn_macro_rec[][2] = SONG(DVORAK_SOUND); |
| 139 | float tone_dyn_macro_play[][2] = SONG(COLEMAK_SOUND); | 137 | float tone_dyn_macro_play[][2] = SONG(COLEMAK_SOUND); |
| 140 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 138 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 141 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 139 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 142 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 143 | |||
| 144 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 145 | #endif | 140 | #endif |
| 146 | 141 | ||
| 147 | void persistant_default_layer_set(uint16_t default_layer) { | 142 | void persistant_default_layer_set(uint16_t default_layer) { |
| @@ -238,36 +233,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 238 | } | 233 | } |
| 239 | return true; | 234 | return true; |
| 240 | } | 235 | } |
| 241 | |||
| 242 | void matrix_init_user(void) { | ||
| 243 | #ifdef AUDIO_ENABLE | ||
| 244 | startup_user(); | ||
| 245 | #endif | ||
| 246 | } | ||
| 247 | |||
| 248 | #ifdef AUDIO_ENABLE | ||
| 249 | |||
| 250 | void startup_user(void) | ||
| 251 | { | ||
| 252 | _delay_ms(20); // gets rid of tick | ||
| 253 | PLAY_SONG(tone_startup); | ||
| 254 | } | ||
| 255 | |||
| 256 | void shutdown_user(void) | ||
| 257 | { | ||
| 258 | PLAY_SONG(tone_goodbye); | ||
| 259 | _delay_ms(150); | ||
| 260 | stop_all_notes(); | ||
| 261 | } | ||
| 262 | |||
| 263 | void music_on_user(void) | ||
| 264 | { | ||
| 265 | music_scale_user(); | ||
| 266 | } | ||
| 267 | |||
| 268 | void music_scale_user(void) | ||
| 269 | { | ||
| 270 | PLAY_SONG(music_scale); | ||
| 271 | } | ||
| 272 | |||
| 273 | #endif | ||
diff --git a/keyboards/planck/keymaps/originerd/keymap.c b/keyboards/planck/keymaps/originerd/keymap.c index 85e5cd3b16..d7c9ffb6b5 100644 --- a/keyboards/planck/keymaps/originerd/keymap.c +++ b/keyboards/planck/keymaps/originerd/keymap.c | |||
| @@ -101,12 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 101 | }; | 101 | }; |
| 102 | 102 | ||
| 103 | #ifdef AUDIO_ENABLE | 103 | #ifdef AUDIO_ENABLE |
| 104 | |||
| 105 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 106 | float tone_nerd[][2] = SONG(QWERTY_SOUND); | 104 | float tone_nerd[][2] = SONG(QWERTY_SOUND); |
| 107 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 108 | |||
| 109 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 110 | #endif | 105 | #endif |
| 111 | 106 | ||
| 112 | 107 | ||
| @@ -149,36 +144,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 149 | } | 144 | } |
| 150 | return true; | 145 | return true; |
| 151 | } | 146 | } |
| 152 | |||
| 153 | void matrix_init_user(void) { | ||
| 154 | #ifdef AUDIO_ENABLE | ||
| 155 | startup_user(); | ||
| 156 | #endif | ||
| 157 | } | ||
| 158 | |||
| 159 | #ifdef AUDIO_ENABLE | ||
| 160 | |||
| 161 | void startup_user(void) | ||
| 162 | { | ||
| 163 | _delay_ms(20); // gets rid of tick | ||
| 164 | PLAY_SONG(tone_startup); | ||
| 165 | } | ||
| 166 | |||
| 167 | void shutdown_user(void) | ||
| 168 | { | ||
| 169 | PLAY_SONG(tone_goodbye); | ||
| 170 | _delay_ms(150); | ||
| 171 | stop_all_notes(); | ||
| 172 | } | ||
| 173 | |||
| 174 | void music_on_user(void) | ||
| 175 | { | ||
| 176 | music_scale_user(); | ||
| 177 | } | ||
| 178 | |||
| 179 | void music_scale_user(void) | ||
| 180 | { | ||
| 181 | PLAY_SONG(music_scale); | ||
| 182 | } | ||
| 183 | |||
| 184 | #endif | ||
diff --git a/keyboards/planck/keymaps/premek/keymap.c b/keyboards/planck/keymaps/premek/keymap.c index 76d3cabfbc..839a53a6fc 100644 --- a/keyboards/planck/keymaps/premek/keymap.c +++ b/keyboards/planck/keymaps/premek/keymap.c | |||
| @@ -76,16 +76,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | #ifdef AUDIO_ENABLE | 78 | #ifdef AUDIO_ENABLE |
| 79 | |||
| 80 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 81 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 79 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 82 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 80 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 83 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 81 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 84 | float tone_plover[][2] = SONG(PLOVER_SOUND); | 82 | float tone_plover[][2] = SONG(PLOVER_SOUND); |
| 85 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); | 83 | float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); |
| 86 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 87 | |||
| 88 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 89 | #endif | 84 | #endif |
| 90 | 85 | ||
| 91 | 86 | ||
| @@ -185,36 +180,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 185 | } | 180 | } |
| 186 | return true; | 181 | return true; |
| 187 | } | 182 | } |
| 188 | |||
| 189 | void matrix_init_user(void) { | ||
| 190 | #ifdef AUDIO_ENABLE | ||
| 191 | startup_user(); | ||
| 192 | #endif | ||
| 193 | } | ||
| 194 | |||
| 195 | #ifdef AUDIO_ENABLE | ||
| 196 | |||
| 197 | void startup_user(void) | ||
| 198 | { | ||
| 199 | _delay_ms(20); // gets rid of tick | ||
| 200 | PLAY_SONG(tone_startup); | ||
| 201 | } | ||
| 202 | |||
| 203 | void shutdown_user(void) | ||
| 204 | { | ||
| 205 | PLAY_SONG(tone_goodbye); | ||
| 206 | _delay_ms(150); | ||
| 207 | stop_all_notes(); | ||
| 208 | } | ||
| 209 | |||
| 210 | void music_on_user(void) | ||
| 211 | { | ||
| 212 | music_scale_user(); | ||
| 213 | } | ||
| 214 | |||
| 215 | void music_scale_user(void) | ||
| 216 | { | ||
| 217 | PLAY_SONG(music_scale); | ||
| 218 | } | ||
| 219 | |||
| 220 | #endif | ||
diff --git a/keyboards/planck/keymaps/roguepullrequest/keymap.c b/keyboards/planck/keymaps/roguepullrequest/keymap.c index 61221601e6..31cce52a5f 100644 --- a/keyboards/planck/keymaps/roguepullrequest/keymap.c +++ b/keyboards/planck/keymaps/roguepullrequest/keymap.c | |||
| @@ -28,7 +28,7 @@ enum { | |||
| 28 | RSHIFT, | 28 | RSHIFT, |
| 29 | LSHIFT, | 29 | LSHIFT, |
| 30 | TD_S, | 30 | TD_S, |
| 31 | SLASH | 31 | SLASH |
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | int cur_dance (tap_dance_state_t *state); | 34 | int cur_dance (tap_dance_state_t *state); |
| @@ -116,10 +116,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 116 | TD(LSHIFT), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(RSHIFT), | 116 | TD(LSHIFT), KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, TD(RSHIFT), |
| 117 | TD(X_AT_FUN), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, ALT_TAB, KC_SPACE, KC_ENTER, MT(MOD_LCTL | MOD_LSFT, KC_LGUI), KC_PGUP, KC_PGDN, LT(_LOWER, KC_PLUS) | 117 | TD(X_AT_FUN), KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, ALT_TAB, KC_SPACE, KC_ENTER, MT(MOD_LCTL | MOD_LSFT, KC_LGUI), KC_PGUP, KC_PGDN, LT(_LOWER, KC_PLUS) |
| 118 | ), | 118 | ), |
| 119 | 119 | ||
| 120 | [_UPPER] = LAYOUT_planck_grid( | 120 | [_UPPER] = LAYOUT_planck_grid( |
| 121 | KC_GRAVE, KC_AMPR, KC_PERC, KC_NO, KC_NO, KC_EQL, KC_ASTR, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_TRNS, | 121 | KC_GRAVE, KC_AMPR, KC_PERC, KC_NO, KC_NO, KC_EQL, KC_ASTR, KC_NO, KC_NO, KC_EXLM, KC_HASH, KC_TRNS, |
| 122 | KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS, | 122 | KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BSLS, |
| 123 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 123 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
| 124 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS | 124 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS |
| 125 | ), | 125 | ), |
| @@ -156,7 +156,7 @@ int cur_dance (tap_dance_state_t *state) { | |||
| 156 | if (state->interrupted || !state->pressed)return TRIPLE_TAP; | 156 | if (state->interrupted || !state->pressed)return TRIPLE_TAP; |
| 157 | else return TRIPLE_HOLD; | 157 | else return TRIPLE_HOLD; |
| 158 | } | 158 | } |
| 159 | else return 8; // magic number that i dont believe works. | 159 | else return 8; // magic number that i dont believe works. |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | // instance of tap for the 'X' dance. | 162 | // instance of tap for the 'X' dance. |
| @@ -251,4 +251,7 @@ tap_dance_action_t tap_dance_actions[] = { | |||
| 251 | 251 | ||
| 252 | }; | 252 | }; |
| 253 | 253 | ||
| 254 | void shutdown_user(void) { clear_keyboard(); } | 254 | bool shutdown_user(bool jump_to_bootloader) { |
| 255 | clear_keyboard(); | ||
| 256 | return true; | ||
| 257 | } | ||
diff --git a/keyboards/planck/keymaps/sdothum/common/init.h b/keyboards/planck/keymaps/sdothum/common/init.h index 6d0b4392fb..e6bb7101e9 100644 --- a/keyboards/planck/keymaps/sdothum/common/init.h +++ b/keyboards/planck/keymaps/sdothum/common/init.h | |||
| @@ -6,9 +6,6 @@ void matrix_init_user(void) | |||
| 6 | #ifdef STENO_ENABLE | 6 | #ifdef STENO_ENABLE |
| 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI | 7 | steno_set_mode(STENO_MODE_BOLT); // or STENO_MODE_GEMINI |
| 8 | #endif | 8 | #endif |
| 9 | #ifdef AUDIO_ENABLE | ||
| 10 | startup_user(); | ||
| 11 | #endif | ||
| 12 | } | 9 | } |
| 13 | 10 | ||
| 14 | #ifdef AUDIO_ENABLE | 11 | #ifdef AUDIO_ENABLE |
| @@ -31,27 +28,4 @@ bool led_update_user(led_t led_state) | |||
| 31 | return false; | 28 | return false; |
| 32 | } | 29 | } |
| 33 | #endif | 30 | #endif |
| 34 | |||
| 35 | void startup_user(void) | ||
| 36 | { | ||
| 37 | _delay_ms(20); // gets rid of tick | ||
| 38 | PLAY_SONG(song_startup); | ||
| 39 | } | ||
| 40 | |||
| 41 | void shutdown_user(void) | ||
| 42 | { | ||
| 43 | PLAY_SONG(song_goodbye); | ||
| 44 | _delay_ms(150); | ||
| 45 | stop_all_notes(); | ||
| 46 | } | ||
| 47 | |||
| 48 | void music_on_user(void) | ||
| 49 | { | ||
| 50 | music_scale_user(); | ||
| 51 | } | ||
| 52 | |||
| 53 | void music_scale_user(void) | ||
| 54 | { | ||
| 55 | PLAY_SONG(music_scale); | ||
| 56 | } | ||
| 57 | #endif | 31 | #endif |
diff --git a/keyboards/planck/keymaps/sgoodwin/keymap.c b/keyboards/planck/keymaps/sgoodwin/keymap.c index e61cd4de68..fbfe793cb8 100644 --- a/keyboards/planck/keymaps/sgoodwin/keymap.c +++ b/keyboards/planck/keymaps/sgoodwin/keymap.c | |||
| @@ -120,13 +120,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 120 | }; | 120 | }; |
| 121 | 121 | ||
| 122 | #ifdef AUDIO_ENABLE | 122 | #ifdef AUDIO_ENABLE |
| 123 | |||
| 124 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 125 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 123 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 126 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 124 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 127 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 128 | |||
| 129 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 130 | #endif | 125 | #endif |
| 131 | 126 | ||
| 132 | 127 | ||
| @@ -189,36 +184,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 189 | } | 184 | } |
| 190 | return true; | 185 | return true; |
| 191 | } | 186 | } |
| 192 | |||
| 193 | void matrix_init_user(void) { | ||
| 194 | #ifdef AUDIO_ENABLE | ||
| 195 | startup_user(); | ||
| 196 | #endif | ||
| 197 | } | ||
| 198 | |||
| 199 | #ifdef AUDIO_ENABLE | ||
| 200 | |||
| 201 | void startup_user(void) | ||
| 202 | { | ||
| 203 | _delay_ms(20); // gets rid of tick | ||
| 204 | PLAY_SONG(tone_startup); | ||
| 205 | } | ||
| 206 | |||
| 207 | void shutdown_user(void) | ||
| 208 | { | ||
| 209 | PLAY_SONG(tone_goodbye); | ||
| 210 | _delay_ms(150); | ||
| 211 | stop_all_notes(); | ||
| 212 | } | ||
| 213 | |||
| 214 | void music_on_user(void) | ||
| 215 | { | ||
| 216 | music_scale_user(); | ||
| 217 | } | ||
| 218 | |||
| 219 | void music_scale_user(void) | ||
| 220 | { | ||
| 221 | PLAY_SONG(music_scale); | ||
| 222 | } | ||
| 223 | |||
| 224 | #endif | ||
diff --git a/keyboards/planck/keymaps/smt/keymap.c b/keyboards/planck/keymaps/smt/keymap.c index 6320e11fcf..7d558e4383 100644 --- a/keyboards/planck/keymaps/smt/keymap.c +++ b/keyboards/planck/keymaps/smt/keymap.c | |||
| @@ -142,14 +142,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | #ifdef AUDIO_ENABLE | 144 | #ifdef AUDIO_ENABLE |
| 145 | |||
| 146 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 147 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 145 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 148 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 146 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 149 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 147 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 150 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 151 | |||
| 152 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 153 | #endif | 148 | #endif |
| 154 | 149 | ||
| 155 | 150 | ||
| @@ -221,36 +216,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 221 | } | 216 | } |
| 222 | return true; | 217 | return true; |
| 223 | } | 218 | } |
| 224 | |||
| 225 | void matrix_init_user(void) { | ||
| 226 | #ifdef AUDIO_ENABLE | ||
| 227 | startup_user(); | ||
| 228 | #endif | ||
| 229 | } | ||
| 230 | |||
| 231 | #ifdef AUDIO_ENABLE | ||
| 232 | |||
| 233 | void startup_user(void) | ||
| 234 | { | ||
| 235 | _delay_ms(20); // gets rid of tick | ||
| 236 | PLAY_SONG(tone_startup); | ||
| 237 | } | ||
| 238 | |||
| 239 | void shutdown_user(void) | ||
| 240 | { | ||
| 241 | PLAY_SONG(tone_goodbye); | ||
| 242 | _delay_ms(150); | ||
| 243 | stop_all_notes(); | ||
| 244 | } | ||
| 245 | |||
| 246 | void music_on_user(void) | ||
| 247 | { | ||
| 248 | music_scale_user(); | ||
| 249 | } | ||
| 250 | |||
| 251 | void music_scale_user(void) | ||
| 252 | { | ||
| 253 | PLAY_SONG(music_scale); | ||
| 254 | } | ||
| 255 | |||
| 256 | #endif | ||
diff --git a/keyboards/planck/keymaps/that_canadian/keymap.c b/keyboards/planck/keymaps/that_canadian/keymap.c index 9f3a415fa3..d7b8a6b356 100644 --- a/keyboards/planck/keymaps/that_canadian/keymap.c +++ b/keyboards/planck/keymaps/that_canadian/keymap.c | |||
| @@ -123,14 +123,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | #ifdef AUDIO_ENABLE | 125 | #ifdef AUDIO_ENABLE |
| 126 | |||
| 127 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 128 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 126 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 129 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 127 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 130 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 128 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 131 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 132 | |||
| 133 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 134 | #endif | 129 | #endif |
| 135 | 130 | ||
| 136 | 131 | ||
| @@ -173,36 +168,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 173 | } | 168 | } |
| 174 | return true; | 169 | return true; |
| 175 | } | 170 | } |
| 176 | |||
| 177 | void matrix_init_user(void) { | ||
| 178 | #ifdef AUDIO_ENABLE | ||
| 179 | startup_user(); | ||
| 180 | #endif | ||
| 181 | } | ||
| 182 | |||
| 183 | #ifdef AUDIO_ENABLE | ||
| 184 | |||
| 185 | void startup_user(void) | ||
| 186 | { | ||
| 187 | _delay_ms(20); // gets rid of tick | ||
| 188 | PLAY_SONG(tone_startup); | ||
| 189 | } | ||
| 190 | |||
| 191 | void shutdown_user(void) | ||
| 192 | { | ||
| 193 | PLAY_SONG(tone_goodbye); | ||
| 194 | _delay_ms(150); | ||
| 195 | stop_all_notes(); | ||
| 196 | } | ||
| 197 | |||
| 198 | void music_on_user(void) | ||
| 199 | { | ||
| 200 | music_scale_user(); | ||
| 201 | } | ||
| 202 | |||
| 203 | void music_scale_user(void) | ||
| 204 | { | ||
| 205 | PLAY_SONG(music_scale); | ||
| 206 | } | ||
| 207 | |||
| 208 | #endif | ||
diff --git a/keyboards/planck/keymaps/vaire/keymap.c b/keyboards/planck/keymaps/vaire/keymap.c index f58486cda8..00b49e52d7 100644 --- a/keyboards/planck/keymaps/vaire/keymap.c +++ b/keyboards/planck/keymaps/vaire/keymap.c | |||
| @@ -31,42 +31,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | LAYOUT_planck_grid( | 33 | LAYOUT_planck_grid( |
| 34 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 34 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
| 35 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 35 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
| 36 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SFT_T(KC_ENT), | 36 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SFT_T(KC_ENT), |
| 37 | MO(1), KC_LCTL, KC_LALT, KC_LGUI, MO(2), LT(5,KC_ENT), LT(4,KC_SPC), MO(3), KC_SLSH, KC_LEFT, KC_DOWN, CTL_T(KC_RGHT)), | 37 | MO(1), KC_LCTL, KC_LALT, KC_LGUI, MO(2), LT(5,KC_ENT), LT(4,KC_SPC), MO(3), KC_SLSH, KC_LEFT, KC_DOWN, CTL_T(KC_RGHT)), |
| 38 | 38 | ||
| 39 | LAYOUT_planck_grid( | 39 | LAYOUT_planck_grid( |
| 40 | KC_ESC, KC_NUM, LCTL(KC_SPC), KC_UP, LSFT(KC_SPC), KC_DLR, KC_EQL, KC_P7, KC_P8, KC_P9, KC_PPLS, LCTL(KC_BSPC), | 40 | KC_ESC, KC_NUM, LCTL(KC_SPC), KC_UP, LSFT(KC_SPC), KC_DLR, KC_EQL, KC_P7, KC_P8, KC_P9, KC_PPLS, LCTL(KC_BSPC), |
| 41 | KC_TAB, FIND, KC_LEFT, KC_DOWN, KC_RGHT, KC_PERC, KC_CIRC, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_BSLS, | 41 | KC_TAB, FIND, KC_LEFT, KC_DOWN, KC_RGHT, KC_PERC, KC_CIRC, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_BSLS, |
| 42 | KC_LSFT, UNDO, CUT, COPY, PASTE, EXCEL_HOME, KC_PSCR, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_LSFT, | 42 | KC_LSFT, UNDO, CUT, COPY, PASTE, EXCEL_HOME, KC_PSCR, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_LSFT, |
| 43 | KC_TRNS, KC_LCTL, KC_LALT, KC_LGUI, TO(1), KC_ENT, KC_SPC, KC_PENT, KC_P0, KC_PDOT, KC_PAST, KC_LCTL), | 43 | KC_TRNS, KC_LCTL, KC_LALT, KC_LGUI, TO(1), KC_ENT, KC_SPC, KC_PENT, KC_P0, KC_PDOT, KC_PAST, KC_LCTL), |
| 44 | 44 | ||
| 45 | LAYOUT_planck_grid( | 45 | LAYOUT_planck_grid( |
| 46 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, | 46 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, |
| 47 | KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LT, KC_GT, KC_LPRN, | 47 | KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LT, KC_GT, KC_LPRN, |
| 48 | KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_MPLY, KC_MNXT, KC_PGUP, SFT_T(KC_VOLU), | 48 | KC_LSFT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_MPLY, KC_MNXT, KC_PGUP, SFT_T(KC_VOLU), |
| 49 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_ENT, KC_SPC, MO(3), KC_PSCR, KC_MPRV, KC_PGDN, CTL_T(KC_VOLD)), | 49 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, KC_TRNS, KC_ENT, KC_SPC, MO(3), KC_PSCR, KC_MPRV, KC_PGDN, CTL_T(KC_VOLD)), |
| 50 | 50 | ||
| 51 | LAYOUT_planck_grid( | 51 | LAYOUT_planck_grid( |
| 52 | KC_TILD, DESK_LEFT, WIN_LEFT, KC_F4, WIN_RIGHT, DESK_RIGHT, DOCS, SNAP_LEFT, SNAP_UP, SNAP_RIGHT, SNAP_DOWN, KC_DEL, | 52 | KC_TILD, DESK_LEFT, WIN_LEFT, KC_F4, WIN_RIGHT, DESK_RIGHT, DOCS, SNAP_LEFT, SNAP_UP, SNAP_RIGHT, SNAP_DOWN, KC_DEL, |
| 53 | KC_CAPS, KC_QUOT, KC_LBRC, KC_LCBR, KC_LPRN, KC_BSLS, KC_SLSH, KC_RPRN, KC_RCBR, KC_RBRC, KC_DQUO, KC_QUOT, | 53 | KC_CAPS, KC_QUOT, KC_LBRC, KC_LCBR, KC_LPRN, KC_BSLS, KC_SLSH, KC_RPRN, KC_RCBR, KC_RBRC, KC_DQUO, KC_QUOT, |
| 54 | KC_PWR, KC_SLEP, KC_WAKE, KC_HOME, BL_BRTG, BL_STEP, KC_TRNS, KC_CALC, KC_LT, KC_GT, KC_COLON, KC_LSFT, | 54 | KC_PWR, KC_SLEP, KC_WAKE, KC_HOME, BL_BRTG, BL_STEP, KC_TRNS, KC_CALC, KC_LT, KC_GT, KC_COLON, KC_LSFT, |
| 55 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_TRNS, AU_TOGG, MU_TOGG, MU_NEXT, LCTL(KC_RGHT)), | 55 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_TRNS, AU_TOGG, MU_TOGG, MU_NEXT, LCTL(KC_RGHT)), |
| 56 | 56 | ||
| 57 | LAYOUT_planck_grid( | 57 | LAYOUT_planck_grid( |
| 58 | TO(0), KC_LSCR, WIN_LEFT, KC_MS_WH_UP, WIN_RIGHT, KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_TRNS, KC_TRNS, | 58 | TO(0), KC_LSCR, WIN_LEFT, KC_MS_WH_UP, WIN_RIGHT, KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_TRNS, KC_TRNS, |
| 59 | KC_TRNS, KC_INS, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, | 59 | KC_TRNS, KC_INS, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, |
| 60 | QK_BOOT, KC_APP, KC_MS_ACCEL0, KC_MS_ACCEL0, KC_MS_ACCEL0, KC_TRNS, KC_TRNS, TO(0), TO(1), TO(2), TO(3), TO(4), | 60 | QK_BOOT, KC_APP, KC_MS_ACCEL0, KC_MS_ACCEL0, KC_MS_ACCEL0, KC_TRNS, KC_TRNS, TO(0), TO(1), TO(2), TO(3), TO(4), |
| 61 | TO(0), KC_MENU, KC_TRNS, KC_TRNS, KC_LALT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RCTL), | 61 | TO(0), KC_MENU, KC_TRNS, KC_TRNS, KC_LALT, KC_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RCTL), |
| 62 | 62 | ||
| 63 | LAYOUT_planck_grid( | 63 | LAYOUT_planck_grid( |
| 64 | KC_BSPC, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSPC, | 64 | KC_BSPC, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_BSPC, |
| 65 | KC_TAB, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_G, KC_F, KC_D, KC_S, KC_A, KC_QUOT, | 65 | KC_TAB, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_G, KC_F, KC_D, KC_S, KC_A, KC_QUOT, |
| 66 | KC_LSFT, KC_ENT, KC_DOT, KC_COMM, KC_M, KC_N, KC_B, KC_V, KC_C, KC_X, KC_Z, SFT_T(KC_ENT), | 66 | KC_LSFT, KC_ENT, KC_DOT, KC_COMM, KC_M, KC_N, KC_B, KC_V, KC_C, KC_X, KC_Z, SFT_T(KC_ENT), |
| 67 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, MO(2), KC_TRNS, KC_TRNS, MO(3), KC_SLSH, KC_LEFT, KC_DOWN, LCTL(KC_RGHT)), | 67 | TO(0), KC_LCTL, KC_LALT, KC_LGUI, MO(2), KC_TRNS, KC_TRNS, MO(3), KC_SLSH, KC_LEFT, KC_DOWN, LCTL(KC_RGHT)), |
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| @@ -76,7 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 76 | void matrix_init_user(void) | 76 | void matrix_init_user(void) |
| 77 | { | 77 | { |
| 78 | set_voice(default_voice); | 78 | set_voice(default_voice); |
| 79 | startup_user(); | ||
| 80 | println("Matrix Init"); | 79 | println("Matrix Init"); |
| 81 | } | 80 | } |
| 82 | 81 | ||
| @@ -123,29 +122,4 @@ bool led_update_user(led_t led_state) | |||
| 123 | old_led_state = led_state; | 122 | old_led_state = led_state; |
| 124 | return false; | 123 | return false; |
| 125 | } | 124 | } |
| 126 | 125 | #endif /* AUDIO_ENABLE */ | |
| 127 | |||
| 128 | void startup_user(void) | ||
| 129 | { | ||
| 130 | _delay_ms(30); // gets rid of tick | ||
| 131 | PLAY_SONG(tone_my_startup); | ||
| 132 | } | ||
| 133 | |||
| 134 | void shutdown_user(void) | ||
| 135 | { | ||
| 136 | PLAY_SONG(tone_my_goodbye); | ||
| 137 | _delay_ms(3000); | ||
| 138 | stop_all_notes(); | ||
| 139 | } | ||
| 140 | |||
| 141 | void audio_on_user(void) | ||
| 142 | { | ||
| 143 | PLAY_SONG(tone_audio_on); | ||
| 144 | } | ||
| 145 | |||
| 146 | void music_on_user(void) | ||
| 147 | { | ||
| 148 | PLAY_SONG(tone_music_on); | ||
| 149 | } | ||
| 150 | |||
| 151 | #endif /* AUDIO_ENABLE */ \ No newline at end of file | ||
diff --git a/keyboards/planck/keymaps/zach/zach_common_functions.c b/keyboards/planck/keymaps/zach/zach_common_functions.c index ae5f44e713..e17e31c7b5 100644 --- a/keyboards/planck/keymaps/zach/zach_common_functions.c +++ b/keyboards/planck/keymaps/zach/zach_common_functions.c | |||
| @@ -52,8 +52,6 @@ enum my_keycodes{ | |||
| 52 | 52 | ||
| 53 | #ifdef AUDIO_ENABLE | 53 | #ifdef AUDIO_ENABLE |
| 54 | #include "audio.h" | 54 | #include "audio.h" |
| 55 | float tone_startup[][2] = SONG(STARTUP_SOUND); | ||
| 56 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 57 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 55 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 58 | float tone_swcole[][2] = SONG(QWERTY_SOUND); | 56 | float tone_swcole[][2] = SONG(QWERTY_SOUND); |
| 59 | float tone_capslock_on[][2] = SONG(CAPS_LOCK_ON_SOUND); | 57 | float tone_capslock_on[][2] = SONG(CAPS_LOCK_ON_SOUND); |
| @@ -414,32 +412,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 414 | return true; | 412 | return true; |
| 415 | }; | 413 | }; |
| 416 | 414 | ||
| 417 | void matrix_init_user(void){ // Run once at startup | ||
| 418 | #ifdef AUDIO_ENABLE | ||
| 419 | _delay_ms(50); // gets rid of tick | ||
| 420 | PLAY_SONG(tone_startup); | ||
| 421 | #endif | ||
| 422 | } | ||
| 423 | |||
| 424 | #ifdef AUDIO_ENABLE | ||
| 425 | void play_goodbye_tone(void){ | ||
| 426 | PLAY_SONG(tone_goodbye); | ||
| 427 | _delay_ms(150); | ||
| 428 | } | ||
| 429 | |||
| 430 | void shutdown_user(void){ | ||
| 431 | PLAY_SONG(tone_goodbye); | ||
| 432 | _delay_ms(150); | ||
| 433 | stop_all_notes(); | ||
| 434 | } | ||
| 435 | |||
| 436 | void music_on_user(void){ // Run when the music layer is turned on | ||
| 437 | PLAY_SONG(tone_startup); | ||
| 438 | } | ||
| 439 | |||
| 440 | void music_off_user(void){ // Run when music is turned off | ||
| 441 | PLAY_SONG(tone_goodbye); | ||
| 442 | } | ||
| 443 | #endif | ||
| 444 | |||
| 445 | #endif | 415 | #endif |
