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

changes to play_notes, goodbye

Browse Source
example_keyboards
Jack Humbert 9 years ago
parent 41cc35425a
commit 8bbd064cf5
6 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

10
keyboard/planck/keymaps/default/keymap.c
Unescape Escape View File

@ -194,7 +194,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QW: case _QW:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_qw, 4, false, 0); play_notes(&tone_qw, false, 0);
#endif #endif
default_layer_set(1UL<<_QW); default_layer_set(1UL<<_QW);
} }
@ -202,7 +202,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _CM: case _CM:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_cm, 6, false, 0); play_notes(&tone_cm, false, 0);
#endif #endif
default_layer_set(1UL<<_CM); default_layer_set(1UL<<_CM);
} }
@ -210,7 +210,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DV: case _DV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_dv, 8, false, 0); play_notes(&tone_dv, false, 0);
#endif #endif
default_layer_set(1UL<<_DV); default_layer_set(1UL<<_DV);
} }
@ -254,7 +254,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
audio_on(); audio_on();
play_notes(&start_up, 5, false, 0); play_notes(&start_up, false, 0);
#endif #endif
} }
break; break;
@ -265,6 +265,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
init_notes(); init_notes();
play_notes(&start_up, 5, false, 0); play_notes(&start_up, false, 0);
#endif #endif
} }

2
keyboard/preonic/Makefile
Unescape Escape View File

@ -133,7 +133,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality

4
keyboard/preonic/config.h
Unescape Escape View File

@ -73,10 +73,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* disable debug print */ /* disable debug print */
#define NO_DEBUG // #define NO_DEBUG
/* disable print */ /* disable print */
#define NO_PRINT // #define NO_PRINT
/* disable action features */ /* disable action features */
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER

12
keyboard/preonic/keymaps/default/keymap.c
Unescape Escape View File

@ -242,7 +242,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY: case _QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_qwerty, 4, false, 0); play_notes(&tone_qwerty, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -250,7 +250,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK: case _COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_colemak, 6, false, 1); play_notes(&tone_colemak, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_COLEMAK); persistant_default_layer_set(1UL<<_COLEMAK);
} }
@ -258,7 +258,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK: case _DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_dvorak, 8, false, 10); play_notes(&tone_dvorak, false, 0);
#endif #endif
persistant_default_layer_set(1UL<<_DVORAK); persistant_default_layer_set(1UL<<_DVORAK);
} }
@ -302,7 +302,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
audio_on(); audio_on();
play_notes(&start_up, 4, false, 0); play_notes(&start_up, false, 0);
#endif #endif
} }
break; break;
@ -317,7 +317,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 9: case 9:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&tone_music, 8, false, 0); play_notes(&tone_music, false, 0);
layer_on(_MUSIC); layer_on(_MUSIC);
#endif #endif
} }
@ -344,6 +344,6 @@ void process_action_user(keyrecord_t *record) {
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
init_notes(); init_notes();
play_notes(&start_up, 4, false, 0); play_notes(&start_up, false, 0);
#endif #endif
} }

2
quantum/audio.c
Unescape Escape View File

@ -318,7 +318,7 @@ ISR(TIMER3_COMPA_vect) {
return; return;
} }
} }
if (!note_resting && ((int)notes_rest != 0)) { if (!note_resting && (notes_rest > 0)) {
note_resting = true; note_resting = true;
note_frequency = 0; note_frequency = 0;
note_length = notes_rest; note_length = notes_rest;

16
quantum/keymap_common.c
Unescape Escape View File

@ -33,12 +33,14 @@ extern keymap_config_t keymap_config;
#include <inttypes.h> #include <inttypes.h>
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#include "audio.h" #include "audio.h"
#ifndef GOODBYE_TUNE
float goodbye[][2] = { #define GOODBYE_TUNE { \
{440.0*pow(2.0,(31)/12.0), 8}, {440.0*pow(2.0,(31)/12.0), 8}, \
{440.0*pow(2.0,(24)/12.0), 8}, {440.0*pow(2.0,(24)/12.0), 8}, \
{440.0*pow(2.0,(19)/12.0), 12}, {440.0*pow(2.0,(19)/12.0), 12}, \
}; }
#endif
float goodbye_tune[][2] = GOODBYE_TUNE;
#endif #endif
static action_t keycode_to_action(uint16_t keycode); static action_t keycode_to_action(uint16_t keycode);
@ -189,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode)
case RESET: ; // RESET is 0x5000, which is why this is here case RESET: ; // RESET is 0x5000, which is why this is here
clear_keyboard(); clear_keyboard();
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&goodbye, 3, false, 0); play_notes(&goodbye_tune, false, 0);
#endif #endif
_delay_ms(250); _delay_ms(250);
#ifdef ATREUS_ASTAR #ifdef ATREUS_ASTAR

Write Preview
Loading…
Cancel
Save