LTVA1 3 лет назад
Родитель
Сommit
03e53d7d9e
2 измененных файлов с 5 добавлено и 5 удалено
  1. 2 2
      flizzer_tracker.c
  2. 3 3
      sound_engine/sound_engine.c

+ 2 - 2
flizzer_tracker.c

@@ -123,7 +123,7 @@ const char* wave_names[5] =
 	"NONE",
 	"NOISE",
 	"PULSE",
-	"TRIANGE",
+	"TRIANGLE",
 	"SAWTOOTH",
 };
 
@@ -209,7 +209,7 @@ int32_t flizzer_tracker_app(void* p)
 	tracker->frequency = 440;
 	tracker->current_waveform_index = 1;
 
-	sound_engine_set_channel_frequency(&tracker->sound_engine, &tracker->sound_engine.channel[0], 440 * 256);
+	sound_engine_set_channel_frequency(&tracker->sound_engine, &tracker->sound_engine.channel[0], 440 * 1024);
 
 	sound_engine_start();
 

+ 3 - 3
sound_engine/sound_engine.c

@@ -85,7 +85,7 @@ uint16_t sound_engine_osc(SoundEngineChannel* channel, uint32_t prev_acc)
 			}
 
 			return (channel->lfsr) & (WAVE_AMP - 1);
-			
+
 			break;
 		}
 
@@ -128,10 +128,10 @@ void sound_engine_fill_buffer(SoundEngine* sound_engine, uint16_t* audio_buffer,
 				channel->accumulator += channel->frequency;
 				channel->accumulator &= ACC_LENGTH - 1;
 
-				output += sound_engine_osc(channel, prev_acc);
+				output += (sound_engine_osc(channel, prev_acc) >> (6 + 2));
 			}
 		}
 
-		audio_buffer[i] = (output >> (6 + 2)); //2 more bits so all channels fit
+		audio_buffer[i] = output; //2 more bits so all channels fit
 	}
 }