From 371f0a20cad4dfcb3237db6f72a7e35403950938 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Fri, 30 Jun 2023 20:48:40 +1000
Subject: Clean up gpios interface

---
 src/audio/include/audio_fsm.hpp        |  7 +++----
 src/audio/include/i2s_audio_output.hpp | 10 +++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/audio/include')

diff --git a/src/audio/include/audio_fsm.hpp b/src/audio/include/audio_fsm.hpp
index 7e84785f..1a52375b 100644
--- a/src/audio/include/audio_fsm.hpp
+++ b/src/audio/include/audio_fsm.hpp
@@ -14,7 +14,7 @@
 #include "database.hpp"
 #include "display.hpp"
 #include "fatfs_audio_input.hpp"
-#include "gpio_expander.hpp"
+#include "gpios.hpp"
 #include "i2s_audio_output.hpp"
 #include "i2s_dac.hpp"
 #include "storage.hpp"
@@ -27,7 +27,7 @@ namespace audio {
 
 class AudioState : public tinyfsm::Fsm<AudioState> {
  public:
-  static auto Init(drivers::GpioExpander* gpio_expander,
+  static auto Init(drivers::IGpios* gpio_expander,
                    std::weak_ptr<database::Database>) -> bool;
 
   virtual ~AudioState() {}
@@ -54,9 +54,8 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   virtual void react(const AudioPipelineIdle&) {}
 
  protected:
-  static drivers::GpioExpander* sGpioExpander;
+  static drivers::IGpios* sIGpios;
   static std::shared_ptr<drivers::I2SDac> sDac;
-  static std::shared_ptr<drivers::DigitalPot> sPots;
   static std::weak_ptr<database::Database> sDatabase;
 
   static std::unique_ptr<FatfsAudioInput> sFileSource;
diff --git a/src/audio/include/i2s_audio_output.hpp b/src/audio/include/i2s_audio_output.hpp
index 5dd6cc27..583a5d6a 100644
--- a/src/audio/include/i2s_audio_output.hpp
+++ b/src/audio/include/i2s_audio_output.hpp
@@ -15,8 +15,7 @@
 #include "chunk.hpp"
 #include "result.hpp"
 
-#include "digital_pot.hpp"
-#include "gpio_expander.hpp"
+#include "gpios.hpp"
 #include "i2s_dac.hpp"
 #include "stream_info.hpp"
 
@@ -24,9 +23,7 @@ namespace audio {
 
 class I2SAudioOutput : public IAudioSink {
  public:
-  I2SAudioOutput(drivers::GpioExpander* expander,
-                 std::weak_ptr<drivers::I2SDac> dac,
-                 std::weak_ptr<drivers::DigitalPot> pots);
+  I2SAudioOutput(drivers::IGpios* expander, std::weak_ptr<drivers::I2SDac> dac);
   ~I2SAudioOutput();
 
   auto SetInUse(bool) -> void override;
@@ -46,9 +43,8 @@ class I2SAudioOutput : public IAudioSink {
  private:
   auto GetAdjustedMaxAttenuation() -> int_fast8_t;
 
-  drivers::GpioExpander* expander_;
+  drivers::IGpios* expander_;
   std::shared_ptr<drivers::I2SDac> dac_;
-  std::shared_ptr<drivers::DigitalPot> pots_;
 
   std::optional<StreamInfo::Pcm> current_config_;
   int_fast8_t left_difference_;
-- 
cgit v1.2.3