diff options
Diffstat (limited to 'src')
90 files changed, 203 insertions, 203 deletions
diff --git a/src/codecs/codec.cpp b/src/codecs/codec.cpp index a51c40d6..c8e1a72c 100644 --- a/src/codecs/codec.cpp +++ b/src/codecs/codec.cpp @@ -9,8 +9,8 @@ #include <memory> #include <optional> -#include "mad.hpp" #include "dr_flac.hpp" +#include "mad.hpp" #include "opus.hpp" #include "types.hpp" #include "vorbis.hpp" diff --git a/src/codecs/source_buffer.cpp b/src/codecs/source_buffer.cpp index 538d7f47..9cd648cd 100644 --- a/src/codecs/source_buffer.cpp +++ b/src/codecs/source_buffer.cpp @@ -62,8 +62,8 @@ auto SourceBuffer::AddBytes(std::function<size_t(std::span<std::byte>)> writer) auto SourceBuffer::ConsumeBytes( std::function<size_t(std::span<std::byte>)> reader) -> void { - size_t bytes_consumed = std::invoke( - reader, buffer_.subspan(offset_of_bytes_, bytes_in_buffer_)); + size_t bytes_consumed = + std::invoke(reader, buffer_.subspan(offset_of_bytes_, bytes_in_buffer_)); assert(bytes_consumed <= bytes_in_buffer_); bytes_in_buffer_ -= bytes_consumed; diff --git a/src/drivers/adc.cpp b/src/drivers/adc.cpp index 3379a1ae..3038f7f6 100644 --- a/src/drivers/adc.cpp +++ b/src/drivers/adc.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "adc.hpp" +#include "drivers/adc.hpp" #include <cstdint> #include "esp_adc/adc_cali.h" diff --git a/src/drivers/bluetooth.cpp b/src/drivers/bluetooth.cpp index 40be530e..4caffae7 100644 --- a/src/drivers/bluetooth.cpp +++ b/src/drivers/bluetooth.cpp @@ -1,4 +1,4 @@ -#include "bluetooth.hpp" +#include "drivers/bluetooth.hpp" #include <stdint.h> @@ -27,9 +27,9 @@ #include "freertos/timers.h" #include "tinyfsm/include/tinyfsm.hpp" -#include "bluetooth_types.hpp" +#include "drivers/bluetooth_types.hpp" +#include "drivers/nvs.hpp" #include "memory_resource.hpp" -#include "nvs.hpp" #include "tasks.hpp" namespace drivers { @@ -47,8 +47,8 @@ auto gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t* param) -> void { bluetooth::events::internal::Gap{.type = event, .param = param}); } -auto avrcp_cb(esp_avrc_ct_cb_event_t event, esp_avrc_ct_cb_param_t* param) - -> void { +auto avrcp_cb(esp_avrc_ct_cb_event_t event, + esp_avrc_ct_cb_param_t* param) -> void { esp_avrc_ct_cb_param_t copy = *param; sBgWorker->Dispatch<void>([=]() { auto lock = bluetooth::BluetoothState::lock(); diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp index 5c686811..b0a97b30 100644 --- a/src/drivers/display.cpp +++ b/src/drivers/display.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "display.hpp" +#include "drivers/display.hpp" #include <stdint.h> #include <cmath> @@ -31,11 +31,11 @@ #include "hal/spi_types.h" #include "lvgl/lvgl.h" -#include "display_init.hpp" -#include "gpios.hpp" +#include "drivers/display_init.hpp" +#include "drivers/gpios.hpp" +#include "drivers/spi.hpp" #include "misc/lv_color.h" #include "soc/soc.h" -#include "spi.hpp" #include "tasks.hpp" [[maybe_unused]] static const char* kTag = "DISPLAY"; diff --git a/src/drivers/display_init.cpp b/src/drivers/display_init.cpp index a69826fa..edd36a8d 100644 --- a/src/drivers/display_init.cpp +++ b/src/drivers/display_init.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "display_init.hpp" +#include "drivers/display_init.hpp" namespace drivers { namespace displays { diff --git a/src/drivers/gpios.cpp b/src/drivers/gpios.cpp index aab932a7..64ba26a7 100644 --- a/src/drivers/gpios.cpp +++ b/src/drivers/gpios.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include <cstdint> @@ -15,7 +15,7 @@ #include "esp_intr_alloc.h" #include "hal/gpio_types.h" -#include "i2c.hpp" +#include "drivers/i2c.hpp" namespace drivers { diff --git a/src/drivers/haptics.cpp b/src/drivers/haptics.cpp index f7b18086..55fa9ad8 100644 --- a/src/drivers/haptics.cpp +++ b/src/drivers/haptics.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include <stdint.h> #include <cstdint> @@ -21,7 +21,7 @@ #include "hal/gpio_types.h" #include "hal/i2c_types.h" -#include "i2c.hpp" +#include "drivers/i2c.hpp" namespace drivers { @@ -54,7 +54,8 @@ Haptics::Haptics(const std::variant<ErmMotor, LraMotor>& motor) { // Set library // TODO(robin): try the other libraries and test response. C is marginal, D // too much? - WriteRegister(Register::kWaveformLibrary, static_cast<uint8_t>(kDefaultErmLibrary)); + WriteRegister(Register::kWaveformLibrary, + static_cast<uint8_t>(kDefaultErmLibrary)); } else if (std::holds_alternative<LraMotor>(motor)) { ESP_LOGI(kTag, "Setting up LRA motor..."); @@ -75,7 +76,8 @@ Haptics::Haptics(const std::variant<ErmMotor, LraMotor>& motor) { ControlMask::kLraOpenLoop); // Set library; only option is the LRA one for, well, LRA motors. - WriteRegister(Register::kWaveformLibrary, static_cast<uint8_t>(Library::LRA)); + WriteRegister(Register::kWaveformLibrary, + static_cast<uint8_t>(Library::LRA)); } // Set mode (internal trigger, on writing 1 to Go register) @@ -123,7 +125,6 @@ auto Haptics::SetWaveformEffect(Effect effect) -> void { current_effect_ = effect; } - auto Haptics::TourEffects() -> void { TourEffects(Effect::kFirst, Effect::kLast, kDefaultErmLibrary); } @@ -174,7 +175,6 @@ auto Haptics::TourLibraries(Effect from, Effect to) -> void { } } - auto Haptics::PowerDown() -> void { WriteRegister(Register::kMode, static_cast<uint8_t>(Mode::kInternalTrigger) | ModeMask::kStandby); diff --git a/src/drivers/i2c.cpp b/src/drivers/i2c.cpp index 7d25717a..793ce9f9 100644 --- a/src/drivers/i2c.cpp +++ b/src/drivers/i2c.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "i2c.hpp" +#include "drivers/i2c.hpp" #include <cstdint> diff --git a/src/drivers/i2s_dac.cpp b/src/drivers/i2s_dac.cpp index 7fe5547d..a271fce0 100644 --- a/src/drivers/i2s_dac.cpp +++ b/src/drivers/i2s_dac.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "i2s_dac.hpp" +#include "drivers/i2s_dac.hpp" #include <cmath> #include <cstdint> @@ -25,11 +25,11 @@ #include "hal/gpio_types.h" #include "hal/i2c_types.h" -#include "gpios.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" +#include "drivers/wm8523.hpp" #include "hal/i2s_types.h" -#include "i2c.hpp" #include "soc/clk_tree_defs.h" -#include "wm8523.hpp" namespace drivers { @@ -142,8 +142,9 @@ auto I2SDac::SetPaused(bool paused) -> void { static volatile bool sSwapWords = false; -auto I2SDac::Reconfigure(Channels ch, BitsPerSample bps, SampleRate rate) - -> void { +auto I2SDac::Reconfigure(Channels ch, + BitsPerSample bps, + SampleRate rate) -> void { std::lock_guard<std::mutex> lock(configure_mutex_); if (i2s_active_) { diff --git a/src/drivers/include/a2dp_audio_output.hpp b/src/drivers/include/drivers/a2dp_audio_output.hpp index 010470c6..010470c6 100644 --- a/src/drivers/include/a2dp_audio_output.hpp +++ b/src/drivers/include/drivers/a2dp_audio_output.hpp diff --git a/src/drivers/include/adc.hpp b/src/drivers/include/drivers/adc.hpp index 3e94a9ee..3e94a9ee 100644 --- a/src/drivers/include/adc.hpp +++ b/src/drivers/include/drivers/adc.hpp diff --git a/src/drivers/include/bluetooth.hpp b/src/drivers/include/drivers/bluetooth.hpp index 8da5ce2e..5960de7e 100644 --- a/src/drivers/include/bluetooth.hpp +++ b/src/drivers/include/drivers/bluetooth.hpp @@ -12,11 +12,11 @@ #include <freertos/FreeRTOS.h> #include <freertos/stream_buffer.h> #include <stdint.h> -#include "bluetooth_types.hpp" +#include "drivers/bluetooth_types.hpp" #include "esp_a2dp_api.h" #include "esp_avrc_api.h" #include "esp_gap_bt_api.h" -#include "nvs.hpp" +#include "drivers/nvs.hpp" #include "tasks.hpp" #include "tinyfsm.hpp" #include "tinyfsm/include/tinyfsm.hpp" diff --git a/src/drivers/include/bluetooth_types.hpp b/src/drivers/include/drivers/bluetooth_types.hpp index 7cfb236f..7cfb236f 100644 --- a/src/drivers/include/bluetooth_types.hpp +++ b/src/drivers/include/drivers/bluetooth_types.hpp diff --git a/src/drivers/include/display.hpp b/src/drivers/include/drivers/display.hpp index d2e18a5c..6dc78e01 100644 --- a/src/drivers/include/display.hpp +++ b/src/drivers/include/drivers/display.hpp @@ -15,8 +15,8 @@ #include "result.hpp" #include "tasks.hpp" -#include "display_init.hpp" -#include "gpios.hpp" +#include "drivers/display_init.hpp" +#include "drivers/gpios.hpp" namespace drivers { diff --git a/src/drivers/include/display_init.hpp b/src/drivers/include/drivers/display_init.hpp index 9bf5b3f5..9bf5b3f5 100644 --- a/src/drivers/include/display_init.hpp +++ b/src/drivers/include/drivers/display_init.hpp diff --git a/src/drivers/include/fatfs_audio_input.hpp b/src/drivers/include/drivers/fatfs_audio_input.hpp index 705f6e7d..705f6e7d 100644 --- a/src/drivers/include/fatfs_audio_input.hpp +++ b/src/drivers/include/drivers/fatfs_audio_input.hpp diff --git a/src/drivers/include/gpios.hpp b/src/drivers/include/drivers/gpios.hpp index e27a3ade..e27a3ade 100644 --- a/src/drivers/include/gpios.hpp +++ b/src/drivers/include/drivers/gpios.hpp diff --git a/src/drivers/include/haptics.hpp b/src/drivers/include/drivers/haptics.hpp index 940c3c6d..940c3c6d 100644 --- a/src/drivers/include/haptics.hpp +++ b/src/drivers/include/drivers/haptics.hpp diff --git a/src/drivers/include/i2c.hpp b/src/drivers/include/drivers/i2c.hpp index 0dc1e7c0..0dc1e7c0 100644 --- a/src/drivers/include/i2c.hpp +++ b/src/drivers/include/drivers/i2c.hpp diff --git a/src/drivers/include/i2s_dac.hpp b/src/drivers/include/drivers/i2s_dac.hpp index 569f0a9a..5e81f875 100644 --- a/src/drivers/include/i2s_dac.hpp +++ b/src/drivers/include/drivers/i2s_dac.hpp @@ -22,7 +22,7 @@ #include "freertos/stream_buffer.h" #include "result.hpp" -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "sys/_stdint.h" namespace drivers { diff --git a/src/drivers/include/nvs.hpp b/src/drivers/include/drivers/nvs.hpp index ac1a1096..83bb8097 100644 --- a/src/drivers/include/nvs.hpp +++ b/src/drivers/include/drivers/nvs.hpp @@ -13,7 +13,7 @@ #include "esp_err.h" #include "nvs.h" -#include "bluetooth_types.hpp" +#include "drivers/bluetooth_types.hpp" #include "lru_cache.hpp" namespace drivers { diff --git a/src/drivers/include/samd.hpp b/src/drivers/include/drivers/samd.hpp index 55ea513c..55ea513c 100644 --- a/src/drivers/include/samd.hpp +++ b/src/drivers/include/drivers/samd.hpp diff --git a/src/drivers/include/spi.hpp b/src/drivers/include/drivers/spi.hpp index 60638f71..60638f71 100644 --- a/src/drivers/include/spi.hpp +++ b/src/drivers/include/drivers/spi.hpp diff --git a/src/drivers/include/spiffs.hpp b/src/drivers/include/drivers/spiffs.hpp index 04478590..04478590 100644 --- a/src/drivers/include/spiffs.hpp +++ b/src/drivers/include/drivers/spiffs.hpp diff --git a/src/drivers/include/storage.hpp b/src/drivers/include/drivers/storage.hpp index 836bbbdc..3aefff2d 100644 --- a/src/drivers/include/storage.hpp +++ b/src/drivers/include/drivers/storage.hpp @@ -15,7 +15,7 @@ #include "ff.h" #include "result.hpp" -#include "gpios.hpp" +#include "drivers/gpios.hpp" namespace drivers { diff --git a/src/drivers/include/touchwheel.hpp b/src/drivers/include/drivers/touchwheel.hpp index 18ace2b4..60902087 100644 --- a/src/drivers/include/touchwheel.hpp +++ b/src/drivers/include/drivers/touchwheel.hpp @@ -12,7 +12,7 @@ #include "esp_err.h" #include "result.hpp" -#include "gpios.hpp" +#include "drivers/gpios.hpp" namespace drivers { diff --git a/src/drivers/include/wm8523.hpp b/src/drivers/include/drivers/wm8523.hpp index a64f6bac..a64f6bac 100644 --- a/src/drivers/include/wm8523.hpp +++ b/src/drivers/include/drivers/wm8523.hpp diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp index 0aaf79f0..1389fd0d 100644 --- a/src/drivers/nvs.cpp +++ b/src/drivers/nvs.cpp @@ -4,19 +4,19 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "nvs.hpp" +#include "drivers/nvs.hpp" #include <cstdint> #include <memory> -#include "bluetooth.hpp" -#include "bluetooth_types.hpp" #include "cppbor.h" #include "cppbor_parse.h" +#include "drivers/bluetooth.hpp" +#include "drivers/bluetooth_types.hpp" +#include "drivers/wm8523.hpp" #include "esp_log.h" #include "nvs.h" #include "nvs_flash.h" -#include "wm8523.hpp" namespace drivers { @@ -39,8 +39,8 @@ static constexpr char kKeyDisplayRows[] = "disprows"; static constexpr char kKeyHapticMotorType[] = "hapticmtype"; static constexpr char kKeyDbAutoIndex[] = "dbautoindex"; -static auto nvs_get_string(nvs_handle_t nvs, const char* key) - -> std::optional<std::string> { +static auto nvs_get_string(nvs_handle_t nvs, + const char* key) -> std::optional<std::string> { size_t len = 0; if (nvs_get_blob(nvs, key, NULL, &len) != ESP_OK) { return {}; @@ -187,8 +187,7 @@ auto NvsStorage::Read() -> void { lock_polarity_.read(handle_); display_cols_.read(handle_); display_rows_.read(handle_); - haptic_motor_type_.read(handle_), - brightness_.read(handle_); + haptic_motor_type_.read(handle_), brightness_.read(handle_); sensitivity_.read(handle_); amp_max_vol_.read(handle_); amp_cur_vol_.read(handle_); @@ -205,8 +204,7 @@ auto NvsStorage::Write() -> bool { lock_polarity_.write(handle_); display_cols_.write(handle_); display_rows_.write(handle_); - haptic_motor_type_.write(handle_), - brightness_.write(handle_); + haptic_motor_type_.write(handle_), brightness_.write(handle_); sensitivity_.write(handle_); amp_max_vol_.write(handle_); amp_cur_vol_.write(handle_); @@ -287,8 +285,8 @@ auto NvsStorage::BluetoothVolume(const bluetooth::mac_addr_t& mac) -> uint8_t { return bt_volumes_.Get(mac).value_or(50); } -auto NvsStorage::BluetoothVolume(const bluetooth::mac_addr_t& mac, uint8_t vol) - -> void { +auto NvsStorage::BluetoothVolume(const bluetooth::mac_addr_t& mac, + uint8_t vol) -> void { std::lock_guard<std::mutex> lock{mutex_}; bt_volumes_dirty_ = true; bt_volumes_.Put(mac, vol); diff --git a/src/drivers/samd.cpp b/src/drivers/samd.cpp index e47d9cfe..c5e8c08a 100644 --- a/src/drivers/samd.cpp +++ b/src/drivers/samd.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "samd.hpp" +#include "drivers/samd.hpp" #include <cstdint> #include <optional> @@ -15,7 +15,7 @@ #include "hal/gpio_types.h" #include "hal/i2c_types.h" -#include "i2c.hpp" +#include "drivers/i2c.hpp" enum Registers : uint8_t { kSamdFirmwareVersion = 0, diff --git a/src/drivers/spi.cpp b/src/drivers/spi.cpp index ae6f83a2..f4d3ea6e 100644 --- a/src/drivers/spi.cpp +++ b/src/drivers/spi.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "spi.hpp" +#include "drivers/spi.hpp" #include "driver/sdspi_host.h" #include "driver/spi_common.h" diff --git a/src/drivers/spiffs.cpp b/src/drivers/spiffs.cpp index f03d2f68..30a2db33 100644 --- a/src/drivers/spiffs.cpp +++ b/src/drivers/spiffs.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "spiffs.hpp" +#include "drivers/spiffs.hpp" #include "esp_err.h" #include "esp_log.h" diff --git a/src/drivers/storage.cpp b/src/drivers/storage.cpp index b3588130..b2b7174e 100644 --- a/src/drivers/storage.cpp +++ b/src/drivers/storage.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "storage.hpp" +#include "drivers/storage.hpp" #include <atomic> #include <memory> @@ -23,7 +23,7 @@ #include "hal/spi_types.h" #include "sdmmc_cmd.h" -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "memory_resource.hpp" [[maybe_unused]] static const char* kTag = "SDSTORAGE"; diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp index e8d8dd94..2269f280 100644 --- a/src/drivers/test/test_dac.cpp +++ b/src/drivers/test/test_dac.cpp @@ -10,8 +10,8 @@ #include "catch2/catch.hpp" -#include "gpios.hpp" -#include "i2c.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" #include "i2c_fixture.hpp" namespace drivers { diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp index 972bcf09..7c323313 100644 --- a/src/drivers/test/test_gpio_expander.cpp +++ b/src/drivers/test/test_gpio_expander.cpp @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "catch2/catch.hpp" -#include "i2c.hpp" +#include "drivers/i2c.hpp" #include "i2c_fixture.hpp" namespace drivers { diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp index 062de3af..f97a0a85 100644 --- a/src/drivers/test/test_storage.cpp +++ b/src/drivers/test/test_storage.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "storage.hpp" +#include "drivers/storage.hpp" #include <dirent.h> @@ -14,10 +14,10 @@ #include "catch2/catch.hpp" -#include "gpios.hpp" -#include "i2c.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" +#include "drivers/spi.hpp" #include "i2c_fixture.hpp" -#include "spi.hpp" #include "spi_fixture.hpp" namespace drivers { diff --git a/src/drivers/touchwheel.cpp b/src/drivers/touchwheel.cpp index 41b9a6af..5d55c6f2 100644 --- a/src/drivers/touchwheel.cpp +++ b/src/drivers/touchwheel.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" #include <stdint.h> #include <cstdint> @@ -18,7 +18,7 @@ #include "hal/gpio_types.h" #include "hal/i2c_types.h" -#include "i2c.hpp" +#include "drivers/i2c.hpp" namespace drivers { diff --git a/src/drivers/wm8523.cpp b/src/drivers/wm8523.cpp index 9fe3e001..26316387 100644 --- a/src/drivers/wm8523.cpp +++ b/src/drivers/wm8523.cpp @@ -3,14 +3,14 @@ * * SPDX-License-Identifier: GPL-3.0-only */ -#include "wm8523.hpp" +#include "drivers/wm8523.hpp" #include <cstdint> #include "esp_err.h" +#include "drivers/i2c.hpp" #include "hal/i2c_types.h" -#include "i2c.hpp" namespace drivers { namespace wm8523 { diff --git a/src/main/main.cpp b/src/main/main.cpp index 811f2709..8c7565f3 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -10,8 +10,8 @@ #include "tinyfsm.hpp" #include "audio/audio_fsm.hpp" +#include "drivers/i2c.hpp" #include "events/event_queue.hpp" -#include "i2c.hpp" #include "system_fsm/system_events.hpp" #include "system_fsm/system_fsm.hpp" #include "ui/ui_fsm.hpp" diff --git a/src/tangara/app_console/app_console.cpp b/src/tangara/app_console/app_console.cpp index 09f267d8..e3048ba2 100644 --- a/src/tangara/app_console/app_console.cpp +++ b/src/tangara/app_console/app_console.cpp @@ -31,11 +31,11 @@ #include "ff.h" #include "freertos/projdefs.h" -#include "bluetooth.hpp" -#include "bluetooth_types.hpp" -#include "haptics.hpp" +#include "drivers/bluetooth.hpp" +#include "drivers/bluetooth_types.hpp" +#include "drivers/haptics.hpp" +#include "drivers/samd.hpp" #include "memory_resource.hpp" -#include "samd.hpp" #include "audio/audio_events.hpp" #include "audio/audio_fsm.hpp" diff --git a/src/tangara/app_console/app_console.hpp b/src/tangara/app_console/app_console.hpp index 07f764f5..b88b1330 100644 --- a/src/tangara/app_console/app_console.hpp +++ b/src/tangara/app_console/app_console.hpp @@ -9,10 +9,10 @@ #include <memory> #include "audio/track_queue.hpp" -#include "bluetooth.hpp" +#include "drivers/bluetooth.hpp" #include "dev_console/console.hpp" #include "database/database.hpp" -#include "samd.hpp" +#include "drivers/samd.hpp" #include "system_fsm/service_locator.hpp" namespace console { diff --git a/src/tangara/audio/audio_converter.cpp b/src/tangara/audio/audio_converter.cpp index 0690b8d3..da8e3916 100644 --- a/src/tangara/audio/audio_converter.cpp +++ b/src/tangara/audio/audio_converter.cpp @@ -13,12 +13,12 @@ #include "audio/audio_events.hpp" #include "audio/audio_sink.hpp" +#include "drivers/i2s_dac.hpp" #include "esp_heap_caps.h" #include "esp_log.h" #include "events/event_queue.hpp" #include "freertos/portmacro.h" #include "freertos/projdefs.h" -#include "i2s_dac.hpp" #include "audio/resample.hpp" #include "sample.hpp" diff --git a/src/tangara/audio/audio_decoder.cpp b/src/tangara/audio/audio_decoder.cpp index 1ef30b2c..ae54a11c 100644 --- a/src/tangara/audio/audio_decoder.cpp +++ b/src/tangara/audio/audio_decoder.cpp @@ -33,8 +33,8 @@ #include "audio/fatfs_audio_input.hpp" #include "codec.hpp" #include "database/track.hpp" +#include "drivers/i2s_dac.hpp" #include "events/event_queue.hpp" -#include "i2s_dac.hpp" #include "sample.hpp" #include "tasks.hpp" #include "types.hpp" diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp index 349f49b3..f504da2e 100644 --- a/src/tangara/audio/audio_fsm.cpp +++ b/src/tangara/audio/audio_fsm.cpp @@ -12,9 +12,9 @@ #include <variant> #include "audio/audio_sink.hpp" -#include "bluetooth_types.hpp" #include "cppbor.h" #include "cppbor_parse.h" +#include "drivers/bluetooth_types.hpp" #include "esp_heap_caps.h" #include "esp_log.h" #include "freertos/FreeRTOS.h" @@ -28,17 +28,17 @@ #include "audio/fatfs_audio_input.hpp" #include "audio/i2s_audio_output.hpp" #include "audio/track_queue.hpp" -#include "bluetooth.hpp" #include "database/future_fetcher.hpp" #include "database/track.hpp" +#include "drivers/bluetooth.hpp" +#include "drivers/i2s_dac.hpp" +#include "drivers/nvs.hpp" +#include "drivers/wm8523.hpp" #include "events/event_queue.hpp" -#include "i2s_dac.hpp" -#include "nvs.hpp" #include "sample.hpp" #include "system_fsm/service_locator.hpp" #include "system_fsm/system_events.hpp" #include "tinyfsm.hpp" -#include "wm8523.hpp" namespace audio { diff --git a/src/tangara/audio/audio_fsm.hpp b/src/tangara/audio/audio_fsm.hpp index 6f14d2d9..b3d64719 100644 --- a/src/tangara/audio/audio_fsm.hpp +++ b/src/tangara/audio/audio_fsm.hpp @@ -24,10 +24,10 @@ #include "database/database.hpp" #include "database/tag_parser.hpp" #include "database/track.hpp" -#include "display.hpp" -#include "gpios.hpp" -#include "i2s_dac.hpp" -#include "storage.hpp" +#include "drivers/display.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2s_dac.hpp" +#include "drivers/storage.hpp" #include "system_fsm/system_events.hpp" namespace audio { diff --git a/src/tangara/audio/bt_audio_output.cpp b/src/tangara/audio/bt_audio_output.cpp index b4bcaae8..637c0c9a 100644 --- a/src/tangara/audio/bt_audio_output.cpp +++ b/src/tangara/audio/bt_audio_output.cpp @@ -18,12 +18,12 @@ #include "freertos/portmacro.h" #include "freertos/projdefs.h" -#include "gpios.hpp" -#include "i2c.hpp" -#include "i2s_dac.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" +#include "drivers/i2s_dac.hpp" +#include "drivers/wm8523.hpp" #include "result.hpp" #include "tasks.hpp" -#include "wm8523.hpp" [[maybe_unused]] static const char* kTag = "BTOUT"; diff --git a/src/tangara/audio/bt_audio_output.hpp b/src/tangara/audio/bt_audio_output.hpp index 0818d0d7..942715b7 100644 --- a/src/tangara/audio/bt_audio_output.hpp +++ b/src/tangara/audio/bt_audio_output.hpp @@ -14,9 +14,9 @@ #include "result.hpp" #include "audio/audio_sink.hpp" -#include "bluetooth.hpp" -#include "gpios.hpp" -#include "i2s_dac.hpp" +#include "drivers/bluetooth.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2s_dac.hpp" #include "tasks.hpp" namespace audio { diff --git a/src/tangara/audio/fatfs_audio_input.cpp b/src/tangara/audio/fatfs_audio_input.cpp index 0868d71a..dc9133ed 100644 --- a/src/tangara/audio/fatfs_audio_input.cpp +++ b/src/tangara/audio/fatfs_audio_input.cpp @@ -33,8 +33,8 @@ #include "database/future_fetcher.hpp" #include "database/tag_parser.hpp" #include "database/track.hpp" +#include "drivers/spi.hpp" #include "events/event_queue.hpp" -#include "spi.hpp" #include "tasks.hpp" #include "types.hpp" diff --git a/src/tangara/audio/fatfs_source.cpp b/src/tangara/audio/fatfs_source.cpp index 645e0a1e..fb6a684d 100644 --- a/src/tangara/audio/fatfs_source.cpp +++ b/src/tangara/audio/fatfs_source.cpp @@ -17,7 +17,7 @@ #include "audio/audio_source.hpp" #include "codec.hpp" -#include "spi.hpp" +#include "drivers/spi.hpp" #include "system_fsm/system_events.hpp" #include "types.hpp" diff --git a/src/tangara/audio/i2s_audio_output.cpp b/src/tangara/audio/i2s_audio_output.cpp index 4f03c1a5..20297193 100644 --- a/src/tangara/audio/i2s_audio_output.cpp +++ b/src/tangara/audio/i2s_audio_output.cpp @@ -19,11 +19,11 @@ #include "freertos/projdefs.h" #include "audio/audio_sink.hpp" -#include "gpios.hpp" -#include "i2c.hpp" -#include "i2s_dac.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" +#include "drivers/i2s_dac.hpp" +#include "drivers/wm8523.hpp" #include "result.hpp" -#include "wm8523.hpp" [[maybe_unused]] static const char* kTag = "I2SOUT"; diff --git a/src/tangara/audio/i2s_audio_output.hpp b/src/tangara/audio/i2s_audio_output.hpp index 13494a6c..f0ce2cf8 100644 --- a/src/tangara/audio/i2s_audio_output.hpp +++ b/src/tangara/audio/i2s_audio_output.hpp @@ -12,8 +12,8 @@ #include <vector> #include "audio/audio_sink.hpp" -#include "gpios.hpp" -#include "i2s_dac.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2s_dac.hpp" #include "result.hpp" namespace audio { diff --git a/src/tangara/audio/readahead_source.cpp b/src/tangara/audio/readahead_source.cpp index 71684ddb..602ec0b1 100644 --- a/src/tangara/audio/readahead_source.cpp +++ b/src/tangara/audio/readahead_source.cpp @@ -16,8 +16,8 @@ #include "audio/audio_source.hpp" #include "codec.hpp" +#include "drivers/spi.hpp" #include "freertos/portmacro.h" -#include "spi.hpp" #include "tasks.hpp" #include "types.hpp" diff --git a/src/tangara/battery/battery.cpp b/src/tangara/battery/battery.cpp index f75914ba..2d2fff56 100644 --- a/src/tangara/battery/battery.cpp +++ b/src/tangara/battery/battery.cpp @@ -8,10 +8,10 @@ #include <cstdint> -#include "adc.hpp" +#include "drivers/adc.hpp" +#include "drivers/samd.hpp" #include "events/event_queue.hpp" #include "freertos/portmacro.h" -#include "samd.hpp" #include "system_fsm/system_events.hpp" namespace battery { diff --git a/src/tangara/battery/battery.hpp b/src/tangara/battery/battery.hpp index 314cd373..80b0f2d2 100644 --- a/src/tangara/battery/battery.hpp +++ b/src/tangara/battery/battery.hpp @@ -11,8 +11,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/timers.h" -#include "adc.hpp" -#include "samd.hpp" +#include "drivers/adc.hpp" +#include "drivers/samd.hpp" namespace battery { diff --git a/src/tangara/database/database.cpp b/src/tangara/database/database.cpp index ddb63907..4064c3ed 100644 --- a/src/tangara/database/database.cpp +++ b/src/tangara/database/database.cpp @@ -42,10 +42,10 @@ #include "database/records.hpp" #include "database/tag_parser.hpp" #include "database/track.hpp" +#include "drivers/spi.hpp" #include "events/event_queue.hpp" #include "memory_resource.hpp" #include "result.hpp" -#include "spi.hpp" #include "tasks.hpp" namespace database { diff --git a/src/tangara/database/env_esp.cpp b/src/tangara/database/env_esp.cpp index 2cf74c3e..86a30613 100644 --- a/src/tangara/database/env_esp.cpp +++ b/src/tangara/database/env_esp.cpp @@ -36,7 +36,7 @@ #include "leveldb/slice.h" #include "leveldb/status.h" -#include "spi.hpp" +#include "drivers/spi.hpp" #include "tasks.hpp" namespace leveldb { diff --git a/src/tangara/database/file_gatherer.cpp b/src/tangara/database/file_gatherer.cpp index 141259c2..75a1af27 100644 --- a/src/tangara/database/file_gatherer.cpp +++ b/src/tangara/database/file_gatherer.cpp @@ -13,8 +13,8 @@ #include "ff.h" +#include "drivers/spi.hpp" #include "memory_resource.hpp" -#include "spi.hpp" namespace database { diff --git a/src/tangara/database/tag_parser.cpp b/src/tangara/database/tag_parser.cpp index 86bd6443..2df2d90f 100644 --- a/src/tangara/database/tag_parser.cpp +++ b/src/tangara/database/tag_parser.cpp @@ -11,9 +11,9 @@ #include <iomanip> #include <mutex> +#include "drivers/spi.hpp" #include "esp_log.h" #include "ff.h" -#include "spi.hpp" #include "tags.h" #include "memory_resource.hpp" diff --git a/src/tangara/input/device_factory.hpp b/src/tangara/input/device_factory.hpp index 862c8728..5044d025 100644 --- a/src/tangara/input/device_factory.hpp +++ b/src/tangara/input/device_factory.hpp @@ -12,7 +12,7 @@ #include "input/feedback_device.hpp" #include "input/input_device.hpp" #include "input/input_touch_wheel.hpp" -#include "nvs.hpp" +#include "drivers/nvs.hpp" #include "system_fsm/service_locator.hpp" namespace input { diff --git a/src/tangara/input/feedback_haptics.cpp b/src/tangara/input/feedback_haptics.cpp index 90a912ec..e690eb9f 100644 --- a/src/tangara/input/feedback_haptics.cpp +++ b/src/tangara/input/feedback_haptics.cpp @@ -13,7 +13,7 @@ #include "core/lv_event.h" #include "esp_log.h" -#include "haptics.hpp" +#include "drivers/haptics.hpp" namespace input { diff --git a/src/tangara/input/feedback_haptics.hpp b/src/tangara/input/feedback_haptics.hpp index 5727c0f3..bde5f345 100644 --- a/src/tangara/input/feedback_haptics.hpp +++ b/src/tangara/input/feedback_haptics.hpp @@ -8,7 +8,7 @@ #include <cstdint> -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include "input/feedback_device.hpp" namespace input { diff --git a/src/tangara/input/input_hook.cpp b/src/tangara/input/input_hook.cpp index d346b863..6946c07f 100644 --- a/src/tangara/input/input_hook.cpp +++ b/src/tangara/input/input_hook.cpp @@ -70,8 +70,8 @@ auto TriggerHooks::update(bool pressed, lv_indev_data_t* d) -> void { } } -auto TriggerHooks::override(Trigger::State s, std::optional<HookCallback> cb) - -> void { +auto TriggerHooks::override(Trigger::State s, + std::optional<HookCallback> cb) -> void { switch (s) { case Trigger::State::kClick: click_.override(cb); diff --git a/src/tangara/input/input_nav_buttons.cpp b/src/tangara/input/input_nav_buttons.cpp index 28711e4e..ba1f4b74 100644 --- a/src/tangara/input/input_nav_buttons.cpp +++ b/src/tangara/input/input_nav_buttons.cpp @@ -6,8 +6,8 @@ #include "input/input_nav_buttons.hpp" +#include "drivers/gpios.hpp" #include "events/event_queue.hpp" -#include "gpios.hpp" #include "hal/lv_hal_indev.h" #include "input/input_hook_actions.hpp" diff --git a/src/tangara/input/input_nav_buttons.hpp b/src/tangara/input/input_nav_buttons.hpp index 1349ff72..ce2312a0 100644 --- a/src/tangara/input/input_nav_buttons.hpp +++ b/src/tangara/input/input_nav_buttons.hpp @@ -8,14 +8,14 @@ #include <cstdint> -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "hal/lv_hal_indev.h" -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include "input/input_device.hpp" #include "input/input_hook.hpp" #include "input/input_trigger.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" namespace input { diff --git a/src/tangara/input/input_touch_dpad.cpp b/src/tangara/input/input_touch_dpad.cpp index f7e12fc5..9275b510 100644 --- a/src/tangara/input/input_touch_dpad.cpp +++ b/src/tangara/input/input_touch_dpad.cpp @@ -10,8 +10,8 @@ #include "hal/lv_hal_indev.h" -#include "haptics.hpp" -#include "touchwheel.hpp" +#include "drivers/haptics.hpp" +#include "drivers/touchwheel.hpp" #include "events/event_queue.hpp" #include "input/input_device.hpp" diff --git a/src/tangara/input/input_touch_dpad.hpp b/src/tangara/input/input_touch_dpad.hpp index a0406e2b..8fb14832 100644 --- a/src/tangara/input/input_touch_dpad.hpp +++ b/src/tangara/input/input_touch_dpad.hpp @@ -10,11 +10,11 @@ #include "hal/lv_hal_indev.h" -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include "input/input_device.hpp" #include "input/input_hook.hpp" #include "input/input_trigger.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" namespace input { diff --git a/src/tangara/input/input_touch_wheel.cpp b/src/tangara/input/input_touch_wheel.cpp index a496e882..2c4a8b03 100644 --- a/src/tangara/input/input_touch_wheel.cpp +++ b/src/tangara/input/input_touch_wheel.cpp @@ -11,14 +11,14 @@ #include "hal/lv_hal_indev.h" +#include "drivers/haptics.hpp" +#include "drivers/nvs.hpp" +#include "drivers/touchwheel.hpp" #include "events/event_queue.hpp" -#include "haptics.hpp" #include "input/input_device.hpp" #include "input/input_hook_actions.hpp" #include "input/input_trigger.hpp" #include "lua/property.hpp" -#include "nvs.hpp" -#include "touchwheel.hpp" #include "ui/ui_events.hpp" namespace input { diff --git a/src/tangara/input/input_touch_wheel.hpp b/src/tangara/input/input_touch_wheel.hpp index b45ba361..d023873a 100644 --- a/src/tangara/input/input_touch_wheel.hpp +++ b/src/tangara/input/input_touch_wheel.hpp @@ -11,13 +11,13 @@ #include "hal/lv_hal_indev.h" -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include "input/input_device.hpp" #include "input/input_hook.hpp" #include "input/input_trigger.hpp" #include "lua/property.hpp" -#include "nvs.hpp" -#include "touchwheel.hpp" +#include "drivers/nvs.hpp" +#include "drivers/touchwheel.hpp" namespace input { diff --git a/src/tangara/input/input_volume_buttons.cpp b/src/tangara/input/input_volume_buttons.cpp index 16267ef6..3c3fb2a3 100644 --- a/src/tangara/input/input_volume_buttons.cpp +++ b/src/tangara/input/input_volume_buttons.cpp @@ -5,8 +5,8 @@ */ #include "input/input_volume_buttons.hpp" +#include "drivers/gpios.hpp" #include "events/event_queue.hpp" -#include "gpios.hpp" #include "input/input_hook_actions.hpp" namespace input { diff --git a/src/tangara/input/input_volume_buttons.hpp b/src/tangara/input/input_volume_buttons.hpp index 8a0ed18d..22a8acf2 100644 --- a/src/tangara/input/input_volume_buttons.hpp +++ b/src/tangara/input/input_volume_buttons.hpp @@ -8,13 +8,13 @@ #include <cstdint> -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "hal/lv_hal_indev.h" -#include "haptics.hpp" +#include "drivers/haptics.hpp" #include "input/input_device.hpp" #include "input/input_hook.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" namespace input { diff --git a/src/tangara/input/lvgl_input_driver.cpp b/src/tangara/input/lvgl_input_driver.cpp index 1cd7167b..8d10bb13 100644 --- a/src/tangara/input/lvgl_input_driver.cpp +++ b/src/tangara/input/lvgl_input_driver.cpp @@ -13,7 +13,7 @@ #include "lua.hpp" #include "lvgl.h" -#include "nvs.hpp" +#include "drivers/nvs.hpp" #include "input/device_factory.hpp" #include "input/feedback_haptics.hpp" diff --git a/src/tangara/input/lvgl_input_driver.hpp b/src/tangara/input/lvgl_input_driver.hpp index 6be24f7f..8ede1855 100644 --- a/src/tangara/input/lvgl_input_driver.hpp +++ b/src/tangara/input/lvgl_input_driver.hpp @@ -12,7 +12,7 @@ #include <set> #include "core/lv_group.h" -#include "gpios.hpp" +#include "drivers/gpios.hpp" #include "hal/lv_hal_indev.h" #include "input/device_factory.hpp" #include "input/feedback_device.hpp" @@ -21,8 +21,8 @@ #include "input/input_hook.hpp" #include "lua/lua_thread.hpp" #include "lua/property.hpp" -#include "nvs.hpp" -#include "touchwheel.hpp" +#include "drivers/nvs.hpp" +#include "drivers/touchwheel.hpp" namespace input { diff --git a/src/tangara/lua/bridge.cpp b/src/tangara/lua/bridge.cpp index 17dd41cc..07c299a7 100644 --- a/src/tangara/lua/bridge.cpp +++ b/src/tangara/lua/bridge.cpp @@ -46,8 +46,9 @@ namespace lua { static constexpr char kBridgeKey[] = "bridge"; -static auto make_font_cb(const char* name, int size, int weight) - -> const lv_font_t* { +static auto make_font_cb(const char* name, + int size, + int weight) -> const lv_font_t* { if (std::string{"fusion"} == name) { if (size == 12) { return &font_fusion_12; diff --git a/src/tangara/lua/lua_controls.cpp b/src/tangara/lua/lua_controls.cpp index ab5b3c02..baf40891 100644 --- a/src/tangara/lua/lua_controls.cpp +++ b/src/tangara/lua/lua_controls.cpp @@ -16,7 +16,7 @@ #include "lua.h" #include "lvgl.h" -#include "nvs.hpp" +#include "drivers/nvs.hpp" #include "ui/ui_events.hpp" namespace lua { diff --git a/src/tangara/lua/property.cpp b/src/tangara/lua/property.cpp index 951c225f..2b93809d 100644 --- a/src/tangara/lua/property.cpp +++ b/src/tangara/lua/property.cpp @@ -14,8 +14,8 @@ #include <string> #include <variant> -#include "bluetooth_types.hpp" #include "database/track.hpp" +#include "drivers/bluetooth_types.hpp" #include "lauxlib.h" #include "lua.h" #include "lua.hpp" diff --git a/src/tangara/lua/property.hpp b/src/tangara/lua/property.hpp index 2df61bad..9f925766 100644 --- a/src/tangara/lua/property.hpp +++ b/src/tangara/lua/property.hpp @@ -11,7 +11,7 @@ #include <string> #include "audio/audio_events.hpp" -#include "bluetooth_types.hpp" +#include "drivers/bluetooth_types.hpp" #include "lua.hpp" #include "lvgl.h" #include "system_fsm/service_locator.hpp" diff --git a/src/tangara/system_fsm/booting.cpp b/src/tangara/system_fsm/booting.cpp index d9e05c39..58f14706 100644 --- a/src/tangara/system_fsm/booting.cpp +++ b/src/tangara/system_fsm/booting.cpp @@ -5,8 +5,8 @@ */ #include "collation.hpp" -#include "haptics.hpp" -#include "spiffs.hpp" +#include "drivers/haptics.hpp" +#include "drivers/spiffs.hpp" #include "system_fsm/system_fsm.hpp" #include <stdint.h> @@ -20,24 +20,24 @@ #include "freertos/projdefs.h" #include "freertos/timers.h" -#include "adc.hpp" #include "audio/audio_fsm.hpp" #include "audio/track_queue.hpp" #include "battery/battery.hpp" -#include "bluetooth.hpp" -#include "bluetooth_types.hpp" #include "database/tag_parser.hpp" -#include "display_init.hpp" +#include "drivers/adc.hpp" +#include "drivers/bluetooth.hpp" +#include "drivers/bluetooth_types.hpp" +#include "drivers/display_init.hpp" +#include "drivers/gpios.hpp" +#include "drivers/i2c.hpp" +#include "drivers/nvs.hpp" +#include "drivers/samd.hpp" +#include "drivers/spi.hpp" +#include "drivers/touchwheel.hpp" #include "events/event_queue.hpp" -#include "gpios.hpp" -#include "i2c.hpp" -#include "nvs.hpp" -#include "samd.hpp" -#include "spi.hpp" #include "system_fsm/service_locator.hpp" #include "system_fsm/system_events.hpp" #include "tasks.hpp" -#include "touchwheel.hpp" #include "ui/ui_fsm.hpp" namespace system_fsm { diff --git a/src/tangara/system_fsm/idle.cpp b/src/tangara/system_fsm/idle.cpp index 243faa5b..e499693d 100644 --- a/src/tangara/system_fsm/idle.cpp +++ b/src/tangara/system_fsm/idle.cpp @@ -6,15 +6,15 @@ #include "app_console/app_console.hpp" #include "database/file_gatherer.hpp" +#include "drivers/gpios.hpp" #include "freertos/portmacro.h" #include "freertos/projdefs.h" -#include "gpios.hpp" #include "result.hpp" #include "audio/audio_fsm.hpp" +#include "drivers/samd.hpp" +#include "drivers/storage.hpp" #include "events/event_queue.hpp" -#include "samd.hpp" -#include "storage.hpp" #include "system_fsm/system_events.hpp" #include "system_fsm/system_fsm.hpp" #include "ui/ui_fsm.hpp" diff --git a/src/tangara/system_fsm/running.cpp b/src/tangara/system_fsm/running.cpp index a19abdaf..82edd018 100644 --- a/src/tangara/system_fsm/running.cpp +++ b/src/tangara/system_fsm/running.cpp @@ -9,15 +9,15 @@ #include "database/database.hpp" #include "database/db_events.hpp" #include "database/file_gatherer.hpp" +#include "drivers/gpios.hpp" #include "ff.h" #include "freertos/portmacro.h" #include "freertos/projdefs.h" -#include "gpios.hpp" #include "result.hpp" #include "audio/audio_fsm.hpp" +#include "drivers/storage.hpp" #include "events/event_queue.hpp" -#include "storage.hpp" #include "system_fsm/system_events.hpp" #include "system_fsm/system_fsm.hpp" #include "ui/ui_fsm.hpp" diff --git a/src/tangara/system_fsm/service_locator.cpp b/src/tangara/system_fsm/service_locator.cpp index 610406f9..ef719930 100644 --- a/src/tangara/system_fsm/service_locator.cpp +++ b/src/tangara/system_fsm/service_locator.cpp @@ -8,9 +8,9 @@ #include <memory> -#include "nvs.hpp" -#include "storage.hpp" -#include "touchwheel.hpp" +#include "drivers/nvs.hpp" +#include "drivers/storage.hpp" +#include "drivers/touchwheel.hpp" namespace system_fsm { diff --git a/src/tangara/system_fsm/service_locator.hpp b/src/tangara/system_fsm/service_locator.hpp index a76488ab..5b2205eb 100644 --- a/src/tangara/system_fsm/service_locator.hpp +++ b/src/tangara/system_fsm/service_locator.hpp @@ -10,17 +10,17 @@ #include "audio/track_queue.hpp" #include "battery/battery.hpp" -#include "bluetooth.hpp" +#include "drivers/bluetooth.hpp" #include "collation.hpp" #include "database/database.hpp" #include "database/tag_parser.hpp" -#include "gpios.hpp" -#include "haptics.hpp" -#include "nvs.hpp" -#include "samd.hpp" -#include "storage.hpp" +#include "drivers/gpios.hpp" +#include "drivers/haptics.hpp" +#include "drivers/nvs.hpp" +#include "drivers/samd.hpp" +#include "drivers/storage.hpp" #include "tasks.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" namespace system_fsm { diff --git a/src/tangara/system_fsm/system_events.hpp b/src/tangara/system_fsm/system_events.hpp index 4f1614bf..c174a1da 100644 --- a/src/tangara/system_fsm/system_events.hpp +++ b/src/tangara/system_fsm/system_events.hpp @@ -9,11 +9,11 @@ #include <memory> #include "battery/battery.hpp" -#include "bluetooth_types.hpp" +#include "drivers/bluetooth_types.hpp" #include "database/database.hpp" #include "ff.h" -#include "haptics.hpp" -#include "samd.hpp" +#include "drivers/haptics.hpp" +#include "drivers/samd.hpp" #include "system_fsm/service_locator.hpp" #include "tinyfsm.hpp" diff --git a/src/tangara/system_fsm/system_fsm.cpp b/src/tangara/system_fsm/system_fsm.cpp index 7b5e2234..2e819569 100644 --- a/src/tangara/system_fsm/system_fsm.cpp +++ b/src/tangara/system_fsm/system_fsm.cpp @@ -9,8 +9,8 @@ #include "audio/track_queue.hpp" #include "database/tag_parser.hpp" #include "driver/gpio.h" +#include "drivers/gpios.hpp" #include "events/event_queue.hpp" -#include "gpios.hpp" #include "system_fsm/service_locator.hpp" #include "system_fsm/system_events.hpp" diff --git a/src/tangara/system_fsm/system_fsm.hpp b/src/tangara/system_fsm/system_fsm.hpp index d2971734..d69141dd 100644 --- a/src/tangara/system_fsm/system_fsm.hpp +++ b/src/tangara/system_fsm/system_fsm.hpp @@ -15,19 +15,19 @@ #include "audio/audio_events.hpp" #include "audio/track_queue.hpp" #include "battery/battery.hpp" -#include "bluetooth.hpp" +#include "drivers/bluetooth.hpp" #include "database/database.hpp" #include "database/db_events.hpp" #include "database/tag_parser.hpp" -#include "display.hpp" -#include "gpios.hpp" -#include "nvs.hpp" -#include "samd.hpp" -#include "storage.hpp" +#include "drivers/display.hpp" +#include "drivers/gpios.hpp" +#include "drivers/nvs.hpp" +#include "drivers/samd.hpp" +#include "drivers/storage.hpp" #include "system_fsm/service_locator.hpp" #include "system_fsm/system_events.hpp" #include "tinyfsm.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" namespace system_fsm { diff --git a/src/tangara/ui/lvgl_task.cpp b/src/tangara/ui/lvgl_task.cpp index 33c3667d..448aa261 100644 --- a/src/tangara/ui/lvgl_task.cpp +++ b/src/tangara/ui/lvgl_task.cpp @@ -20,6 +20,7 @@ #include "core/lv_obj.h" #include "core/lv_obj_pos.h" #include "core/lv_obj_tree.h" +#include "drivers/touchwheel.hpp" #include "esp_log.h" #include "events/event_queue.hpp" #include "extra/themes/basic/lv_theme_basic.h" @@ -38,13 +39,12 @@ #include "misc/lv_style.h" #include "misc/lv_timer.h" #include "tasks.hpp" -#include "touchwheel.hpp" #include "ui/modal.hpp" #include "ui/ui_fsm.hpp" #include "widgets/lv_label.h" -#include "display.hpp" -#include "gpios.hpp" +#include "drivers/display.hpp" +#include "drivers/gpios.hpp" namespace ui { diff --git a/src/tangara/ui/lvgl_task.hpp b/src/tangara/ui/lvgl_task.hpp index dc611d75..fcf00ab1 100644 --- a/src/tangara/ui/lvgl_task.hpp +++ b/src/tangara/ui/lvgl_task.hpp @@ -14,9 +14,9 @@ #include "freertos/task.h" #include "freertos/timers.h" -#include "display.hpp" +#include "drivers/display.hpp" #include "input/lvgl_input_driver.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" #include "ui/screen.hpp" #include "ui/themes.hpp" diff --git a/src/tangara/ui/ui_events.hpp b/src/tangara/ui/ui_events.hpp index 613b9629..cb446cd2 100644 --- a/src/tangara/ui/ui_events.hpp +++ b/src/tangara/ui/ui_events.hpp @@ -9,8 +9,8 @@ #include <memory> #include "database/database.hpp" #include "database/index.hpp" -#include "gpios.hpp" -#include "nvs.hpp" +#include "drivers/gpios.hpp" +#include "drivers/nvs.hpp" #include "tinyfsm.hpp" #include "ui/screen.hpp" diff --git a/src/tangara/ui/ui_fsm.cpp b/src/tangara/ui/ui_fsm.cpp index 614d5216..17967e20 100644 --- a/src/tangara/ui/ui_fsm.cpp +++ b/src/tangara/ui/ui_fsm.cpp @@ -10,9 +10,9 @@ #include <memory_resource> #include <variant> -#include "bluetooth_types.hpp" #include "database/db_events.hpp" -#include "display_init.hpp" +#include "drivers/bluetooth_types.hpp" +#include "drivers/display_init.hpp" #include "esp_spp_api.h" #include "freertos/portmacro.h" #include "freertos/projdefs.h" @@ -30,9 +30,9 @@ #include "core/lv_obj.h" #include "core/lv_obj_tree.h" #include "database/database.hpp" +#include "drivers/haptics.hpp" #include "esp_heap_caps.h" #include "esp_timer.h" -#include "haptics.hpp" #include "input/lvgl_input_driver.hpp" #include "lauxlib.h" #include "lua/lua_thread.hpp" @@ -42,18 +42,18 @@ #include "audio/audio_events.hpp" #include "audio/track_queue.hpp" -#include "display.hpp" +#include "drivers/display.hpp" +#include "drivers/gpios.hpp" +#include "drivers/nvs.hpp" +#include "drivers/samd.hpp" +#include "drivers/spiffs.hpp" +#include "drivers/storage.hpp" +#include "drivers/touchwheel.hpp" #include "events/event_queue.hpp" -#include "gpios.hpp" #include "lua/lua_registry.hpp" #include "lua/property.hpp" -#include "nvs.hpp" -#include "samd.hpp" -#include "spiffs.hpp" -#include "storage.hpp" #include "system_fsm/system_events.hpp" #include "tinyfsm.hpp" -#include "touchwheel.hpp" #include "ui/lvgl_task.hpp" #include "ui/screen.hpp" #include "ui/screen_lua.hpp" diff --git a/src/tangara/ui/ui_fsm.hpp b/src/tangara/ui/ui_fsm.hpp index e4f21ce0..54d8a9ac 100644 --- a/src/tangara/ui/ui_fsm.hpp +++ b/src/tangara/ui/ui_fsm.hpp @@ -15,8 +15,8 @@ #include "battery/battery.hpp" #include "database/db_events.hpp" #include "database/track.hpp" -#include "display.hpp" -#include "gpios.hpp" +#include "drivers/display.hpp" +#include "drivers/gpios.hpp" #include "input/device_factory.hpp" #include "input/feedback_haptics.hpp" #include "input/input_touch_wheel.hpp" @@ -24,12 +24,12 @@ #include "input/lvgl_input_driver.hpp" #include "lua/lua_thread.hpp" #include "lua/property.hpp" -#include "nvs.hpp" -#include "storage.hpp" +#include "drivers/nvs.hpp" +#include "drivers/storage.hpp" #include "system_fsm/service_locator.hpp" #include "system_fsm/system_events.hpp" #include "tinyfsm.hpp" -#include "touchwheel.hpp" +#include "drivers/touchwheel.hpp" #include "ui/lvgl_task.hpp" #include "ui/modal.hpp" #include "ui/screen.hpp" diff --git a/src/util/random.cpp b/src/util/random.cpp index ae543765..2b2af9c7 100644 --- a/src/util/random.cpp +++ b/src/util/random.cpp @@ -29,8 +29,8 @@ auto Random::Next() -> std::uint64_t { return komirand(&seed1_, &seed2_); } -auto Random::RangeInclusive(std::uint64_t lower, std::uint64_t upper) - -> std::uint64_t { +auto Random::RangeInclusive(std::uint64_t lower, + std::uint64_t upper) -> std::uint64_t { return (Next() % (upper - lower + 1)) + lower; } |