3 files changed, 19 insertions, 50 deletions

diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboard/atomic/keymaps/pvc/keymap.c
index 229708344..c2081f525 100644
--- a/keyboard/atomic/keymaps/pvc/keymap.c
+++ b/keyboard/atomic/keymaps/pvc/keymap.c
@@ -75,8 +75,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  },
 };
 
-#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer)))
-#define IS_LAYER_OFF(layer) (!IS_LAYER_ON(layer))
 
 #ifdef AUDIO_ENABLE
 
@@ -201,24 +199,14 @@ Q_NOTE(_B8   ) ,
 };
 
 float tone_rs[][2] = {
-Q_NOTE(_F8   ) ,
-Q_NOTE(_G8   ) ,
-Q_NOTE(_GS8  ) ,
-Q_NOTE(_A8   ) ,
+Q_NOTE(_A4   ) ,
+Q_NOTE(_A4   ) ,
+Q_NOTE(_A4   ) ,
+Q_NOTE(_A4   ) ,
 Q_NOTE(_AS8  ) ,
 Q_NOTE(_B8   ) ,
 };
 
-float tone_fn[][2] = {
-  {440.0*pow(2.0,(59)/12.0), 8},
-  {440.0*pow(2.0,(60)/12.0), 8},
-  {0, 4},
-  {440.0*pow(2.0,(67)/12.0), 16},
-  {0, 4},
-  {440.0*pow(2.0,(69)/12.0), 16},
-  {0, 4},
-  {440.0*pow(2.0,(67)/12.0), 16}
-};
 #endif
 
 void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t layer4, bool order)
@@ -253,18 +241,18 @@ void update_quad_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3, uint8_t l
 const uint16_t PROGMEM fn_actions[] = {
 };
 
-#define ARRAY_SIZE(x) ((sizeof x) / (sizeof *x))
+//#define MUSIC_ARRAY_SIZE(x) (((int)(sizeof(x) / (sizeof(x[0][0])))) / 2)
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
+
   // MACRODOWN only works in this function
       switch(id) {
         case M_LW:
           if (record->event.pressed) {
             #ifdef AUDIO_ENABLE
               println("PlayNotes LW");
-              print_val_hex32(ARRAY_SIZE(tone_lw));
-              play_notes(&tone_lw, 96, false);
+              PLAY_NOTE_ARRAY(tone_lw, false, STACCATO);
             #endif
             layer_on(_LW);
             update_tri_layer(_LW, _RS, _FN);
@@ -277,7 +265,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           if (record->event.pressed) {
             #ifdef AUDIO_ENABLE
               println("PlayNotes RS");
-              play_notes(&tone_rs, 6, false);
+              PLAY_NOTE_ARRAY(tone_rs, false, LEGATO);
             #endif
             layer_on(_RS);
             update_tri_layer(_LW, _RS, _FN);
@@ -295,33 +283,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 #ifdef AUDIO_ENABLE
 float start_up[][2] = {
 Q_NOTE(_E4   ) ,
-{0,1} ,
 Q_NOTE(_E4   ) ,
-{0,1} ,
 Q_NOTE(_F4   ) ,
-{0,1} ,
 Q_NOTE(_G4   ) ,
-{0,1} ,
 Q_NOTE(_G4   ) ,
-{0,1} ,
 Q_NOTE(_F4   ) ,
-{0,1} ,
 Q_NOTE(_E4   ) ,
-{0,1} ,
 Q_NOTE(_D4   ) ,
-{0,1} ,
 Q_NOTE(_C4   ) ,
-{0,1} ,
 Q_NOTE(_C4   ) ,
-{0,1} ,
 Q_NOTE(_D4   ) ,
-{0,1} ,
 Q_NOTE(_E4   ) ,
-{0,1} ,
 H_NOTE(_E4   ) ,
-{0,1} ,
 Q_NOTE(_D4   ) ,
-{0,1} ,
 H_NOTE(_D4   ) ,
 };
 #endif
@@ -329,7 +303,7 @@ H_NOTE(_D4   ) ,
 void matrix_init_user(void) {
   #ifdef AUDIO_ENABLE
     init_notes();
-    play_notes(&start_up, 29, false);
+    PLAY_NOTE_ARRAY(start_up, false, STACCATO);
     println("Matrix Init");
   #endif
 }
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index 5591b337d..207af2a1d 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -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, false, 0);
+              PLAY_NOTE_ARRAY(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, false, 0);
+              PLAY_NOTE_ARRAY(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, false, 0);
+              PLAY_NOTE_ARRAY(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, false, 0);
+              PLAY_NOTE_ARRAY(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, false, 0);
+    PLAY_NOTE_ARRAY(start_up, false, 0);
   #endif
 }
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index c7b6b89f2..48bc72dab 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -3,11 +3,6 @@
 #include "eeconfig.h"
 #ifdef AUDIO_ENABLE
   #include "audio.h"
-  #define SCALE (int []){ 0 + (12*0), 2 + (12*0), 4 + (12*0), 5 + (12*0), 7 + (12*0), 9 + (12*0), 11 + (12*0), \
-              0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \
-              0 + (12*2), 2 + (12*2), 4 + (12*2), 5 + (12*2), 7 + (12*2), 9 + (12*2), 11 + (12*2), \
-              0 + (12*3), 2 + (12*3), 4 + (12*3), 5 + (12*3), 7 + (12*3), 9 + (12*3), 11 + (12*3), \
-              0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), }
 #endif
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -242,7 +237,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, false, 0);
+              PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
             #endif
             persistant_default_layer_set(1UL<<_QWERTY);
           }
@@ -250,7 +245,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, false, 0);
+              PLAY_NOTE_ARRAY(tone_colemak, false, 0);
             #endif
             persistant_default_layer_set(1UL<<_COLEMAK);
           }
@@ -258,7 +253,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, false, 0);
+              PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
             #endif
             persistant_default_layer_set(1UL<<_DVORAK);
           }
@@ -302,7 +297,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, false, 0);
+              PLAY_NOTE_ARRAY(start_up, false, 0);
             #endif
           }
         break;
@@ -317,7 +312,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, false, 0);
+              PLAY_NOTE_ARRAY(tone_music, false, 0);
               layer_on(_MUSIC);
             #endif
           }