diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-05-30 13:14:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 13:14:59 -0700 |
| commit | fced377ac007d27f2650ccffbe0b18abcdcfe23d (patch) | |
| tree | bd5b141987394a5a16cfc416bfe2b9efdb14d067 /keyboards/thevankeyboards | |
| parent | 7b8a013826ad90714a05ea522de53adf964ab3b9 (diff) | |
| download | qmk_firmware-fced377ac007d27f2650ccffbe0b18abcdcfe23d.tar.gz qmk_firmware-fced377ac007d27f2650ccffbe0b18abcdcfe23d.zip | |
2020 May 30 Breaking Changes Update (#9215)
* Branch point for 2020 May 30 Breaking Change
* Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954)
* Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957)
* Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958)
* Migrate `ACTION_LAYER_MODS` to `LM()` (#8959)
* Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968)
* Convert V-USB usbdrv to a submodule (#8321)
* Unify Tap Hold functions and documentation (#8348)
* Changing board names to prevent confusion (#8412)
* Move the Keyboardio Model01 to a keyboardio/ subdir (#8499)
* Move spaceman keyboards (#8830)
* Migrate miscellaneous `fn_actions` entries (#8977)
* Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979)
* Organizing my keyboards (plaid, tartan, ergoinu) (#8537)
* Refactor Lily58 to use split_common (#6260)
* Refactor zinc to use split_common (#7114)
* Add a message if bin/qmk doesn't work (#9000)
* Fix conflicting types for 'tfp_printf' (#8269)
* Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480)
* Refactor and updates to TKC1800 code (#8472)
* Switch to qmk forks for everything (#9019)
* audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484)
* Audio enable corrections (2/3) (#8903)
* Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582)
* Audio enable corrections (Part 4) (#8974)
* Fix typo from PR7114 (#9171)
* Augment future branch Changelogs (#8978)
* Revert "Branch point for 2020 May 30 Breaking Change"
Diffstat (limited to 'keyboards/thevankeyboards')
3 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c index 3d282e182..509b49780 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c | |||
| @@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 114 | }; | 114 | }; |
| 115 | 115 | ||
| 116 | #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term | 116 | #define TAPPING_LAYER_TERM 150 // Custom LT Tapping term |
| 117 | uint16_t get_tapping_term(uint16_t keycode) { | 117 | uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { |
| 118 | switch (keycode) { | 118 | switch (keycode) { |
| 119 | case KC_BSLO: | 119 | case KC_BSLO: |
| 120 | return TAPPING_LAYER_TERM; | 120 | return TAPPING_LAYER_TERM; |
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c index 6e22e9e23..a9d3a802d 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c | |||
| @@ -99,7 +99,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 99 | if (record->event.pressed) { | 99 | if (record->event.pressed) { |
| 100 | #ifdef AUDIO_ENABLE | 100 | #ifdef AUDIO_ENABLE |
| 101 | stop_all_notes(); | 101 | stop_all_notes(); |
| 102 | PLAY_NOTE_ARRAY(tone_plover, false, 0); | 102 | PLAY_SONG(tone_plover); |
| 103 | #endif | 103 | #endif |
| 104 | layer_off(_NUMSYM); | 104 | layer_off(_NUMSYM); |
| 105 | layer_off(_FKEYS); | 105 | layer_off(_FKEYS); |
| @@ -110,7 +110,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 110 | case 7: // LAYERRESET | 110 | case 7: // LAYERRESET |
| 111 | if (record->event.pressed) { | 111 | if (record->event.pressed) { |
| 112 | #ifdef AUDIO_ENABLE | 112 | #ifdef AUDIO_ENABLE |
| 113 | PLAY_NOTE_ARRAY(tone_qwerty, false, 0); | 113 | PLAY_SONG(tone_qwerty); |
| 114 | #endif | 114 | #endif |
| 115 | layer_off(_NUMSYM); | 115 | layer_off(_NUMSYM); |
| 116 | layer_off(_FKEYS); | 116 | layer_off(_FKEYS); |
| @@ -132,7 +132,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 132 | if(record->event.pressed) { | 132 | if(record->event.pressed) { |
| 133 | #ifdef AUDIO_ENABLE | 133 | #ifdef AUDIO_ENABLE |
| 134 | stop_all_notes(); | 134 | stop_all_notes(); |
| 135 | PLAY_NOTE_ARRAY(tone_adjust, false, 0); | 135 | PLAY_SONG(tone_adjust); |
| 136 | #endif | 136 | #endif |
| 137 | layer_off(_NUMSYM); | 137 | layer_off(_NUMSYM); |
| 138 | layer_off(_FKEYS); | 138 | layer_off(_FKEYS); |
| @@ -166,12 +166,12 @@ void matrix_init_user(void) { | |||
| 166 | void startup_user() | 166 | void startup_user() |
| 167 | { | 167 | { |
| 168 | _delay_ms(20); // gets rid of tick | 168 | _delay_ms(20); // gets rid of tick |
| 169 | PLAY_NOTE_ARRAY(tone_startup, false, 0); | 169 | PLAY_SONG(tone_startup); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | void shutdown_user() | 172 | void shutdown_user() |
| 173 | { | 173 | { |
| 174 | PLAY_NOTE_ARRAY(tone_goodbye, false, 0); | 174 | PLAY_SONG(tone_goodbye); |
| 175 | _delay_ms(150); | 175 | _delay_ms(150); |
| 176 | stop_all_notes(); | 176 | stop_all_notes(); |
| 177 | } | 177 | } |
| @@ -183,6 +183,6 @@ void music_on_user(void) | |||
| 183 | 183 | ||
| 184 | void music_scale_user(void) | 184 | void music_scale_user(void) |
| 185 | { | 185 | { |
| 186 | PLAY_NOTE_ARRAY(music_scale, false, 0); | 186 | PLAY_SONG(music_scale); |
| 187 | } | 187 | } |
| 188 | #endif | 188 | #endif |
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c index 18454d564..db5f6c37c 100644 --- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c +++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c | |||
| @@ -145,7 +145,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 145 | case NUMPAD_LOCK: | 145 | case NUMPAD_LOCK: |
| 146 | if (record->event.pressed) { | 146 | if (record->event.pressed) { |
| 147 | #ifdef AUDIO_ENABLE | 147 | #ifdef AUDIO_ENABLE |
| 148 | PLAY_NOTE_ARRAY(tone_numpad, false, 0); | 148 | PLAY_SONG(tone_numpad); |
| 149 | #endif | 149 | #endif |
| 150 | persistant_default_layer_set(1UL<<_NUMPAD); | 150 | persistant_default_layer_set(1UL<<_NUMPAD); |
| 151 | } | 151 | } |
| @@ -154,7 +154,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 154 | case NAVIGATION_LOCK: | 154 | case NAVIGATION_LOCK: |
| 155 | if (record->event.pressed) { | 155 | if (record->event.pressed) { |
| 156 | #ifdef AUDIO_ENABLE | 156 | #ifdef AUDIO_ENABLE |
| 157 | PLAY_NOTE_ARRAY(tone_navigation, false, 0); | 157 | PLAY_SONG(tone_navigation); |
| 158 | #endif | 158 | #endif |
| 159 | persistant_default_layer_set(1UL<<_NAVIGATION); | 159 | persistant_default_layer_set(1UL<<_NAVIGATION); |
| 160 | } | 160 | } |
| @@ -163,7 +163,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 163 | case EXCEL_LOCK: | 163 | case EXCEL_LOCK: |
| 164 | if (record->event.pressed) { | 164 | if (record->event.pressed) { |
| 165 | #ifdef AUDIO_ENABLE | 165 | #ifdef AUDIO_ENABLE |
| 166 | PLAY_NOTE_ARRAY(tone_excel, false, 0); | 166 | PLAY_SONG(tone_excel); |
| 167 | #endif | 167 | #endif |
| 168 | persistant_default_layer_set(1UL<<_EXCEL); | 168 | persistant_default_layer_set(1UL<<_EXCEL); |
| 169 | } | 169 | } |
