summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/gpio_expander.cpp101
-rw-r--r--src/drivers/include/gpio_expander.hpp72
-rw-r--r--src/drivers/storage.cpp4
3 files changed, 108 insertions, 69 deletions
diff --git a/src/drivers/gpio_expander.cpp b/src/drivers/gpio_expander.cpp
index 87c5d038..5a9bb83e 100644
--- a/src/drivers/gpio_expander.cpp
+++ b/src/drivers/gpio_expander.cpp
@@ -5,35 +5,97 @@
*/
#include "gpio_expander.hpp"
+#include <stdint.h>
#include <cstdint>
+#include "driver/gpio.h"
+#include "hal/gpio_types.h"
#include "i2c.hpp"
namespace drivers {
-GpioExpander::GpioExpander() {
- ports_ = pack(kPortADefault, kPortBDefault);
- // Read and write initial values on initialisation so that we do not have a
- // strange partially-initialised state.
- // TODO: log or abort if these error; it's really bad!
- Write();
- Read();
+static const uint8_t kPca8575Address = 0x20;
+
+// Port A:
+// 0 - sd card mux switch
+// 1 - sd card mux enable (active low)
+// 2 - key up
+// 3 - key down
+// 4 - key lock
+// 5 - display reset (active low)
+// 6 - NC
+// 7 - sd card power (active low)
+// Default to SD card off, inputs high.
+static const uint8_t kPortADefault = 0b10111110;
+
+// Port B:
+// 0 - 3.5mm jack detect (active low)
+// 1 - headphone amp power enable
+// 2 - volume zero-cross detection
+// 3 - volume direction
+// 4 - volume left channel
+// 5 - volume right channel
+// 6 - NC
+// 7 - NC
+// Default input high, trs output low
+static const uint8_t kPortBDefault = 0b00000011;
+
+/*
+ * Convenience mehod for packing the port a and b bytes into a single 16 bit
+ * value.
+ */
+constexpr uint16_t pack(uint8_t a, uint8_t b) {
+ return ((uint16_t)b) << 8 | a;
}
-GpioExpander::~GpioExpander() {}
+/*
+ * Convenience mehod for unpacking the result of `pack` back into two single
+ * byte port datas.
+ */
+constexpr std::pair<uint8_t, uint8_t> unpack(uint16_t ba) {
+ return std::pair((uint8_t)ba, (uint8_t)(ba >> 8));
+}
-void GpioExpander::with(std::function<void(GpioExpander&)> f) {
- f(*this);
- Write();
+void interrupt_isr(void* arg) {
+ GpioExpander* instance = reinterpret_cast<GpioExpander*>(arg);
+ auto listener = instance->listener().lock();
+ if (listener) {
+ std::invoke(*listener);
+ }
}
-esp_err_t GpioExpander::Write() {
- i2c_cmd_handle_t handle = i2c_cmd_link_create();
- if (handle == NULL) {
- return ESP_ERR_NO_MEM;
+auto GpioExpander::Create() -> GpioExpander* {
+ GpioExpander* instance = new GpioExpander();
+ // Read and write initial values on initialisation so that we do not have a
+ // strange partially-initialised state.
+ if (!instance->Write() || !instance->Read()) {
+ return nullptr;
}
+ return instance;
+}
+
+GpioExpander::GpioExpander()
+ : ports_(pack(kPortADefault, kPortBDefault)), inputs_(0), listener_() {
+ gpio_config_t config{
+ .pin_bit_mask = static_cast<uint64_t>(1) << GPIO_NUM_34,
+ .mode = GPIO_MODE_INPUT,
+ .pull_up_en = GPIO_PULLUP_ENABLE,
+ .pull_down_en = GPIO_PULLDOWN_DISABLE,
+ .intr_type = GPIO_INTR_NEGEDGE,
+ };
+ gpio_config(&config);
+ gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_SHARED |
+ ESP_INTR_FLAG_IRAM);
+ gpio_isr_handler_add(GPIO_NUM_34, &interrupt_isr, this);
+}
+
+GpioExpander::~GpioExpander() {
+ gpio_isr_handler_remove(GPIO_NUM_34);
+ gpio_uninstall_isr_service();
+}
+bool GpioExpander::Write() {
std::pair<uint8_t, uint8_t> ports_ab = unpack(ports());
I2CTransaction transaction;
@@ -42,10 +104,10 @@ esp_err_t GpioExpander::Write() {
.write_ack(ports_ab.first, ports_ab.second)
.stop();
- return transaction.Execute();
+ return transaction.Execute() == ESP_OK;
}
-esp_err_t GpioExpander::Read() {
+bool GpioExpander::Read() {
uint8_t input_a, input_b;
I2CTransaction transaction;
@@ -56,8 +118,11 @@ esp_err_t GpioExpander::Read() {
.stop();
esp_err_t ret = transaction.Execute();
+ if (ret != ESP_OK) {
+ return false;
+ }
inputs_ = pack(input_a, input_b);
- return ret;
+ return true;
}
void GpioExpander::set_pin(Pin pin, bool value) {
diff --git a/src/drivers/include/gpio_expander.hpp b/src/drivers/include/gpio_expander.hpp
index 8231e140..8108d176 100644
--- a/src/drivers/include/gpio_expander.hpp
+++ b/src/drivers/include/gpio_expander.hpp
@@ -10,6 +10,7 @@
#include <atomic>
#include <functional>
+#include <memory>
#include <mutex>
#include <optional>
#include <tuple>
@@ -35,52 +36,9 @@ namespace drivers {
*/
class GpioExpander {
public:
- static auto Create() -> GpioExpander* { return new GpioExpander(); }
-
- GpioExpander();
+ static auto Create() -> GpioExpander*;
~GpioExpander();
- static const uint8_t kPca8575Address = 0x20;
- static const uint8_t kPca8575Timeout = pdMS_TO_TICKS(100);
-
- // Port A:
- // 0 - sd card mux switch
- // 1 - sd card mux enable (active low)
- // 2 - key up
- // 3 - key down
- // 4 - key lock
- // 5 - display reset
- // 6 - NC
- // 7 - sd card power (active low)
- // Default to SD card off, inputs high.
- static const uint8_t kPortADefault = 0b10111110;
-
- // Port B:
- // 0 - 3.5mm jack detect (active low)
- // 1 - trs output enable
- // 2 - volume zero-cross detection
- // 3 - volume direction
- // 4 - volume left channel
- // 5 - volume right channel
- // 6 - NC
- // 7 - NC
- // Default input high, trs output low
- static const uint8_t kPortBDefault = 0b00000010;
-
- /*
- * Convenience mehod for packing the port a and b bytes into a single 16 bit
- * value.
- */
- static uint16_t pack(uint8_t a, uint8_t b) { return ((uint16_t)b) << 8 | a; }
-
- /*
- * Convenience mehod for unpacking the result of `pack` back into two single
- * byte port datas.
- */
- static std::pair<uint8_t, uint8_t> unpack(uint16_t ba) {
- return std::pair((uint8_t)ba, (uint8_t)(ba >> 8));
- }
-
/*
* Convenience function for running some arbitrary pin writing code, then
* flushing a `Write()` to the expander. Example usage:
@@ -91,19 +49,23 @@ class GpioExpander {
* });
* ```
*/
- void with(std::function<void(GpioExpander&)> f);
+ template <typename F>
+ auto with(F fn) -> void {
+ std::invoke(fn);
+ Write();
+ }
/**
* Sets the ports on the GPIO expander to the values currently represented
* in `ports`.
*/
- esp_err_t Write(void);
+ auto Write(void) -> bool;
/**
* Reads from the GPIO expander, populating `inputs` with the most recent
* values.
*/
- esp_err_t Read(void);
+ auto Read(void) -> bool;
/* Maps each pin of the expander to its number in a `pack`ed uint16. */
enum Pin {
@@ -113,9 +75,9 @@ class GpioExpander {
KEY_UP = 2,
KEY_DOWN = 3,
KEY_LOCK = 4,
- DISPLAY_RESET = 5,
+ DISPLAY_RESET_ACTIVE_LOW = 5,
// UNUSED = 6,
- SD_CARD_POWER_ENABLE = 7,
+ SD_CARD_POWER_ENABLE_ACTIVE_LOW = 7,
// Port B
PHONE_DETECT = 8,
@@ -161,14 +123,26 @@ class GpioExpander {
*/
bool get_input(Pin pin) const;
+ auto listener() -> std::weak_ptr<std::function<void(void)>>& {
+ return listener_;
+ }
+
+ auto set_listener(const std::weak_ptr<std::function<void(void)>>& l) -> void {
+ listener_ = l;
+ }
+
// Not copyable or movable. There should usually only ever be once instance
// of this class, and that instance will likely have a static lifetime.
GpioExpander(const GpioExpander&) = delete;
GpioExpander& operator=(const GpioExpander&) = delete;
private:
+ GpioExpander();
+
std::atomic<uint16_t> ports_;
std::atomic<uint16_t> inputs_;
+
+ std::weak_ptr<std::function<void(void)>> listener_;
};
} // namespace drivers
diff --git a/src/drivers/storage.cpp b/src/drivers/storage.cpp
index 211b1484..4f16f1d1 100644
--- a/src/drivers/storage.cpp
+++ b/src/drivers/storage.cpp
@@ -56,7 +56,7 @@ static esp_err_t do_transaction(sdspi_dev_handle_t handle,
} // namespace callback
auto SdStorage::Create(GpioExpander* gpio) -> cpp::result<SdStorage*, Error> {
- gpio->set_pin(GpioExpander::SD_CARD_POWER_ENABLE, 0);
+ gpio->set_pin(GpioExpander::SD_CARD_POWER_ENABLE_ACTIVE_LOW, 0);
gpio->set_pin(GpioExpander::SD_MUX_EN_ACTIVE_LOW, 0);
gpio->set_pin(GpioExpander::SD_MUX_SWITCH, GpioExpander::SD_MUX_ESP);
gpio->Write();
@@ -144,7 +144,7 @@ SdStorage::~SdStorage() {
sdspi_host_remove_device(this->handle_);
sdspi_host_deinit();
- gpio_->set_pin(GpioExpander::SD_CARD_POWER_ENABLE, 0);
+ gpio_->set_pin(GpioExpander::SD_CARD_POWER_ENABLE_ACTIVE_LOW, 1);
gpio_->set_pin(GpioExpander::SD_MUX_EN_ACTIVE_LOW, 1);
gpio_->Write();
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-29 20:34:04 +0000