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/system_fsm/system_fsm.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/system_fsm/system_fsm.cpp')

diff --git a/src/system_fsm/system_fsm.cpp b/src/system_fsm/system_fsm.cpp
index dd5161ed..9483088e 100644
--- a/src/system_fsm/system_fsm.cpp
+++ b/src/system_fsm/system_fsm.cpp
@@ -12,7 +12,7 @@
 
 namespace system_fsm {
 
-std::shared_ptr<drivers::GpioExpander> SystemState::sGpioExpander;
+std::shared_ptr<drivers::Gpios> SystemState::sGpios;
 std::shared_ptr<drivers::Samd> SystemState::sSamd;
 
 std::shared_ptr<drivers::TouchWheel> SystemState::sTouch;
@@ -32,21 +32,17 @@ void SystemState::react(const FatalError& err) {
 
 void SystemState::react(const internal::GpioInterrupt& ev) {
   ESP_LOGI("sys", "gpios changed");
-  bool prev_key_up = sGpioExpander->get_input(drivers::GpioExpander::KEY_UP);
-  bool prev_key_down =
-      sGpioExpander->get_input(drivers::GpioExpander::KEY_DOWN);
-  bool prev_key_lock =
-      sGpioExpander->get_input(drivers::GpioExpander::KEY_LOCK);
-  bool prev_has_headphones =
-      sGpioExpander->get_input(drivers::GpioExpander::PHONE_DETECT);
+  bool prev_key_up = sGpios->Get(drivers::Gpios::Pin::kKeyUp);
+  bool prev_key_down = sGpios->Get(drivers::Gpios::Pin::kKeyDown);
+  bool prev_key_lock = sGpios->Get(drivers::Gpios::Pin::kKeyLock);
+  bool prev_has_headphones = sGpios->Get(drivers::Gpios::Pin::kPhoneDetect);
 
-  sGpioExpander->Read();
+  sGpios->Read();
 
-  bool key_up = sGpioExpander->get_input(drivers::GpioExpander::KEY_UP);
-  bool key_down = sGpioExpander->get_input(drivers::GpioExpander::KEY_DOWN);
-  bool key_lock = sGpioExpander->get_input(drivers::GpioExpander::KEY_LOCK);
-  bool has_headphones =
-      sGpioExpander->get_input(drivers::GpioExpander::PHONE_DETECT);
+  bool key_up = sGpios->Get(drivers::Gpios::Pin::kKeyUp);
+  bool key_down = sGpios->Get(drivers::Gpios::Pin::kKeyDown);
+  bool key_lock = sGpios->Get(drivers::Gpios::Pin::kKeyLock);
+  bool has_headphones = sGpios->Get(drivers::Gpios::Pin::kPhoneDetect);
 
   if (key_up != prev_key_up) {
     events::Dispatch<KeyUpChanged, audio::AudioState, ui::UiState>(
-- 
cgit v1.2.3