diff options
| author | Drashna Jaelre <drashna@live.com> | 2023-11-26 03:59:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-26 22:59:18 +1100 |
| commit | 3ef06aa732ce8063e11b2f983592529883f7ecbc (patch) | |
| tree | 7fa143f938e711b6db1c2ed40c36298b8f7604c7 /keyboards/preonic | |
| parent | 4601f339e48b0116ca139dd06ce55ef0b9ed598f (diff) | |
Improve and Cleanup Shutdown callbacks (#21060)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Diffstat (limited to 'keyboards/preonic')
| -rw-r--r-- | keyboards/preonic/keymaps/0xdec/keymap.c | 27 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/bucktooth/keymap.c | 44 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/jacwib/keymap.c | 46 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/nikchi/keymap.c | 44 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/smt/keymap.c | 44 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/that_canadian/keymap.c | 44 | ||||
| -rw-r--r-- | keyboards/preonic/keymaps/zach/zach_common_functions.c | 28 |
7 files changed, 0 insertions, 277 deletions
diff --git a/keyboards/preonic/keymaps/0xdec/keymap.c b/keyboards/preonic/keymaps/0xdec/keymap.c index fafa5c4460..fad47842a5 100644 --- a/keyboards/preonic/keymaps/0xdec/keymap.c +++ b/keyboards/preonic/keymaps/0xdec/keymap.c | |||
| @@ -81,13 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 81 | 81 | ||
| 82 | 82 | ||
| 83 | #ifdef AUDIO_ENABLE | 83 | #ifdef AUDIO_ENABLE |
| 84 | |||
| 85 | float tone_startup[][2] = { | ||
| 86 | {NOTE_B5, 20}, | ||
| 87 | {NOTE_B6, 8}, | ||
| 88 | {NOTE_DS6, 20}, | ||
| 89 | {NOTE_B6, 8} | ||
| 90 | }; | ||
| 91 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 84 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 92 | float tone_game[][2] = { | 85 | float tone_game[][2] = { |
| 93 | {NOTE_E6, 10} ,{NOTE_E6, 10} ,{NOTE_REST, 10} ,{NOTE_E6, 10} , | 86 | {NOTE_E6, 10} ,{NOTE_E6, 10} ,{NOTE_REST, 10} ,{NOTE_E6, 10} , |
| @@ -95,26 +88,6 @@ float tone_game[][2] = { | |||
| 95 | {NOTE_G6, 10} ,{NOTE_REST, 30}, | 88 | {NOTE_G6, 10} ,{NOTE_REST, 30}, |
| 96 | {NOTE_G5, 10} ,{NOTE_REST, 30} | 89 | {NOTE_G5, 10} ,{NOTE_REST, 30} |
| 97 | }; | 90 | }; |
| 98 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 99 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 100 | |||
| 101 | void startup_user(void) { | ||
| 102 | _delay_ms(20); // gets rid of tick | ||
| 103 | PLAY_SONG(tone_startup); | ||
| 104 | } | ||
| 105 | void shutdown_user(void) { | ||
| 106 | PLAY_SONG(tone_goodbye); | ||
| 107 | _delay_ms(150); | ||
| 108 | stop_all_notes(); | ||
| 109 | } | ||
| 110 | |||
| 111 | void music_on_user(void) { | ||
| 112 | music_scale_user(); | ||
| 113 | } | ||
| 114 | void music_scale_user(void) { | ||
| 115 | PLAY_SONG(music_scale); | ||
| 116 | } | ||
| 117 | |||
| 118 | #endif | 91 | #endif |
| 119 | 92 | ||
| 120 | 93 | ||
diff --git a/keyboards/preonic/keymaps/bucktooth/keymap.c b/keyboards/preonic/keymaps/bucktooth/keymap.c index 593083f201..09602a1673 100644 --- a/keyboards/preonic/keymaps/bucktooth/keymap.c +++ b/keyboards/preonic/keymaps/bucktooth/keymap.c | |||
| @@ -69,47 +69,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 69 | ) | 69 | ) |
| 70 | 70 | ||
| 71 | }; | 71 | }; |
| 72 | |||
| 73 | #ifdef AUDIO_ENABLE | ||
| 74 | float tone_startup[][2] = { | ||
| 75 | {NOTE_C5, 8}, | ||
| 76 | {NOTE_E6, 4}, | ||
| 77 | {NOTE_D6, 16}, | ||
| 78 | {NOTE_G6, 8} | ||
| 79 | }; | ||
| 80 | |||
| 81 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 82 | |||
| 83 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 84 | #endif | ||
| 85 | |||
| 86 | void matrix_init_user(void) { | ||
| 87 | #ifdef AUDIO_ENABLE | ||
| 88 | startup_user(); | ||
| 89 | #endif | ||
| 90 | } | ||
| 91 | |||
| 92 | #ifdef AUDIO_ENABLE | ||
| 93 | |||
| 94 | void startup_user(void) | ||
| 95 | { | ||
| 96 | PLAY_SONG(tone_startup); | ||
| 97 | } | ||
| 98 | |||
| 99 | void shutdown_user(void) | ||
| 100 | { | ||
| 101 | PLAY_SONG(tone_goodbye); | ||
| 102 | stop_all_notes(); | ||
| 103 | } | ||
| 104 | |||
| 105 | void music_on_user(void) | ||
| 106 | { | ||
| 107 | music_scale_user(); | ||
| 108 | } | ||
| 109 | |||
| 110 | void music_scale_user(void) | ||
| 111 | { | ||
| 112 | PLAY_SONG(music_scale); | ||
| 113 | } | ||
| 114 | |||
| 115 | #endif | ||
diff --git a/keyboards/preonic/keymaps/jacwib/keymap.c b/keyboards/preonic/keymaps/jacwib/keymap.c index 9de460c2a4..694c44b3c7 100644 --- a/keyboards/preonic/keymaps/jacwib/keymap.c +++ b/keyboards/preonic/keymaps/jacwib/keymap.c | |||
| @@ -174,19 +174,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 174 | 174 | ||
| 175 | }; | 175 | }; |
| 176 | 176 | ||
| 177 | #ifdef AUDIO_ENABLE | ||
| 178 | float tone_startup[][2] = { | ||
| 179 | {NOTE_D5, 8}, | ||
| 180 | {NOTE_E6, 8}, | ||
| 181 | {NOTE_D6, 8}, | ||
| 182 | {NOTE_E5, 8} | ||
| 183 | }; | ||
| 184 | |||
| 185 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 186 | |||
| 187 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 188 | #endif | ||
| 189 | |||
| 190 | void persistent_default_layer_set(uint16_t default_layer) { | 177 | void persistent_default_layer_set(uint16_t default_layer) { |
| 191 | eeconfig_update_default_layer(default_layer); | 178 | eeconfig_update_default_layer(default_layer); |
| 192 | default_layer_set(default_layer); | 179 | default_layer_set(default_layer); |
| @@ -249,36 +236,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 249 | } | 236 | } |
| 250 | return true; | 237 | return true; |
| 251 | }; | 238 | }; |
| 252 | |||
| 253 | void matrix_init_user(void) { | ||
| 254 | #ifdef AUDIO_ENABLE | ||
| 255 | startup_user(); | ||
| 256 | #endif | ||
| 257 | } | ||
| 258 | |||
| 259 | #ifdef AUDIO_ENABLE | ||
| 260 | |||
| 261 | void startup_user(void) | ||
| 262 | { | ||
| 263 | _delay_ms(20); // gets rid of tick | ||
| 264 | PLAY_SONG(tone_startup); | ||
| 265 | } | ||
| 266 | |||
| 267 | void shutdown_user(void) | ||
| 268 | { | ||
| 269 | PLAY_SONG(tone_goodbye); | ||
| 270 | _delay_ms(150); | ||
| 271 | stop_all_notes(); | ||
| 272 | } | ||
| 273 | |||
| 274 | void music_on_user(void) | ||
| 275 | { | ||
| 276 | music_scale_user(); | ||
| 277 | } | ||
| 278 | |||
| 279 | void music_scale_user(void) | ||
| 280 | { | ||
| 281 | PLAY_SONG(music_scale); | ||
| 282 | } | ||
| 283 | |||
| 284 | #endif | ||
diff --git a/keyboards/preonic/keymaps/nikchi/keymap.c b/keyboards/preonic/keymaps/nikchi/keymap.c index e14f8f0052..50589039b7 100644 --- a/keyboards/preonic/keymaps/nikchi/keymap.c +++ b/keyboards/preonic/keymaps/nikchi/keymap.c | |||
| @@ -111,20 +111,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | #ifdef AUDIO_ENABLE | 113 | #ifdef AUDIO_ENABLE |
| 114 | float tone_startup[][2] = { | ||
| 115 | {NOTE_B5, 20}, | ||
| 116 | {NOTE_B6, 8}, | ||
| 117 | {NOTE_DS6, 20}, | ||
| 118 | {NOTE_B6, 8} | ||
| 119 | }; | ||
| 120 | |||
| 121 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 114 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 122 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 115 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 123 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 116 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 124 | |||
| 125 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 126 | |||
| 127 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 128 | #endif | 117 | #endif |
| 129 | 118 | ||
| 130 | void persistent_default_layer_set(uint16_t default_layer) { | 119 | void persistent_default_layer_set(uint16_t default_layer) { |
| @@ -177,36 +166,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 177 | } | 166 | } |
| 178 | return true; | 167 | return true; |
| 179 | }; | 168 | }; |
| 180 | |||
| 181 | void matrix_init_user(void) { | ||
| 182 | #ifdef AUDIO_ENABLE | ||
| 183 | startup_user(); | ||
| 184 | #endif | ||
| 185 | } | ||
| 186 | |||
| 187 | #ifdef AUDIO_ENABLE | ||
| 188 | |||
| 189 | void startup_user(void) | ||
| 190 | { | ||
| 191 | _delay_ms(20); // gets rid of tick | ||
| 192 | PLAY_SONG(tone_startup); | ||
| 193 | } | ||
| 194 | |||
| 195 | void shutdown_user(void) | ||
| 196 | { | ||
| 197 | PLAY_SONG(tone_goodbye); | ||
| 198 | _delay_ms(150); | ||
| 199 | stop_all_notes(); | ||
| 200 | } | ||
| 201 | |||
| 202 | void music_on_user(void) | ||
| 203 | { | ||
| 204 | music_scale_user(); | ||
| 205 | } | ||
| 206 | |||
| 207 | void music_scale_user(void) | ||
| 208 | { | ||
| 209 | PLAY_SONG(music_scale); | ||
| 210 | } | ||
| 211 | |||
| 212 | #endif | ||
diff --git a/keyboards/preonic/keymaps/smt/keymap.c b/keyboards/preonic/keymaps/smt/keymap.c index 7dd9545261..22f6c39a92 100644 --- a/keyboards/preonic/keymaps/smt/keymap.c +++ b/keyboards/preonic/keymaps/smt/keymap.c | |||
| @@ -158,20 +158,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | #ifdef AUDIO_ENABLE | 160 | #ifdef AUDIO_ENABLE |
| 161 | float tone_startup[][2] = { | ||
| 162 | {NOTE_B5, 20}, | ||
| 163 | {NOTE_B6, 8}, | ||
| 164 | {NOTE_DS6, 20}, | ||
| 165 | {NOTE_B6, 8} | ||
| 166 | }; | ||
| 167 | |||
| 168 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 161 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 169 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 162 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 170 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 163 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 171 | |||
| 172 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 173 | |||
| 174 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 175 | #endif | 164 | #endif |
| 176 | 165 | ||
| 177 | void persistent_default_layer_set(uint16_t default_layer) { | 166 | void persistent_default_layer_set(uint16_t default_layer) { |
| @@ -242,36 +231,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 242 | } | 231 | } |
| 243 | return true; | 232 | return true; |
| 244 | }; | 233 | }; |
| 245 | |||
| 246 | void matrix_init_user(void) { | ||
| 247 | #ifdef AUDIO_ENABLE | ||
| 248 | startup_user(); | ||
| 249 | #endif | ||
| 250 | } | ||
| 251 | |||
| 252 | #ifdef AUDIO_ENABLE | ||
| 253 | |||
| 254 | void startup_user(void) | ||
| 255 | { | ||
| 256 | _delay_ms(20); // gets rid of tick | ||
| 257 | PLAY_SONG(tone_startup); | ||
| 258 | } | ||
| 259 | |||
| 260 | void shutdown_user(void) | ||
| 261 | { | ||
| 262 | PLAY_SONG(tone_goodbye); | ||
| 263 | _delay_ms(150); | ||
| 264 | stop_all_notes(); | ||
| 265 | } | ||
| 266 | |||
| 267 | void music_on_user(void) | ||
| 268 | { | ||
| 269 | music_scale_user(); | ||
| 270 | } | ||
| 271 | |||
| 272 | void music_scale_user(void) | ||
| 273 | { | ||
| 274 | PLAY_SONG(music_scale); | ||
| 275 | } | ||
| 276 | |||
| 277 | #endif | ||
diff --git a/keyboards/preonic/keymaps/that_canadian/keymap.c b/keyboards/preonic/keymaps/that_canadian/keymap.c index 8af796821c..18b2e046e8 100644 --- a/keyboards/preonic/keymaps/that_canadian/keymap.c +++ b/keyboards/preonic/keymaps/that_canadian/keymap.c | |||
| @@ -135,20 +135,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 135 | }; | 135 | }; |
| 136 | 136 | ||
| 137 | #ifdef AUDIO_ENABLE | 137 | #ifdef AUDIO_ENABLE |
| 138 | float tone_startup[][2] = { | ||
| 139 | {NOTE_B5, 20}, | ||
| 140 | {NOTE_B6, 8}, | ||
| 141 | {NOTE_DS6, 20}, | ||
| 142 | {NOTE_B6, 8} | ||
| 143 | }; | ||
| 144 | |||
| 145 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 138 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 146 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 139 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 147 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 140 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 148 | |||
| 149 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); | ||
| 150 | |||
| 151 | float music_scale[][2] = SONG(MUSIC_SCALE_SOUND); | ||
| 152 | #endif | 141 | #endif |
| 153 | 142 | ||
| 154 | void persistant_default_layer_set(uint16_t default_layer) { | 143 | void persistant_default_layer_set(uint16_t default_layer) { |
| @@ -201,36 +190,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 201 | } | 190 | } |
| 202 | return true; | 191 | return true; |
| 203 | }; | 192 | }; |
| 204 | |||
| 205 | void matrix_init_user(void) { | ||
| 206 | #ifdef AUDIO_ENABLE | ||
| 207 | startup_user(); | ||
| 208 | #endif | ||
| 209 | } | ||
| 210 | |||
| 211 | #ifdef AUDIO_ENABLE | ||
| 212 | |||
| 213 | void startup_user(void) | ||
| 214 | { | ||
| 215 | _delay_ms(20); // gets rid of tick | ||
| 216 | PLAY_SONG(tone_startup); | ||
| 217 | } | ||
| 218 | |||
| 219 | void shutdown_user(void) | ||
| 220 | { | ||
| 221 | PLAY_SONG(tone_goodbye); | ||
| 222 | _delay_ms(150); | ||
| 223 | stop_all_notes(); | ||
| 224 | } | ||
| 225 | |||
| 226 | void music_on_user(void) | ||
| 227 | { | ||
| 228 | music_scale_user(); | ||
| 229 | } | ||
| 230 | |||
| 231 | void music_scale_user(void) | ||
| 232 | { | ||
| 233 | PLAY_SONG(music_scale); | ||
| 234 | } | ||
| 235 | |||
| 236 | #endif | ||
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c index ae5f44e713..ba6c402526 100644 --- a/keyboards/preonic/keymaps/zach/zach_common_functions.c +++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c | |||
| @@ -52,7 +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); | 55 | float tone_goodbye[][2] = SONG(GOODBYE_SOUND); |
| 57 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 56 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 58 | float tone_swcole[][2] = SONG(QWERTY_SOUND); | 57 | float tone_swcole[][2] = SONG(QWERTY_SOUND); |
| @@ -414,32 +413,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 414 | return true; | 413 | return true; |
| 415 | }; | 414 | }; |
| 416 | 415 | ||
| 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 | 416 | ||
| 445 | #endif | 417 | #endif |
