Cleaning dev stuff

EremusOne · Mar 29, 2023 · 626bd66 · 626bd66
1 parent b18eaa4
commit 626bd66
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 42 deletions.
diff --git a/include/ESPectrum.h b/include/ESPectrum.h
@@ -80,9 +80,6 @@ class ESPectrum
 
     // static int ESPoffset; // Testing
 
-    // static ayemu_ay_t ay;
-    static int bufcount;    
-
 private:
 
     static void IRAM_ATTR audioTask(void* unused);

diff --git a/src/ESPectrum.cpp b/src/ESPectrum.cpp
@@ -83,7 +83,6 @@ int ESPectrum::overSamplesPerFrame = ESP_AUDIO_OVERSAMPLES_48;
 bool ESPectrum::AY_emu = false;
 int ESPectrum::Audio_freq = ESP_AUDIO_FREQ_48;
 // bool ESPectrum::Audio_restart = false;
-int ESPectrum::bufcount = 0;
 
 QueueHandle_t audioTaskQueue;
 TaskHandle_t audioTaskHandle;
@@ -263,36 +262,13 @@ void ESPectrum::setup()
     audioTaskQueue = xQueueCreate(1, sizeof(uint8_t *));
     // Latest parameter = Core. In ESPIF, main task runs on core 0 by default. In Arduino, loop() runs on core 1.
     xTaskCreatePinnedToCore(&ESPectrum::audioTask, "audioTask", 1024, NULL, 5, &audioTaskHandle, 1);
-    // xTaskCreatePinnedToCore(&ESPectrum::audioTask, "audioTask", 2048, NULL, 5, &audioTaskHandle, 1);    
-
-    // // PWM Audio Init
-    // pwm_audio_config_t pac;
-    // pac.duty_resolution    = LEDC_TIMER_8_BIT;
-    // pac.gpio_num_left      = SPEAKER_PIN;
-    // pac.ledc_channel_left  = LEDC_CHANNEL_0;
-    // pac.gpio_num_right     = -1;
-    // pac.ledc_channel_right = LEDC_CHANNEL_1;
-    // pac.ledc_timer_sel     = LEDC_TIMER_0;
-    // pac.tg_num             = TIMER_GROUP_0;
-    // pac.timer_num          = TIMER_0;
-    // pac.ringbuf_len        = 1024 * 8;
-
-    // pwm_audio_init(&pac);
-    // pwm_audio_set_param(Audio_freq,LEDC_TIMER_8_BIT,1);
-    // pwm_audio_start();
-    // // pwm_audio_set_volume(aud_volume);
 
     // AY Sound
     AySound::init();
     AySound::set_sound_format(Audio_freq,1,8);
     AySound::set_stereo(AYEMU_MONO,NULL);
 
-    // ayemu_init(&ESPectrum::ay);
-    // ayemu_set_sound_format (&ESPectrum::ay, Audio_freq, 1, 8);
-    // ayemu_set_stereo(&ay, AYEMU_MONO, NULL);
-
     AySound::reset();
-    bufcount = 0;
 
     //=======================================================================================
     // KEYBOARD
@@ -431,11 +407,7 @@ void ESPectrum::reset()
     AySound::init();
     AySound::set_sound_format(Audio_freq,1,8);
     AySound::set_stereo(AYEMU_MONO,NULL);
-    // ayemu_init(&ESPectrum::ay);
-    // ayemu_set_sound_format (&ESPectrum::ay, Audio_freq, 1, 8);
-    // ayemu_set_stereo(&ay, AYEMU_MONO, NULL);
     AySound::reset();
-    bufcount = 0;
 
     pwm_audio_start();
 
@@ -861,9 +833,7 @@ void IRAM_ATTR ESPectrum::audioTask(void *unused) {
         //     break;
         // }
 
-        if ((Z80Ops::is48) || (bufcount==0)) {
-            pwm_audio_write(audioBuffer, samplesPerFrame, &written, portMAX_DELAY);
-        }
+        pwm_audio_write(audioBuffer, samplesPerFrame, &written, portMAX_DELAY);
 
         xQueueReceive(audioTaskQueue, &param, portMAX_DELAY);
 

diff --git a/src/FileSNA.cpp b/src/FileSNA.cpp
@@ -304,11 +304,7 @@ bool FileSNA::load(string sna_fn)
     AySound::init();
     AySound::set_sound_format(ESPectrum::Audio_freq,1,8);
     AySound::set_stereo(AYEMU_MONO,NULL);
-    // ayemu_init(&ESPectrum::ay);
-    // ayemu_set_sound_format (&ESPectrum::ay, ESPectrum::Audio_freq, 1, 8);
-    // ayemu_set_stereo(&ESPectrum::ay, AYEMU_MONO, NULL);
     AySound::reset();
-    ESPectrum::bufcount=0;
 
     pwm_audio_start();
 

diff --git a/src/FileZ80.cpp b/src/FileZ80.cpp
@@ -387,11 +387,7 @@ bool FileZ80::load(string z80_fn)
     AySound::init();
     AySound::set_sound_format(ESPectrum::Audio_freq,1,8);
     AySound::set_stereo(AYEMU_MONO,NULL);
-    // ayemu_init(&ESPectrum::ay);
-    // ayemu_set_sound_format (&ESPectrum::ay, ESPectrum::Audio_freq, 1, 8);
-    // ayemu_set_stereo(&ESPectrum::ay, AYEMU_MONO, NULL);
     AySound::reset();
-    ESPectrum::bufcount=0;    
 
     pwm_audio_start();