فهرست منبع

Converted goodbye to notes, fixed eighth dotted note macro

IBNobody 9 سال پیش
والد
کامیت
23231fa577
5فایلهای تغییر یافته به همراه15 افزوده شده و 11 حذف شده
  1. 1 1
      keyboard/atomic/keymaps/pvc/makefile.mk
  2. 1 0
      quantum/audio.h
  3. 6 8
      quantum/keymap_common.c
  4. 1 1
      quantum/musical_notes.h
  5. 6 1
      quantum/song_list.h

+ 1 - 1
keyboard/atomic/keymaps/pvc/makefile.mk

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

+ 1 - 0
quantum/audio.h

@@ -3,6 +3,7 @@
 #include <avr/io.h>
 #include <util/delay.h>
 #include "musical_notes.h"
+#include "song_list.h"
 
 #ifndef AUDIO_H
 #define AUDIO_H

+ 6 - 8
quantum/keymap_common.c

@@ -34,15 +34,13 @@ extern keymap_config_t keymap_config;
 #include <inttypes.h>
 #ifdef AUDIO_ENABLE
     #include "audio.h"
+
     #ifndef TONE_GOODBYE
-    #define TONE_GOODBYE { \
-        {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 tone_goodbye[][2] = TONE_GOODBYE;
-#endif
+    	#define TONE_GOODBYE OLKB_GOODBYE
+    #endif /*! TONE_GOODBYE */
+
+    float tone_goodbye[][2] = SONG(TONE_GOODBYE);
+#endif /* AUDIO_ENABLE */
 
 static action_t keycode_to_action(uint16_t keycode);
 

+ 1 - 1
quantum/musical_notes.h

@@ -32,7 +32,7 @@
 #define WD_NOTE(n)                     WHOLE_DOT_NOTE(n)
 #define HD_NOTE(n)                     HALF_DOT_NOTE(n)
 #define QD_NOTE(n)                     QUARTER_DOT_NOTE(n)
-#define ED_NOTE(n)                     EIGTH_DOT_NOTE(n)
+#define ED_NOTE(n)                     EIGHTH_DOT_NOTE(n)
 #define SD_NOTE(n)                     SIXTEENTH_DOT_NOTE(n)
 
 // Note Styles

+ 6 - 1
quantum/song_list.h

@@ -15,4 +15,9 @@
 	QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5),      \
 	H__NOTE(_FS5),
 
-#endif
+#define OLKB_GOODBYE \
+	E__NOTE(_E7),    \
+	E__NOTE(_A6),    \
+	ED_NOTE(_E6),
+
+#endif