changes to play_notes, goodbye
This commit is contained in:
parent
41cc35425a
commit
8bbd064cf5
6 changed files with 24 additions and 22 deletions
|
@ -194,7 +194,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
case _QW:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_qw, 4, false, 0);
|
||||
play_notes(&tone_qw, false, 0);
|
||||
#endif
|
||||
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:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_cm, 6, false, 0);
|
||||
play_notes(&tone_cm, false, 0);
|
||||
#endif
|
||||
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:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_dv, 8, false, 0);
|
||||
play_notes(&tone_dv, false, 0);
|
||||
#endif
|
||||
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) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
audio_on();
|
||||
play_notes(&start_up, 5, false, 0);
|
||||
play_notes(&start_up, false, 0);
|
||||
#endif
|
||||
}
|
||||
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) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
init_notes();
|
||||
play_notes(&start_up, 5, false, 0);
|
||||
play_notes(&start_up, false, 0);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -133,7 +133,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
|
|||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
|
||||
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
|
||||
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
|
||||
|
|
|
@ -73,10 +73,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/
|
||||
|
||||
/* disable debug print */
|
||||
#define NO_DEBUG
|
||||
// #define NO_DEBUG
|
||||
|
||||
/* disable print */
|
||||
#define NO_PRINT
|
||||
// #define NO_PRINT
|
||||
|
||||
/* disable action features */
|
||||
//#define NO_ACTION_LAYER
|
||||
|
|
|
@ -242,7 +242,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
case _QWERTY:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_qwerty, 4, false, 0);
|
||||
play_notes(&tone_qwerty, false, 0);
|
||||
#endif
|
||||
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:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_colemak, 6, false, 1);
|
||||
play_notes(&tone_colemak, false, 0);
|
||||
#endif
|
||||
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:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_dvorak, 8, false, 10);
|
||||
play_notes(&tone_dvorak, false, 0);
|
||||
#endif
|
||||
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) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
audio_on();
|
||||
play_notes(&start_up, 4, false, 0);
|
||||
play_notes(&start_up, false, 0);
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
|
@ -317,7 +317,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
case 9:
|
||||
if (record->event.pressed) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&tone_music, 8, false, 0);
|
||||
play_notes(&tone_music, false, 0);
|
||||
layer_on(_MUSIC);
|
||||
#endif
|
||||
}
|
||||
|
@ -344,6 +344,6 @@ void process_action_user(keyrecord_t *record) {
|
|||
void matrix_init_user(void) {
|
||||
#ifdef AUDIO_ENABLE
|
||||
init_notes();
|
||||
play_notes(&start_up, 4, false, 0);
|
||||
play_notes(&start_up, false, 0);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -318,7 +318,7 @@ ISR(TIMER3_COMPA_vect) {
|
|||
return;
|
||||
}
|
||||
}
|
||||
if (!note_resting && ((int)notes_rest != 0)) {
|
||||
if (!note_resting && (notes_rest > 0)) {
|
||||
note_resting = true;
|
||||
note_frequency = 0;
|
||||
note_length = notes_rest;
|
||||
|
|
|
@ -33,12 +33,14 @@ extern keymap_config_t keymap_config;
|
|||
#include <inttypes.h>
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
|
||||
float goodbye[][2] = {
|
||||
{440.0*pow(2.0,(31)/12.0), 8},
|
||||
{440.0*pow(2.0,(24)/12.0), 8},
|
||||
{440.0*pow(2.0,(19)/12.0), 12},
|
||||
};
|
||||
#ifndef GOODBYE_TUNE
|
||||
#define GOODBYE_TUNE { \
|
||||
{440.0*pow(2.0,(31)/12.0), 8}, \
|
||||
{440.0*pow(2.0,(24)/12.0), 8}, \
|
||||
{440.0*pow(2.0,(19)/12.0), 12}, \
|
||||
}
|
||||
#endif
|
||||
float goodbye_tune[][2] = GOODBYE_TUNE;
|
||||
#endif
|
||||
|
||||
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
|
||||
clear_keyboard();
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&goodbye, 3, false, 0);
|
||||
play_notes(&goodbye_tune, false, 0);
|
||||
#endif
|
||||
_delay_ms(250);
|
||||
#ifdef ATREUS_ASTAR
|
||||
|
|
Loading…
Reference in a new issue