emul/pico-zxspectrum
emul/pico-zxspectrum
1
0
Fork 0
mirror of https://github.com/fruit-bat/pico-zxspectrum.git synced 2025-04-19 00:04:01 +03:00
Code

Correct PWM level calc

Browse Source
This commit is contained in:
Phil 2024-12-10 22:42:39 +00:00
parent e38f71080d
commit 1fcfb9c52c
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ZxSpectrumAudio.cpp
View File

@ -58,15 +58,30 @@ inline zx_audio_sample_t *zx_audio_buf_write_ptr(zx_audio_buf_t *b) {
return &b->sample[b->wi];
}
#ifdef BZR_PIN
#ifdef AY8912_A_PIN
#ifdef AY8912_ABC_STEREO
#define PWM_WRAP (255 + 255)
#else
#define PWM_WRAP (255)
#endif
#else
#define PWM_WRAP (255 + 255 + 255)
#endif
#else
#define PWM_WRAP (255 + 255 + 255)
#endif
static zx_audio_buf_t zx_audio_buf;
static struct repeating_timer timer;
bool repeating_timer_callback(struct repeating_timer *timer)
bool __not_in_flash_func(repeating_timer_callback)(struct repeating_timer *timer)
{
static zx_audio_sample_t last;
uint32_t vA;
uint32_t vB;
uint32_t vC;
uint32_t s;
int32_t s;
uint32_t buzzer;
if (zx_audio_buf_ready_for_read(&zx_audio_buf))
@ -109,30 +124,16 @@ bool repeating_timer_callback(struct repeating_timer *timer)
pwm_set_gpio_level(AY8912_A_PIN, lt);
pwm_set_gpio_level(AY8912_C_PIN, rt);
pwm_set_gpio_level(SPK_PIN, st);
#else
#else
uint32_t ayt = __mul_instruction(_vol, vA + vB + vC) >> 8;
uint32_t ss = __mul_instruction(_vol, s) >> 8;
uint32_t t = ayt + ss;
uint32_t t = ayt + ss + 128;
pwm_set_gpio_level(SPK_PIN, t >= 255 + 255 + 255 ? ayt - ss : t);
#endif
#endif
return true;
}
#ifdef BZR_PIN
#ifdef AY8912_A_PIN
#ifdef AY8912_ABC_STEREO
#define PWM_WRAP (255 + 255)
#else
#define PWM_WRAP (255)
#endif
#else
#define PWM_WRAP (255 + 255 + 255)
#endif
#else
#define PWM_WRAP (255 + 255 + 255)
#endif
static void init_pwm_pin(uint32_t pin) {
gpio_set_function(pin, GPIO_FUNC_PWM);
const int audio_pin_slice = pwm_gpio_to_slice_num(pin);
@ -278,7 +279,7 @@ void zxSpectrumAudioInit() {
#endif
}
void __not_in_flash_func(zxSpectrumAudioHandler)(uint32_t vA, uint32_t vB, uint32_t vC, uint32_t s, uint32_t buzzer, bool mute) {
void __not_in_flash_func(zxSpectrumAudioHandler)(uint32_t vA, uint32_t vB, uint32_t vC, int32_t s, uint32_t buzzer, bool mute) {
#if defined(PICO_HDMI_AUDIO) || defined(PICO_AUDIO_I2S)
uint32_t ll, rr;
if (mute) {

2
src/ZxSpectrumAudio.h
View File

@ -38,7 +38,7 @@
void zxSpectrumAudioInit();
void zxSpectrumAudioHandler(uint32_t vA, uint32_t vB, uint32_t vC, uint32_t buzzerSmoothed, uint32_t buzzer, bool mute);
void zxSpectrumAudioHandler(uint32_t vA, uint32_t vB, uint32_t vC, int32_t buzzerSmoothed, uint32_t buzzer, bool mute);
uint32_t zxSpectrumReadEar();
bool zxSpectrumEarReady();