masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Keyboard] Fix default keymaps for OLKB boards to play Startup Sound (#6721) 

* Fix Planck default keymap to play sounds on rev6

The dip_switch_update callback was overriding the default startup sound.  This should prevent that from happening, and still allow it to play sounds, or stop them, when appropriate.

* Fix Preonic default keymap to play sounds on Rev 3

The dip_switch_update callback was overriding the default startup sound.  This should prevent that from happening, and still allow it to play sounds, or stop them, when appropriate.
This commit is contained in:
Drashna Jaelre 2019-09-14 19:59:44 -07:00 committed by GitHub
parent 265d8abee1
commit 6c871408df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
keyboards/planck/keymaps/default/keymap.c
View File

@ -291,33 +291,33 @@ void encoder_update(bool clockwise) {
void dip_switch_update_user(uint8_t index, bool active) { void dip_switch_update_user(uint8_t index, bool active) {
switch (index) { switch (index) {
case 0: case 0: {
static bool play_sound = false;
if (active) { if (active) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(plover_song); if (play_sound) { PLAY_SONG(plover_song); }
#endif #endif
layer_on(_ADJUST); layer_on(_ADJUST);
} else { } else {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(plover_gb_song); if (play_sound) { PLAY_SONG(plover_gb_song); }
#endif #endif
layer_off(_ADJUST); layer_off(_ADJUST);
} }
play_sound = true;
break; break;
}
case 1: case 1:
if (active) { if (active) {
muse_mode = true; muse_mode = true;
} else { } else {
muse_mode = false; muse_mode = false;
#ifdef AUDIO_ENABLE
stop_all_notes();
#endif
} }
} }
} }
void matrix_scan_user(void) { void matrix_scan_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
if (muse_mode) { if (muse_mode) {
if (muse_counter == 0) { if (muse_counter == 0) {
uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
@ -328,8 +328,13 @@ void matrix_scan_user(void) {
} }
} }
muse_counter = (muse_counter + 1) % muse_tempo; muse_counter = (muse_counter + 1) % muse_tempo;
} else {
if (muse_counter) {
stop_all_notes();
muse_counter = 0;
} }
#endif }
#endif
} }
bool music_mask_user(uint16_t keycode) { bool music_mask_user(uint16_t keycode) {

15
keyboards/preonic/keymaps/default/keymap.c
View File

@ -273,15 +273,13 @@ void dip_switch_update_user(uint8_t index, bool active) {
muse_mode = true; muse_mode = true;
} else { } else {
muse_mode = false; muse_mode = false;
#ifdef AUDIO_ENABLE
stop_all_notes();
#endif
}
} }
xs}
} }
void matrix_scan_user(void) { void matrix_scan_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
if (muse_mode) { if (muse_mode) {
if (muse_counter == 0) { if (muse_counter == 0) {
uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
@ -292,8 +290,13 @@ void matrix_scan_user(void) {
} }
} }
muse_counter = (muse_counter + 1) % muse_tempo; muse_counter = (muse_counter + 1) % muse_tempo;
} else {
if (muse_counter) {
stop_all_notes();
muse_counter = 0;
} }
#endif }
#endif
} }
bool music_mask_user(uint16_t keycode) { bool music_mask_user(uint16_t keycode) {