diff options
author | Michael Terhar <michael.terhar@pararray.com> | 2017-08-30 11:50:31 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-30 11:50:31 -0400 |
commit | a4316ba486ae25eae93174f5d7e4952811680601 (patch) | |
tree | cfbb93193d0b506328d7697a04a870ff147343dd /keyboards/mitosis/keymaps/mjt/keymap.c | |
parent | da83f04a30903a98b9a8dbe29c2d6cef4f9da3a7 (diff) |
Fixed mitosis-mjt audio (#1653)
* copied mjt keymaps from archive
* All mjt boards now compile
* fixed jd45-mjt breathing
* Updates to fix SpaceFN but not tested yet.
* Still missing either spacebar or an adjacent keypress.
* Debugging rigged up for use with hid_listen.
* Reverted the default keymap to use tap_layer_key rather than custom. Moved custom approach to keymap_debug.c
* Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function.
* Cleaned up JD45 keymap that uses tapkey.
* Redid minivan keymap with numsym rather than raise/lower.
Untested.
* Created my MJT keymap for HHKB
Enabled dynamic macros and moved
somoe of the shortcuts around.
* Minor keymap fixes to make them compile without errors.
* Added home/end to right arrow cluster on DYN layer.
* Added more keys to fn and dyn layers.
* It wasn't using my custom layer last time somehow...? Now it will.
* Compiled and installed at end of day on 8/23
* Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback.
* Fixed volume controls... were reversed and disabled.
* Added F13-F15 back to fkeys layer in Minivan
* Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan.
* Removed DYN layer.
* Fixed diagram in planck numsym.
* Cleanup for pull request.
* Roadkit flip phone warning.
* Replaced PLAY_NOTES_ARRAY to PLAY_SONG
* reset the submodules
* checked out specific commits for submodules
* Removed debugging from JD45 shared config.h
* Moved custom rules.mk to apropriate keymap
Reset the shared rules.mk file.
* Trailing return issue in rules.mk
Gotta make for a smooth pull request :-)
* Mitosis music troubleshooting
Also updated the song playing function.
Does not work currently.
* Fixed mitosis audio
* Put mitosis/rules.mk back to QMK master
Diffstat (limited to 'keyboards/mitosis/keymaps/mjt/keymap.c')
-rw-r--r-- | keyboards/mitosis/keymaps/mjt/keymap.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/keyboards/mitosis/keymaps/mjt/keymap.c b/keyboards/mitosis/keymaps/mjt/keymap.c index 01443d5f49..4663c0acf4 100644 --- a/keyboards/mitosis/keymaps/mjt/keymap.c +++ b/keyboards/mitosis/keymaps/mjt/keymap.c @@ -28,6 +28,7 @@ enum mitosis_keycodes MACSLEEP, FNMAC, FNPC, + AUDIOTEST, DYNAMIC_MACRO_RANGE, }; @@ -236,7 +237,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { persistent_function_layer_set(_FUNCTIONPC); #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_fnpc, false, 0); + PLAY_SONG(tone_fnpc); #endif } return false; @@ -245,9 +246,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { persistent_function_layer_set(_FUNCTIONMAC); #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_fnmac, false, 0); + PLAY_SONG(tone_fnmac); #endif } + return false; + break; + case AUDIOTEST: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + PLAY_SONG(music_scale); + register_code(KC_M); + unregister_code(KC_M); + #endif + register_code(KC_A); + } else { + unregister_code(KC_A); + } return false; break; //If any other key was pressed during the layer mod hold period, @@ -279,12 +293,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void startup_user() { _delay_ms(20); // gets rid of tick - PLAY_NOTE_ARRAY(tone_startup, false, 0); + PLAY_SONG(tone_startup); } void shutdown_user() { - PLAY_NOTE_ARRAY(tone_goodbye, false, 0); + PLAY_SONG(tone_goodbye); _delay_ms(150); stop_all_notes(); } @@ -296,7 +310,7 @@ void music_on_user(void) void music_scale_user(void) { - PLAY_NOTE_ARRAY(music_scale, false, 0); + PLAY_SONG(music_scale); } #endif |