From 26eb580043ad176bdc58d996f30d470e1073ef00 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 21:52:59 +1000 Subject: move driver includes into a subdir as well --- src/tangara/lua/bridge.cpp | 5 +++-- src/tangara/lua/lua_controls.cpp | 2 +- src/tangara/lua/property.cpp | 2 +- src/tangara/lua/property.hpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/tangara/lua') 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 #include -#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 #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" -- cgit v1.2.3