Fixed VU-based novelty curve

Author: connornishijima

src/EMOTISCOPE_FIRMWARE.ino.cpp

@@ -102,18 +102,26 @@ void init_goertzel_constants_musical() {
 }
 
 void init_window_lookup() {
-	for (uint16_t i = 0; i < 2048; i++) {
-		float ratio = i / 4095.0;
+    float sigma = 0.4;
 
-		// Hamming window
-		//float weighing_factor = 0.54 * (1.0 - cos(TWOPI * ratio));
+    for (uint16_t i = 0; i < 2048; i++) {
+        float ratio = i / 2047.0;
 
-		// Blackman-Harris window
-		float weighing_factor = 0.3635819 - (0.4891775 * (cos(TWOPI * ratio))) + (0.1365995 * (cos(FOURPI * ratio))) - (0.0106411 * (cos(SIXPI * ratio)));
+        float n_minus_halfN = i - 2048 / 2;
+        float gaussian_weighing_factor = exp(-0.5 * pow((n_minus_halfN / (sigma * 2048 / 2)), 2));
 
-		window_lookup[i] = weighing_factor;
-		window_lookup[4095 - i] = weighing_factor;
-	}
+        // Hamming window
+        //float weighing_factor = 0.54 * (1.0 - cos(TWOPI * ratio));
+
+        // Blackman-Harris window
+        //float weighing_factor = 0.3635819 - (0.4891775 * cos(TWOPI * ratio)) + (0.1365995 * cos(FOURPI * ratio)) - (0.0106411 * cos(SIXPI * ratio));
+
+        // Gaussian window
+        float weighing_factor = gaussian_weighing_factor;
+
+        window_lookup[i] = weighing_factor;
+        window_lookup[4095 - i] = weighing_factor; // Mirror the value for the second half
+    }
 }
 
 // Function to find the median in a small array of floats

src/goertzel.h

@@ -97,7 +97,7 @@ void draw_metronome() {
 		else if(sine < -1.0){ sine = -1.0; }
 
 		float dot_pos = clip_float( sine * (0.5*(sqrt(contribution))) + 0.5 );
-		float opacity = sqrt(contribution);
+		float opacity = sqrt(sqrt(contribution));
 
 		if(opacity > 0.0025){
 			CRGBF dot_color = hsv(configuration.hue + configuration.hue_range*progress, configuration.saturation, 1.0);

src/lightshow_modes/metronome.h

@@ -15,8 +15,8 @@
 #define NOVELTY_HISTORY_LENGTH (1024)  // 50 FPS for 20.48 seconds
 #define NOVELTY_LOG_HZ (50)
 
-#define TEMPO_LOW (64-32)
-#define TEMPO_HIGH (192-32)
+#define TEMPO_LOW (64-16)
+#define TEMPO_HIGH (192-16)
 
 #define BEAT_SHIFT_PERCENT (0.08)
 
@@ -144,19 +144,19 @@ float calculate_magnitude_of_tempo(uint16_t tempo_bin) {
 		float q1 = 0;
 		float q2 = 0;
 
-		// float window_pos = 0.0;
+		float window_pos = 0.0;
 
 		for (uint16_t i = 0; i < block_size; i++) {
 			float progress = float(i) / block_size;
 			float sample_novelty = novelty_curve_normalized[((NOVELTY_HISTORY_LENGTH - 1) - block_size) + i];
 			float sample_vu      =                 vu_curve[((NOVELTY_HISTORY_LENGTH - 1) - block_size) + i];
 			float sample = (sample_novelty + sample_vu) / 2.0;
 
-			float q0 = tempi[tempo_bin].coeff * q1 - q2 + sample_novelty;
+			float q0 = tempi[tempo_bin].coeff * q1 - q2 + (sample * window_lookup[uint32_t(window_pos)]);
 			q2 = q1;
 			q1 = q0;
 
-			// window_pos += tempi[tempo_bin].window_step;
+			window_pos += tempi[tempo_bin].window_step;
 		}
 
 		float real = (q1 - q2 * tempi[tempo_bin].cosine);
@@ -180,7 +180,7 @@ float calculate_magnitude_of_tempo(uint16_t tempo_bin) {
 		float progress = 1.0 - (tempo_bin / float(NUM_TEMPI));
 		progress *= progress;
 
-		float scale = (0.75 * progress) + 0.25;
+		float scale = (0.5 * progress) + 0.5;
 
 		normalized_magnitude *= scale;
 	}, __func__ );
@@ -350,7 +350,7 @@ void update_novelty() {
 
 		float current_novelty = 0.0;
 		for (uint16_t i = 0; i < NUM_FREQS; i++) {
-			float new_mag = frequencies_musical[i].magnitude;	 // sqrt(sqrt(frequencies[i].magnitude));
+			float new_mag = spectrogram_smooth[i];	 // sqrt(sqrt(frequencies[i].magnitude));
 			frequencies_musical[i].novelty = max(0.0f, new_mag - frequencies_musical[i].magnitude_last);
 			frequencies_musical[i].magnitude_last = new_mag;
 
@@ -361,7 +361,9 @@ void update_novelty() {
 		check_silence(current_novelty);
 
 		log_novelty(current_novelty);
-		log_vu(vu_level);
+
+		log_vu(vu_max);
+		vu_max = 0.000001;
 	}
 }
 

src/tempo.h

@@ -1,5 +1,6 @@
 volatile float vu_level_raw = 0.0;
 volatile float vu_level = 0.0;
+volatile float vu_max = 0.0;
 
 void run_vu(){
 	static float max_amplitude_cap = 0.0000001;
@@ -34,4 +35,6 @@ void run_vu(){
 
 	float mix_speed = 0.25;
 	vu_level = vu_level_raw * mix_speed + vu_level*(1.0-mix_speed);
+
+	vu_max = max(vu_max, vu_level);
 }