1
0
mirror of https://github.com/jscrane/r65emu.git synced 2024-06-25 05:29:37 +00:00

just use tone()/noTone() to support PWM sound now (#17)

This commit is contained in:
Stephen Crane 2023-07-27 10:32:20 +01:00 committed by GitHub
parent f4dbc8ae26
commit 0ad9cb1741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 79 deletions

View File

@ -1,4 +1,3 @@
// sound: dac and pwm
#define DAC_SOUND 25
#define PWM_SOUND 25
#define PWM_DUTY 20 // 20/1024 -> volume

View File

@ -1,4 +1,3 @@
// sound
#define PWM_SOUND D2
#define PWM_DUTY 20 // 20/1024 -> volume
#define PWM_TOP 1024

View File

@ -10,11 +10,7 @@
// sound: dac and pwm
#define DAC_SOUND 25
// PWM doesn't work
// "assert failed: ledc_clk_cfg_to_global_clk ledc.c:443 (false)"
//#define PWM_SOUND 25
//#define PWM_DUTY 20 // 20/1024 -> volume
#define PWM_SOUND 25
// "tape" storage...
#undef USE_SD

View File

@ -1,82 +1,16 @@
#include <Arduino.h>
#include "sound_pwm.h"
#include "hardware.h"
#if defined(PWM_SOUND) && defined(ESP32)
#include <driver/ledc.h>
#define CHANNEL LEDC_CHANNEL_0
#define TIMER LEDC_TIMER_0
#define SPEED_MODE LEDC_HIGH_SPEED_MODE
void PWM::begin(unsigned gpio) {
ledc_timer_config_t timer_conf;
timer_conf.duty_resolution = LEDC_TIMER_10_BIT;
timer_conf.freq_hz = 440;
timer_conf.speed_mode = SPEED_MODE;
timer_conf.timer_num = TIMER;
ESP_ERROR_CHECK(::ledc_timer_config(&timer_conf));
ledc_channel_config_t ledc_conf;
ledc_conf.channel = CHANNEL;
ledc_conf.duty = 0;
ledc_conf.gpio_num = gpio;
ledc_conf.intr_type = LEDC_INTR_DISABLE;
ledc_conf.speed_mode = SPEED_MODE;
ledc_conf.timer_sel = TIMER;
ESP_ERROR_CHECK(::ledc_channel_config(&ledc_conf));
}
void PWM::set_duty(unsigned duty) {
ESP_ERROR_CHECK(::ledc_set_duty(SPEED_MODE, CHANNEL, duty));
ESP_ERROR_CHECK(::ledc_update_duty(SPEED_MODE, CHANNEL));
}
void PWM::stop() {
set_duty(0);
}
void PWM::set_freq(unsigned freq) {
ESP_ERROR_CHECK(::ledc_set_freq(SPEED_MODE, TIMER, freq));
}
#elif defined(PWM_SOUND) && defined(ESP8266)
#include <core_esp8266_waveform.h>
static unsigned gpio, duty;
const unsigned period = 1024;
static unsigned gpio;
void PWM::begin(unsigned gpio) {
::gpio = gpio;
pinMode(gpio, OUTPUT);
}
void PWM::set_duty(unsigned duty) {
::duty = duty;
}
void PWM::stop() {
stopWaveform(gpio);
noTone(gpio);
}
void PWM::set_freq(unsigned freq) {
uint32_t t = 1000000 / freq;
uint32_t h = duty * t / period;
startWaveform(gpio, h, t-h, 0);
void PWM::start(unsigned freq) {
tone(gpio, freq);
}
#else
#pragma message "No PWM"
void PWM::begin(unsigned gpio) {
}
void PWM::set_duty(unsigned duty) {
}
void PWM::stop() {
}
void PWM::set_freq(unsigned freq) {
}
#endif

View File

@ -4,9 +4,8 @@
class PWM {
public:
void begin(unsigned gpio);
void set_duty(unsigned duty);
void stop();
void set_freq(unsigned freq);
void start(unsigned freq);
};
#endif