note seq, start-up beeps, function beeps

keyboard/planck/keymaps/keymap_lock.c

@@ -2,6 +2,7 @@
 // #include "backlight.h"
 #include "action_layer.h"
 #include "keymap_midi.h"
+#include "beeps.h"
 #include <avr/boot.h>
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -63,12 +64,26 @@ uint16_t hextokeycode(int hex) {
     }
 }
 
+float walk_up[][2] = {
+  {440.0*pow(2.0,(60)/12.0), 400},
+  {0, 50},
+  {440.0*pow(2.0,(67)/12.0), 400},
+};
+
+float walk_dn[][2] = {
+  {440.0*pow(2.0,(67)/12.0), 400},
+  {0, 50},
+  {440.0*pow(2.0,(60)/12.0), 400},
+};
+
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 
 {
   // MACRODOWN only works in this function
       switch(id) {
         case 0:   
         if (record->event.pressed) {
+
+          play_notes(&walk_up, 3, false);
           // play_note(440, 20);
           // register_code(KC_RSFT);
           // backlight_set(BACKLIGHT_LEVELS);
@@ -107,7 +122,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           // note(0+24, 20);
         } else {
           unregister_code(KC_RSFT);
-          stop_all_notes();
+          play_notes(&walk_dn, 3, false);
           // backlight_set(0);
           default_layer_and(0); 
           default_layer_or(0);
@@ -120,32 +135,58 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
     return MACRO_NONE;
 };
 
+float start_up[][2] = {
+  {440.0*pow(2.0,(67)/12.0), 600},
+  {0, 50},
+  {440.0*pow(2.0,(64)/12.0), 400},
+  {0, 50},
+  {440.0*pow(2.0,(55)/12.0), 400},
+  {0, 50},
+  {440.0*pow(2.0,(60)/12.0), 400},
+  {0, 50},
+  {440.0*pow(2.0,(64)/12.0), 1000},
+};
 
 void * matrix_init_user(void) {
     init_notes();
 
-    play_note(((double)261.6*3)*pow(2.0,(36)/12.0), 0xF);
+    play_notes(&start_up, 9, false);
-    _delay_ms(50);
+    // play_note(((double)261.6*3)*pow(2.0,(36)/12.0), 0xF);
+    // _delay_ms(50);
 
-    play_note(((double)261.6*3)*pow(2.0,(48)/12.0), 0xF);
+    // play_note(((double)261.6*3)*pow(2.0,(48)/12.0), 0xF);
-    _delay_ms(25);
+    // _delay_ms(25);
-    stop_note(((double)261.6*3)*pow(2.0,(48)/12.0));
+    // stop_note(((double)261.6*3)*pow(2.0,(48)/12.0));
 
-    play_note(((double)261.6*3)*pow(2.0,(48)/12.0), 0xF);
+    // play_note(((double)261.6*3)*pow(2.0,(48)/12.0), 0xF);
-    _delay_ms(25);
+    // _delay_ms(25);
-    stop_note(((double)261.6*3)*pow(2.0,(48)/12.0));
+    // stop_note(((double)261.6*3)*pow(2.0,(48)/12.0));
 
 
-    stop_note(((double)261.6*3)*pow(2.0,(36)/12.0));
+    // stop_note(((double)261.6*3)*pow(2.0,(36)/12.0));
 
 
-    play_note(((double)261.6*3)*pow(2.0,(62)/12.0), 0xF);
+    // play_note(((double)261.6*3)*pow(2.0,(62)/12.0), 0xF);
-    _delay_ms(50);
+    // _delay_ms(50);
-    stop_note(((double)261.6*3)*pow(2.0,(62)/12.0));
+    // stop_note(((double)261.6*3)*pow(2.0,(62)/12.0));
 
 
-    play_note(((double)261.6*3)*pow(2.0,(64)/12.0), 0xF);
+    // play_note(((double)261.6*3)*pow(2.0,(64)/12.0), 0xF);
-    _delay_ms(50);
+    // _delay_ms(50);
-    stop_note(((double)261.6*3)*pow(2.0,(64)/12.0));
+    // stop_note(((double)261.6*3)*pow(2.0,(64)/12.0));
 
 }
+
+
+// void * matrix_scan_user(void) {
+//   if (layer_state & (1<<2)) {
+//     if (!playing_notes)
+//       play_notes(&start_up, 9, true);
+//   } else if (layer_state & (1<<3)) {
+//     if (!playing_notes)
+//       play_notes(&start_up, 9, true);
+//   } else {
+//     if (playing_notes)
+//       stop_all_notes();
+//   }
+// }

quantum/beeps.c

@@ -11,8 +11,8 @@
 
 #define PI 3.14159265
 
-#define SAMPLE_DIVIDER 70
+#define SAMPLE_DIVIDER 39
-#define SAMPLE_RATE (2000000.0/SAMPLE_DIVIDER/256)
+#define SAMPLE_RATE (2000000.0/SAMPLE_DIVIDER/2048)
 // Resistor value of 1/ (2 * PI * 10nF * (2000000 hertz / SAMPLE_DIVIDER / 10)) for 10nF cap
 
 void delay_us(int count) {
@@ -32,9 +32,31 @@ bool sliding = false;
 #define RANGE 1000
 volatile int i=0; //elements of the wave
 
+int max = 0xFF;
+float sum = 0;
+int value = 128;
+float place = 0;
+
+uint16_t place_int = 0;
+bool repeat = true;
+uint8_t * sample;
+uint16_t sample_length = 0;
+
+
+bool notes = false;
+float note_frequency = 0;
+float note_length = 0;
+uint16_t note_position = 0;
+float (* notes_pointer)[][2];
+uint8_t notes_length;
+bool notes_repeat;
+uint8_t current_note = 0;
+
 void stop_all_notes() {
     voices = 0;
     TIMSK3 &= ~_BV(OCIE3A);
+    notes = false;
+    playing_notes = false;
     frequency = 0;
     volume = 0;
 
@@ -102,17 +124,22 @@ void init_notes() {
     /* Enable the OC4A output */
     DDRC |= _BV(PORTC6);
 
+    TIMSK3 &= ~_BV(OCIE3A); // Turn off 3A interputs
+    
+    TCCR3A = 0x0; // Options not needed
+    TCCR3B = _BV(CS31) | _BV(CS30) | _BV(WGM32); // 64th prescaling and CTC
+    OCR3A = SAMPLE_DIVIDER - 1; // Correct count/compare, related to sample playback
+
+    playing_notes = false;
+
 }
 
-int max = 0xFF;
-float sum = 0;
-int value = 128;
-float place = 0;
 
 ISR(TIMER3_COMPA_vect) {
 
+
     // SINE
-    OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]);
+    // OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]);
     
     // SQUARE
     // if (((int)place) >= 1024){
@@ -131,12 +158,84 @@ ISR(TIMER3_COMPA_vect) {
     //     OCR4A = 2048 - (int)place / 2;
     // }
 
-    place += frequency;
+    // place += frequency;
+
+    // if (place >= SINE_LENGTH)
+    //     if (repeat)
+    //         place -= SINE_LENGTH;
+    //     else
+    //         TIMSK3 &= ~_BV(OCIE3A);
+
+    // SAMPLE
+    // OCR4A = pgm_read_byte(&sample[(uint16_t)place_int]);
+
+    // place_int++;
+
+    // if (place_int >= sample_length)
+    //     if (repeat)
+    //         place_int -= sample_length;
+    //     else
+    //         TIMSK3 &= ~_BV(OCIE3A);
+
+
+    if (notes) {
+        OCR4A = pgm_read_byte(&sinewave[(uint16_t)place]) >> 0;
+
+        place += note_frequency;
         if (place >= SINE_LENGTH)
             place -= SINE_LENGTH;
+        note_position++;
+        if (note_position >= note_length) {
+            current_note++;
+            if (current_note >= notes_length) {
+                if (notes_repeat) {
+                    current_note = 0;
+                } else {
+                    TIMSK3 &= ~_BV(OCIE3A);
+                    notes = false;
+                    playing_notes = false;
+                    return;
+                }
+            }
+            note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
+            note_length = (*notes_pointer)[current_note][1];
+            note_position = 0;
+        }
 
     }
 
+}
+
+void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat) {
+    notes = true;
+
+    notes_pointer = np;
+    notes_length = n_length;
+    notes_repeat = n_repeat;
+
+    place = 0;
+    current_note = 0;
+    note_frequency = (*notes_pointer)[current_note][0] / SAMPLE_RATE;
+    note_length = (*notes_pointer)[current_note][1];
+    // note_frequency = 880.0 / SAMPLE_RATE;
+    // note_length = 1000;
+    note_position = 0;
+
+
+    TIMSK3 |= _BV(OCIE3A);
+    playing_notes = true;
+}
+
+void play_sample(uint8_t * s, uint16_t l, bool r) {
+    place_int = 0;
+    sample = s;
+    sample_length = l;
+    repeat = r;
+
+    TIMSK3 |= _BV(OCIE3A);
+    playing_notes = true;
+}
+
 void play_note(double freq, int vol) {
 
     freq = freq / SAMPLE_RATE;
@@ -161,12 +260,6 @@ void play_note(double freq, int vol) {
         voices++;
     }
 
-    TIMSK3 &= ~_BV(OCIE3A);
-
-    TCCR3A = 0x0; 
-    TCCR3B = _BV(CS31) | _BV(WGM32);
-    OCR3A = SAMPLE_DIVIDER - 1;
-
     TIMSK3 |= _BV(OCIE3A);
 
 }

quantum/beeps.h

@@ -3,10 +3,13 @@
 #include <avr/io.h>
 #include <util/delay.h>
 
-void note(int x, float length);
+bool playing_notes;
-void beeps();
+
-void true_note(float x, float y, float length);
+void play_sample(uint8_t * s, uint16_t l, bool r);
 void play_note(double freq, int vol);
 void stop_note(double freq);
 void stop_all_notes();
 void init_notes();
+
+
+void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat);