PicoCalc/Code/MP3Player/320dcf025478994c10930c5d6ffccd511d456b0a.patch
2025-05-22 00:42:50 +08:00

48 lines
1.7 KiB
Diff

diff --git a/Code/MP3Player/main_task.h b/Code/MP3Player/main_task.h
index 640b48c..9ee7110 100644
--- a/Code/MP3Player/main_task.h
+++ b/Code/MP3Player/main_task.h
@@ -81,22 +81,22 @@ public:
void draw_playing();
void draw_wrap_text(const char *);
private:
- gpio_rp2040_pin _cs; // CS Line of SD card SPI interface
+ gpio_rp2040 _cs; // CS Line of SD card SPI interface
spi_rp2040 _spi; // SPI interface used for the SD card reader
sd_spi_drv _sd; // SD card low level driver
- gpio_rp2040_pin _next; // Next button
- gpio_rp2040_pin _part; // Partition button
- gpio_rp2040_pin _ps; // Pico Power save pin
+ gpio_rp2040 _next; // Next button
+ gpio_rp2040 _part; // Partition button
+ gpio_rp2040 _ps; // Pico Power save pin
FatFs _fs;
FatFs::DIR _dir{};
FatFs::FILEINFO _finfo{};
FatFs::FILE _file{}; // MP3 file on SD
- gpio_rp2040_pin _lcd_rst;
- gpio_rp2040_pin _lcd_dc;
- gpio_rp2040_pin _lcd_cs;
+ gpio_rp2040 _lcd_rst;
+ gpio_rp2040 _lcd_dc;
+ gpio_rp2040 _lcd_cs;
spi_rp2040 _lcd_spi;
ili9488_drv _lcd;
uGUI _gui;
diff --git a/Code/MP3Player/mp3_decoder_task.h b/Code/MP3Player/mp3_decoder_task.h
index 316cae1..094a17c 100644
--- a/Code/MP3Player/mp3_decoder_task.h
+++ b/Code/MP3Player/mp3_decoder_task.h
@@ -28,7 +28,7 @@ private:
pcm_audio_interface & _pcm_if;
sd_reader_task & _sd_reader;
mad_decoder _decoder{};
- gpio_rp2040_pin _led;
+ gpio_rp2040 _led;
uint8_t _mp3_buf[MP3_BUF_SIZE]{};
uint32_t _pcm_rate;
mad_timer_t _timer;