diff --git a/.github/actions/build-simulator/action.yml b/.github/actions/build-simulator/action.yml index c7187385..3d3eb962 100644 --- a/.github/actions/build-simulator/action.yml +++ b/.github/actions/build-simulator/action.yml @@ -23,6 +23,7 @@ runs: shell: bash # See Libraries/SDL/docs/README-linux.md run: > + sudo apt-get update && sudo apt-get install build-essential git make pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev diff --git a/App/Source/Boards.h b/App/Source/Boards.h index f4a6ab82..068e353d 100644 --- a/App/Source/Boards.h +++ b/App/Source/Boards.h @@ -1,7 +1,7 @@ #pragma once #ifdef ESP_PLATFORM -#include "sdkconfig.h" +#include // Supported hardware: #if defined(CONFIG_TT_BOARD_LILYGO_TDECK) diff --git a/App/Source/HelloWorld/HelloWorld.cpp b/App/Source/HelloWorld/HelloWorld.cpp index c6856a20..f02e3fc4 100644 --- a/App/Source/HelloWorld/HelloWorld.cpp +++ b/App/Source/HelloWorld/HelloWorld.cpp @@ -1,6 +1,6 @@ -#include "app/AppManifest.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" +#include +#include +#include using namespace tt::app; diff --git a/App/Source/Main.cpp b/App/Source/Main.cpp index 5f3b8f1b..5f9f7f80 100644 --- a/App/Source/Main.cpp +++ b/App/Source/Main.cpp @@ -1,5 +1,5 @@ #include "Boards.h" -#include "Tactility.h" +#include #ifdef ESP_PLATFORM #include "tt_init.h" diff --git a/Boards/CYD-2432S024C/Source/Boot.cpp b/Boards/CYD-2432S024C/Source/Boot.cpp index a8351726..f5353923 100644 --- a/Boards/CYD-2432S024C/Source/Boot.cpp +++ b/Boards/CYD-2432S024C/Source/Boot.cpp @@ -1,6 +1,6 @@ #include "YellowConfig.h" -#include "TactilityCore.h" #include "hal/YellowTouchConstants.h" +#include #include #define TAG "twodotfour_bootstrap" diff --git a/Boards/CYD-2432S024C/Source/CYD2432S024C.h b/Boards/CYD-2432S024C/Source/CYD2432S024C.h index f9b4cff5..aff1b7e3 100644 --- a/Boards/CYD-2432S024C/Source/CYD2432S024C.h +++ b/Boards/CYD-2432S024C/Source/CYD2432S024C.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Configuration.h" +#include // Capacitive touch version of the 2.4" yellow board extern const tt::hal::Configuration cyd_2432S024c_config; diff --git a/Boards/CYD-2432S024C/Source/Lvgl.cpp b/Boards/CYD-2432S024C/Source/Lvgl.cpp index ab8983c7..5f26dfef 100644 --- a/Boards/CYD-2432S024C/Source/Lvgl.cpp +++ b/Boards/CYD-2432S024C/Source/Lvgl.cpp @@ -1,7 +1,7 @@ #include "esp_lvgl_port.h" -#include "Log.h" -#include "lvgl/LvglSync.h" -#include "Thread.h" +#include +#include +#include #define TAG "twodotfour_lvgl" diff --git a/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp b/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp index ff07af95..57de49c7 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp +++ b/Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp @@ -1,17 +1,17 @@ #include "YellowDisplay.h" #include "YellowDisplayConstants.h" #include "YellowTouch.h" -#include "Log.h" -#include +#include +#include #include -#include "driver/gpio.h" -#include "driver/ledc.h" -#include "esp_err.h" -#include "esp_lcd_ili9341.h" -#include "esp_lcd_panel_ops.h" -#include "esp_lvgl_port.h" +#include +#include +#include +#include +#include +#include #define TAG "yellow_display" diff --git a/Boards/CYD-2432S024C/Source/hal/YellowDisplay.h b/Boards/CYD-2432S024C/Source/hal/YellowDisplay.h index 1d60aa44..7db767c1 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowDisplay.h +++ b/Boards/CYD-2432S024C/Source/hal/YellowDisplay.h @@ -1,7 +1,7 @@ #pragma once #include "lvgl.h" -#include "hal/Display.h" +#include #include "esp_lcd_panel_io.h" extern lv_disp_t* displayHandle; diff --git a/Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp b/Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp index 7465b57e..e1fc5e5d 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp +++ b/Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp @@ -2,8 +2,8 @@ #define TAG "twodotfour_sdcard" -#include "lvgl/LvglSync.h" -#include "hal/SpiSdCard.h" +#include +#include #define SDCARD_SPI_HOST SPI3_HOST #define SDCARD_PIN_CS GPIO_NUM_5 diff --git a/Boards/CYD-2432S024C/Source/hal/YellowSdCard.h b/Boards/CYD-2432S024C/Source/hal/YellowSdCard.h index 4a162bb5..b0692219 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowSdCard.h +++ b/Boards/CYD-2432S024C/Source/hal/YellowSdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/CYD-2432S024C/Source/hal/YellowTouch.cpp b/Boards/CYD-2432S024C/Source/hal/YellowTouch.cpp index 7da3e993..a2fc628d 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowTouch.cpp +++ b/Boards/CYD-2432S024C/Source/hal/YellowTouch.cpp @@ -1,6 +1,6 @@ #include "YellowTouch.h" #include "YellowTouchConstants.h" -#include "Log.h" +#include #include "driver/i2c.h" #include "esp_err.h" #include "esp_lcd_touch_cst816s.h" diff --git a/Boards/CYD-2432S024C/Source/hal/YellowTouch.h b/Boards/CYD-2432S024C/Source/hal/YellowTouch.h index 55e8ab7f..306a290a 100644 --- a/Boards/CYD-2432S024C/Source/hal/YellowTouch.h +++ b/Boards/CYD-2432S024C/Source/hal/YellowTouch.h @@ -1,7 +1,7 @@ #pragma once -#include "hal/Touch.h" -#include "TactilityCore.h" +#include +#include #include class YellowTouch : public tt::hal::Touch { diff --git a/Boards/LilygoTdeck/Source/InitHardware.cpp b/Boards/LilygoTdeck/Source/InitHardware.cpp index 4e78bbd3..59053a9f 100644 --- a/Boards/LilygoTdeck/Source/InitHardware.cpp +++ b/Boards/LilygoTdeck/Source/InitHardware.cpp @@ -1,5 +1,5 @@ -#include "TactilityCore.h" #include "hal/TdeckDisplayConstants.h" +#include #include #include diff --git a/Boards/LilygoTdeck/Source/LilygoTdeck.cpp b/Boards/LilygoTdeck/Source/LilygoTdeck.cpp index 36d2619e..538d6294 100644 --- a/Boards/LilygoTdeck/Source/LilygoTdeck.cpp +++ b/Boards/LilygoTdeck/Source/LilygoTdeck.cpp @@ -1,9 +1,10 @@ -#include "hal/Configuration.h" #include "hal/TdeckDisplay.h" #include "hal/TdeckKeyboard.h" #include "hal/TdeckPower.h" #include "hal/TdeckSdCard.h" +#include + bool tdeck_init_power(); bool tdeck_init_hardware(); bool tdeck_init_lvgl(); diff --git a/Boards/LilygoTdeck/Source/LilygoTdeck.h b/Boards/LilygoTdeck/Source/LilygoTdeck.h index 0039120f..5edc402d 100644 --- a/Boards/LilygoTdeck/Source/LilygoTdeck.h +++ b/Boards/LilygoTdeck/Source/LilygoTdeck.h @@ -1,5 +1,5 @@ #pragma once -#include +#include extern const tt::hal::Configuration lilygo_tdeck; diff --git a/Boards/LilygoTdeck/Source/Lvgl.cpp b/Boards/LilygoTdeck/Source/Lvgl.cpp index e9fb8acc..257328af 100644 --- a/Boards/LilygoTdeck/Source/Lvgl.cpp +++ b/Boards/LilygoTdeck/Source/Lvgl.cpp @@ -1,9 +1,11 @@ -#include "Log.h" -#include "Thread.h" -#include "lvgl/LvglSync.h" -#include "esp_lvgl_port.h" #include "hal/TdeckDisplay.h" +#include +#include +#include + +#include + #define TAG "tdeck_lvgl" // LVGL diff --git a/Boards/LilygoTdeck/Source/PowerOn.cpp b/Boards/LilygoTdeck/Source/PowerOn.cpp index bd21099e..a0e0e116 100644 --- a/Boards/LilygoTdeck/Source/PowerOn.cpp +++ b/Boards/LilygoTdeck/Source/PowerOn.cpp @@ -1,5 +1,5 @@ #include -#include "TactilityCore.h" +#include #define TAG "tdeck" diff --git a/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp b/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp index 654c4e57..bc8c1c4f 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp +++ b/Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp @@ -1,17 +1,17 @@ #include "TdeckDisplay.h" #include "TdeckDisplayConstants.h" #include "TdeckTouch.h" -#include "Log.h" -#include +#include +#include + #include - -#include "driver/ledc.h" -#include "driver/spi_master.h" -#include "esp_err.h" -#include "esp_lcd_panel_ops.h" -#include "esp_lcd_panel_vendor.h" -#include "esp_lvgl_port.h" +#include +#include +#include +#include +#include +#include #define TAG "tdeck_display" diff --git a/Boards/LilygoTdeck/Source/hal/TdeckDisplay.h b/Boards/LilygoTdeck/Source/hal/TdeckDisplay.h index e5311951..5c437d84 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckDisplay.h +++ b/Boards/LilygoTdeck/Source/hal/TdeckDisplay.h @@ -1,8 +1,8 @@ #pragma once #include -#include "lvgl.h" -#include "hal/Display.h" +#include +#include extern lv_disp_t* displayHandle; diff --git a/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.cpp b/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.cpp index d3220a99..ad7407b0 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.cpp +++ b/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.cpp @@ -1,5 +1,5 @@ #include "TdeckKeyboard.h" -#include "hal/i2c/I2c.h" +#include #include #define TAG "tdeck_keyboard" diff --git a/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h b/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h index 33a65717..e2d453f1 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h +++ b/Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h @@ -1,9 +1,9 @@ #pragma once -#include "hal/Keyboard.h" -#include -#include "esp_lcd_panel_io_interface.h" -#include "esp_lcd_touch.h" +#include +#include +#include +#include class TdeckKeyboard : public tt::hal::Keyboard { private: diff --git a/Boards/LilygoTdeck/Source/hal/TdeckPower.cpp b/Boards/LilygoTdeck/Source/hal/TdeckPower.cpp index 2e387518..95383964 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckPower.cpp +++ b/Boards/LilygoTdeck/Source/hal/TdeckPower.cpp @@ -1,7 +1,6 @@ #include "TdeckPower.h" -#include "Log.h" -#include "CoreDefines.h" +#include #define TAG "power" diff --git a/Boards/LilygoTdeck/Source/hal/TdeckPower.h b/Boards/LilygoTdeck/Source/hal/TdeckPower.h index fd6be1b9..df4de389 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckPower.h +++ b/Boards/LilygoTdeck/Source/hal/TdeckPower.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Power.h" +#include #include #include diff --git a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp index f6631f80..f6833296 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp +++ b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp @@ -1,10 +1,9 @@ #include "TdeckSdCard.h" -#include "lvgl/LvglSync.h" -#include "hal/SpiSdCard.h" +#include +#include #include -#include #define TDECK_SDCARD_PIN_CS GPIO_NUM_39 #define TDECK_LCD_PIN_CS GPIO_NUM_12 diff --git a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.h b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.h index 0cfdb0de..63a45433 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckSdCard.h +++ b/Boards/LilygoTdeck/Source/hal/TdeckSdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/LilygoTdeck/Source/hal/TdeckTouch.cpp b/Boards/LilygoTdeck/Source/hal/TdeckTouch.cpp index 579c8e06..36771b88 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckTouch.cpp +++ b/Boards/LilygoTdeck/Source/hal/TdeckTouch.cpp @@ -1,9 +1,9 @@ #include "TdeckTouch.h" -#include "esp_err.h" -#include "esp_lcd_touch_gt911.h" -#include "Log.h" -#include "esp_lvgl_port.h" +#include +#include +#include +#include #define TAG "tdeck_touch" diff --git a/Boards/LilygoTdeck/Source/hal/TdeckTouch.h b/Boards/LilygoTdeck/Source/hal/TdeckTouch.h index fa97a456..e282adc4 100644 --- a/Boards/LilygoTdeck/Source/hal/TdeckTouch.h +++ b/Boards/LilygoTdeck/Source/hal/TdeckTouch.h @@ -1,9 +1,9 @@ #pragma once -#include "hal/Touch.h" -#include "TactilityCore.h" -#include "esp_lcd_panel_io_interface.h" -#include "esp_lcd_touch.h" +#include +#include +#include +#include class TdeckTouch : public tt::hal::Touch { private: diff --git a/Boards/M5stackCore2/Source/InitBoot.cpp b/Boards/M5stackCore2/Source/InitBoot.cpp index ff2173ef..45d71428 100644 --- a/Boards/M5stackCore2/Source/InitBoot.cpp +++ b/Boards/M5stackCore2/Source/InitBoot.cpp @@ -1,11 +1,13 @@ +#include "hal/Core2DisplayConstants.h" +#include "axp192/axp192.h" + +#include +#include +#include + #include #include #include -#include "Log.h" -#include "hal/Core2DisplayConstants.h" -#include "axp192/axp192.h" -#include "hal/i2c/I2c.h" -#include "CoreDefines.h" #define TAG "core2" diff --git a/Boards/M5stackCore2/Source/InitLvgl.cpp b/Boards/M5stackCore2/Source/InitLvgl.cpp index 0d4aed8d..6094a8fc 100644 --- a/Boards/M5stackCore2/Source/InitLvgl.cpp +++ b/Boards/M5stackCore2/Source/InitLvgl.cpp @@ -1,6 +1,6 @@ -#include "Log.h" -#include "Thread.h" -#include "lvgl/LvglSync.h" +#include +#include +#include #include "esp_lvgl_port.h" #define TAG "core2" diff --git a/Boards/M5stackCore2/Source/M5stackCore2.h b/Boards/M5stackCore2/Source/M5stackCore2.h index f90c8fb4..45b8a82b 100644 --- a/Boards/M5stackCore2/Source/M5stackCore2.h +++ b/Boards/M5stackCore2/Source/M5stackCore2.h @@ -1,5 +1,5 @@ #pragma once -#include "hal/Configuration.h" +#include extern const tt::hal::Configuration m5stack_core2; diff --git a/Boards/M5stackCore2/Source/hal/Core2Display.cpp b/Boards/M5stackCore2/Source/hal/Core2Display.cpp index f38620eb..9151c0cc 100644 --- a/Boards/M5stackCore2/Source/hal/Core2Display.cpp +++ b/Boards/M5stackCore2/Source/hal/Core2Display.cpp @@ -1,17 +1,15 @@ #include "Core2Display.h" #include "Core2DisplayConstants.h" -#include "Log.h" - -#include -#include - -#include "driver/gpio.h" -#include "esp_err.h" -#include "esp_lcd_ili9341.h" -#include "esp_lcd_panel_ops.h" -#include "esp_lvgl_port.h" #include "Core2Touch.h" +#include +#include +#include +#include +#include +#include +#include + #define TAG "core2_display" bool Core2Display::start() { diff --git a/Boards/M5stackCore2/Source/hal/Core2Display.h b/Boards/M5stackCore2/Source/hal/Core2Display.h index 272a3681..9530c2ff 100644 --- a/Boards/M5stackCore2/Source/hal/Core2Display.h +++ b/Boards/M5stackCore2/Source/hal/Core2Display.h @@ -1,7 +1,7 @@ #pragma once #include "lvgl.h" -#include "hal/Display.h" +#include #include diff --git a/Boards/M5stackCore2/Source/hal/Core2Power.cpp b/Boards/M5stackCore2/Source/hal/Core2Power.cpp index 4d4f9624..9fd64ad1 100644 --- a/Boards/M5stackCore2/Source/hal/Core2Power.cpp +++ b/Boards/M5stackCore2/Source/hal/Core2Power.cpp @@ -1,5 +1,5 @@ #include "Core2Power.h" -#include "TactilityCore.h" +#include #include "axp192/axp192.h" #define TAG "core2_power" diff --git a/Boards/M5stackCore2/Source/hal/Core2Power.h b/Boards/M5stackCore2/Source/hal/Core2Power.h index 0f5a7938..63c2d5bb 100644 --- a/Boards/M5stackCore2/Source/hal/Core2Power.h +++ b/Boards/M5stackCore2/Source/hal/Core2Power.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Power.h" +#include #include using namespace tt::hal; diff --git a/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp b/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp index e1460377..701d02e4 100644 --- a/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp +++ b/Boards/M5stackCore2/Source/hal/Core2SdCard.cpp @@ -1,7 +1,7 @@ #include "Core2SdCard.h" -#include "lvgl/LvglSync.h" -#include "hal/SpiSdCard.h" +#include +#include #include diff --git a/Boards/M5stackCore2/Source/hal/Core2SdCard.h b/Boards/M5stackCore2/Source/hal/Core2SdCard.h index a6671951..940f7aa6 100644 --- a/Boards/M5stackCore2/Source/hal/Core2SdCard.h +++ b/Boards/M5stackCore2/Source/hal/Core2SdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/M5stackCore2/Source/hal/Core2Touch.h b/Boards/M5stackCore2/Source/hal/Core2Touch.h index eca8301e..e9de26da 100644 --- a/Boards/M5stackCore2/Source/hal/Core2Touch.h +++ b/Boards/M5stackCore2/Source/hal/Core2Touch.h @@ -1,7 +1,7 @@ #pragma once -#include "hal/Touch.h" -#include "TactilityCore.h" +#include +#include #include "ft6x36/FT6X36.h" class Core2Touch : public tt::hal::Touch { diff --git a/Boards/M5stackCoreS3/Source/Aw9523/Aw9523.h b/Boards/M5stackCoreS3/Source/Aw9523/Aw9523.h index 8e643b37..36b32b57 100644 --- a/Boards/M5stackCoreS3/Source/Aw9523/Aw9523.h +++ b/Boards/M5stackCoreS3/Source/Aw9523/Aw9523.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/i2c/I2cDevice.h" +#include #define AW9523_ADDRESS 0x58 diff --git a/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.cpp b/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.cpp index 80efff44..f4e15c49 100644 --- a/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.cpp +++ b/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.cpp @@ -1,5 +1,5 @@ #include "Axp2101.h" -#include "Log.h" +#include bool Axp2101::getBatteryVoltage(float& vbatMillis) const { return readRegister14(0x34, vbatMillis); diff --git a/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.h b/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.h index bbf3c0ef..327ffd23 100644 --- a/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.h +++ b/Boards/M5stackCoreS3/Source/Axp2101/Axp2101.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/i2c/I2cDevice.h" +#include #define AXP2101_ADDRESS 0x34 diff --git a/Boards/M5stackCoreS3/Source/InitBoot.cpp b/Boards/M5stackCoreS3/Source/InitBoot.cpp index 55d1f2a1..d1bea12e 100644 --- a/Boards/M5stackCoreS3/Source/InitBoot.cpp +++ b/Boards/M5stackCoreS3/Source/InitBoot.cpp @@ -1,11 +1,12 @@ +#include "hal/CoreS3DisplayConstants.h" +#include "Axp2101/Axp2101.h" +#include "Aw9523/Aw9523.h" + +#include +#include #include #include #include -#include "Log.h" -#include "hal/CoreS3DisplayConstants.h" -#include "kernel/Kernel.h" -#include "Axp2101/Axp2101.h" -#include "Aw9523/Aw9523.h" #define TAG "core2" diff --git a/Boards/M5stackCoreS3/Source/InitLvgl.cpp b/Boards/M5stackCoreS3/Source/InitLvgl.cpp index 0d4aed8d..f741f6e2 100644 --- a/Boards/M5stackCoreS3/Source/InitLvgl.cpp +++ b/Boards/M5stackCoreS3/Source/InitLvgl.cpp @@ -1,7 +1,7 @@ -#include "Log.h" -#include "Thread.h" -#include "lvgl/LvglSync.h" -#include "esp_lvgl_port.h" +#include +#include +#include +#include #define TAG "core2" diff --git a/Boards/M5stackCoreS3/Source/M5stackCoreS3.h b/Boards/M5stackCoreS3/Source/M5stackCoreS3.h index 9878c56d..120c7697 100644 --- a/Boards/M5stackCoreS3/Source/M5stackCoreS3.h +++ b/Boards/M5stackCoreS3/Source/M5stackCoreS3.h @@ -1,5 +1,5 @@ #pragma once -#include "hal/Configuration.h" +#include extern const tt::hal::Configuration m5stack_cores3; diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp index 78fc6dc0..d8c4308e 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp @@ -1,16 +1,15 @@ #include "CoreS3Display.h" #include "CoreS3DisplayConstants.h" -#include "Log.h" +#include -#include +#include #include -#include "driver/gpio.h" -#include "esp_err.h" -#include "esp_lcd_ili9341.h" -#include "esp_lcd_panel_ops.h" -#include "esp_lvgl_port.h" -#include "hal/i2c/I2c.h" +#include +#include +#include +#include +#include #include "CoreS3Constants.h" #include "CoreS3Touch.h" diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Display.h b/Boards/M5stackCoreS3/Source/hal/CoreS3Display.h index c1388a4d..45b7851b 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Display.h +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Display.h @@ -1,8 +1,7 @@ #pragma once -#include "lvgl.h" -#include "hal/Display.h" - +#include +#include #include extern lv_disp_t* displayHandle; diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Power.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3Power.cpp index 31755849..36a983a2 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Power.cpp +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Power.cpp @@ -1,5 +1,5 @@ #include "CoreS3Power.h" -#include "TactilityCore.h" +#include #define TAG "core2_power" diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Power.h b/Boards/M5stackCoreS3/Source/hal/CoreS3Power.h index 654ba8c6..a2988900 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Power.h +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Power.h @@ -1,7 +1,8 @@ #pragma once -#include "hal/Power.h" #include "Axp2101/Axp2101.h" + +#include #include using namespace tt::hal; diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp index e8a4a8dc..5419417d 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp @@ -1,7 +1,7 @@ #include "CoreS3SdCard.h" -#include "lvgl/LvglSync.h" -#include "hal/SpiSdCard.h" +#include +#include #include diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.h b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.h index a6671951..940f7aa6 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.h +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.cpp b/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.cpp index efd69017..56177c20 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.cpp +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.cpp @@ -1,5 +1,5 @@ #include "CoreS3Touch.h" -#include "Log.h" +#include #include "driver/i2c.h" #include "esp_err.h" #include "esp_lcd_touch_ft5x06.h" diff --git a/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.h b/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.h index 9cca7aa8..fed1d5de 100644 --- a/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.h +++ b/Boards/M5stackCoreS3/Source/hal/CoreS3Touch.h @@ -1,7 +1,7 @@ #pragma once -#include "hal/Touch.h" -#include "TactilityCore.h" +#include +#include #include class CoreS3Touch : public tt::hal::Touch { diff --git a/Boards/Simulator/Source/LvglTask.cpp b/Boards/Simulator/Source/LvglTask.cpp index acd41cf3..5876bf43 100644 --- a/Boards/Simulator/Source/LvglTask.cpp +++ b/Boards/Simulator/Source/LvglTask.cpp @@ -1,11 +1,11 @@ #include "LvglTask.h" -#include "lvgl.h" -#include "Log.h" -#include "Thread.h" -#include "lvgl/LvglSync.h" +#include +#include +#include +#include -#include "Mutex.h" +#include #define TAG "lvgl_task" diff --git a/Boards/Simulator/Source/Main.cpp b/Boards/Simulator/Source/Main.cpp index 86f64b23..f367e145 100644 --- a/Boards/Simulator/Source/Main.cpp +++ b/Boards/Simulator/Source/Main.cpp @@ -1,6 +1,6 @@ #include "Main.h" -#include "TactilityCore.h" -#include "Thread.h" +#include +#include #include "FreeRTOS.h" #include "task.h" diff --git a/Boards/Simulator/Source/Simulator.h b/Boards/Simulator/Source/Simulator.h index c0198327..340e6c2e 100644 --- a/Boards/Simulator/Source/Simulator.h +++ b/Boards/Simulator/Source/Simulator.h @@ -1,7 +1,7 @@ #pragma once -#include "hal/Configuration.h" #include "Main.h" +#include namespace simulator { /** Set the function pointer of the real app_main() */ diff --git a/Boards/Simulator/Source/hal/Configuration.cpp b/Boards/Simulator/Source/hal/Configuration.cpp index bd0d4ea5..e808d6ba 100644 --- a/Boards/Simulator/Source/hal/Configuration.cpp +++ b/Boards/Simulator/Source/hal/Configuration.cpp @@ -1,5 +1,4 @@ -#include "Tactility.h" -#include "hal/Configuration.h" +#include #include "hal/SimulatorPower.h" #include "LvglTask.h" #include "src/lv_init.h" diff --git a/Boards/Simulator/Source/hal/SdlDisplay.h b/Boards/Simulator/Source/hal/SdlDisplay.h index e0172f10..dd2c600c 100644 --- a/Boards/Simulator/Source/hal/SdlDisplay.h +++ b/Boards/Simulator/Source/hal/SdlDisplay.h @@ -1,7 +1,7 @@ #pragma once #include "SdlTouch.h" -#include "hal/Display.h" +#include extern lv_disp_t* displayHandle; diff --git a/Boards/Simulator/Source/hal/SdlKeyboard.h b/Boards/Simulator/Source/hal/SdlKeyboard.h index dc49e92d..b1c572c3 100644 --- a/Boards/Simulator/Source/hal/SdlKeyboard.h +++ b/Boards/Simulator/Source/hal/SdlKeyboard.h @@ -1,8 +1,7 @@ #pragma once -#include "hal/Keyboard.h" - -#include +#include +#include class SdlKeyboard : public tt::hal::Keyboard { private: diff --git a/Boards/Simulator/Source/hal/SdlTouch.h b/Boards/Simulator/Source/hal/SdlTouch.h index df1dfbcc..a6e3cc46 100644 --- a/Boards/Simulator/Source/hal/SdlTouch.h +++ b/Boards/Simulator/Source/hal/SdlTouch.h @@ -1,8 +1,7 @@ #pragma once -#include "hal/Touch.h" - -#include +#include +#include class SdlTouch : public tt::hal::Touch { private: diff --git a/Boards/Simulator/Source/hal/SimulatorPower.h b/Boards/Simulator/Source/hal/SimulatorPower.h index b12b1252..15931960 100644 --- a/Boards/Simulator/Source/hal/SimulatorPower.h +++ b/Boards/Simulator/Source/hal/SimulatorPower.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Power.h" +#include #include using namespace tt::hal; diff --git a/Boards/Simulator/Source/hal/SimulatorSdCard.h b/Boards/Simulator/Source/hal/SimulatorSdCard.h index cd07a127..43cc459c 100644 --- a/Boards/Simulator/Source/hal/SimulatorSdCard.h +++ b/Boards/Simulator/Source/hal/SimulatorSdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/UnPhone/Source/InitHardware.cpp b/Boards/UnPhone/Source/InitHardware.cpp index 91bef156..5a6fde45 100644 --- a/Boards/UnPhone/Source/InitHardware.cpp +++ b/Boards/UnPhone/Source/InitHardware.cpp @@ -1,6 +1,6 @@ -#include "TactilityCore.h" #include "hal/UnPhoneDisplayConstants.h" #include "hx8357/disp_spi.h" +#include #include #include #include diff --git a/Boards/UnPhone/Source/Lvgl.cpp b/Boards/UnPhone/Source/Lvgl.cpp index 503dbf5f..0e7b0a93 100644 --- a/Boards/UnPhone/Source/Lvgl.cpp +++ b/Boards/UnPhone/Source/Lvgl.cpp @@ -1,9 +1,10 @@ -#include "Log.h" -#include "Thread.h" -#include "lvgl/LvglSync.h" -#include "esp_lvgl_port.h" #include "hal/UnPhoneDisplay.h" +#include +#include +#include +#include + #define TAG "unphone_lvgl" // LVGL diff --git a/Boards/UnPhone/Source/PowerOn.cpp b/Boards/UnPhone/Source/PowerOn.cpp index af16b5ec..28d1dbfc 100644 --- a/Boards/UnPhone/Source/PowerOn.cpp +++ b/Boards/UnPhone/Source/PowerOn.cpp @@ -1,6 +1,6 @@ -#include "Preferences.h" -#include "TactilityCore.h" #include "UnPhoneFeatures.h" +#include +#include #include #define TAG "unphone" diff --git a/Boards/UnPhone/Source/UnPhone.cpp b/Boards/UnPhone/Source/UnPhone.cpp index 1f725e9e..5c82ee31 100644 --- a/Boards/UnPhone/Source/UnPhone.cpp +++ b/Boards/UnPhone/Source/UnPhone.cpp @@ -1,8 +1,8 @@ #include "UnPhoneFeatures.h" -#include "hal/Configuration.h" #include "hal/UnPhoneDisplay.h" #include "hal/UnPhonePower.h" #include "hal/UnPhoneSdCard.h" +#include bool unPhoneInitPower(); bool unPhoneInitHardware(); diff --git a/Boards/UnPhone/Source/UnPhone.h b/Boards/UnPhone/Source/UnPhone.h index a2370b6a..c2ac9749 100644 --- a/Boards/UnPhone/Source/UnPhone.h +++ b/Boards/UnPhone/Source/UnPhone.h @@ -1,5 +1,5 @@ #pragma once -#include +#include extern const tt::hal::Configuration unPhone; diff --git a/Boards/UnPhone/Source/UnPhoneFeatures.cpp b/Boards/UnPhone/Source/UnPhoneFeatures.cpp index 82aaa9bc..5207ab88 100644 --- a/Boards/UnPhone/Source/UnPhoneFeatures.cpp +++ b/Boards/UnPhone/Source/UnPhoneFeatures.cpp @@ -1,8 +1,8 @@ #include "UnPhoneFeatures.h" -#include "FreeRTOS-Kernel/include/FreeRTOS.h" -#include "Log.h" -#include "kernel/Kernel.h" -#include "service/loader/Loader.h" + +#include +#include +#include #include #include #include diff --git a/Boards/UnPhone/Source/UnPhoneFeatures.h b/Boards/UnPhone/Source/UnPhoneFeatures.h index cfd591c6..11549e6b 100644 --- a/Boards/UnPhone/Source/UnPhoneFeatures.h +++ b/Boards/UnPhone/Source/UnPhoneFeatures.h @@ -1,7 +1,7 @@ #pragma once -#include "Thread.h" #include "bq24295/Bq24295.h" +#include #include /** diff --git a/Boards/UnPhone/Source/bq24295/Bq24295.cpp b/Boards/UnPhone/Source/bq24295/Bq24295.cpp index 43a036a7..22e94b13 100644 --- a/Boards/UnPhone/Source/bq24295/Bq24295.cpp +++ b/Boards/UnPhone/Source/bq24295/Bq24295.cpp @@ -1,5 +1,5 @@ #include "Bq24295.h" -#include "Log.h" +#include #define TAG "bq24295" diff --git a/Boards/UnPhone/Source/bq24295/Bq24295.h b/Boards/UnPhone/Source/bq24295/Bq24295.h index 0d11402f..822ee45a 100644 --- a/Boards/UnPhone/Source/bq24295/Bq24295.h +++ b/Boards/UnPhone/Source/bq24295/Bq24295.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/i2c/I2cDevice.h" +#include #define BQ24295_ADDRESS 0x6BU diff --git a/Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp b/Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp index 09e19343..9142318a 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp +++ b/Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp @@ -1,9 +1,9 @@ #include "UnPhoneDisplay.h" #include "UnPhoneDisplayConstants.h" #include "UnPhoneTouch.h" -#include "Log.h" +#include -#include +#include #include "UnPhoneFeatures.h" #include "esp_err.h" diff --git a/Boards/UnPhone/Source/hal/UnPhoneDisplay.h b/Boards/UnPhone/Source/hal/UnPhoneDisplay.h index 0ecdff24..1f28fca5 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneDisplay.h +++ b/Boards/UnPhone/Source/hal/UnPhoneDisplay.h @@ -1,8 +1,8 @@ #pragma once #include -#include "lvgl.h" -#include "hal/Display.h" +#include +#include extern lv_disp_t* displayHandle; diff --git a/Boards/UnPhone/Source/hal/UnPhonePower.cpp b/Boards/UnPhone/Source/hal/UnPhonePower.cpp index 5bc18ee8..87beb949 100644 --- a/Boards/UnPhone/Source/hal/UnPhonePower.cpp +++ b/Boards/UnPhone/Source/hal/UnPhonePower.cpp @@ -1,6 +1,6 @@ #include "UnPhonePower.h" #include "UnPhoneTouch.h" -#include "Log.h" +#include #define TAG "unphone_power" diff --git a/Boards/UnPhone/Source/hal/UnPhonePower.h b/Boards/UnPhone/Source/hal/UnPhonePower.h index 040687e8..c70dce01 100644 --- a/Boards/UnPhone/Source/hal/UnPhonePower.h +++ b/Boards/UnPhone/Source/hal/UnPhonePower.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Power.h" +#include #include using namespace tt::hal; diff --git a/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp b/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp index 340e1dca..176d61ab 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp +++ b/Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp @@ -1,7 +1,7 @@ #include "UnPhoneSdCard.h" -#include "lvgl/LvglSync.h" -#include "hal/SpiSdCard.h" +#include +#include #include diff --git a/Boards/UnPhone/Source/hal/UnPhoneSdCard.h b/Boards/UnPhone/Source/hal/UnPhoneSdCard.h index 372888c0..0d9e410e 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneSdCard.h +++ b/Boards/UnPhone/Source/hal/UnPhoneSdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/SdCard.h" +#include using namespace tt::hal; diff --git a/Boards/UnPhone/Source/hal/UnPhoneTouch.cpp b/Boards/UnPhone/Source/hal/UnPhoneTouch.cpp index e2a5a59b..f6563b23 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneTouch.cpp +++ b/Boards/UnPhone/Source/hal/UnPhoneTouch.cpp @@ -1,10 +1,10 @@ #include "UnPhoneTouch.h" -#include "Log.h" +#include #include "esp_err.h" #include "esp_lcd_touch_xpt2046.h" #include "esp_lvgl_port.h" -#include "lvgl/LvglSync.h" +#include #define TAG "unphone_touch" diff --git a/Boards/UnPhone/Source/hal/UnPhoneTouch.h b/Boards/UnPhone/Source/hal/UnPhoneTouch.h index 57afbf1b..d275d44d 100644 --- a/Boards/UnPhone/Source/hal/UnPhoneTouch.h +++ b/Boards/UnPhone/Source/hal/UnPhoneTouch.h @@ -1,9 +1,9 @@ #pragma once -#include "hal/Touch.h" -#include "TactilityCore.h" -#include "esp_lcd_panel_io_interface.h" -#include "esp_lcd_touch.h" +#include +#include +#include +#include class UnPhoneTouch : public tt::hal::Touch { diff --git a/Buildscripts/release-sdk.sh b/Buildscripts/release-sdk.sh index 4dfc16e3..00a14ef7 100755 --- a/Buildscripts/release-sdk.sh +++ b/Buildscripts/release-sdk.sh @@ -21,8 +21,7 @@ mkdir -p $tactility_library_path/Binary cp build/esp-idf/TactilityC/libTactilityC.a $tactility_library_path/Binary/ mkdir -p $tactility_library_path/Include find_target_dir=$build_dir/$tactility_library_path/Include/ -cd TactilityC/Source -find -name '*.h' | cpio -pdm $find_target_dir +cp TactilityC/Include/* $find_target_dir cd - cp Documentation/license-tactilitysdk.md $build_dir/$tactility_library_path/LICENSE.md diff --git a/Documentation/ideas.md b/Documentation/ideas.md index 4a76eb31..5ff12e87 100644 --- a/Documentation/ideas.md +++ b/Documentation/ideas.md @@ -1,4 +1,5 @@ # TODOs +- Create a base `Driver` object for drives, and a `DriverManager` to find devices - Use std::span or string_view in StringUtils https://youtu.be/FRkJCvHWdwQ?t=2754 - Fix bug in T-Deck/etc: esp_lvgl_port settings has a large stack size (~9kB) to fix an issue where the T-Deck would get a stackoverflow. This sometimes happens when WiFi is auto-enabled and you open the app while it is still connecting. - Clean up static_cast when casting to base class. @@ -46,6 +47,10 @@ - On crash, try to save current log to flash or SD card? (this is risky, though, so ask in Discord first) # App Ideas +- Map widget: + https://github.com/portapack-mayhem/mayhem-firmware/blob/b66d8b1aa178d8a9cd06436fea788d5d58cb4c8d/firmware/application/ui/ui_geomap.cpp + https://github.com/portapack-mayhem/mayhem-firmware/blob/b66d8b1aa178d8a9cd06436fea788d5d58cb4c8d/firmware/tools/generate_world_map.bin.py + https://github.com/portapack-mayhem/mayhem-firmware/releases - Weather app: https://lab.flipper.net/apps/flip_weather - wget app: https://lab.flipper.net/apps/web_crawler (add profiles for known public APIs?) - USB implementation to make device act as mass storage device. diff --git a/ExternalApps/HelloWorld/main/Source/main.c b/ExternalApps/HelloWorld/main/Source/main.c index 6184c713..ff457b00 100644 --- a/ExternalApps/HelloWorld/main/Source/main.c +++ b/ExternalApps/HelloWorld/main/Source/main.c @@ -1,5 +1,5 @@ -#include "tt_app_manifest.h" -#include "tt_lvgl_toolbar.h" +#include +#include /** * Note: LVGL and Tactility methods need to be exposed manually from TactilityC/Source/tt_init.cpp diff --git a/Libraries/QRCode/CMakeLists.txt b/Libraries/QRCode/CMakeLists.txt index 1ae269c9..dc61e7d6 100644 --- a/Libraries/QRCode/CMakeLists.txt +++ b/Libraries/QRCode/CMakeLists.txt @@ -8,8 +8,6 @@ if (DEFINED ENV{ESP_IDF_VERSION}) INCLUDE_DIRS "src/" ) - add_definitions(-DESP_PLATFORM) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unknown-pragmas) endif() diff --git a/Libraries/lv_screenshot/CMakeLists.txt b/Libraries/lv_screenshot/CMakeLists.txt index 9282f359..cc7c6998 100644 --- a/Libraries/lv_screenshot/CMakeLists.txt +++ b/Libraries/lv_screenshot/CMakeLists.txt @@ -12,7 +12,6 @@ if (DEFINED ENV{ESP_IDF_VERSION}) REQUIRES lvgl ) - add_definitions(-DESP_PLATFORM) else() file(GLOB SOURCES "Source/*.c*") file(GLOB HEADERS "Source/*.h*") diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt index fe7118ad..2ee287ac 100644 --- a/Tactility/CMakeLists.txt +++ b/Tactility/CMakeLists.txt @@ -8,25 +8,21 @@ if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCE_FILES} - INCLUDE_DIRS "Source/" + INCLUDE_DIRS "Include/" PRIV_INCLUDE_DIRS "Private/" REQUIRES TactilityHeadless lvgl driver elf_loader lv_screenshot QRCode ) - add_definitions(-DESP_PLATFORM) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable) endif() else() file(GLOB_RECURSE SOURCES "Source/*.c*") - file(GLOB_RECURSE HEADERS "Source/*.h*") add_library(Tactility OBJECT) target_sources(Tactility PRIVATE ${SOURCES} - PUBLIC ${HEADERS} ) include_directories( @@ -34,11 +30,12 @@ else() ) target_include_directories(Tactility - PUBLIC Source/ + PUBLIC Include/ ) add_definitions(-D_Nullable=) add_definitions(-D_Nonnull=) + target_link_libraries(Tactility PUBLIC TactilityHeadless PUBLIC lvgl diff --git a/Tactility/Source/Tactility.h b/Tactility/Include/Tactility/Tactility.h similarity index 87% rename from Tactility/Source/Tactility.h rename to Tactility/Include/Tactility/Tactility.h index 8d5f9b81..a8c60973 100644 --- a/Tactility/Source/Tactility.h +++ b/Tactility/Include/Tactility/Tactility.h @@ -1,9 +1,10 @@ #pragma once -#include "app/AppManifest.h" -#include "hal/Configuration.h" -#include "service/ServiceManifest.h" -#include "TactilityConfig.h" +#include "Tactility/app/AppManifest.h" + +#include +#include +#include namespace tt { diff --git a/Tactility/Source/TactilityConfig.h b/Tactility/Include/Tactility/TactilityConfig.h similarity index 94% rename from Tactility/Source/TactilityConfig.h rename to Tactility/Include/Tactility/TactilityConfig.h index 7d84071a..0f37cdea 100644 --- a/Tactility/Source/TactilityConfig.h +++ b/Tactility/Include/Tactility/TactilityConfig.h @@ -1,7 +1,7 @@ #pragma once #ifdef ESP_PLATFORM -#include "sdkconfig.h" +#include #endif #define TT_CONFIG_FORCE_ONSCREEN_KEYBOARD false // for development/debug purposes diff --git a/Tactility/Source/app/App.h b/Tactility/Include/Tactility/app/App.h similarity index 96% rename from Tactility/Source/app/App.h rename to Tactility/Include/Tactility/app/App.h index 473e21b2..0fd2530e 100644 --- a/Tactility/Source/app/App.h +++ b/Tactility/Include/Tactility/app/App.h @@ -1,8 +1,10 @@ #pragma once -#include "AppContext.h" -#include "Bundle.h" -#include +#include "Tactility/app/AppContext.h" + +#include +#include + #include // Forward declarations diff --git a/Tactility/Source/app/AppContext.h b/Tactility/Include/Tactility/app/AppContext.h similarity index 98% rename from Tactility/Source/app/AppContext.h rename to Tactility/Include/Tactility/app/AppContext.h index fadc548a..95eeb7b5 100644 --- a/Tactility/Source/app/AppContext.h +++ b/Tactility/Include/Tactility/app/AppContext.h @@ -1,6 +1,6 @@ #pragma once -#include "Bundle.h" +#include #include namespace tt::app { diff --git a/Tactility/Source/app/AppManifest.h b/Tactility/Include/Tactility/app/AppManifest.h similarity index 94% rename from Tactility/Source/app/AppManifest.h rename to Tactility/Include/Tactility/app/AppManifest.h index 6403603f..61dbf612 100644 --- a/Tactility/Source/app/AppManifest.h +++ b/Tactility/Include/Tactility/app/AppManifest.h @@ -1,8 +1,10 @@ #pragma once -#include "CoreDefines.h" -#include "ManifestRegistry.h" -#include +#include "Tactility/app/ManifestRegistry.h" + +#include +#include + #include // Forward declarations diff --git a/Tactility/Source/app/ElfApp.h b/Tactility/Include/Tactility/app/ElfApp.h similarity index 100% rename from Tactility/Source/app/ElfApp.h rename to Tactility/Include/Tactility/app/ElfApp.h diff --git a/Tactility/Source/app/ManifestRegistry.h b/Tactility/Include/Tactility/app/ManifestRegistry.h similarity index 100% rename from Tactility/Source/app/ManifestRegistry.h rename to Tactility/Include/Tactility/app/ManifestRegistry.h diff --git a/Tactility/Source/app/alertdialog/AlertDialog.h b/Tactility/Include/Tactility/app/alertdialog/AlertDialog.h similarity index 96% rename from Tactility/Source/app/alertdialog/AlertDialog.h rename to Tactility/Include/Tactility/app/alertdialog/AlertDialog.h index 4e805118..ae689deb 100644 --- a/Tactility/Source/app/alertdialog/AlertDialog.h +++ b/Tactility/Include/Tactility/app/alertdialog/AlertDialog.h @@ -1,8 +1,9 @@ #pragma once +#include + #include #include -#include "Bundle.h" /** * Start the app by its ID and provide: diff --git a/Tactility/Source/app/display/DisplaySettings.h b/Tactility/Include/Tactility/app/display/DisplaySettings.h similarity index 100% rename from Tactility/Source/app/display/DisplaySettings.h rename to Tactility/Include/Tactility/app/display/DisplaySettings.h diff --git a/Tactility/Source/app/files/Files.h b/Tactility/Include/Tactility/app/files/Files.h similarity index 73% rename from Tactility/Source/app/files/Files.h rename to Tactility/Include/Tactility/app/files/Files.h index 51f8f16f..1d77e44a 100644 --- a/Tactility/Source/app/files/Files.h +++ b/Tactility/Include/Tactility/app/files/Files.h @@ -1,7 +1,7 @@ #pragma once -#include "View.h" -#include "State.h" +#include "app/files/View.h" +#include "app/files/State.h" #include "app/AppManifest.h" #include diff --git a/Tactility/Source/app/imageviewer/ImageViewer.h b/Tactility/Include/Tactility/app/imageviewer/ImageViewer.h similarity index 100% rename from Tactility/Source/app/imageviewer/ImageViewer.h rename to Tactility/Include/Tactility/app/imageviewer/ImageViewer.h diff --git a/Tactility/Source/app/inputdialog/InputDialog.h b/Tactility/Include/Tactility/app/inputdialog/InputDialog.h similarity index 92% rename from Tactility/Source/app/inputdialog/InputDialog.h rename to Tactility/Include/Tactility/app/inputdialog/InputDialog.h index 563a88e7..df0c8e84 100644 --- a/Tactility/Source/app/inputdialog/InputDialog.h +++ b/Tactility/Include/Tactility/app/inputdialog/InputDialog.h @@ -1,8 +1,9 @@ #pragma once +#include + #include #include -#include "Bundle.h" /** * Start the app by its ID and provide: diff --git a/Tactility/Source/app/selectiondialog/SelectionDialog.h b/Tactility/Include/Tactility/app/selectiondialog/SelectionDialog.h similarity index 95% rename from Tactility/Source/app/selectiondialog/SelectionDialog.h rename to Tactility/Include/Tactility/app/selectiondialog/SelectionDialog.h index 9dad7fc7..de964017 100644 --- a/Tactility/Source/app/selectiondialog/SelectionDialog.h +++ b/Tactility/Include/Tactility/app/selectiondialog/SelectionDialog.h @@ -1,8 +1,9 @@ #pragma once +#include + #include #include -#include "Bundle.h" /** * Start the app by its ID and provide: diff --git a/Tactility/Source/app/textviewer/TextViewer.h b/Tactility/Include/Tactility/app/textviewer/TextViewer.h similarity index 100% rename from Tactility/Source/app/textviewer/TextViewer.h rename to Tactility/Include/Tactility/app/textviewer/TextViewer.h diff --git a/Tactility/Include/Tactility/app/wifimanage/WifiManage.h b/Tactility/Include/Tactility/app/wifimanage/WifiManage.h new file mode 100644 index 00000000..b1cd4994 --- /dev/null +++ b/Tactility/Include/Tactility/app/wifimanage/WifiManage.h @@ -0,0 +1,7 @@ +#pragma once + +namespace tt::app::wifimanage { + +void start(); + +} // namespace diff --git a/Tactility/Source/lvgl/LabelUtils.h b/Tactility/Include/Tactility/lvgl/LabelUtils.h similarity index 100% rename from Tactility/Source/lvgl/LabelUtils.h rename to Tactility/Include/Tactility/lvgl/LabelUtils.h diff --git a/Tactility/Source/lvgl/LvglDisplay.h b/Tactility/Include/Tactility/lvgl/LvglDisplay.h similarity index 66% rename from Tactility/Source/lvgl/LvglDisplay.h rename to Tactility/Include/Tactility/lvgl/LvglDisplay.h index 72d5e843..648b559d 100644 --- a/Tactility/Source/lvgl/LvglDisplay.h +++ b/Tactility/Include/Tactility/lvgl/LvglDisplay.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Display.h" +#include namespace tt::lvgl { hal::Display* getDisplay(); diff --git a/Tactility/Source/lvgl/LvglKeypad.h b/Tactility/Include/Tactility/lvgl/LvglKeypad.h similarity index 97% rename from Tactility/Source/lvgl/LvglKeypad.h rename to Tactility/Include/Tactility/lvgl/LvglKeypad.h index 5f43a7cf..7a0c7115 100644 --- a/Tactility/Source/lvgl/LvglKeypad.h +++ b/Tactility/Include/Tactility/lvgl/LvglKeypad.h @@ -3,7 +3,7 @@ */ #pragma once -#include "lvgl.h" +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/LvglSync.h b/Tactility/Include/Tactility/lvgl/LvglSync.h similarity index 96% rename from Tactility/Source/lvgl/LvglSync.h rename to Tactility/Include/Tactility/lvgl/LvglSync.h index bb3b144c..b29a637b 100644 --- a/Tactility/Source/lvgl/LvglSync.h +++ b/Tactility/Include/Tactility/lvgl/LvglSync.h @@ -1,6 +1,6 @@ #pragma once -#include "Lockable.h" +#include #include diff --git a/Tactility/Source/lvgl/Spinner.h b/Tactility/Include/Tactility/lvgl/Spinner.h similarity index 100% rename from Tactility/Source/lvgl/Spinner.h rename to Tactility/Include/Tactility/lvgl/Spinner.h diff --git a/Tactility/Source/lvgl/Statusbar.h b/Tactility/Include/Tactility/lvgl/Statusbar.h similarity index 89% rename from Tactility/Source/lvgl/Statusbar.h rename to Tactility/Include/Tactility/lvgl/Statusbar.h index 9fe71a9d..180571f5 100644 --- a/Tactility/Source/lvgl/Statusbar.h +++ b/Tactility/Include/Tactility/lvgl/Statusbar.h @@ -1,7 +1,8 @@ #pragma once -#include "lvgl.h" -#include "app/AppContext.h" +#include "Tactility/app/AppContext.h" + +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/Style.h b/Tactility/Include/Tactility/lvgl/Style.h similarity index 100% rename from Tactility/Source/lvgl/Style.h rename to Tactility/Include/Tactility/lvgl/Style.h diff --git a/Tactility/Source/lvgl/Toolbar.h b/Tactility/Include/Tactility/lvgl/Toolbar.h similarity index 95% rename from Tactility/Source/lvgl/Toolbar.h rename to Tactility/Include/Tactility/lvgl/Toolbar.h index 2b01bdb5..85d06050 100644 --- a/Tactility/Source/lvgl/Toolbar.h +++ b/Tactility/Include/Tactility/lvgl/Toolbar.h @@ -1,7 +1,7 @@ #pragma once #include "lvgl.h" -#include "app/AppContext.h" +#include "../app/AppContext.h" namespace tt::lvgl { diff --git a/Tactility/Source/service/gui/Gui.h b/Tactility/Include/Tactility/service/gui/Gui.h similarity index 94% rename from Tactility/Source/service/gui/Gui.h rename to Tactility/Include/Tactility/service/gui/Gui.h index 0650d7a6..bd3cd673 100644 --- a/Tactility/Source/service/gui/Gui.h +++ b/Tactility/Include/Tactility/service/gui/Gui.h @@ -1,7 +1,7 @@ #pragma once -#include "app/AppInstance.h" -#include "app/AppContext.h" +#include "Tactility/app/AppInstance.h" +#include "Tactility/app/AppContext.h" namespace tt::service::gui { diff --git a/Tactility/Source/service/loader/Loader.h b/Tactility/Include/Tactility/service/loader/Loader.h similarity index 88% rename from Tactility/Source/service/loader/Loader.h rename to Tactility/Include/Tactility/service/loader/Loader.h index 072897da..edd02d57 100644 --- a/Tactility/Source/service/loader/Loader.h +++ b/Tactility/Include/Tactility/service/loader/Loader.h @@ -1,9 +1,11 @@ #pragma once -#include "Bundle.h" -#include "PubSub.h" -#include "app/AppManifest.h" -#include "service/ServiceManifest.h" +#include "Tactility/app/AppManifest.h" + +#include +#include +#include + #include namespace tt::service::loader { diff --git a/Tactility/Private/app/AppInstance.h b/Tactility/Private/Tactility/app/AppInstance.h similarity index 93% rename from Tactility/Private/app/AppInstance.h rename to Tactility/Private/Tactility/app/AppInstance.h index 12c96aeb..3bd76558 100644 --- a/Tactility/Private/app/AppInstance.h +++ b/Tactility/Private/Tactility/app/AppInstance.h @@ -1,10 +1,12 @@ #pragma once -#include "Bundle.h" -#include "Mutex.h" -#include "app/AppContext.h" -#include "app/AppManifest.h" -#include "app/ElfApp.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/app/ElfApp.h" + +#include +#include + #include #include diff --git a/Tactility/Private/app/AppInstancePaths.h b/Tactility/Private/Tactility/app/AppInstancePaths.h similarity index 95% rename from Tactility/Private/app/AppInstancePaths.h rename to Tactility/Private/Tactility/app/AppInstancePaths.h index eb1f3bae..7cd1e38c 100644 --- a/Tactility/Private/app/AppInstancePaths.h +++ b/Tactility/Private/Tactility/app/AppInstancePaths.h @@ -1,6 +1,6 @@ #pragma once -#include "app/AppInstance.h" +#include "Tactility/app/AppInstance.h" namespace tt::app { diff --git a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.h b/Tactility/Private/Tactility/app/crashdiagnostics/CrashDiagnostics.h similarity index 100% rename from Tactility/Source/app/crashdiagnostics/CrashDiagnostics.h rename to Tactility/Private/Tactility/app/crashdiagnostics/CrashDiagnostics.h diff --git a/Tactility/Private/app/crashdiagnostics/QrHelpers.h b/Tactility/Private/Tactility/app/crashdiagnostics/QrHelpers.h similarity index 100% rename from Tactility/Private/app/crashdiagnostics/QrHelpers.h rename to Tactility/Private/Tactility/app/crashdiagnostics/QrHelpers.h diff --git a/Tactility/Private/app/crashdiagnostics/QrUrl.h b/Tactility/Private/Tactility/app/crashdiagnostics/QrUrl.h similarity index 100% rename from Tactility/Private/app/crashdiagnostics/QrUrl.h rename to Tactility/Private/Tactility/app/crashdiagnostics/QrUrl.h diff --git a/Tactility/Private/app/files/FileUtils.h b/Tactility/Private/Tactility/app/files/FileUtils.h similarity index 100% rename from Tactility/Private/app/files/FileUtils.h rename to Tactility/Private/Tactility/app/files/FileUtils.h diff --git a/Tactility/Private/app/files/State.h b/Tactility/Private/Tactility/app/files/State.h similarity index 97% rename from Tactility/Private/app/files/State.h rename to Tactility/Private/Tactility/app/files/State.h index 66b021b0..c29e1521 100644 --- a/Tactility/Private/app/files/State.h +++ b/Tactility/Private/Tactility/app/files/State.h @@ -1,9 +1,10 @@ #pragma once +#include + #include #include #include -#include "Mutex.h" namespace tt::app::files { diff --git a/Tactility/Private/app/files/View.h b/Tactility/Private/Tactility/app/files/View.h similarity index 95% rename from Tactility/Private/app/files/View.h rename to Tactility/Private/Tactility/app/files/View.h index e3838786..0c616c7c 100644 --- a/Tactility/Private/app/files/View.h +++ b/Tactility/Private/Tactility/app/files/View.h @@ -2,7 +2,8 @@ #include "./State.h" -#include "app/AppManifest.h" +#include "Tactility/app/AppManifest.h" + #include #include diff --git a/Tactility/Source/app/gpio/GpioHal.h b/Tactility/Private/Tactility/app/gpio/GpioHal.h similarity index 100% rename from Tactility/Source/app/gpio/GpioHal.h rename to Tactility/Private/Tactility/app/gpio/GpioHal.h diff --git a/Tactility/Private/app/i2cscanner/I2cHelpers.h b/Tactility/Private/Tactility/app/i2cscanner/I2cHelpers.h similarity index 100% rename from Tactility/Private/app/i2cscanner/I2cHelpers.h rename to Tactility/Private/Tactility/app/i2cscanner/I2cHelpers.h diff --git a/Tactility/Source/app/i2cscanner/I2cScanner.h b/Tactility/Private/Tactility/app/i2cscanner/I2cScanner.h similarity index 84% rename from Tactility/Source/app/i2cscanner/I2cScanner.h rename to Tactility/Private/Tactility/app/i2cscanner/I2cScanner.h index 9ba5537f..e83fbd13 100644 --- a/Tactility/Source/app/i2cscanner/I2cScanner.h +++ b/Tactility/Private/Tactility/app/i2cscanner/I2cScanner.h @@ -4,7 +4,7 @@ #include #include #include "lvgl.h" -#include "hal/i2c/I2c.h" +#include #include "Timer.h" #include diff --git a/Tactility/Private/app/i2cscanner/I2cScannerPrivate.h b/Tactility/Private/Tactility/app/i2cscanner/I2cScannerPrivate.h similarity index 58% rename from Tactility/Private/app/i2cscanner/I2cScannerPrivate.h rename to Tactility/Private/Tactility/app/i2cscanner/I2cScannerPrivate.h index 0d6a951a..569975a2 100644 --- a/Tactility/Private/app/i2cscanner/I2cScannerPrivate.h +++ b/Tactility/Private/Tactility/app/i2cscanner/I2cScannerPrivate.h @@ -1,11 +1,12 @@ #pragma once -#include -#include -#include -#include "lvgl.h" -#include "hal/i2c/I2c.h" -#include "Timer.h" +#include +#include +#include +#include +#include + +#include #include namespace tt::app::i2cscanner { diff --git a/Tactility/Private/app/i2cscanner/I2cScannerThread.h b/Tactility/Private/Tactility/app/i2cscanner/I2cScannerThread.h similarity index 100% rename from Tactility/Private/app/i2cscanner/I2cScannerThread.h rename to Tactility/Private/Tactility/app/i2cscanner/I2cScannerThread.h diff --git a/Tactility/Source/app/launcher/Launcher.h b/Tactility/Private/Tactility/app/launcher/Launcher.h similarity index 100% rename from Tactility/Source/app/launcher/Launcher.h rename to Tactility/Private/Tactility/app/launcher/Launcher.h diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.h b/Tactility/Private/Tactility/app/timedatesettings/TimeDateSettings.h similarity index 100% rename from Tactility/Source/app/timedatesettings/TimeDateSettings.h rename to Tactility/Private/Tactility/app/timedatesettings/TimeDateSettings.h diff --git a/Tactility/Source/app/timezone/TimeZone.h b/Tactility/Private/Tactility/app/timezone/TimeZone.h similarity index 84% rename from Tactility/Source/app/timezone/TimeZone.h rename to Tactility/Private/Tactility/app/timezone/TimeZone.h index 725723e8..ec46f601 100644 --- a/Tactility/Source/app/timezone/TimeZone.h +++ b/Tactility/Private/Tactility/app/timezone/TimeZone.h @@ -1,6 +1,6 @@ #pragma once -#include "Bundle.h" +#include namespace tt::app::timezone { diff --git a/Tactility/Source/app/wifiapsettings/WifiApSettings.h b/Tactility/Private/Tactility/app/wifiapsettings/WifiApSettings.h similarity index 51% rename from Tactility/Source/app/wifiapsettings/WifiApSettings.h rename to Tactility/Private/Tactility/app/wifiapsettings/WifiApSettings.h index da6fed9a..e16acb77 100644 --- a/Tactility/Source/app/wifiapsettings/WifiApSettings.h +++ b/Tactility/Private/Tactility/app/wifiapsettings/WifiApSettings.h @@ -1,8 +1,8 @@ #pragma once -#include "Bundle.h" -#include "Mutex.h" -#include "service/wifi/Wifi.h" +#include +#include +#include namespace tt::app::wifiapsettings { diff --git a/Tactility/Private/app/wificonnect/Bindings.h b/Tactility/Private/Tactility/app/wificonnect/Bindings.h similarity index 84% rename from Tactility/Private/app/wificonnect/Bindings.h rename to Tactility/Private/Tactility/app/wificonnect/Bindings.h index 6353761f..193157e2 100644 --- a/Tactility/Private/app/wificonnect/Bindings.h +++ b/Tactility/Private/Tactility/app/wificonnect/Bindings.h @@ -1,6 +1,6 @@ #pragma once -#include "service/wifi/WifiSettings.h" +#include "Tactility/service/wifi/WifiSettings.h" namespace tt::app::wificonnect { diff --git a/Tactility/Private/app/wificonnect/State.h b/Tactility/Private/Tactility/app/wificonnect/State.h similarity index 82% rename from Tactility/Private/app/wificonnect/State.h rename to Tactility/Private/Tactility/app/wificonnect/State.h index 5b0b4631..0d95178f 100644 --- a/Tactility/Private/app/wificonnect/State.h +++ b/Tactility/Private/Tactility/app/wificonnect/State.h @@ -1,8 +1,8 @@ #pragma once -#include "Mutex.h" -#include "service/wifi/Wifi.h" -#include "service/wifi/WifiSettings.h" +#include +#include +#include namespace tt::app::wificonnect { diff --git a/Tactility/Private/app/wificonnect/View.h b/Tactility/Private/Tactility/app/wificonnect/View.h similarity index 88% rename from Tactility/Private/app/wificonnect/View.h rename to Tactility/Private/Tactility/app/wificonnect/View.h index 61774272..30492b6f 100644 --- a/Tactility/Private/app/wificonnect/View.h +++ b/Tactility/Private/Tactility/app/wificonnect/View.h @@ -1,10 +1,11 @@ #pragma once -#include "Bindings.h" -#include "State.h" +#include "./Bindings.h" +#include "./State.h" -#include "app/AppContext.h" -#include "lvgl.h" +#include "Tactility/app/AppContext.h" + +#include namespace tt::app::wificonnect { diff --git a/Tactility/Private/app/wificonnect/WifiConnectPrivate.h b/Tactility/Private/Tactility/app/wificonnect/WifiConnect.h similarity index 70% rename from Tactility/Private/app/wificonnect/WifiConnectPrivate.h rename to Tactility/Private/Tactility/app/wificonnect/WifiConnect.h index a4666919..ed184e71 100644 --- a/Tactility/Private/app/wificonnect/WifiConnectPrivate.h +++ b/Tactility/Private/Tactility/app/wificonnect/WifiConnect.h @@ -1,12 +1,12 @@ #pragma once -#include "app/App.h" -#include "app/wificonnect/Bindings.h" -#include "app/wificonnect/State.h" -#include "app/wificonnect/View.h" +#include "Tactility/app/App.h" +#include "Tactility/app/wificonnect/Bindings.h" +#include "Tactility/app/wificonnect/State.h" +#include "Tactility/app/wificonnect/View.h" -#include "Mutex.h" -#include "service/wifi/Wifi.h" +#include +#include namespace tt::app::wificonnect { @@ -43,7 +43,13 @@ public: void requestViewUpdate(); }; +/** + * Start the app with optional pre-filled fields. + */ +void start(const std::string& ssid = "", const std::string& password = ""); + bool optSsidParameter(const std::shared_ptr& bundle, std::string& ssid); + bool optPasswordParameter(const std::shared_ptr& bundle, std::string& password); } // namespace diff --git a/Tactility/Private/app/wifimanage/Bindings.h b/Tactility/Private/Tactility/app/wifimanage/Bindings.h similarity index 100% rename from Tactility/Private/app/wifimanage/Bindings.h rename to Tactility/Private/Tactility/app/wifimanage/Bindings.h diff --git a/Tactility/Private/app/wifimanage/State.h b/Tactility/Private/Tactility/app/wifimanage/State.h similarity index 93% rename from Tactility/Private/app/wifimanage/State.h rename to Tactility/Private/Tactility/app/wifimanage/State.h index cdf2e19c..e59ee301 100644 --- a/Tactility/Private/app/wifimanage/State.h +++ b/Tactility/Private/Tactility/app/wifimanage/State.h @@ -1,7 +1,7 @@ #pragma once -#include "service/wifi/Wifi.h" -#include "Mutex.h" +#include +#include namespace tt::app::wifimanage { diff --git a/Tactility/Private/app/wifimanage/View.h b/Tactility/Private/Tactility/app/wifimanage/View.h similarity index 93% rename from Tactility/Private/app/wifimanage/View.h rename to Tactility/Private/Tactility/app/wifimanage/View.h index 6281161e..a5e3e54c 100644 --- a/Tactility/Private/app/wifimanage/View.h +++ b/Tactility/Private/Tactility/app/wifimanage/View.h @@ -1,9 +1,11 @@ #pragma once -#include "app/AppContext.h" #include "./Bindings.h" #include "./State.h" -#include "lvgl.h" + +#include "Tactility/app/AppContext.h" + +#include namespace tt::app::wifimanage { diff --git a/Tactility/Private/app/wifimanage/WifiManagePrivate.h b/Tactility/Private/Tactility/app/wifimanage/WifiManagePrivate.h similarity index 82% rename from Tactility/Private/app/wifimanage/WifiManagePrivate.h rename to Tactility/Private/Tactility/app/wifimanage/WifiManagePrivate.h index 3b529050..9b6b1013 100644 --- a/Tactility/Private/app/wifimanage/WifiManagePrivate.h +++ b/Tactility/Private/Tactility/app/wifimanage/WifiManagePrivate.h @@ -1,10 +1,13 @@ #pragma once -#include "app/App.h" -#include "Mutex.h" #include "./View.h" #include "./State.h" -#include "service/wifi/Wifi.h" + +#include "Tactility/app/App.h" + +#include +#include +#include namespace tt::app::wifimanage { diff --git a/Tactility/Private/lvgl/Init_i.h b/Tactility/Private/Tactility/lvgl/Init_i.h similarity index 70% rename from Tactility/Private/lvgl/Init_i.h rename to Tactility/Private/Tactility/lvgl/Init_i.h index 2fe1be24..76dfd493 100644 --- a/Tactility/Private/lvgl/Init_i.h +++ b/Tactility/Private/Tactility/lvgl/Init_i.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Configuration.h" +#include namespace tt::lvgl { diff --git a/Tactility/Private/service/gui/Gui_i.h b/Tactility/Private/Tactility/service/gui/Gui_i.h similarity index 87% rename from Tactility/Private/service/gui/Gui_i.h rename to Tactility/Private/Tactility/service/gui/Gui_i.h index 97a958c3..138e7f02 100644 --- a/Tactility/Private/service/gui/Gui_i.h +++ b/Tactility/Private/Tactility/service/gui/Gui_i.h @@ -1,10 +1,12 @@ #pragma once -#include "MessageQueue.h" -#include "Mutex.h" -#include "PubSub.h" -#include "service/gui/Gui.h" +#include +#include +#include +#include + #include + #include namespace tt::service::gui { diff --git a/Tactility/Private/service/loader/Loader_i.h b/Tactility/Private/Tactility/service/loader/Loader_i.h similarity index 77% rename from Tactility/Private/service/loader/Loader_i.h rename to Tactility/Private/Tactility/service/loader/Loader_i.h index 5703c077..3ec659db 100644 --- a/Tactility/Private/service/loader/Loader_i.h +++ b/Tactility/Private/Tactility/service/loader/Loader_i.h @@ -1,14 +1,16 @@ #pragma once -#include "EventFlag.h" -#include "MessageQueue.h" -#include "PubSub.h" -#include "RtosCompatSemaphore.h" -#include "Thread.h" -#include "app/AppInstance.h" -#include "app/AppManifest.h" -#include "service/loader/Loader.h" -#include +#include "Tactility/app/AppInstance.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include +#include +#include +#include +#include + #include #include diff --git a/Tactility/Source/service/screenshot/Screenshot.h b/Tactility/Private/Tactility/service/screenshot/Screenshot.h similarity index 91% rename from Tactility/Source/service/screenshot/Screenshot.h rename to Tactility/Private/Tactility/service/screenshot/Screenshot.h index 08866c19..d726f024 100644 --- a/Tactility/Source/service/screenshot/Screenshot.h +++ b/Tactility/Private/Tactility/service/screenshot/Screenshot.h @@ -1,13 +1,13 @@ #pragma once -#include "TactilityConfig.h" +#include "Tactility/TactilityConfig.h" #if TT_FEATURE_SCREENSHOT_ENABLED -#include "Mutex.h" #include "ScreenshotTask.h" -#include "service/Service.h" -#include + +#include +#include namespace tt::service::screenshot { diff --git a/Tactility/Source/service/screenshot/ScreenshotTask.h b/Tactility/Private/Tactility/service/screenshot/ScreenshotTask.h similarity index 93% rename from Tactility/Source/service/screenshot/ScreenshotTask.h rename to Tactility/Private/Tactility/service/screenshot/ScreenshotTask.h index 5500cb45..7015a5fa 100644 --- a/Tactility/Source/service/screenshot/ScreenshotTask.h +++ b/Tactility/Private/Tactility/service/screenshot/ScreenshotTask.h @@ -1,12 +1,11 @@ -#include "TactilityConfig.h" +#include "Tactility/TactilityConfig.h" #if TT_FEATURE_SCREENSHOT_ENABLED #pragma once -#include -#include -#include +#include +#include namespace tt::service::screenshot { diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp index df96cd22..6bd5eab4 100644 --- a/Tactility/Source/Tactility.cpp +++ b/Tactility/Source/Tactility.cpp @@ -1,10 +1,12 @@ -#include "Tactility.h" +#include "Tactility/Tactility.h" -#include "app/ManifestRegistry.h" -#include "service/ServiceRegistry.h" -#include "service/loader/Loader.h" -#include "TactilityHeadless.h" -#include "lvgl/Init_i.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/lvgl/Init_i.h" +#include "Tactility/service/ServiceManifest.h" + +#include +#include +#include namespace tt { diff --git a/Tactility/Source/app/App.cpp b/Tactility/Source/app/App.cpp index fd6bd95e..2c74ceb8 100644 --- a/Tactility/Source/app/App.cpp +++ b/Tactility/Source/app/App.cpp @@ -1,5 +1,6 @@ -#include "App.h" -#include "service/loader/Loader.h" +#include "Tactility/app/App.h" + +#include namespace tt::app { diff --git a/Tactility/Source/app/AppInstance.cpp b/Tactility/Source/app/AppInstance.cpp index 8b6fba2b..8989f32a 100644 --- a/Tactility/Source/app/AppInstance.cpp +++ b/Tactility/Source/app/AppInstance.cpp @@ -1,5 +1,5 @@ -#include "app/AppInstance.h" -#include "app/AppInstancePaths.h" +#include "Tactility/app/AppInstance.h" +#include "Tactility/app/AppInstancePaths.h" namespace tt::app { diff --git a/Tactility/Source/app/AppInstancePaths.cpp b/Tactility/Source/app/AppInstancePaths.cpp index 56ae4bb9..72ac5a70 100644 --- a/Tactility/Source/app/AppInstancePaths.cpp +++ b/Tactility/Source/app/AppInstancePaths.cpp @@ -1,5 +1,6 @@ -#include "app/AppInstancePaths.h" -#include "Partitions.h" +#include "Tactility/app/AppInstancePaths.h" + +#include #define LVGL_PATH_PREFIX std::string("A:/") #ifdef ESP_PLATFORM diff --git a/Tactility/Source/app/ElfApp.cpp b/Tactility/Source/app/ElfApp.cpp index 8a4aaaf0..51617729 100644 --- a/Tactility/Source/app/ElfApp.cpp +++ b/Tactility/Source/app/ElfApp.cpp @@ -1,12 +1,13 @@ #ifdef ESP_PLATFORM -#include "ElfApp.h" -#include "Log.h" -#include "StringUtils.h" -#include "TactilityCore.h" +#include "Tactility/app/ElfApp.h" +#include "Tactility/file/File.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + #include "esp_elf.h" -#include "file/File.h" -#include "service/loader/Loader.h" #include #include diff --git a/Tactility/Source/app/ManifestRegistry.cpp b/Tactility/Source/app/ManifestRegistry.cpp index 8835e45d..a708d79a 100644 --- a/Tactility/Source/app/ManifestRegistry.cpp +++ b/Tactility/Source/app/ManifestRegistry.cpp @@ -1,6 +1,8 @@ -#include "ManifestRegistry.h" -#include "Mutex.h" -#include "AppManifest.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/app/AppManifest.h" + +#include + #include #define TAG "app" diff --git a/Tactility/Source/app/alertdialog/AlertDialog.cpp b/Tactility/Source/app/alertdialog/AlertDialog.cpp index 39f35a62..d1d457e8 100644 --- a/Tactility/Source/app/alertdialog/AlertDialog.cpp +++ b/Tactility/Source/app/alertdialog/AlertDialog.cpp @@ -1,9 +1,12 @@ -#include "AlertDialog.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include -#include +#include "Tactility/app/alertdialog/AlertDialog.h" + +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + +#include namespace tt::app::alertdialog { diff --git a/Tactility/Source/app/applist/AppList.cpp b/Tactility/Source/app/applist/AppList.cpp index 04f9d9b0..0eda04dd 100644 --- a/Tactility/Source/app/applist/AppList.cpp +++ b/Tactility/Source/app/applist/AppList.cpp @@ -1,10 +1,12 @@ -#include "app/ManifestRegistry.h" -#include "Assets.h" -#include "Check.h" -#include "lvgl.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/Toolbar.h" + +#include +#include + +#include #include -#include "service/loader/Loader.h" -#include "lvgl/Toolbar.h" namespace tt::app::applist { diff --git a/Tactility/Source/app/boot/Boot.cpp b/Tactility/Source/app/boot/Boot.cpp index 4d8adf63..fd450d93 100644 --- a/Tactility/Source/app/boot/Boot.cpp +++ b/Tactility/Source/app/boot/Boot.cpp @@ -1,21 +1,22 @@ -#include "TactilityCore.h" +#include "Tactility/TactilityCore.h" -#include "app/AppContext.h" -#include "app/display/DisplaySettings.h" -#include "app/launcher/Launcher.h" -#include "hal/Display.h" -#include "service/loader/Loader.h" -#include "lvgl/Style.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/app/display/DisplaySettings.h" +#include "Tactility/app/launcher/Launcher.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/Style.h" -#include "lvgl.h" -#include "Tactility.h" -#include "hal/usb/Usb.h" -#include "kernel/SystemEvents.h" +#include +#include +#include +#include + +#include #ifdef ESP_PLATFORM -#include "kernel/PanicHandler.h" -#include "sdkconfig.h" -#include "app/crashdiagnostics/CrashDiagnostics.h" +#include "Tactility/app/crashdiagnostics/CrashDiagnostics.h" +#include +#include #else #define CONFIG_TT_SPLASH_DURATION 0 #endif diff --git a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp index 46f421e0..56ab3fbd 100644 --- a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp +++ b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp @@ -1,12 +1,13 @@ #ifdef ESP_PLATFORM -#include "app/crashdiagnostics/QrHelpers.h" -#include "app/crashdiagnostics/QrUrl.h" -#include "app/launcher/Launcher.h" -#include "lvgl.h" -#include "lvgl/Statusbar.h" -#include "qrcode.h" -#include "service/loader/Loader.h" +#include "Tactility/app/crashdiagnostics/QrHelpers.h" +#include "Tactility/app/crashdiagnostics/QrUrl.h" +#include "Tactility/app/launcher/Launcher.h" +#include "Tactility/lvgl/Statusbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include #define TAG "crash_diagnostics" diff --git a/Tactility/Source/app/crashdiagnostics/QrHelpers.cpp b/Tactility/Source/app/crashdiagnostics/QrHelpers.cpp index 3d36248d..498dfa1b 100644 --- a/Tactility/Source/app/crashdiagnostics/QrHelpers.cpp +++ b/Tactility/Source/app/crashdiagnostics/QrHelpers.cpp @@ -1,4 +1,5 @@ -#include "app/crashdiagnostics/QrHelpers.h" +#include "Tactility/app/crashdiagnostics/QrHelpers.h" + #include /** diff --git a/Tactility/Source/app/crashdiagnostics/QrUrl.cpp b/Tactility/Source/app/crashdiagnostics/QrUrl.cpp index 1c774f74..06a1ef76 100644 --- a/Tactility/Source/app/crashdiagnostics/QrUrl.cpp +++ b/Tactility/Source/app/crashdiagnostics/QrUrl.cpp @@ -1,9 +1,8 @@ #ifdef ESP_PLATFORM -#include "app/crashdiagnostics/QrUrl.h" +#include "Tactility/app/crashdiagnostics/QrUrl.h" -#include "kernel/PanicHandler.h" -#include "Log.h" +#include #include #include diff --git a/Tactility/Source/app/display/Display.cpp b/Tactility/Source/app/display/Display.cpp index 8dbde04c..ff84f267 100644 --- a/Tactility/Source/app/display/Display.cpp +++ b/Tactility/Source/app/display/Display.cpp @@ -1,10 +1,12 @@ -#include "app/AppContext.h" -#include "Assets.h" -#include "DisplaySettings.h" -#include "Tactility.h" -#include "lvgl/Toolbar.h" -#include "lvgl.h" -#include "hal/Display.h" +#include "Tactility/app/display/DisplaySettings.h" + +#include "Tactility/hal/Display.h" +#include "Tactility/lvgl/Toolbar.h" + +#include +#include + +#include namespace tt::app::display { @@ -13,7 +15,6 @@ namespace tt::app::display { static bool backlight_duty_set = false; static uint8_t backlight_duty = 255; -static bool gamma_set = false; static uint8_t gamma = 255; #define ROTATION_DEFAULT 0 @@ -49,7 +50,6 @@ static void onGammaSliderEvent(lv_event_t* event) { int32_t slider_value = lv_slider_get_value(slider); gamma = (uint8_t)slider_value; - gamma_set = true; hal_display->setGammaCurve(gamma); } diff --git a/Tactility/Source/app/display/DisplaySettings.cpp b/Tactility/Source/app/display/DisplaySettings.cpp index 4bc06e74..63616a1d 100644 --- a/Tactility/Source/app/display/DisplaySettings.cpp +++ b/Tactility/Source/app/display/DisplaySettings.cpp @@ -1,5 +1,6 @@ -#include "DisplaySettings.h" -#include "Preferences.h" +#include "Tactility/app/display/DisplaySettings.h" + +#include namespace tt::app::display { diff --git a/Tactility/Source/app/files/FileUtils.cpp b/Tactility/Source/app/files/FileUtils.cpp index 2267cdf3..830e0d25 100644 --- a/Tactility/Source/app/files/FileUtils.cpp +++ b/Tactility/Source/app/files/FileUtils.cpp @@ -1,8 +1,9 @@ -#include "app/files/FileUtils.h" +#include "Tactility/app/files/FileUtils.h" + +#include +#include -#include "TactilityCore.h" #include -#include namespace tt::app::files { diff --git a/Tactility/Source/app/files/Files.cpp b/Tactility/Source/app/files/Files.cpp index e5d7ac3e..37b1ceb4 100644 --- a/Tactility/Source/app/files/Files.cpp +++ b/Tactility/Source/app/files/Files.cpp @@ -1,9 +1,9 @@ -#include "app/files/View.h" -#include "app/files/State.h" +#include "Tactility/app/files/View.h" +#include "Tactility/app/files/State.h" +#include "Tactility/app/AppContext.h" -#include "app/AppContext.h" -#include "Assets.h" -#include "service/loader/Loader.h" +#include +#include #include diff --git a/Tactility/Source/app/files/State.cpp b/Tactility/Source/app/files/State.cpp index bcbac3eb..6c13e716 100644 --- a/Tactility/Source/app/files/State.cpp +++ b/Tactility/Source/app/files/State.cpp @@ -1,11 +1,11 @@ -#include "app/files/State.h" -#include "app/files/FileUtils.h" +#include "Tactility/app/files/State.h" +#include "Tactility/app/files/FileUtils.h" -#include "Log.h" -#include "Partitions.h" -#include "TactilityHeadless.h" -#include "hal/SdCard.h" -#include "kernel/Kernel.h" +#include +#include +#include +#include +#include #include diff --git a/Tactility/Source/app/files/View.cpp b/Tactility/Source/app/files/View.cpp index f06755f8..f9a5d3b1 100644 --- a/Tactility/Source/app/files/View.cpp +++ b/Tactility/Source/app/files/View.cpp @@ -1,20 +1,22 @@ -#include "app/files/FileUtils.h" -#include "app/files/View.h" +#include "Tactility/app/files/FileUtils.h" +#include "Tactility/app/files/View.h" + +#include "Tactility/app/alertdialog/AlertDialog.h" +#include "Tactility/app/imageviewer/ImageViewer.h" +#include "Tactility/app/inputdialog/InputDialog.h" +#include "Tactility/app/textviewer/TextViewer.h" +#include "Tactility/app/ElfApp.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/lvgl/LvglSync.h" + +#include +#include -#include "app/alertdialog/AlertDialog.h" -#include "app/imageviewer/ImageViewer.h" -#include "app/inputdialog/InputDialog.h" -#include "app/textviewer/TextViewer.h" -#include "app/ElfApp.h" -#include "lvgl/Toolbar.h" -#include "lvgl/LvglSync.h" -#include "Tactility.h" -#include "StringUtils.h" #include #include #ifdef ESP_PLATFORM -#include "service/loader/Loader.h" +#include "Tactility/service/loader/Loader.h" #endif #define TAG "files_app" diff --git a/Tactility/Source/app/gpio/Gpio.cpp b/Tactility/Source/app/gpio/Gpio.cpp index c6de598e..afd78466 100644 --- a/Tactility/Source/app/gpio/Gpio.cpp +++ b/Tactility/Source/app/gpio/Gpio.cpp @@ -1,11 +1,11 @@ -#include "Mutex.h" -#include "Thread.h" -#include "service/loader/Loader.h" -#include "lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/Toolbar.h" -#include "GpioHal.h" -#include "lvgl/LvglSync.h" -#include "Timer.h" +#include +#include +#include +#include +#include namespace tt::app::gpio { diff --git a/Tactility/Source/app/i2cscanner/I2cHelpers.cpp b/Tactility/Source/app/i2cscanner/I2cHelpers.cpp index 95b2dbcd..ade8058c 100644 --- a/Tactility/Source/app/i2cscanner/I2cHelpers.cpp +++ b/Tactility/Source/app/i2cscanner/I2cHelpers.cpp @@ -1,6 +1,8 @@ -#include "app/i2cscanner/I2cHelpers.h" -#include "Tactility.h" -#include "StringUtils.h" +#include "Tactility/app/i2cscanner/I2cHelpers.h" + +#include +#include + #include #include #include diff --git a/Tactility/Source/app/i2cscanner/I2cScanner.cpp b/Tactility/Source/app/i2cscanner/I2cScanner.cpp index 30db64e5..532003fe 100644 --- a/Tactility/Source/app/i2cscanner/I2cScanner.cpp +++ b/Tactility/Source/app/i2cscanner/I2cScanner.cpp @@ -1,13 +1,15 @@ -#include "app/i2cscanner/I2cScannerPrivate.h" -#include "app/i2cscanner/I2cScannerThread.h" -#include "app/i2cscanner/I2cHelpers.h" +#include "Tactility/app/i2cscanner/I2cScannerPrivate.h" +#include "Tactility/app/i2cscanner/I2cScannerThread.h" +#include "Tactility/app/i2cscanner/I2cHelpers.h" -#include "Assets.h" -#include "Tactility.h" -#include "app/AppContext.h" -#include "lvgl/LvglSync.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include +#include #define START_SCAN_TEXT "Scan" #define STOP_SCAN_TEXT "Stop scan" diff --git a/Tactility/Source/app/i2csettings/I2cSettings.cpp b/Tactility/Source/app/i2csettings/I2cSettings.cpp index 9fab4488..773c2391 100644 --- a/Tactility/Source/app/i2csettings/I2cSettings.cpp +++ b/Tactility/Source/app/i2csettings/I2cSettings.cpp @@ -1,9 +1,11 @@ -#include "Assets.h" -#include "hal/i2c/I2c.h" -#include "Tactility.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "lvgl.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" + +#include +#include +#include + +#include namespace tt::app::i2csettings { diff --git a/Tactility/Source/app/imageviewer/ImageViewer.cpp b/Tactility/Source/app/imageviewer/ImageViewer.cpp index b00ca9e1..7ef7e2df 100644 --- a/Tactility/Source/app/imageviewer/ImageViewer.cpp +++ b/Tactility/Source/app/imageviewer/ImageViewer.cpp @@ -1,9 +1,11 @@ -#include -#include "lvgl.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "StringUtils.h" -#include "service/loader/Loader.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + +#include namespace tt::app::imageviewer { diff --git a/Tactility/Source/app/inputdialog/InputDialog.cpp b/Tactility/Source/app/inputdialog/InputDialog.cpp index bfee2691..0acb477e 100644 --- a/Tactility/Source/app/inputdialog/InputDialog.cpp +++ b/Tactility/Source/app/inputdialog/InputDialog.cpp @@ -1,10 +1,12 @@ -#include "InputDialog.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include "service/gui/Gui.h" -#include -#include +#include "Tactility/app/inputdialog/InputDialog.h" + +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/service/gui/Gui.h" + +#include + +#include namespace tt::app::inputdialog { diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp index fd3d5192..20771f7b 100644 --- a/Tactility/Source/app/launcher/Launcher.cpp +++ b/Tactility/Source/app/launcher/Launcher.cpp @@ -1,9 +1,11 @@ -#include "Check.h" -#include "Tactility.h" -#include "app/AppContext.h" -#include "app/ManifestRegistry.h" -#include "lvgl.h" -#include "service/loader/Loader.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + +#include #define TAG "launcher" diff --git a/Tactility/Source/app/log/Log.cpp b/Tactility/Source/app/log/Log.cpp index b6f49e10..5bae0fbf 100644 --- a/Tactility/Source/app/log/Log.cpp +++ b/Tactility/Source/app/log/Log.cpp @@ -1,14 +1,15 @@ -#include "lvgl.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "app/selectiondialog/SelectionDialog.h" -#include "service/loader/Loader.h" -#include "lvgl/LvglSync.h" +#include "Tactility/app/selectiondialog/SelectionDialog.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/service/loader/Loader.h" #include #include #include +#include + #define TAG "text_viewer" namespace tt::app::log { diff --git a/Tactility/Source/app/power/Power.cpp b/Tactility/Source/app/power/Power.cpp index 0e69e76f..a7deec24 100644 --- a/Tactility/Source/app/power/Power.cpp +++ b/Tactility/Source/app/power/Power.cpp @@ -1,12 +1,14 @@ -#include "app/AppContext.h" -#include "Assets.h" -#include "lvgl.h" -#include "Tactility.h" -#include "Timer.h" -#include "lvgl/LvglSync.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include +#include + +#include namespace tt::app::power { diff --git a/Tactility/Source/app/screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp index 5b9fb261..1a7d1939 100644 --- a/Tactility/Source/app/screenshot/Screenshot.cpp +++ b/Tactility/Source/app/screenshot/Screenshot.cpp @@ -1,17 +1,19 @@ -#include "TactilityConfig.h" -#include -#include +#include "Tactility/TactilityConfig.h" + +#include +#include #if TT_FEATURE_SCREENSHOT_ENABLED -#include "TactilityHeadless.h" -#include "app/App.h" -#include "app/AppManifest.h" -#include "lvgl/LvglSync.h" -#include "lvgl/Toolbar.h" -#include "service/gui/Gui.h" -#include "service/loader/Loader.h" -#include "service/screenshot/Screenshot.h" +#include "Tactility/app/App.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/gui/Gui.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/service/screenshot/Screenshot.h" + +#include #define TAG "screenshot" diff --git a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp index cd6caf90..4048436b 100644 --- a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp +++ b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp @@ -1,9 +1,12 @@ -#include "SelectionDialog.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include -#include +#include "Tactility/app/selectiondialog/SelectionDialog.h" + +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + +#include namespace tt::app::selectiondialog { diff --git a/Tactility/Source/app/settings/Settings.cpp b/Tactility/Source/app/settings/Settings.cpp index d09596bf..6190e98f 100644 --- a/Tactility/Source/app/settings/Settings.cpp +++ b/Tactility/Source/app/settings/Settings.cpp @@ -1,9 +1,11 @@ -#include "app/ManifestRegistry.h" -#include "Assets.h" -#include "Check.h" -#include "service/loader/Loader.h" -#include "lvgl/Toolbar.h" -#include "lvgl.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include +#include + #include namespace tt::app::settings { diff --git a/Tactility/Source/app/systeminfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp index b74fa888..7f157347 100644 --- a/Tactility/Source/app/systeminfo/SystemInfo.cpp +++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp @@ -1,7 +1,9 @@ -#include "Assets.h" -#include "lvgl.h" -#include "Tactility.h" -#include "lvgl/Toolbar.h" +#include "Tactility/lvgl/Toolbar.h" + +#include +#include + +#include namespace tt::app::systeminfo { diff --git a/Tactility/Source/app/textviewer/TextViewer.cpp b/Tactility/Source/app/textviewer/TextViewer.cpp index f5f88212..048ba211 100644 --- a/Tactility/Source/app/textviewer/TextViewer.cpp +++ b/Tactility/Source/app/textviewer/TextViewer.cpp @@ -1,10 +1,11 @@ -#include -#include "TextViewer.h" -#include "lvgl.h" -#include "lvgl/LabelUtils.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" +#include "Tactility/lvgl/LabelUtils.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include + +#include #define TAG "text_viewer" #define TEXT_VIEWER_FILE_ARGUMENT "file" diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp index 19668610..462dc07b 100644 --- a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp +++ b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp @@ -1,11 +1,11 @@ -#include -#include "lvgl.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include "app/timezone/TimeZone.h" -#include "Assets.h" -#include "time/Time.h" -#include "lvgl/LvglSync.h" +#include "Tactility/app/timezone/TimeZone.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/LvglSync.h" + +#include +#include +#include #define TAG "text_viewer" diff --git a/Tactility/Source/app/timezone/TimeZone.cpp b/Tactility/Source/app/timezone/TimeZone.cpp index be902d10..291e8df1 100644 --- a/Tactility/Source/app/timezone/TimeZone.cpp +++ b/Tactility/Source/app/timezone/TimeZone.cpp @@ -1,16 +1,17 @@ -#include "TimeZone.h" -#include "app/AppManifest.h" -#include "app/AppContext.h" -#include "service/loader/Loader.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" -#include "Partitions.h" -#include "TactilityHeadless.h" -#include "lvgl/LvglSync.h" -#include "service/gui/Gui.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/app/timezone/TimeZone.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/service/gui/Gui.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include +#include + +#include #include -#include -#include namespace tt::app::timezone { diff --git a/Tactility/Source/app/usbsettings/UsbSettings.cpp b/Tactility/Source/app/usbsettings/UsbSettings.cpp index 4b760234..a2432442 100644 --- a/Tactility/Source/app/usbsettings/UsbSettings.cpp +++ b/Tactility/Source/app/usbsettings/UsbSettings.cpp @@ -1,9 +1,11 @@ -#include "CoreDefines.h" -#include "app/App.h" -#include "app/AppManifest.h" -#include "hal/usb/Usb.h" -#include "lvgl.h" -#include "lvgl/Toolbar.h" +#include "Tactility/app/App.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/lvgl/Toolbar.h" + +#include +#include + +#include #define TAG "usb_settings" diff --git a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp index 920ca972..44aef1ae 100644 --- a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp +++ b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp @@ -1,12 +1,15 @@ -#include "WifiApSettings.h" -#include "TactilityCore.h" -#include "app/AppContext.h" -#include "app/alertdialog/AlertDialog.h" -#include "lvgl.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include "service/wifi/WifiSettings.h" +#include "Tactility/app/wifiapsettings/WifiApSettings.h" + +#include "Tactility/app/AppContext.h" +#include "Tactility/app/alertdialog/AlertDialog.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/service/loader/Loader.h" + +#include +#include + +#include namespace tt::app::wifiapsettings { diff --git a/Tactility/Source/app/wificonnect/State.cpp b/Tactility/Source/app/wificonnect/State.cpp index 1a8dad0b..9fd13230 100644 --- a/Tactility/Source/app/wificonnect/State.cpp +++ b/Tactility/Source/app/wificonnect/State.cpp @@ -1,4 +1,5 @@ -#include "app/wificonnect/State.h" +#include "Tactility/app/wificonnect/State.h" + #include namespace tt::app::wificonnect { diff --git a/Tactility/Source/app/wificonnect/View.cpp b/Tactility/Source/app/wificonnect/View.cpp index 68745336..cea9bb22 100644 --- a/Tactility/Source/app/wificonnect/View.cpp +++ b/Tactility/Source/app/wificonnect/View.cpp @@ -1,14 +1,15 @@ -#include "app/wificonnect/View.h" -#include "app/wificonnect/WifiConnectPrivate.h" -#include "WifiConnect.h" +#include "Tactility/app/wificonnect/View.h" +#include "Tactility/app/wificonnect/WifiConnect.h" -#include "lvgl.h" -#include "service/gui/Gui.h" -#include "service/wifi/WifiSettings.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "lvgl/Spinner.h" -#include +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/lvgl/Spinner.h" +#include "Tactility/service/gui/Gui.h" + +#include +#include + +#include #include namespace tt::app::wificonnect { diff --git a/Tactility/Source/app/wificonnect/WifiConnect.cpp b/Tactility/Source/app/wificonnect/WifiConnect.cpp index ee729bdc..de6343a0 100644 --- a/Tactility/Source/app/wificonnect/WifiConnect.cpp +++ b/Tactility/Source/app/wificonnect/WifiConnect.cpp @@ -1,10 +1,9 @@ -#include "app/wificonnect/WifiConnectPrivate.h" +#include "Tactility/app/wificonnect/WifiConnect.h" -#include "app/AppContext.h" -#include "TactilityCore.h" -#include "service/loader/Loader.h" -#include "service/wifi/Wifi.h" -#include "lvgl/LvglSync.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/service/wifi/Wifi.h" +#include "Tactility/lvgl/LvglSync.h" namespace tt::app::wificonnect { diff --git a/Tactility/Source/app/wificonnect/WifiConnect.h b/Tactility/Source/app/wificonnect/WifiConnect.h deleted file mode 100644 index 9891b4bf..00000000 --- a/Tactility/Source/app/wificonnect/WifiConnect.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include - -namespace tt::app::wificonnect { - -/** - * Start the app with optional pre-filled fields. - */ -void start(const std::string& ssid = "", const std::string& password = ""); - -} // namespace diff --git a/Tactility/Source/app/wifimanage/State.cpp b/Tactility/Source/app/wifimanage/State.cpp index c67bd67b..d69d8a00 100644 --- a/Tactility/Source/app/wifimanage/State.cpp +++ b/Tactility/Source/app/wifimanage/State.cpp @@ -1,4 +1,4 @@ -#include "app/wifimanage/WifiManagePrivate.h" +#include "Tactility/app/wifimanage/WifiManagePrivate.h" namespace tt::app::wifimanage { diff --git a/Tactility/Source/app/wifimanage/View.cpp b/Tactility/Source/app/wifimanage/View.cpp index 36e5a3fc..6ac01914 100644 --- a/Tactility/Source/app/wifimanage/View.cpp +++ b/Tactility/Source/app/wifimanage/View.cpp @@ -1,11 +1,12 @@ -#include "app/wifimanage/View.h" -#include "app/wifimanage/WifiManagePrivate.h" +#include "Tactility/app/wifimanage/View.h" +#include "Tactility/app/wifimanage/WifiManagePrivate.h" -#include "Log.h" -#include "service/wifi/Wifi.h" -#include "lvgl/Style.h" -#include "lvgl/Toolbar.h" -#include "lvgl/Spinner.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Toolbar.h" +#include "Tactility/lvgl/Spinner.h" + +#include +#include #include #include diff --git a/Tactility/Source/app/wifimanage/WifiManage.cpp b/Tactility/Source/app/wifimanage/WifiManage.cpp index 15f2c2c7..ad7ec6fc 100644 --- a/Tactility/Source/app/wifimanage/WifiManage.cpp +++ b/Tactility/Source/app/wifimanage/WifiManage.cpp @@ -1,14 +1,12 @@ -#include "app/wifimanage/WifiManagePrivate.h" -#include "app/wifimanage/View.h" -#include "app/wifimanage/State.h" +#include "Tactility/app/wifimanage/WifiManagePrivate.h" +#include "Tactility/app/wifimanage/View.h" -#include "app/AppContext.h" -#include "app/wifiapsettings/WifiApSettings.h" -#include "TactilityCore.h" -#include "service/loader/Loader.h" -#include "service/wifi/WifiSettings.h" -#include "lvgl/LvglSync.h" -#include "app/wificonnect/WifiConnect.h" +#include "Tactility/app/AppContext.h" +#include "Tactility/app/wifiapsettings/WifiApSettings.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/service/wifi/WifiSettings.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/app/wificonnect/WifiConnect.h" namespace tt::app::wifimanage { diff --git a/Tactility/Source/app/wifimanage/WifiManage.h b/Tactility/Source/app/wifimanage/WifiManage.h deleted file mode 100644 index f9902927..00000000 --- a/Tactility/Source/app/wifimanage/WifiManage.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "Mutex.h" -#include "app/wifimanage/View.h" -#include "app/wifimanage/State.h" -#include "service/wifi/Wifi.h" - -namespace tt::app::wifimanage { - -void start(); - -} // namespace diff --git a/Tactility/Source/lvgl/Init.cpp b/Tactility/Source/lvgl/Init.cpp index a0a934e5..18f89328 100644 --- a/Tactility/Source/lvgl/Init.cpp +++ b/Tactility/Source/lvgl/Init.cpp @@ -1,12 +1,13 @@ -#include "app/display/DisplaySettings.h" -#include "lvgl.h" -#include "hal/Configuration.h" -#include "hal/Display.h" -#include "hal/Touch.h" -#include "hal/Keyboard.h" -#include "lvgl/LvglKeypad.h" -#include "lvgl/LvglDisplay.h" -#include "kernel/SystemEvents.h" +#include "Tactility/app/display/DisplaySettings.h" +#include "Tactility/lvgl/LvglKeypad.h" +#include "Tactility/lvgl/LvglDisplay.h" + +#include +#include +#include +#include + +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/LabelUtils.cpp b/Tactility/Source/lvgl/LabelUtils.cpp index 710f83ad..78ffbb63 100644 --- a/Tactility/Source/lvgl/LabelUtils.cpp +++ b/Tactility/Source/lvgl/LabelUtils.cpp @@ -1,5 +1,5 @@ -#include "LabelUtils.h" -#include "file/File.h" +#include +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/LvglDisplay.cpp b/Tactility/Source/lvgl/LvglDisplay.cpp index 8da38d85..0660b8c4 100644 --- a/Tactility/Source/lvgl/LvglDisplay.cpp +++ b/Tactility/Source/lvgl/LvglDisplay.cpp @@ -1,5 +1,6 @@ -#include "lvgl/LvglDisplay.h" -#include "Check.h" +#include "Tactility/lvgl/LvglDisplay.h" + +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/LvglKeypad.cpp b/Tactility/Source/lvgl/LvglKeypad.cpp index 957a463e..017f5af6 100644 --- a/Tactility/Source/lvgl/LvglKeypad.cpp +++ b/Tactility/Source/lvgl/LvglKeypad.cpp @@ -1,11 +1,11 @@ -#include "LvglKeypad.h" +#include "Tactility/lvgl/LvglKeypad.h" namespace tt::lvgl { -static lv_indev_t* keyboard_device = NULL; +static lv_indev_t* keyboard_device = nullptr; bool keypad_is_available() { - return keyboard_device != NULL; + return keyboard_device != nullptr; } void keypad_set_indev(lv_indev_t* device) { @@ -13,14 +13,14 @@ void keypad_set_indev(lv_indev_t* device) { } void keypad_activate(lv_group_t* group) { - if (keyboard_device != NULL) { + if (keyboard_device != nullptr) { lv_indev_set_group(keyboard_device, group); } } void keypad_deactivate() { - if (keyboard_device != NULL) { - lv_indev_set_group(keyboard_device, NULL); + if (keyboard_device != nullptr) { + lv_indev_set_group(keyboard_device, nullptr); } } diff --git a/Tactility/Source/lvgl/LvglSync.cpp b/Tactility/Source/lvgl/LvglSync.cpp index 5822e88f..eb648df0 100644 --- a/Tactility/Source/lvgl/LvglSync.cpp +++ b/Tactility/Source/lvgl/LvglSync.cpp @@ -1,5 +1,6 @@ -#include -#include "LvglSync.h" +#include "Tactility/lvgl/LvglSync.h" + +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/Spinner.cpp b/Tactility/Source/lvgl/Spinner.cpp index 1b7ee209..111f32aa 100644 --- a/Tactility/Source/lvgl/Spinner.cpp +++ b/Tactility/Source/lvgl/Spinner.cpp @@ -1,9 +1,10 @@ #define LV_USE_PRIVATE_API 1 // For actual lv_obj_t declaration -#include "Assets.h" -#include "CoreDefines.h" -#include "Log.h" -#include "lvgl.h" +#include +#include +#include + +#include namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/Statusbar.cpp b/Tactility/Source/lvgl/Statusbar.cpp index 30c26013..5fd85c2f 100644 --- a/Tactility/Source/lvgl/Statusbar.cpp +++ b/Tactility/Source/lvgl/Statusbar.cpp @@ -1,17 +1,18 @@ #define LV_USE_PRIVATE_API 1 // For actual lv_obj_t declaration -#include -#include "Statusbar.h" +#include "Tactility/lvgl/Statusbar.h" -#include "Mutex.h" -#include "PubSub.h" -#include "TactilityCore.h" -#include "lvgl/Style.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/LvglSync.h" -#include "LvglSync.h" -#include "lvgl.h" -#include "kernel/SystemEvents.h" -#include "time/Time.h" +#include +#include +#include +#include +#include +#include + +#include namespace tt::lvgl { @@ -46,7 +47,7 @@ typedef struct { PubSub::SubscriptionHandle pubsub_subscription; } Statusbar; -static bool statusbar_lock(uint32_t timeoutTicks = portMAX_DELAY) { +static bool statusbar_lock(TickType_t timeoutTicks = portMAX_DELAY) { return statusbar_data.mutex.lock(timeoutTicks); } diff --git a/Tactility/Source/lvgl/Style.cpp b/Tactility/Source/lvgl/Style.cpp index 9acad8de..cd666f03 100644 --- a/Tactility/Source/lvgl/Style.cpp +++ b/Tactility/Source/lvgl/Style.cpp @@ -1,4 +1,4 @@ -#include "Style.h" +#include "Tactility/lvgl/Style.h" namespace tt::lvgl { diff --git a/Tactility/Source/lvgl/Toolbar.cpp b/Tactility/Source/lvgl/Toolbar.cpp index 91ffa3ec..f879fb81 100644 --- a/Tactility/Source/lvgl/Toolbar.cpp +++ b/Tactility/Source/lvgl/Toolbar.cpp @@ -1,10 +1,10 @@ #define LV_USE_PRIVATE_API 1 // For actual lv_obj_t declaration -#include "Toolbar.h" +#include "Tactility/lvgl/Toolbar.h" -#include "service/loader/Loader.h" -#include "lvgl/Style.h" -#include "Spinner.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Spinner.h" namespace tt::lvgl { diff --git a/Tactility/Source/service/gui/Gui.cpp b/Tactility/Source/service/gui/Gui.cpp index 3a3999d9..152b22ce 100644 --- a/Tactility/Source/service/gui/Gui.cpp +++ b/Tactility/Source/service/gui/Gui.cpp @@ -1,10 +1,11 @@ -#include "Tactility.h" -#include "service/gui/Gui_i.h" -#include "service/loader/Loader_i.h" -#include "lvgl/LvglSync.h" -#include "RtosCompat.h" -#include "lvgl/Style.h" -#include "lvgl/Statusbar.h" +#include "Tactility/service/gui/Gui_i.h" +#include "Tactility/service/loader/Loader_i.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/lvgl/Style.h" +#include "Tactility/lvgl/Statusbar.h" + +#include +#include namespace tt::service::gui { @@ -120,7 +121,7 @@ static int32_t guiMain(TT_UNUSED void* p) { Gui* local_gui = gui; while (true) { - uint32_t flags = Thread::awaitFlags(GUI_THREAD_FLAG_ALL, EventFlag::WaitAny, portMAX_DELAY); + uint32_t flags = Thread::awaitFlags(GUI_THREAD_FLAG_ALL, EventFlag::WaitAny, (uint32_t)portMAX_DELAY); // Process and dispatch draw call if (flags & GUI_THREAD_FLAG_DRAW) { diff --git a/Tactility/Source/service/gui/GuiDraw.cpp b/Tactility/Source/service/gui/GuiDraw.cpp index f6af3d3c..016aa546 100644 --- a/Tactility/Source/service/gui/GuiDraw.cpp +++ b/Tactility/Source/service/gui/GuiDraw.cpp @@ -1,9 +1,10 @@ -#include "Check.h" -#include "Log.h" -#include "service/gui/Gui_i.h" -#include "lvgl/LvglSync.h" -#include "lvgl/Statusbar.h" -#include "lvgl/Style.h" +#include "Tactility/service/gui/Gui_i.h" +#include "Tactility/lvgl/LvglSync.h" +#include "Tactility/lvgl/Statusbar.h" +#include "Tactility/lvgl/Style.h" + +#include +#include namespace tt::service::gui { diff --git a/Tactility/Source/service/gui/Keyboard.cpp b/Tactility/Source/service/gui/Keyboard.cpp index 214d5bc7..90338f20 100644 --- a/Tactility/Source/service/gui/Keyboard.cpp +++ b/Tactility/Source/service/gui/Keyboard.cpp @@ -1,8 +1,9 @@ -#include "Check.h" -#include "TactilityConfig.h" -#include "service/gui/Gui_i.h" -#include "lvgl/LvglKeypad.h" -#include "lvgl/LvglSync.h" +#include "Tactility/Check.h" +#include "Tactility/service/gui/Gui_i.h" +#include "Tactility/lvgl/LvglKeypad.h" +#include "Tactility/lvgl/LvglSync.h" + +#include namespace tt::service::gui { diff --git a/Tactility/Source/service/loader/Loader.cpp b/Tactility/Source/service/loader/Loader.cpp index f3b72048..9eb08121 100644 --- a/Tactility/Source/service/loader/Loader.cpp +++ b/Tactility/Source/service/loader/Loader.cpp @@ -1,17 +1,17 @@ -#include "app/AppManifest.h" -#include "app/ManifestRegistry.h" -#include "service/ServiceManifest.h" -#include "service/gui/Gui.h" -#include "service/loader/Loader_i.h" -#include "RtosCompat.h" +#include "Tactility/app/AppManifest.h" +#include "Tactility/app/ManifestRegistry.h" +#include "Tactility/service/gui/Gui.h" +#include "Tactility/service/loader/Loader_i.h" + +#include +#include #ifdef ESP_PLATFORM -#include "TactilityHeadless.h" -#include "app/ElfApp.h" -#include "esp_heap_caps.h" - +#include "Tactility/app/ElfApp.h" +#include +#include #else -#include "lvgl/LvglSync.h" +#include "Tactility/lvgl/LvglSync.h" #endif namespace tt::service::loader { diff --git a/Tactility/Source/service/screenshot/Screenshot.cpp b/Tactility/Source/service/screenshot/Screenshot.cpp index e25e0aae..08753a7b 100644 --- a/Tactility/Source/service/screenshot/Screenshot.cpp +++ b/Tactility/Source/service/screenshot/Screenshot.cpp @@ -1,12 +1,13 @@ -#include "TactilityConfig.h" +#include #if TT_FEATURE_SCREENSHOT_ENABLED -#include "Screenshot.h" -#include +#include "Tactility/service/screenshot/Screenshot.h" -#include "service/ServiceContext.h" -#include "service/ServiceRegistry.h" +#include +#include + +#include namespace tt::service::screenshot { diff --git a/Tactility/Source/service/screenshot/ScreenshotTask.cpp b/Tactility/Source/service/screenshot/ScreenshotTask.cpp index 412a5fd9..ffbef833 100644 --- a/Tactility/Source/service/screenshot/ScreenshotTask.cpp +++ b/Tactility/Source/service/screenshot/ScreenshotTask.cpp @@ -1,14 +1,16 @@ -#include "TactilityConfig.h" +#include "Tactility/TactilityConfig.h" #if TT_FEATURE_SCREENSHOT_ENABLED -#include "ScreenshotTask.h" -#include "lv_screenshot.h" -#include +#include "Tactility/service/screenshot/ScreenshotTask.h" -#include "TactilityCore.h" -#include "service/loader/Loader.h" -#include "lvgl/LvglSync.h" +#include "Tactility/service/loader/Loader.h" +#include "Tactility/lvgl/LvglSync.h" + +#include +#include + +#include namespace tt::service::screenshot { diff --git a/Tactility/Source/service/statusbar/Statusbar.cpp b/Tactility/Source/service/statusbar/Statusbar.cpp index 0f6fc709..a49cbe42 100644 --- a/Tactility/Source/service/statusbar/Statusbar.cpp +++ b/Tactility/Source/service/statusbar/Statusbar.cpp @@ -1,15 +1,15 @@ -#include "Mutex.h" -#include "Timer.h" -#include "Tactility.h" +#include "Tactility/lvgl/Statusbar.h" +#include "Tactility/lvgl/LvglSync.h" -#include "hal/Power.h" -#include "hal/SdCard.h" -#include "lvgl/Statusbar.h" -#include "service/ServiceContext.h" -#include "service/wifi/Wifi.h" -#include "service/ServiceRegistry.h" -#include "TactilityHeadless.h" -#include "lvgl/LvglSync.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace tt::service::statusbar { diff --git a/TactilityC/CMakeLists.txt b/TactilityC/CMakeLists.txt index b4ad7fcb..0f25f677 100644 --- a/TactilityC/CMakeLists.txt +++ b/TactilityC/CMakeLists.txt @@ -8,29 +8,25 @@ if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCE_FILES} - INCLUDE_DIRS "Source/" + INCLUDE_DIRS "Include/" REQUIRES lvgl PRIV_REQUIRES Tactility TactilityCore TactilityHeadless elf_loader ) - add_definitions(-DESP_PLATFORM) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable) endif() else() file(GLOB_RECURSE SOURCES "Source/*.c**") - file(GLOB_RECURSE HEADERS "Source/*.h**") add_library(TactilityC OBJECT) target_sources(TactilityC PRIVATE ${SOURCES} - PUBLIC ${HEADERS} ) target_include_directories(TactilityC - PUBLIC Source/ + PUBLIC Include/ ) add_definitions(-D_Nullable=) diff --git a/TactilityC/Source/tt_app.h b/TactilityC/Include/tt_app.h similarity index 100% rename from TactilityC/Source/tt_app.h rename to TactilityC/Include/tt_app.h diff --git a/TactilityC/Source/tt_app_alertdialog.h b/TactilityC/Include/tt_app_alertdialog.h similarity index 100% rename from TactilityC/Source/tt_app_alertdialog.h rename to TactilityC/Include/tt_app_alertdialog.h diff --git a/TactilityC/Source/tt_app_manifest.h b/TactilityC/Include/tt_app_manifest.h similarity index 100% rename from TactilityC/Source/tt_app_manifest.h rename to TactilityC/Include/tt_app_manifest.h diff --git a/TactilityC/Source/tt_app_selectiondialog.h b/TactilityC/Include/tt_app_selectiondialog.h similarity index 100% rename from TactilityC/Source/tt_app_selectiondialog.h rename to TactilityC/Include/tt_app_selectiondialog.h diff --git a/TactilityC/Source/tt_bundle.h b/TactilityC/Include/tt_bundle.h similarity index 100% rename from TactilityC/Source/tt_bundle.h rename to TactilityC/Include/tt_bundle.h diff --git a/TactilityC/Source/tt_hal_i2c.h b/TactilityC/Include/tt_hal_i2c.h similarity index 100% rename from TactilityC/Source/tt_hal_i2c.h rename to TactilityC/Include/tt_hal_i2c.h diff --git a/TactilityC/Source/tt_init.h b/TactilityC/Include/tt_init.h similarity index 100% rename from TactilityC/Source/tt_init.h rename to TactilityC/Include/tt_init.h diff --git a/TactilityC/Source/tt_lvgl_spinner.h b/TactilityC/Include/tt_lvgl_spinner.h similarity index 100% rename from TactilityC/Source/tt_lvgl_spinner.h rename to TactilityC/Include/tt_lvgl_spinner.h diff --git a/TactilityC/Source/tt_lvgl_toolbar.h b/TactilityC/Include/tt_lvgl_toolbar.h similarity index 100% rename from TactilityC/Source/tt_lvgl_toolbar.h rename to TactilityC/Include/tt_lvgl_toolbar.h diff --git a/TactilityC/Source/tt_message_queue.h b/TactilityC/Include/tt_message_queue.h similarity index 100% rename from TactilityC/Source/tt_message_queue.h rename to TactilityC/Include/tt_message_queue.h diff --git a/TactilityC/Source/tt_mutex.h b/TactilityC/Include/tt_mutex.h similarity index 100% rename from TactilityC/Source/tt_mutex.h rename to TactilityC/Include/tt_mutex.h diff --git a/TactilityC/Source/tt_semaphore.h b/TactilityC/Include/tt_semaphore.h similarity index 100% rename from TactilityC/Source/tt_semaphore.h rename to TactilityC/Include/tt_semaphore.h diff --git a/TactilityC/Source/tt_service_loader.h b/TactilityC/Include/tt_service_loader.h similarity index 100% rename from TactilityC/Source/tt_service_loader.h rename to TactilityC/Include/tt_service_loader.h diff --git a/TactilityC/Source/tt_thread.h b/TactilityC/Include/tt_thread.h similarity index 100% rename from TactilityC/Source/tt_thread.h rename to TactilityC/Include/tt_thread.h diff --git a/TactilityC/Source/tt_timer.h b/TactilityC/Include/tt_timer.h similarity index 100% rename from TactilityC/Source/tt_timer.h rename to TactilityC/Include/tt_timer.h diff --git a/TactilityC/Source/tt_app.cpp b/TactilityC/Source/tt_app.cpp index 801dd007..44edc58a 100644 --- a/TactilityC/Source/tt_app.cpp +++ b/TactilityC/Source/tt_app.cpp @@ -1,6 +1,6 @@ #include "tt_app.h" -#include -#include +#include +#include extern "C" { diff --git a/TactilityC/Source/tt_app_alertdialog.cpp b/TactilityC/Source/tt_app_alertdialog.cpp index 7b967efc..e9fed771 100644 --- a/TactilityC/Source/tt_app_alertdialog.cpp +++ b/TactilityC/Source/tt_app_alertdialog.cpp @@ -1,5 +1,5 @@ #include "tt_app_alertdialog.h" -#include +#include extern "C" { diff --git a/TactilityC/Source/tt_app_manifest.cpp b/TactilityC/Source/tt_app_manifest.cpp index 9fa46996..4d77a2b8 100644 --- a/TactilityC/Source/tt_app_manifest.cpp +++ b/TactilityC/Source/tt_app_manifest.cpp @@ -1,7 +1,7 @@ #include "tt_app_manifest.h" -#include -#include +#include +#include #define TAG "tt_app" diff --git a/TactilityC/Source/tt_app_selectiondialog.cpp b/TactilityC/Source/tt_app_selectiondialog.cpp index 7595b801..4f45d512 100644 --- a/TactilityC/Source/tt_app_selectiondialog.cpp +++ b/TactilityC/Source/tt_app_selectiondialog.cpp @@ -1,5 +1,5 @@ #include "tt_app_selectiondialog.h" -#include +#include extern "C" { diff --git a/TactilityC/Source/tt_bundle.cpp b/TactilityC/Source/tt_bundle.cpp index 54846d64..14530a32 100644 --- a/TactilityC/Source/tt_bundle.cpp +++ b/TactilityC/Source/tt_bundle.cpp @@ -1,6 +1,6 @@ -#include #include "tt_bundle.h" -#include "Bundle.h" +#include +#include #define HANDLE_AS_BUNDLE(handle) ((tt::Bundle*)(handle)) diff --git a/TactilityC/Source/tt_hal_i2c.cpp b/TactilityC/Source/tt_hal_i2c.cpp index a6186fee..e2ca0798 100644 --- a/TactilityC/Source/tt_hal_i2c.cpp +++ b/TactilityC/Source/tt_hal_i2c.cpp @@ -1,5 +1,5 @@ #include "tt_hal_i2c.h" -#include "hal/i2c/I2c.h" +#include extern "C" { diff --git a/TactilityC/Source/tt_lvgl_spinner.cpp b/TactilityC/Source/tt_lvgl_spinner.cpp index a18dcf5c..8726d7fd 100644 --- a/TactilityC/Source/tt_lvgl_spinner.cpp +++ b/TactilityC/Source/tt_lvgl_spinner.cpp @@ -1,5 +1,5 @@ #include "tt_lvgl_spinner.h" -#include "lvgl/Spinner.h" +#include extern "C" { diff --git a/TactilityC/Source/tt_lvgl_toolbar.cpp b/TactilityC/Source/tt_lvgl_toolbar.cpp index 4bdd5d31..669f1fd2 100644 --- a/TactilityC/Source/tt_lvgl_toolbar.cpp +++ b/TactilityC/Source/tt_lvgl_toolbar.cpp @@ -1,5 +1,5 @@ #include "tt_lvgl_toolbar.h" -#include +#include extern "C" { diff --git a/TactilityC/Source/tt_message_queue.cpp b/TactilityC/Source/tt_message_queue.cpp index 95bd4ab9..c0474d7a 100644 --- a/TactilityC/Source/tt_message_queue.cpp +++ b/TactilityC/Source/tt_message_queue.cpp @@ -1,5 +1,5 @@ #include "tt_message_queue.h" -#include +#include #define HANDLE_TO_MESSAGE_QUEUE(handle) ((tt::MessageQueue*)(handle)) diff --git a/TactilityC/Source/tt_mutex.cpp b/TactilityC/Source/tt_mutex.cpp index 46b96d58..55dcc1f2 100644 --- a/TactilityC/Source/tt_mutex.cpp +++ b/TactilityC/Source/tt_mutex.cpp @@ -1,5 +1,5 @@ #include "tt_mutex.h" -#include "Mutex.h" +#include extern "C" { diff --git a/TactilityC/Source/tt_semaphore.cpp b/TactilityC/Source/tt_semaphore.cpp index 6fb87d5b..f395e1a8 100644 --- a/TactilityC/Source/tt_semaphore.cpp +++ b/TactilityC/Source/tt_semaphore.cpp @@ -1,5 +1,5 @@ #include "tt_semaphore.h" -#include "Semaphore.h" +#include extern "C" { diff --git a/TactilityC/Source/tt_service_loader.cpp b/TactilityC/Source/tt_service_loader.cpp index 8cb57f12..92bfe6da 100644 --- a/TactilityC/Source/tt_service_loader.cpp +++ b/TactilityC/Source/tt_service_loader.cpp @@ -1,6 +1,6 @@ #include "tt_service_loader.h" -#include -#include +#include +#include extern "C" { diff --git a/TactilityC/Source/tt_thread.cpp b/TactilityC/Source/tt_thread.cpp index 9c3ba85e..82795e75 100644 --- a/TactilityC/Source/tt_thread.cpp +++ b/TactilityC/Source/tt_thread.cpp @@ -1,5 +1,5 @@ #include "tt_thread.h" -#include +#include extern "C" { diff --git a/TactilityC/Source/tt_timer.cpp b/TactilityC/Source/tt_timer.cpp index 3d513f4d..3e6f31e1 100644 --- a/TactilityC/Source/tt_timer.cpp +++ b/TactilityC/Source/tt_timer.cpp @@ -1,5 +1,5 @@ #include "tt_timer.h" -#include +#include struct TimerWrapper { std::unique_ptr timer; diff --git a/TactilityCore/CMakeLists.txt b/TactilityCore/CMakeLists.txt index 24da6529..d6fcfe97 100644 --- a/TactilityCore/CMakeLists.txt +++ b/TactilityCore/CMakeLists.txt @@ -8,32 +8,29 @@ if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCE_FILES} - INCLUDE_DIRS "Source/" + INCLUDE_DIRS "Include/" REQUIRES mbedtls nvs_flash esp_rom ) - add_definitions(-DESP_PLATFORM) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable) endif() else() file(GLOB_RECURSE SOURCES "Source/*.c*") - file(GLOB_RECURSE HEADERS "Source/*.h*") add_library(TactilityCore OBJECT) target_sources(TactilityCore PRIVATE ${SOURCES} - PUBLIC ${HEADERS} ) target_include_directories(TactilityCore SYSTEM - PUBLIC Source/ + PUBLIC Include/ ) add_definitions(-D_Nullable=) add_definitions(-D_Nonnull=) + target_link_libraries(TactilityCore PUBLIC mbedtls PUBLIC freertos_kernel diff --git a/TactilityCore/Source/Bundle.h b/TactilityCore/Include/Tactility/Bundle.h similarity index 100% rename from TactilityCore/Source/Bundle.h rename to TactilityCore/Include/Tactility/Bundle.h diff --git a/TactilityCore/Source/Check.h b/TactilityCore/Include/Tactility/Check.h similarity index 99% rename from TactilityCore/Source/Check.h rename to TactilityCore/Include/Tactility/Check.h index ceaddc98..c5078d50 100644 --- a/TactilityCore/Source/Check.h +++ b/TactilityCore/Include/Tactility/Check.h @@ -13,9 +13,10 @@ */ #pragma once -#include "Log.h" -#include #include "CoreDefines.h" +#include "Log.h" + +#include #define TT_NORETURN [[noreturn]] diff --git a/TactilityCore/Source/CoreDefines.h b/TactilityCore/Include/Tactility/CoreDefines.h similarity index 100% rename from TactilityCore/Source/CoreDefines.h rename to TactilityCore/Include/Tactility/CoreDefines.h diff --git a/TactilityCore/Source/CoreExtraDefines.h b/TactilityCore/Include/Tactility/CoreExtraDefines.h similarity index 100% rename from TactilityCore/Source/CoreExtraDefines.h rename to TactilityCore/Include/Tactility/CoreExtraDefines.h diff --git a/TactilityCore/Source/Dispatcher.h b/TactilityCore/Include/Tactility/Dispatcher.h similarity index 99% rename from TactilityCore/Source/Dispatcher.h rename to TactilityCore/Include/Tactility/Dispatcher.h index 8bb70542..dc17caea 100644 --- a/TactilityCore/Source/Dispatcher.h +++ b/TactilityCore/Include/Tactility/Dispatcher.h @@ -8,6 +8,7 @@ #include "MessageQueue.h" #include "Mutex.h" #include "EventFlag.h" + #include #include diff --git a/TactilityCore/Source/DispatcherThread.h b/TactilityCore/Include/Tactility/DispatcherThread.h similarity index 100% rename from TactilityCore/Source/DispatcherThread.h rename to TactilityCore/Include/Tactility/DispatcherThread.h diff --git a/TactilityCore/Source/EventFlag.h b/TactilityCore/Include/Tactility/EventFlag.h similarity index 96% rename from TactilityCore/Source/EventFlag.h rename to TactilityCore/Include/Tactility/EventFlag.h index 8b7dfdda..d0cbc282 100644 --- a/TactilityCore/Source/EventFlag.h +++ b/TactilityCore/Include/Tactility/EventFlag.h @@ -43,7 +43,7 @@ public: uint32_t wait( uint32_t flags, uint32_t options = WaitAny, - uint32_t timeout = portMAX_DELAY + uint32_t timeout = (uint32_t)portMAX_DELAY ) const; }; diff --git a/TactilityCore/Source/Lockable.h b/TactilityCore/Include/Tactility/Lockable.h similarity index 100% rename from TactilityCore/Source/Lockable.h rename to TactilityCore/Include/Tactility/Lockable.h diff --git a/TactilityCore/Source/Log.h b/TactilityCore/Include/Tactility/Log.h similarity index 100% rename from TactilityCore/Source/Log.h rename to TactilityCore/Include/Tactility/Log.h diff --git a/TactilityCore/Source/LogMessages.h b/TactilityCore/Include/Tactility/LogMessages.h similarity index 100% rename from TactilityCore/Source/LogMessages.h rename to TactilityCore/Include/Tactility/LogMessages.h diff --git a/TactilityCore/Source/MessageQueue.h b/TactilityCore/Include/Tactility/MessageQueue.h similarity index 100% rename from TactilityCore/Source/MessageQueue.h rename to TactilityCore/Include/Tactility/MessageQueue.h diff --git a/TactilityCore/Source/Mutex.h b/TactilityCore/Include/Tactility/Mutex.h similarity index 100% rename from TactilityCore/Source/Mutex.h rename to TactilityCore/Include/Tactility/Mutex.h diff --git a/TactilityCore/Source/PubSub.h b/TactilityCore/Include/Tactility/PubSub.h similarity index 100% rename from TactilityCore/Source/PubSub.h rename to TactilityCore/Include/Tactility/PubSub.h diff --git a/TactilityCore/Source/RtosCompat.h b/TactilityCore/Include/Tactility/RtosCompat.h similarity index 100% rename from TactilityCore/Source/RtosCompat.h rename to TactilityCore/Include/Tactility/RtosCompat.h diff --git a/TactilityCore/Source/RtosCompatEventGroups.h b/TactilityCore/Include/Tactility/RtosCompatEventGroups.h similarity index 100% rename from TactilityCore/Source/RtosCompatEventGroups.h rename to TactilityCore/Include/Tactility/RtosCompatEventGroups.h diff --git a/TactilityCore/Source/RtosCompatSemaphore.h b/TactilityCore/Include/Tactility/RtosCompatSemaphore.h similarity index 100% rename from TactilityCore/Source/RtosCompatSemaphore.h rename to TactilityCore/Include/Tactility/RtosCompatSemaphore.h diff --git a/TactilityCore/Source/RtosCompatTask.h b/TactilityCore/Include/Tactility/RtosCompatTask.h similarity index 100% rename from TactilityCore/Source/RtosCompatTask.h rename to TactilityCore/Include/Tactility/RtosCompatTask.h diff --git a/TactilityCore/Source/RtosCompatTimers.h b/TactilityCore/Include/Tactility/RtosCompatTimers.h similarity index 100% rename from TactilityCore/Source/RtosCompatTimers.h rename to TactilityCore/Include/Tactility/RtosCompatTimers.h diff --git a/TactilityCore/Source/Semaphore.h b/TactilityCore/Include/Tactility/Semaphore.h similarity index 100% rename from TactilityCore/Source/Semaphore.h rename to TactilityCore/Include/Tactility/Semaphore.h diff --git a/TactilityCore/Source/StreamBuffer.h b/TactilityCore/Include/Tactility/StreamBuffer.h similarity index 100% rename from TactilityCore/Source/StreamBuffer.h rename to TactilityCore/Include/Tactility/StreamBuffer.h diff --git a/TactilityCore/Source/StringUtils.h b/TactilityCore/Include/Tactility/StringUtils.h similarity index 100% rename from TactilityCore/Source/StringUtils.h rename to TactilityCore/Include/Tactility/StringUtils.h diff --git a/TactilityCore/Source/TactilityCore.h b/TactilityCore/Include/Tactility/TactilityCore.h similarity index 100% rename from TactilityCore/Source/TactilityCore.h rename to TactilityCore/Include/Tactility/TactilityCore.h diff --git a/TactilityCore/Source/TactilityCoreConfig.h b/TactilityCore/Include/Tactility/TactilityCoreConfig.h similarity index 100% rename from TactilityCore/Source/TactilityCoreConfig.h rename to TactilityCore/Include/Tactility/TactilityCoreConfig.h diff --git a/TactilityCore/Source/Thread.h b/TactilityCore/Include/Tactility/Thread.h similarity index 100% rename from TactilityCore/Source/Thread.h rename to TactilityCore/Include/Tactility/Thread.h diff --git a/TactilityCore/Source/Timer.h b/TactilityCore/Include/Tactility/Timer.h similarity index 100% rename from TactilityCore/Source/Timer.h rename to TactilityCore/Include/Tactility/Timer.h diff --git a/TactilityCore/Source/crypt/Crypt.h b/TactilityCore/Include/Tactility/crypt/Crypt.h similarity index 100% rename from TactilityCore/Source/crypt/Crypt.h rename to TactilityCore/Include/Tactility/crypt/Crypt.h diff --git a/TactilityCore/Source/crypt/Hash.h b/TactilityCore/Include/Tactility/crypt/Hash.h similarity index 100% rename from TactilityCore/Source/crypt/Hash.h rename to TactilityCore/Include/Tactility/crypt/Hash.h diff --git a/TactilityCore/Source/file/File.h b/TactilityCore/Include/Tactility/file/File.h similarity index 94% rename from TactilityCore/Source/file/File.h rename to TactilityCore/Include/Tactility/file/File.h index e95a016c..4dca8b45 100644 --- a/TactilityCore/Source/file/File.h +++ b/TactilityCore/Include/Tactility/file/File.h @@ -1,6 +1,7 @@ #pragma once -#include "TactilityCore.h" +#include "Tactility/TactilityCore.h" + #include namespace tt::file { diff --git a/TactilityCore/Source/kernel/Kernel.h b/TactilityCore/Include/Tactility/kernel/Kernel.h similarity index 100% rename from TactilityCore/Source/kernel/Kernel.h rename to TactilityCore/Include/Tactility/kernel/Kernel.h diff --git a/TactilityCore/Source/kernel/PanicHandler.h b/TactilityCore/Include/Tactility/kernel/PanicHandler.h similarity index 100% rename from TactilityCore/Source/kernel/PanicHandler.h rename to TactilityCore/Include/Tactility/kernel/PanicHandler.h diff --git a/TactilityCore/Source/kernel/critical/Critical.h b/TactilityCore/Include/Tactility/kernel/critical/Critical.h similarity index 100% rename from TactilityCore/Source/kernel/critical/Critical.h rename to TactilityCore/Include/Tactility/kernel/critical/Critical.h diff --git a/TactilityCore/Source/Bundle.cpp b/TactilityCore/Source/Bundle.cpp index 5f6c101b..8e78f8c2 100644 --- a/TactilityCore/Source/Bundle.cpp +++ b/TactilityCore/Source/Bundle.cpp @@ -1,4 +1,4 @@ -#include "Bundle.h" +#include "Tactility/Bundle.h" namespace tt { diff --git a/TactilityCore/Source/Check.cpp b/TactilityCore/Source/Check.cpp index 1ce4f128..4c97d459 100644 --- a/TactilityCore/Source/Check.cpp +++ b/TactilityCore/Source/Check.cpp @@ -1,7 +1,7 @@ -#include "Check.h" +#include "Tactility/Check.h" -#include "Log.h" -#include "RtosCompatTask.h" +#include "Tactility/Log.h" +#include "Tactility/RtosCompatTask.h" #define TAG "kernel" diff --git a/TactilityCore/Source/Dispatcher.cpp b/TactilityCore/Source/Dispatcher.cpp index 32328419..0a5cbf52 100644 --- a/TactilityCore/Source/Dispatcher.cpp +++ b/TactilityCore/Source/Dispatcher.cpp @@ -1,6 +1,7 @@ -#include -#include "Dispatcher.h" -#include "Check.h" +#include "Tactility/Dispatcher.h" + +#include "Tactility/Check.h" +#include "Tactility/kernel/Kernel.h" namespace tt { diff --git a/TactilityCore/Source/DispatcherThread.cpp b/TactilityCore/Source/DispatcherThread.cpp index 6186a095..5487c39e 100644 --- a/TactilityCore/Source/DispatcherThread.cpp +++ b/TactilityCore/Source/DispatcherThread.cpp @@ -1,4 +1,4 @@ -#include "DispatcherThread.h" +#include "Tactility/DispatcherThread.h" namespace tt { diff --git a/TactilityCore/Source/EventFlag.cpp b/TactilityCore/Source/EventFlag.cpp index 3dbcdd00..bedfc449 100644 --- a/TactilityCore/Source/EventFlag.cpp +++ b/TactilityCore/Source/EventFlag.cpp @@ -1,7 +1,7 @@ -#include "EventFlag.h" +#include "Tactility/EventFlag.h" -#include "Check.h" -#include "CoreDefines.h" +#include "Tactility/Check.h" +#include "Tactility/CoreDefines.h" #define TT_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U #define TT_EVENT_FLAG_INVALID_BITS (~((1UL << TT_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U)) diff --git a/TactilityCore/Source/Lockable.cpp b/TactilityCore/Source/Lockable.cpp index 4e2c9f0d..edcaedc9 100644 --- a/TactilityCore/Source/Lockable.cpp +++ b/TactilityCore/Source/Lockable.cpp @@ -1,4 +1,4 @@ -#include "Lockable.h" +#include "Tactility/Lockable.h" namespace tt { diff --git a/TactilityCore/Source/Log.cpp b/TactilityCore/Source/Log.cpp index 3e8ce8e0..992f59d8 100644 --- a/TactilityCore/Source/Log.cpp +++ b/TactilityCore/Source/Log.cpp @@ -1,4 +1,5 @@ -#include "Mutex.h" +#include "Tactility/Mutex.h" + #include #include @@ -49,7 +50,7 @@ std::unique_ptr> copyLogEntries(std::si #ifndef ESP_PLATFORM -#include "Log.h" +#include "Tactility/Log.h" #include #include diff --git a/TactilityCore/Source/MessageQueue.cpp b/TactilityCore/Source/MessageQueue.cpp index 07aee189..b7c05e6e 100644 --- a/TactilityCore/Source/MessageQueue.cpp +++ b/TactilityCore/Source/MessageQueue.cpp @@ -1,6 +1,6 @@ -#include "MessageQueue.h" -#include "Check.h" -#include "kernel/Kernel.h" +#include "Tactility/MessageQueue.h" +#include "Tactility/Check.h" +#include "Tactility/kernel/Kernel.h" namespace tt { diff --git a/TactilityCore/Source/Mutex.cpp b/TactilityCore/Source/Mutex.cpp index 8c0e22f7..4d95ee12 100644 --- a/TactilityCore/Source/Mutex.cpp +++ b/TactilityCore/Source/Mutex.cpp @@ -1,8 +1,8 @@ -#include "Mutex.h" +#include "Tactility/Mutex.h" -#include "Check.h" -#include "CoreDefines.h" -#include "Log.h" +#include "Tactility/Check.h" +#include "Tactility/CoreDefines.h" +#include "Tactility/Log.h" namespace tt { diff --git a/TactilityCore/Source/PubSub.cpp b/TactilityCore/Source/PubSub.cpp index 7f026527..d99b547d 100644 --- a/TactilityCore/Source/PubSub.cpp +++ b/TactilityCore/Source/PubSub.cpp @@ -1,5 +1,5 @@ -#include "PubSub.h" -#include "Check.h" +#include "Tactility/PubSub.h" +#include "Tactility/Check.h" namespace tt { diff --git a/TactilityCore/Source/Semaphore.cpp b/TactilityCore/Source/Semaphore.cpp index fc6d010c..5bf4baa0 100644 --- a/TactilityCore/Source/Semaphore.cpp +++ b/TactilityCore/Source/Semaphore.cpp @@ -1,6 +1,6 @@ -#include "Semaphore.h" -#include "Check.h" -#include "CoreDefines.h" +#include "Tactility/Semaphore.h" +#include "Tactility/Check.h" +#include "Tactility/CoreDefines.h" namespace tt { diff --git a/TactilityCore/Source/StreamBuffer.cpp b/TactilityCore/Source/StreamBuffer.cpp index 20f89b80..4ae992f7 100644 --- a/TactilityCore/Source/StreamBuffer.cpp +++ b/TactilityCore/Source/StreamBuffer.cpp @@ -1,7 +1,7 @@ -#include "StreamBuffer.h" +#include "Tactility/StreamBuffer.h" -#include "Check.h" -#include "CoreDefines.h" +#include "Tactility/Check.h" +#include "Tactility/CoreDefines.h" namespace tt { diff --git a/TactilityCore/Source/StringUtils.cpp b/TactilityCore/Source/StringUtils.cpp index 095c3413..558ba342 100644 --- a/TactilityCore/Source/StringUtils.cpp +++ b/TactilityCore/Source/StringUtils.cpp @@ -1,4 +1,5 @@ -#include "StringUtils.h" +#include "Tactility/StringUtils.h" + #include #include #include diff --git a/TactilityCore/Source/Thread.cpp b/TactilityCore/Source/Thread.cpp index e30ac32b..0dcd4316 100644 --- a/TactilityCore/Source/Thread.cpp +++ b/TactilityCore/Source/Thread.cpp @@ -1,11 +1,11 @@ -#include "Thread.h" +#include "Tactility/Thread.h" -#include "Check.h" -#include "CoreDefines.h" -#include "EventFlag.h" -#include "kernel/Kernel.h" -#include "Log.h" -#include "TactilityCoreConfig.h" +#include "Tactility/Check.h" +#include "Tactility/CoreDefines.h" +#include "Tactility/EventFlag.h" +#include "Tactility/kernel/Kernel.h" +#include "Tactility/Log.h" +#include "Tactility/TactilityCoreConfig.h" #include diff --git a/TactilityCore/Source/Timer.cpp b/TactilityCore/Source/Timer.cpp index 1a6dba2d..6e46e8a2 100644 --- a/TactilityCore/Source/Timer.cpp +++ b/TactilityCore/Source/Timer.cpp @@ -1,8 +1,9 @@ -#include "Timer.h" +#include "Tactility/Timer.h" + +#include "Tactility/Check.h" +#include "Tactility/RtosCompat.h" #include -#include "Check.h" -#include "RtosCompat.h" namespace tt { diff --git a/TactilityCore/Source/crypt/Crypt.cpp b/TactilityCore/Source/crypt/Crypt.cpp index 7faec8cd..05daafc5 100644 --- a/TactilityCore/Source/crypt/Crypt.cpp +++ b/TactilityCore/Source/crypt/Crypt.cpp @@ -1,8 +1,9 @@ -#include "Crypt.h" +#include "Tactility/crypt/Crypt.h" -#include "Check.h" -#include "Log.h" -#include "mbedtls/aes.h" +#include "Tactility/Check.h" +#include "Tactility/Log.h" + +#include #include #include diff --git a/TactilityCore/Source/crypt/Hash.cpp b/TactilityCore/Source/crypt/Hash.cpp index 9b4bf6cb..61047387 100644 --- a/TactilityCore/Source/crypt/Hash.cpp +++ b/TactilityCore/Source/crypt/Hash.cpp @@ -1,4 +1,4 @@ -#include "Hash.h" +#include "Tactility/crypt/Hash.h" namespace tt::crypt { diff --git a/TactilityCore/Source/file/File.cpp b/TactilityCore/Source/file/File.cpp index 53140701..3bd28998 100644 --- a/TactilityCore/Source/file/File.cpp +++ b/TactilityCore/Source/file/File.cpp @@ -1,4 +1,4 @@ -#include "File.h" +#include "Tactility/file/File.h" namespace tt::file { diff --git a/TactilityCore/Source/kernel/Kernel.cpp b/TactilityCore/Source/kernel/Kernel.cpp index b6a244bd..2f1faf12 100644 --- a/TactilityCore/Source/kernel/Kernel.cpp +++ b/TactilityCore/Source/kernel/Kernel.cpp @@ -1,6 +1,6 @@ -#include "kernel/Kernel.h" -#include "CoreDefines.h" -#include "RtosCompatTask.h" +#include "Tactility/kernel/Kernel.h" +#include "Tactility/CoreDefines.h" +#include "Tactility/RtosCompatTask.h" #ifdef ESP_PLATFORM #include "rom/ets_sys.h" diff --git a/TactilityCore/Source/kernel/PanicHandler.cpp b/TactilityCore/Source/kernel/PanicHandler.cpp index aaa7913f..160c9598 100644 --- a/TactilityCore/Source/kernel/PanicHandler.cpp +++ b/TactilityCore/Source/kernel/PanicHandler.cpp @@ -1,6 +1,6 @@ #ifdef ESP_PLATFORM -#include "PanicHandler.h" +#include "Tactility/kernel/PanicHandler.h" #include #include diff --git a/TactilityCore/Source/kernel/critical/Critical.cpp b/TactilityCore/Source/kernel/critical/Critical.cpp index 169ce846..9cb0b63b 100644 --- a/TactilityCore/Source/kernel/critical/Critical.cpp +++ b/TactilityCore/Source/kernel/critical/Critical.cpp @@ -1,6 +1,7 @@ -#include "Critical.h" -#include "CoreDefines.h" -#include "RtosCompatTask.h" +#include "Tactility/kernel/critical/Critical.h" + +#include "Tactility/CoreDefines.h" +#include "Tactility/RtosCompatTask.h" #ifdef ESP_PLATFORM static portMUX_TYPE critical_mutex; diff --git a/TactilityHeadless/CMakeLists.txt b/TactilityHeadless/CMakeLists.txt index c949298a..8216c2be 100644 --- a/TactilityHeadless/CMakeLists.txt +++ b/TactilityHeadless/CMakeLists.txt @@ -13,7 +13,7 @@ if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCE_FILES} - INCLUDE_DIRS "Source/" + INCLUDE_DIRS "Include/" PRIV_INCLUDE_DIRS "Private/" REQUIRES ${REQUIRES_LIST} ) @@ -25,31 +25,29 @@ if (DEFINED ENV{ESP_IDF_VERSION}) fatfs_create_spiflash_image(data "${CMAKE_CURRENT_SOURCE_DIR}/../Data/data" FLASH_IN_PROJECT PRESERVE_TIME) endif() - add_definitions(-DESP_PLATFORM) - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable) endif() else() file(GLOB_RECURSE SOURCES "Source/*.c*") - file(GLOB_RECURSE HEADERS "Source/*.h*") add_library(TactilityHeadless OBJECT) target_sources(TactilityHeadless PRIVATE ${SOURCES} - PUBLIC ${HEADERS} ) include_directories( Private/ + Include/ ) target_include_directories(TactilityHeadless - PUBLIC Source/ + PUBLIC Include/ ) add_definitions(-D_Nullable=) add_definitions(-D_Nonnull=) + target_link_libraries(TactilityHeadless PUBLIC TactilityCore PUBLIC freertos_kernel diff --git a/TactilityHeadless/Source/Assets.h b/TactilityHeadless/Include/Tactility/Assets.h similarity index 100% rename from TactilityHeadless/Source/Assets.h rename to TactilityHeadless/Include/Tactility/Assets.h diff --git a/TactilityHeadless/Source/Partitions.h b/TactilityHeadless/Include/Tactility/Partitions.h similarity index 100% rename from TactilityHeadless/Source/Partitions.h rename to TactilityHeadless/Include/Tactility/Partitions.h diff --git a/TactilityHeadless/Source/Preferences.h b/TactilityHeadless/Include/Tactility/Preferences.h similarity index 100% rename from TactilityHeadless/Source/Preferences.h rename to TactilityHeadless/Include/Tactility/Preferences.h diff --git a/TactilityHeadless/Source/TactilityHeadless.h b/TactilityHeadless/Include/Tactility/TactilityHeadless.h similarity index 83% rename from TactilityHeadless/Source/TactilityHeadless.h rename to TactilityHeadless/Include/Tactility/TactilityHeadless.h index dc87924d..3094dbd5 100644 --- a/TactilityHeadless/Source/TactilityHeadless.h +++ b/TactilityHeadless/Include/Tactility/TactilityHeadless.h @@ -1,8 +1,9 @@ #pragma once -#include "TactilityCore.h" -#include "hal/Configuration.h" -#include "Dispatcher.h" +#include "Tactility/hal/Configuration.h" + +#include +#include namespace tt { diff --git a/TactilityHeadless/Source/hal/Configuration.h b/TactilityHeadless/Include/Tactility/hal/Configuration.h similarity index 95% rename from TactilityHeadless/Source/hal/Configuration.h rename to TactilityHeadless/Include/Tactility/hal/Configuration.h index 0c80e080..ec6387df 100644 --- a/TactilityHeadless/Source/hal/Configuration.h +++ b/TactilityHeadless/Include/Tactility/hal/Configuration.h @@ -1,8 +1,8 @@ #pragma once -#include "Power.h" -#include "hal/i2c/I2c.h" -#include "SdCard.h" +#include "./Power.h" +#include "./SdCard.h" +#include "./i2c/I2c.h" namespace tt::hal { diff --git a/TactilityHeadless/Source/hal/Display.h b/TactilityHeadless/Include/Tactility/hal/Display.h similarity index 100% rename from TactilityHeadless/Source/hal/Display.h rename to TactilityHeadless/Include/Tactility/hal/Display.h diff --git a/TactilityHeadless/Source/hal/Keyboard.h b/TactilityHeadless/Include/Tactility/hal/Keyboard.h similarity index 100% rename from TactilityHeadless/Source/hal/Keyboard.h rename to TactilityHeadless/Include/Tactility/hal/Keyboard.h diff --git a/TactilityHeadless/Source/hal/Power.h b/TactilityHeadless/Include/Tactility/hal/Power.h similarity index 100% rename from TactilityHeadless/Source/hal/Power.h rename to TactilityHeadless/Include/Tactility/hal/Power.h diff --git a/TactilityHeadless/Source/hal/SdCard.h b/TactilityHeadless/Include/Tactility/hal/SdCard.h similarity index 95% rename from TactilityHeadless/Source/hal/SdCard.h rename to TactilityHeadless/Include/Tactility/hal/SdCard.h index b2746d24..80375833 100644 --- a/TactilityHeadless/Source/hal/SdCard.h +++ b/TactilityHeadless/Include/Tactility/hal/SdCard.h @@ -1,6 +1,6 @@ #pragma once -#include "TactilityCore.h" +#include namespace tt::hal { diff --git a/TactilityHeadless/Source/hal/SpiSdCard.h b/TactilityHeadless/Include/Tactility/hal/SpiSdCard.h similarity index 98% rename from TactilityHeadless/Source/hal/SpiSdCard.h rename to TactilityHeadless/Include/Tactility/hal/SpiSdCard.h index 12bc26f8..5e7dca54 100644 --- a/TactilityHeadless/Source/hal/SpiSdCard.h +++ b/TactilityHeadless/Include/Tactility/hal/SpiSdCard.h @@ -2,7 +2,7 @@ #pragma once -#include "hal/SdCard.h" +#include "Tactility/hal/SdCard.h" #include #include diff --git a/TactilityHeadless/Source/hal/Touch.h b/TactilityHeadless/Include/Tactility/hal/Touch.h similarity index 100% rename from TactilityHeadless/Source/hal/Touch.h rename to TactilityHeadless/Include/Tactility/hal/Touch.h diff --git a/TactilityHeadless/Source/hal/i2c/I2c.h b/TactilityHeadless/Include/Tactility/hal/i2c/I2c.h similarity index 97% rename from TactilityHeadless/Source/hal/i2c/I2c.h rename to TactilityHeadless/Include/Tactility/hal/i2c/I2c.h index 5b59f54e..a9fffec1 100644 --- a/TactilityHeadless/Source/hal/i2c/I2c.h +++ b/TactilityHeadless/Include/Tactility/hal/i2c/I2c.h @@ -1,7 +1,9 @@ #pragma once -#include "I2cCompat.h" -#include "RtosCompat.h" +#include "./I2cCompat.h" + +#include + #include #include #include diff --git a/TactilityHeadless/Source/hal/i2c/I2cCompat.h b/TactilityHeadless/Include/Tactility/hal/i2c/I2cCompat.h similarity index 100% rename from TactilityHeadless/Source/hal/i2c/I2cCompat.h rename to TactilityHeadless/Include/Tactility/hal/i2c/I2cCompat.h diff --git a/TactilityHeadless/Source/hal/i2c/I2cDevice.h b/TactilityHeadless/Include/Tactility/hal/i2c/I2cDevice.h similarity index 100% rename from TactilityHeadless/Source/hal/i2c/I2cDevice.h rename to TactilityHeadless/Include/Tactility/hal/i2c/I2cDevice.h diff --git a/TactilityHeadless/Source/hal/usb/Usb.h b/TactilityHeadless/Include/Tactility/hal/usb/Usb.h similarity index 100% rename from TactilityHeadless/Source/hal/usb/Usb.h rename to TactilityHeadless/Include/Tactility/hal/usb/Usb.h diff --git a/TactilityHeadless/Source/kernel/SystemEvents.h b/TactilityHeadless/Include/Tactility/kernel/SystemEvents.h similarity index 100% rename from TactilityHeadless/Source/kernel/SystemEvents.h rename to TactilityHeadless/Include/Tactility/kernel/SystemEvents.h diff --git a/TactilityHeadless/Source/service/Service.h b/TactilityHeadless/Include/Tactility/service/Service.h similarity index 100% rename from TactilityHeadless/Source/service/Service.h rename to TactilityHeadless/Include/Tactility/service/Service.h diff --git a/TactilityHeadless/Source/service/ServiceContext.h b/TactilityHeadless/Include/Tactility/service/ServiceContext.h similarity index 98% rename from TactilityHeadless/Source/service/ServiceContext.h rename to TactilityHeadless/Include/Tactility/service/ServiceContext.h index 7a421d78..58127c77 100644 --- a/TactilityHeadless/Source/service/ServiceContext.h +++ b/TactilityHeadless/Include/Tactility/service/ServiceContext.h @@ -1,7 +1,9 @@ #pragma once -#include "Mutex.h" #include "ServiceManifest.h" + +#include + #include namespace tt::service { diff --git a/TactilityHeadless/Source/service/ServiceManifest.h b/TactilityHeadless/Include/Tactility/service/ServiceManifest.h similarity index 91% rename from TactilityHeadless/Source/service/ServiceManifest.h rename to TactilityHeadless/Include/Tactility/service/ServiceManifest.h index d1f7f38d..e55e0895 100644 --- a/TactilityHeadless/Source/service/ServiceManifest.h +++ b/TactilityHeadless/Include/Tactility/service/ServiceManifest.h @@ -1,6 +1,7 @@ #pragma once -#include "service/Service.h" +#include "Tactility/service/Service.h" + #include namespace tt::service { diff --git a/TactilityHeadless/Source/service/ServiceRegistry.h b/TactilityHeadless/Include/Tactility/service/ServiceRegistry.h similarity index 96% rename from TactilityHeadless/Source/service/ServiceRegistry.h rename to TactilityHeadless/Include/Tactility/service/ServiceRegistry.h index 99b777cc..fbae2292 100644 --- a/TactilityHeadless/Source/service/ServiceRegistry.h +++ b/TactilityHeadless/Include/Tactility/service/ServiceRegistry.h @@ -1,7 +1,8 @@ #pragma once -#include "service/ServiceManifest.h" -#include "service/Service.h" +#include "ServiceManifest.h" +#include "Service.h" + #include namespace tt::service { diff --git a/TactilityHeadless/Source/service/wifi/Wifi.h b/TactilityHeadless/Include/Tactility/service/wifi/Wifi.h similarity index 97% rename from TactilityHeadless/Source/service/wifi/Wifi.h rename to TactilityHeadless/Include/Tactility/service/wifi/Wifi.h index 6c32b4ab..0e6f6290 100644 --- a/TactilityHeadless/Source/service/wifi/Wifi.h +++ b/TactilityHeadless/Include/Tactility/service/wifi/Wifi.h @@ -1,8 +1,10 @@ #pragma once -#include "PubSub.h" -#include "WifiGlobals.h" -#include "WifiSettings.h" +#include "./WifiGlobals.h" +#include "./WifiSettings.h" + +#include + #include #include #include diff --git a/TactilityHeadless/Source/service/wifi/WifiGlobals.h b/TactilityHeadless/Include/Tactility/service/wifi/WifiGlobals.h similarity index 100% rename from TactilityHeadless/Source/service/wifi/WifiGlobals.h rename to TactilityHeadless/Include/Tactility/service/wifi/WifiGlobals.h diff --git a/TactilityHeadless/Source/service/wifi/WifiSettings.h b/TactilityHeadless/Include/Tactility/service/wifi/WifiSettings.h similarity index 100% rename from TactilityHeadless/Source/service/wifi/WifiSettings.h rename to TactilityHeadless/Include/Tactility/service/wifi/WifiSettings.h diff --git a/TactilityHeadless/Source/time/Time.h b/TactilityHeadless/Include/Tactility/time/Time.h similarity index 100% rename from TactilityHeadless/Source/time/Time.h rename to TactilityHeadless/Include/Tactility/time/Time.h diff --git a/TactilityHeadless/Private/EspInit.h b/TactilityHeadless/Private/Tactility/InitEsp.h similarity index 100% rename from TactilityHeadless/Private/EspInit.h rename to TactilityHeadless/Private/Tactility/InitEsp.h diff --git a/TactilityHeadless/Private/EspPartitions_i.h b/TactilityHeadless/Private/Tactility/PartitionsEsp.h similarity index 100% rename from TactilityHeadless/Private/EspPartitions_i.h rename to TactilityHeadless/Private/Tactility/PartitionsEsp.h diff --git a/TactilityHeadless/Private/hal/Hal_i.h b/TactilityHeadless/Private/Tactility/hal/Hal_i.h similarity index 70% rename from TactilityHeadless/Private/hal/Hal_i.h rename to TactilityHeadless/Private/Tactility/hal/Hal_i.h index ff91c127..3e471288 100644 --- a/TactilityHeadless/Private/hal/Hal_i.h +++ b/TactilityHeadless/Private/Tactility/hal/Hal_i.h @@ -1,6 +1,6 @@ #pragma once -#include "hal/Configuration.h" +#include "Tactility/hal/Configuration.h" namespace tt::hal { diff --git a/TactilityHeadless/Source/hal/usb/UsbTusb.h b/TactilityHeadless/Private/Tactility/hal/usb/UsbTusb.h similarity index 100% rename from TactilityHeadless/Source/hal/usb/UsbTusb.h rename to TactilityHeadless/Private/Tactility/hal/usb/UsbTusb.h diff --git a/TactilityHeadless/Private/network/NtpPrivate.h b/TactilityHeadless/Private/Tactility/network/NtpPrivate.h similarity index 100% rename from TactilityHeadless/Private/network/NtpPrivate.h rename to TactilityHeadless/Private/Tactility/network/NtpPrivate.h diff --git a/TactilityHeadless/Private/service/ServiceInstance.h b/TactilityHeadless/Private/Tactility/service/ServiceInstance.h similarity index 89% rename from TactilityHeadless/Private/service/ServiceInstance.h rename to TactilityHeadless/Private/Tactility/service/ServiceInstance.h index fb19724e..dc7e0cab 100644 --- a/TactilityHeadless/Private/service/ServiceInstance.h +++ b/TactilityHeadless/Private/Tactility/service/ServiceInstance.h @@ -1,7 +1,7 @@ #pragma once -#include "service/ServiceContext.h" -#include "service/Service.h" +#include "Tactility/service/ServiceContext.h" +#include "Tactility/service/Service.h" namespace tt::service { diff --git a/TactilityHeadless/Private/service/ServiceInstancePaths.h b/TactilityHeadless/Private/Tactility/service/ServiceInstancePaths.h similarity index 94% rename from TactilityHeadless/Private/service/ServiceInstancePaths.h rename to TactilityHeadless/Private/Tactility/service/ServiceInstancePaths.h index f215d034..a491a285 100644 --- a/TactilityHeadless/Private/service/ServiceInstancePaths.h +++ b/TactilityHeadless/Private/Tactility/service/ServiceInstancePaths.h @@ -1,6 +1,6 @@ #pragma once -#include "service/ServiceInstance.h" +#include "Tactility/service/ServiceInstance.h" namespace tt::service { diff --git a/TactilityHeadless/Private/time/TimePrivate.h b/TactilityHeadless/Private/Tactility/time/TimePrivate.h similarity index 100% rename from TactilityHeadless/Private/time/TimePrivate.h rename to TactilityHeadless/Private/Tactility/time/TimePrivate.h diff --git a/TactilityHeadless/Source/PartitionsEsp.cpp b/TactilityHeadless/Source/PartitionsEsp.cpp index ca415f6c..cf9f7bbf 100644 --- a/TactilityHeadless/Source/PartitionsEsp.cpp +++ b/TactilityHeadless/Source/PartitionsEsp.cpp @@ -1,7 +1,8 @@ #ifdef ESP_PLATFORM -#include "EspPartitions_i.h" -#include "Log.h" +#include "Tactility/PartitionsEsp.h" + +#include #include #include diff --git a/TactilityHeadless/Source/PreferencesEsp.cpp b/TactilityHeadless/Source/PreferencesEsp.cpp index a92d4168..f75f8de0 100644 --- a/TactilityHeadless/Source/PreferencesEsp.cpp +++ b/TactilityHeadless/Source/PreferencesEsp.cpp @@ -1,8 +1,9 @@ #ifdef ESP_PLATFORM #include "nvs_flash.h" -#include "Preferences.h" -#include "TactilityCore.h" +#include "Tactility/Preferences.h" + +#include #define TAG "preferences" diff --git a/TactilityHeadless/Source/PreferencesMock.cpp b/TactilityHeadless/Source/PreferencesMock.cpp index 82338ec0..44b39152 100644 --- a/TactilityHeadless/Source/PreferencesMock.cpp +++ b/TactilityHeadless/Source/PreferencesMock.cpp @@ -1,7 +1,8 @@ #ifndef ESP_PLATFOM -#include "Bundle.h" -#include "Preferences.h" +#include "Tactility/Preferences.h" + +#include namespace tt { diff --git a/TactilityHeadless/Source/TactilityHeadless.cpp b/TactilityHeadless/Source/TactilityHeadless.cpp index f4076cf6..54d93d1f 100644 --- a/TactilityHeadless/Source/TactilityHeadless.cpp +++ b/TactilityHeadless/Source/TactilityHeadless.cpp @@ -1,15 +1,15 @@ -#include -#include "TactilityHeadless.h" -#include "hal/Configuration.h" -#include "hal/Hal_i.h" -#include "service/ServiceManifest.h" -#include "service/ServiceRegistry.h" -#include "kernel/SystemEvents.h" -#include "network/NtpPrivate.h" -#include "time/TimePrivate.h" +#include "Tactility/TactilityHeadless.h" +#include "Tactility/hal/Configuration.h" +#include "Tactility/hal/Hal_i.h" +#include "Tactility/network/NtpPrivate.h" +#include "Tactility/service/ServiceManifest.h" +#include "Tactility/service/ServiceRegistry.h" + +#include +#include #ifdef ESP_PLATFORM -#include "EspInit.h" +#include "Tactility/InitEsp.h" #endif namespace tt { diff --git a/TactilityHeadless/Source/TactilityHeadlessEsp.cpp b/TactilityHeadless/Source/TactilityHeadlessEsp.cpp index 63b44dfc..a8a145cb 100644 --- a/TactilityHeadless/Source/TactilityHeadlessEsp.cpp +++ b/TactilityHeadless/Source/TactilityHeadlessEsp.cpp @@ -1,7 +1,7 @@ #ifdef ESP_PLATFORM -#include "TactilityCore.h" -#include "EspPartitions_i.h" +#include "Tactility/PartitionsEsp.h" +#include "Tactility/TactilityCore.h" #include "esp_event.h" #include "esp_netif.h" diff --git a/TactilityHeadless/Source/hal/Hal.cpp b/TactilityHeadless/Source/hal/Hal.cpp index bbd34062..6c853e69 100644 --- a/TactilityHeadless/Source/hal/Hal.cpp +++ b/TactilityHeadless/Source/hal/Hal.cpp @@ -1,6 +1,7 @@ -#include "hal/Hal_i.h" -#include "hal/i2c/I2c.h" -#include "kernel/SystemEvents.h" +#include "Tactility/hal/Hal_i.h" +#include "Tactility/hal/i2c/I2c.h" + +#include #define TAG "hal" diff --git a/TactilityHeadless/Source/hal/SpiSdCard.cpp b/TactilityHeadless/Source/hal/SpiSdCard.cpp index 1b08bff3..4b8d1a7a 100644 --- a/TactilityHeadless/Source/hal/SpiSdCard.cpp +++ b/TactilityHeadless/Source/hal/SpiSdCard.cpp @@ -1,9 +1,8 @@ #ifdef ESP_PLATFORM -#include "SpiSdCard.h" +#include "Tactility/hal/SpiSdCard.h" -#include "Check.h" -#include "Log.h" +#include #include #include diff --git a/TactilityHeadless/Source/hal/i2c/I2c.cpp b/TactilityHeadless/Source/hal/i2c/I2c.cpp index 7aa2193e..a47953c5 100644 --- a/TactilityHeadless/Source/hal/i2c/I2c.cpp +++ b/TactilityHeadless/Source/hal/i2c/I2c.cpp @@ -1,8 +1,9 @@ #ifdef ESP_PLATFORM -#include "I2c.h" -#include "Log.h" -#include "Mutex.h" +#include "Tactility/hal/i2c/I2c.h" + +#include +#include #include diff --git a/TactilityHeadless/Source/hal/i2c/I2cDevice.cpp b/TactilityHeadless/Source/hal/i2c/I2cDevice.cpp index df4fab74..bd1be457 100644 --- a/TactilityHeadless/Source/hal/i2c/I2cDevice.cpp +++ b/TactilityHeadless/Source/hal/i2c/I2cDevice.cpp @@ -1,4 +1,5 @@ -#include "I2cDevice.h" +#include "Tactility/hal/i2c/I2cDevice.h" + #include bool I2cDevice::readRegister12(uint8_t reg, float& out) const { diff --git a/TactilityHeadless/Source/hal/i2c/I2cMock.cpp b/TactilityHeadless/Source/hal/i2c/I2cMock.cpp index ad511dd7..a0d6a966 100644 --- a/TactilityHeadless/Source/hal/i2c/I2cMock.cpp +++ b/TactilityHeadless/Source/hal/i2c/I2cMock.cpp @@ -3,8 +3,8 @@ /** * This code is based on i2c_manager from https://github.com/ropg/i2c_manager/blob/master/i2c_manager/i2c_manager.c (original has MIT license) */ -#include "TactilityCore.h" -#include "I2c.h" +#include "Tactility/TactilityCore.h" +#include "Tactility/hal/i2c/I2c.h" namespace tt::hal::i2c { diff --git a/TactilityHeadless/Source/hal/usb/Usb.cpp b/TactilityHeadless/Source/hal/usb/Usb.cpp index 96df5e35..389ed075 100644 --- a/TactilityHeadless/Source/hal/usb/Usb.cpp +++ b/TactilityHeadless/Source/hal/usb/Usb.cpp @@ -1,10 +1,11 @@ #ifdef ESP_PLATFORM -#include -#include "Usb.h" -#include "UsbTusb.h" -#include "TactilityHeadless.h" -#include "hal/SpiSdCard.h" +#include "Tactility/hal/usb/Usb.h" +#include "Tactility/hal/usb/UsbTusb.h" +#include "Tactility/hal/SpiSdCard.h" +#include "Tactility/TactilityHeadless.h" + +#include namespace tt::hal::usb { diff --git a/TactilityHeadless/Source/hal/usb/UsbMock.cpp b/TactilityHeadless/Source/hal/usb/UsbMock.cpp index 94f881b8..cb623d0b 100644 --- a/TactilityHeadless/Source/hal/usb/UsbMock.cpp +++ b/TactilityHeadless/Source/hal/usb/UsbMock.cpp @@ -1,6 +1,6 @@ #ifndef ESP_PLATFORM -#include "Usb.h" +#include "Tactility/hal/usb/Usb.h" #define TAG "usb" diff --git a/TactilityHeadless/Source/hal/usb/UsbTusb.cpp b/TactilityHeadless/Source/hal/usb/UsbTusb.cpp index def1c6d5..6c725eeb 100644 --- a/TactilityHeadless/Source/hal/usb/UsbTusb.cpp +++ b/TactilityHeadless/Source/hal/usb/UsbTusb.cpp @@ -1,13 +1,14 @@ #ifdef ESP_PLATFORM -#include "UsbTusb.h" -#include "sdkconfig.h" +#include "Tactility/hal/usb/UsbTusb.h" + +#include #if CONFIG_TINYUSB_MSC_ENABLED == 1 -#include "Log.h" -#include "tinyusb.h" -#include "tusb_msc_storage.h" +#include +#include +#include #define TAG "usb" #define EPNUM_MSC 1 diff --git a/TactilityHeadless/Source/kernel/SystemEvents.cpp b/TactilityHeadless/Source/kernel/SystemEvents.cpp index 8a6a185b..f3e82d19 100644 --- a/TactilityHeadless/Source/kernel/SystemEvents.cpp +++ b/TactilityHeadless/Source/kernel/SystemEvents.cpp @@ -1,6 +1,8 @@ -#include "SystemEvents.h" -#include "Mutex.h" -#include "CoreExtraDefines.h" +#include "Tactility/kernel/SystemEvents.h" + +#include +#include + #include #define TAG "system_event" diff --git a/TactilityHeadless/Source/network/Ntp.cpp b/TactilityHeadless/Source/network/Ntp.cpp index d102f69b..3ee252a7 100644 --- a/TactilityHeadless/Source/network/Ntp.cpp +++ b/TactilityHeadless/Source/network/Ntp.cpp @@ -1,8 +1,8 @@ -#include "network/NtpPrivate.h" +#include "Tactility/network/NtpPrivate.h" #ifdef ESP_PLATFORM -#include "kernel/SystemEvents.h" -#include "TactilityCore.h" +#include +#include #include #include #endif diff --git a/TactilityHeadless/Source/service/ServiceInstance.cpp b/TactilityHeadless/Source/service/ServiceInstance.cpp index 08ebbe6d..8ecb1768 100644 --- a/TactilityHeadless/Source/service/ServiceInstance.cpp +++ b/TactilityHeadless/Source/service/ServiceInstance.cpp @@ -1,5 +1,5 @@ -#include "service/ServiceInstance.h" -#include "service/ServiceInstancePaths.h" +#include "Tactility/service/ServiceInstance.h" +#include "Tactility/service/ServiceInstancePaths.h" namespace tt::service { diff --git a/TactilityHeadless/Source/service/ServiceInstancePaths.cpp b/TactilityHeadless/Source/service/ServiceInstancePaths.cpp index f575ed32..8fe7c9c3 100644 --- a/TactilityHeadless/Source/service/ServiceInstancePaths.cpp +++ b/TactilityHeadless/Source/service/ServiceInstancePaths.cpp @@ -1,5 +1,6 @@ -#include "service/ServiceInstancePaths.h" -#include "Partitions.h" +#include "Tactility/service/ServiceInstancePaths.h" + +#include "Tactility/Partitions.h" #define LVGL_PATH_PREFIX std::string("A:/") #ifdef ESP_PLATFORM diff --git a/TactilityHeadless/Source/service/ServiceRegistry.cpp b/TactilityHeadless/Source/service/ServiceRegistry.cpp index 0e613630..57ef8e2e 100644 --- a/TactilityHeadless/Source/service/ServiceRegistry.cpp +++ b/TactilityHeadless/Source/service/ServiceRegistry.cpp @@ -1,8 +1,10 @@ -#include "ServiceRegistry.h" +#include "Tactility/service/ServiceRegistry.h" + +#include "Tactility/service/ServiceInstance.h" +#include "Tactility/service/ServiceManifest.h" + +#include -#include "Mutex.h" -#include "service/ServiceInstance.h" -#include "service/ServiceManifest.h" #include #include diff --git a/TactilityHeadless/Source/service/sdcard/Sdcard.cpp b/TactilityHeadless/Source/service/sdcard/Sdcard.cpp index 26a34ce0..fa15b9d0 100644 --- a/TactilityHeadless/Source/service/sdcard/Sdcard.cpp +++ b/TactilityHeadless/Source/service/sdcard/Sdcard.cpp @@ -1,9 +1,9 @@ -#include "Mutex.h" -#include "Timer.h" +#include "Tactility/service/ServiceContext.h" +#include "Tactility/TactilityHeadless.h" +#include "Tactility/service/ServiceRegistry.h" -#include "service/ServiceContext.h" -#include "TactilityHeadless.h" -#include "service/ServiceRegistry.h" +#include +#include #define TAG "sdcard_service" diff --git a/TactilityHeadless/Source/service/wifi/Wifi.cpp b/TactilityHeadless/Source/service/wifi/Wifi.cpp index 74989bfc..b14ce3bf 100644 --- a/TactilityHeadless/Source/service/wifi/Wifi.cpp +++ b/TactilityHeadless/Source/service/wifi/Wifi.cpp @@ -1,4 +1,4 @@ -#include "./Wifi.h" +#include "Tactility/service/wifi/Wifi.h" namespace tt::service::wifi { diff --git a/TactilityHeadless/Source/service/wifi/WifiEsp.cpp b/TactilityHeadless/Source/service/wifi/WifiEsp.cpp index ff209156..f350f16c 100644 --- a/TactilityHeadless/Source/service/wifi/WifiEsp.cpp +++ b/TactilityHeadless/Source/service/wifi/WifiEsp.cpp @@ -1,13 +1,14 @@ #ifdef ESP_PLATFORM -#include "Wifi.h" +#include "Tactility/service/wifi/Wifi.h" -#include "TactilityHeadless.h" -#include "Timer.h" -#include "service/ServiceContext.h" -#include "WifiSettings.h" +#include "Tactility/TactilityHeadless.h" +#include "Tactility/service/ServiceContext.h" +#include "Tactility/service/wifi/WifiSettings.h" -#include "freertos/FreeRTOS.h" +#include + +#include #include #include diff --git a/TactilityHeadless/Source/service/wifi/WifiMock.cpp b/TactilityHeadless/Source/service/wifi/WifiMock.cpp index 60badbf0..af84a9e2 100644 --- a/TactilityHeadless/Source/service/wifi/WifiMock.cpp +++ b/TactilityHeadless/Source/service/wifi/WifiMock.cpp @@ -1,13 +1,13 @@ -#include "Wifi.h" +#include "Tactility/service/wifi/Wifi.h" #ifndef ESP_PLATFORM -#include "Check.h" -#include "Log.h" -#include "MessageQueue.h" -#include "Mutex.h" -#include "PubSub.h" -#include "service/ServiceContext.h" +#include "Tactility/service/ServiceContext.h" + +#include +#include +#include +#include namespace tt::service::wifi { diff --git a/TactilityHeadless/Source/service/wifi/WifiSettings.cpp b/TactilityHeadless/Source/service/wifi/WifiSettings.cpp index 48c0b35c..bc8874c9 100644 --- a/TactilityHeadless/Source/service/wifi/WifiSettings.cpp +++ b/TactilityHeadless/Source/service/wifi/WifiSettings.cpp @@ -1,4 +1,4 @@ -#include "Preferences.h" +#include "Tactility/Preferences.h" #define WIFI_PREFERENCES_NAMESPACE "wifi" #define WIFI_PREFERENCES_KEY_ENABLE_ON_BOOT "enable_on_boot" diff --git a/TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp b/TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp index b5ab84ae..eda470df 100644 --- a/TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp +++ b/TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp @@ -1,13 +1,14 @@ #ifdef ESP_PLATFORM -#include "WifiGlobals.h" -#include "WifiSettings.h" -#include +#include "Tactility/service/wifi/WifiGlobals.h" +#include "Tactility/service/wifi/WifiSettings.h" -#include "nvs_flash.h" -#include "Log.h" -#include "crypt/Hash.h" -#include "crypt/Crypt.h" +#include +#include +#include + +#include +#include #define TAG "wifi_settings" #define TT_NVS_NAMESPACE "wifi_settings" // limited by NVS_KEY_NAME_MAX_SIZE diff --git a/TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp b/TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp index 58c7a403..0de215b1 100644 --- a/TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp +++ b/TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp @@ -1,7 +1,6 @@ #ifndef ESP_PLATFORM -#include "WifiSettings.h" -#include "Log.h" +#include "Tactility/service/wifi/WifiSettings.h" namespace tt::service::wifi::settings { diff --git a/TactilityHeadless/Source/time/Time.cpp b/TactilityHeadless/Source/time/Time.cpp index 531249e7..978a323c 100644 --- a/TactilityHeadless/Source/time/Time.cpp +++ b/TactilityHeadless/Source/time/Time.cpp @@ -1,7 +1,10 @@ +#include "Tactility/time/Time.h" +#include "Tactility/kernel/SystemEvents.h" + +#ifdef ESP_PLATFORM #include -#include "Time.h" -#include "Preferences.h" -#include "kernel/SystemEvents.h" +#include "Tactility/Preferences.h" +#endif namespace tt::time { diff --git a/Tests/TactilityCore/BundleTest.cpp b/Tests/TactilityCore/BundleTest.cpp index e0eeae61..99f1fe6e 100644 --- a/Tests/TactilityCore/BundleTest.cpp +++ b/Tests/TactilityCore/BundleTest.cpp @@ -1,5 +1,5 @@ #include "doctest.h" -#include "Bundle.h" +#include using namespace tt; diff --git a/Tests/TactilityCore/DispatcherTest.cpp b/Tests/TactilityCore/DispatcherTest.cpp index e238041f..ad5711a9 100644 --- a/Tests/TactilityCore/DispatcherTest.cpp +++ b/Tests/TactilityCore/DispatcherTest.cpp @@ -1,6 +1,6 @@ #include "doctest.h" -#include "TactilityCore.h" -#include "Dispatcher.h" +#include +#include using namespace tt; diff --git a/Tests/TactilityCore/LockableTest.cpp b/Tests/TactilityCore/LockableTest.cpp index dd39f57e..8cd7fbe3 100644 --- a/Tests/TactilityCore/LockableTest.cpp +++ b/Tests/TactilityCore/LockableTest.cpp @@ -1,7 +1,7 @@ -#include "Lockable.h" -#include "Semaphore.h" #include "doctest.h" -#include +#include +#include +#include using namespace tt; diff --git a/Tests/TactilityCore/MessageQueueTest.cpp b/Tests/TactilityCore/MessageQueueTest.cpp index f1452166..5972fbab 100644 --- a/Tests/TactilityCore/MessageQueueTest.cpp +++ b/Tests/TactilityCore/MessageQueueTest.cpp @@ -1,5 +1,5 @@ #include "doctest.h" -#include "MessageQueue.h" +#include using namespace tt; diff --git a/Tests/TactilityCore/MutexTest.cpp b/Tests/TactilityCore/MutexTest.cpp index 2c01eefb..d53a6aef 100644 --- a/Tests/TactilityCore/MutexTest.cpp +++ b/Tests/TactilityCore/MutexTest.cpp @@ -1,6 +1,6 @@ #include "doctest.h" -#include "TactilityCore.h" -#include "Mutex.h" +#include +#include using namespace tt; diff --git a/Tests/TactilityCore/SemaphoreTest.cpp b/Tests/TactilityCore/SemaphoreTest.cpp index f6e42bac..4b000675 100644 --- a/Tests/TactilityCore/SemaphoreTest.cpp +++ b/Tests/TactilityCore/SemaphoreTest.cpp @@ -1,5 +1,5 @@ #include "doctest.h" -#include "Semaphore.h" +#include using namespace tt; diff --git a/Tests/TactilityCore/StringTest.cpp b/Tests/TactilityCore/StringTest.cpp index d27a7b79..530e3053 100644 --- a/Tests/TactilityCore/StringTest.cpp +++ b/Tests/TactilityCore/StringTest.cpp @@ -1,5 +1,5 @@ #include "doctest.h" -#include "StringUtils.h" +#include // region split diff --git a/Tests/TactilityCore/ThreadTest.cpp b/Tests/TactilityCore/ThreadTest.cpp index 7ec7cb84..215c00fa 100644 --- a/Tests/TactilityCore/ThreadTest.cpp +++ b/Tests/TactilityCore/ThreadTest.cpp @@ -1,6 +1,6 @@ #include "doctest.h" -#include "TactilityCore.h" -#include "Thread.h" +#include +#include using namespace tt; diff --git a/Tests/TactilityCore/TimerTest.cpp b/Tests/TactilityCore/TimerTest.cpp index 95df2af7..44ee3f47 100644 --- a/Tests/TactilityCore/TimerTest.cpp +++ b/Tests/TactilityCore/TimerTest.cpp @@ -1,6 +1,6 @@ #include "doctest.h" -#include "TactilityCore.h" -#include "Timer.h" +#include +#include #include