summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2022-11-16 11:24:33 +1100
committerjacqueline <me@jacqueline.id.au>2022-11-16 11:24:33 +1100
commit0ef333164bb47956a5ac686f376583e865cedcc4 (patch)
treec3c2f1be88fce8e3a5f5077b3ba166071aaa58a6
parent8c51280bc68e51b76243e83b84762e33c52510ca (diff)
downloadtangara-fw-0ef333164bb47956a5ac686f376583e865cedcc4.tar.gz
Use underscores instead of dashes in filenames consistently
-rw-r--r--src/drivers/CMakeLists.txt4
-rw-r--r--src/drivers/dac.cpp2
-rw-r--r--src/drivers/display.cpp2
-rw-r--r--src/drivers/display_init.cpp (renamed from src/drivers/display-init.cpp)2
-rw-r--r--src/drivers/gpio_expander.cpp (renamed from src/drivers/gpio-expander.cpp)2
-rw-r--r--src/drivers/include/dac.hpp2
-rw-r--r--src/drivers/include/display.hpp4
-rw-r--r--src/drivers/include/display_init.hpp (renamed from src/drivers/include/display-init.hpp)0
-rw-r--r--src/drivers/include/gpio_expander.hpp (renamed from src/drivers/include/gpio-expander.hpp)0
-rw-r--r--src/drivers/include/i2s_audio_output.hpp2
-rw-r--r--src/drivers/include/storage.hpp2
-rw-r--r--src/drivers/storage.cpp2
-rw-r--r--src/drivers/test/test_dac.cpp2
-rw-r--r--src/drivers/test/test_gpio_expander.cpp2
-rw-r--r--src/drivers/test/test_storage.cpp2
-rw-r--r--src/main/main.cpp4
16 files changed, 17 insertions, 17 deletions
diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
index 899fcf79..42b774ba 100644
--- a/src/drivers/CMakeLists.txt
+++ b/src/drivers/CMakeLists.txt
@@ -1,6 +1,6 @@
idf_component_register(
- SRCS "dac.cpp" "gpio-expander.cpp" "battery.cpp" "storage.cpp" "i2c.cpp"
- "audio_playback.cpp" "i2s_audio_output.cpp" "display.cpp" "display-init.cpp" "spi.cpp"
+ SRCS "dac.cpp" "gpio_expander.cpp" "battery.cpp" "storage.cpp" "i2c.cpp"
+ "audio_playback.cpp" "i2s_audio_output.cpp" "display.cpp" "display_init.cpp" "spi.cpp"
INCLUDE_DIRS "include"
REQUIRES "esp_adc_cal" "fatfs" "audio_pipeline" "audio_stream" "result" "lvgl")
target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/drivers/dac.cpp b/src/drivers/dac.cpp
index ac5b5eaa..3b7011c4 100644
--- a/src/drivers/dac.cpp
+++ b/src/drivers/dac.cpp
@@ -1,6 +1,6 @@
#include "dac.hpp"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
#include <cstdint>
diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp
index dd9005cb..f5f926bf 100644
--- a/src/drivers/display.cpp
+++ b/src/drivers/display.cpp
@@ -5,7 +5,7 @@
#include <memory>
#include <mutex>
#include "assert.h"
-#include "display-init.hpp"
+#include "display_init.hpp"
#include "driver/gpio.h"
#include "driver/spi_master.h"
#include "esp_attr.h"
diff --git a/src/drivers/display-init.cpp b/src/drivers/display_init.cpp
index b958505d..e66d6a47 100644
--- a/src/drivers/display-init.cpp
+++ b/src/drivers/display_init.cpp
@@ -1,4 +1,4 @@
-#include "display-init.hpp"
+#include "display_init.hpp"
namespace drivers {
namespace displays {
diff --git a/src/drivers/gpio-expander.cpp b/src/drivers/gpio_expander.cpp
index 8b2e527e..02bd73c3 100644
--- a/src/drivers/gpio-expander.cpp
+++ b/src/drivers/gpio_expander.cpp
@@ -1,4 +1,4 @@
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
diff --git a/src/drivers/include/dac.hpp b/src/drivers/include/dac.hpp
index b4e95ad4..8c4b6419 100644
--- a/src/drivers/include/dac.hpp
+++ b/src/drivers/include/dac.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include <stdint.h>
#include <functional>
diff --git a/src/drivers/include/display.hpp b/src/drivers/include/display.hpp
index 6caf1571..958218ca 100644
--- a/src/drivers/include/display.hpp
+++ b/src/drivers/include/display.hpp
@@ -1,9 +1,9 @@
#pragma once
#include <cstdint>
-#include "display-init.hpp"
+#include "display_init.hpp"
#include "driver/spi_master.h"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "lvgl/lvgl.h"
#include "result.hpp"
diff --git a/src/drivers/include/display-init.hpp b/src/drivers/include/display_init.hpp
index f7d287f7..f7d287f7 100644
--- a/src/drivers/include/display-init.hpp
+++ b/src/drivers/include/display_init.hpp
diff --git a/src/drivers/include/gpio-expander.hpp b/src/drivers/include/gpio_expander.hpp
index 7ae0f107..7ae0f107 100644
--- a/src/drivers/include/gpio-expander.hpp
+++ b/src/drivers/include/gpio_expander.hpp
diff --git a/src/drivers/include/i2s_audio_output.hpp b/src/drivers/include/i2s_audio_output.hpp
index d4f6dae1..dabf1ff0 100644
--- a/src/drivers/include/i2s_audio_output.hpp
+++ b/src/drivers/include/i2s_audio_output.hpp
@@ -2,7 +2,7 @@
#include "audio_output.hpp"
#include "dac.hpp"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "result.hpp"
#include <cstdint>
diff --git a/src/drivers/include/storage.hpp b/src/drivers/include/storage.hpp
index 3aa2cb92..3dec16a5 100644
--- a/src/drivers/include/storage.hpp
+++ b/src/drivers/include/storage.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include <memory>
diff --git a/src/drivers/storage.cpp b/src/drivers/storage.cpp
index 465c84ea..7840e6f4 100644
--- a/src/drivers/storage.cpp
+++ b/src/drivers/storage.cpp
@@ -1,6 +1,6 @@
#include "storage.hpp"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include <atomic>
#include <memory>
diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp
index aa7a521c..84be09b9 100644
--- a/src/drivers/test/test_dac.cpp
+++ b/src/drivers/test/test_dac.cpp
@@ -1,6 +1,6 @@
#include <cstdint>
#include "dac.hpp"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
#include "i2c_fixture.hpp"
diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp
index 901953d0..d0d31002 100644
--- a/src/drivers/test/test_gpio_expander.cpp
+++ b/src/drivers/test/test_gpio_expander.cpp
@@ -1,4 +1,4 @@
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
#include "i2c_fixture.hpp"
diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp
index a767a52e..49b3d097 100644
--- a/src/drivers/test/test_storage.cpp
+++ b/src/drivers/test/test_storage.cpp
@@ -3,7 +3,7 @@
#include <fstream>
#include <iostream>
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
#include "i2c_fixture.hpp"
#include "spi.hpp"
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 26deef39..c79cc055 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -4,11 +4,11 @@
#include "core/lv_disp.h"
#include "core/lv_obj_pos.h"
#include "dac.hpp"
-#include "display-init.hpp"
+#include "display_init.hpp"
#include "display.hpp"
#include "esp_freertos_hooks.h"
#include "freertos/portmacro.h"
-#include "gpio-expander.hpp"
+#include "gpio_expander.hpp"
#include "i2c.hpp"
#include "i2s_audio_output.hpp"
#include "misc/lv_color.h"