From a231fd1c8afedbeb14b0bc77d76bad61db986059 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 17:06:25 +1000
Subject: Replace cpp::span shim with std::span

---
 src/drivers/CMakeLists.txt      | 2 +-
 src/drivers/i2s_dac.cpp         | 2 +-
 src/drivers/include/i2s_dac.hpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
index 891115d4..c2018d3f 100644
--- a/src/drivers/CMakeLists.txt
+++ b/src/drivers/CMakeLists.txt
@@ -7,6 +7,6 @@ idf_component_register(
   "i2c.cpp" "bluetooth.cpp" "spi.cpp" "display.cpp" "display_init.cpp"
   "samd.cpp" "wm8523.cpp" "nvs.cpp" "haptics.cpp" "spiffs.cpp"
   INCLUDE_DIRS "include"
-  REQUIRES "esp_adc" "fatfs" "result" "lvgl" "span" "tasks" "nvs_flash" "spiffs"
+  REQUIRES "esp_adc" "fatfs" "result" "lvgl" "tasks" "nvs_flash" "spiffs"
   "bt" "tinyfsm" "util")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/drivers/i2s_dac.cpp b/src/drivers/i2s_dac.cpp
index aef466c2..7fe5547d 100644
--- a/src/drivers/i2s_dac.cpp
+++ b/src/drivers/i2s_dac.cpp
@@ -207,7 +207,7 @@ auto I2SDac::Reconfigure(Channels ch, BitsPerSample bps, SampleRate rate)
   }
 }
 
-auto I2SDac::WriteData(const cpp::span<const std::byte>& data) -> void {
+auto I2SDac::WriteData(const std::span<const std::byte>& data) -> void {
   std::size_t bytes_written = 0;
   esp_err_t err = i2s_channel_write(i2s_handle_, data.data(), data.size_bytes(),
                                     &bytes_written, portMAX_DELAY);
diff --git a/src/drivers/include/i2s_dac.hpp b/src/drivers/include/i2s_dac.hpp
index bd837ca0..569f0a9a 100644
--- a/src/drivers/include/i2s_dac.hpp
+++ b/src/drivers/include/i2s_dac.hpp
@@ -12,6 +12,7 @@
 #include <memory>
 #include <optional>
 #include <utility>
+#include <span>
 
 #include "driver/i2s_std.h"
 #include "driver/i2s_types.h"
@@ -20,7 +21,6 @@
 #include "freertos/portmacro.h"
 #include "freertos/stream_buffer.h"
 #include "result.hpp"
-#include "span.hpp"
 
 #include "gpios.hpp"
 #include "sys/_stdint.h"
@@ -68,7 +68,7 @@ class I2SDac {
 
   auto Reconfigure(Channels ch, BitsPerSample bps, SampleRate rate) -> void;
 
-  auto WriteData(const cpp::span<const std::byte>& data) -> void;
+  auto WriteData(const std::span<const std::byte>& data) -> void;
   auto SetSource(StreamBufferHandle_t buffer) -> void;
 
   // Not copyable or movable.
-- 
cgit v1.2.3