covox on right port

xrip · Dec 13, 2023 · ade200d · ade200d
1 parent 8c760a3
commit ade200d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ pico_set_program_version(pico-xt "test")
 
 #set(PICO_DEOPTIMIZED_DEBUG 1)
 #if (!OVERCLOCKING)
-set(OVERCLOCKING 366)
+set(OVERCLOCKING 416)
 #endif ()
 
 

diff --git a/drivers/vga-nextgen/vga.c b/drivers/vga-nextgen/vga.c
@@ -99,14 +99,14 @@ void __not_in_flash_func(sound_callback)(repeating_timer_t *rt) {
     out += getBlasterSample();
 #endif
 #if DSS
-    if (sound_cycles_per_vga >= 70) { // about 7-8kHz, TODO: divide by 4.5
+    if (sound_cycles_per_vga >= 50) { // about 7-8kHz, TODO: divide by 4.5
         last_dss_sample = dss_sample();
         sound_cycles_per_vga = 0;
     }
     out += last_dss_sample;
     out += true_covox; // on LPT2
 #endif
-    out += sn76489_sample() >> 6;
+    out += sn76489_sample();
     pwm_set_gpio_level(PWM_PIN0,(uint8_t)((uint16_t)out)); // Право
     pwm_set_gpio_level(PWM_PIN1,(uint8_t)((uint16_t)out)); // Лево
 }

diff --git a/src/audio/sn76489.c b/src/audio/sn76489.c
@@ -16,6 +16,7 @@
 
 *****************************************************************************/
 // https://github.com/mamedev/mame/blob/master/src/devices/sound/sn76496.cpp
+// https://www.zeridajh.org/articles/me_sn76489_sound_chip_details/index.html
 #include <stdint.h>
 
 /*
@@ -200,7 +201,7 @@ static inline int16_t mix_output() {
 int16_t sn76489_sample() {
     if (!quality) {
         update_output();
-        return mix_output();
+        return mix_output() >> 6;
     }
 
     /* Simple rate converter */