Project restructuring (fixes macOS builds) (#198)

- Create `Include/` folder for all main projects
- Fix some issues here and there (found while moving things)
- All includes are now in `Tactility/` subfolder and must be included with that prefix. This fixes issues with clashing POSIX headers (e.g. `<semaphore.h>` versus Tactility's `Semaphore.h`)

.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

App/Source/Boards.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef ESP_PLATFORM
-#include "sdkconfig.h"
+#include <sdkconfig.h>
 
 // Supported hardware:
 #if defined(CONFIG_TT_BOARD_LILYGO_TDECK)

App/Source/HelloWorld/HelloWorld.cpp

@@ -1,6 +1,6 @@
-#include "app/AppManifest.h"
+#include <Tactility/app/AppManifest.h>
-#include "lvgl.h"
+#include <Tactility/lvgl/Toolbar.h>
-#include "lvgl/Toolbar.h"
+#include <lvgl.h>
 
 using namespace tt::app;
 

App/Source/Main.cpp

@@ -1,5 +1,5 @@
 #include "Boards.h"
-#include "Tactility.h"
+#include <Tactility/Tactility.h>
 
 #ifdef ESP_PLATFORM
 #include "tt_init.h"

Boards/CYD-2432S024C/Source/Boot.cpp

@@ -1,6 +1,6 @@
 #include "YellowConfig.h"
-#include "TactilityCore.h"
 #include "hal/YellowTouchConstants.h"
+#include <Tactility/TactilityCore.h>
 #include <driver/spi_common.h>
 
 #define TAG "twodotfour_bootstrap"

Boards/CYD-2432S024C/Source/CYD2432S024C.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Configuration.h"
+#include <Tactility/hal/Configuration.h>
 
 // Capacitive touch version of the 2.4" yellow board
 extern const tt::hal::Configuration cyd_2432S024c_config;

Boards/CYD-2432S024C/Source/Lvgl.cpp

@@ -1,7 +1,7 @@
 #include "esp_lvgl_port.h"
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "Thread.h"
+#include <Tactility/Thread.h>
 
 #define TAG "twodotfour_lvgl"
 

Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp

@@ -1,17 +1,17 @@
 #include "YellowDisplay.h"
 #include "YellowDisplayConstants.h"
 #include "YellowTouch.h"
-#include "Log.h"
 
-#include <TactilityCore.h>
+#include <Tactility/Log.h>
+#include <Tactility/TactilityCore.h>
 #include <esp_lcd_panel_commands.h>
 
-#include "driver/gpio.h"
+#include <driver/gpio.h>
-#include "driver/ledc.h"
+#include <driver/ledc.h>
-#include "esp_err.h"
+#include <esp_err.h>
-#include "esp_lcd_ili9341.h"
+#include <esp_lcd_ili9341.h>
-#include "esp_lcd_panel_ops.h"
+#include <esp_lcd_panel_ops.h>
-#include "esp_lvgl_port.h"
+#include <esp_lvgl_port.h>
 
 #define TAG "yellow_display"
 

Boards/CYD-2432S024C/Source/hal/YellowDisplay.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "lvgl.h"
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 #include "esp_lcd_panel_io.h"
 
 extern lv_disp_t* displayHandle;

Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp

@@ -2,8 +2,8 @@
 
 #define TAG "twodotfour_sdcard"
 
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "hal/SpiSdCard.h"
+#include <Tactility/hal/SpiSdCard.h>
 
 #define SDCARD_SPI_HOST SPI3_HOST
 #define SDCARD_PIN_CS GPIO_NUM_5

Boards/CYD-2432S024C/Source/hal/YellowSdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/CYD-2432S024C/Source/hal/YellowTouch.cpp

@@ -1,6 +1,6 @@
 #include "YellowTouch.h"
 #include "YellowTouchConstants.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 #include "driver/i2c.h"
 #include "esp_err.h"
 #include "esp_lcd_touch_cst816s.h"

Boards/CYD-2432S024C/Source/hal/YellowTouch.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 #include <esp_lcd_touch.h>
 
 class YellowTouch : public tt::hal::Touch {

Boards/LilygoTdeck/Source/InitHardware.cpp

@@ -1,5 +1,5 @@
-#include "TactilityCore.h"
 #include "hal/TdeckDisplayConstants.h"
+#include <Tactility/TactilityCore.h>
 #include <driver/spi_common.h>
 #include <soc/gpio_num.h>
 

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 <Tactility/hal/Configuration.h>
+
 bool tdeck_init_power();
 bool tdeck_init_hardware();
 bool tdeck_init_lvgl();

Boards/LilygoTdeck/Source/LilygoTdeck.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <hal/Configuration.h>
+#include <Tactility/hal/Configuration.h>
 
 extern const tt::hal::Configuration lilygo_tdeck;

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 <Tactility/Log.h>
+#include <Tactility/Thread.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+#include <esp_lvgl_port.h>
+
 #define TAG "tdeck_lvgl"
 
 // LVGL

Boards/LilygoTdeck/Source/PowerOn.cpp

@@ -1,5 +1,5 @@
 #include <driver/gpio.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 
 #define TAG "tdeck"
 

Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp

@@ -1,17 +1,17 @@
 #include "TdeckDisplay.h"
 #include "TdeckDisplayConstants.h"
 #include "TdeckTouch.h"
-#include "Log.h"
 
-#include <TactilityCore.h>
+#include <Tactility/Log.h>
+#include <Tactility/TactilityCore.h>
+
 #include <esp_lcd_panel_commands.h>
-
+#include <driver/ledc.h>
-#include "driver/ledc.h"
+#include <driver/spi_master.h>
-#include "driver/spi_master.h"
+#include <esp_err.h>
-#include "esp_err.h"
+#include <esp_lcd_panel_ops.h>
-#include "esp_lcd_panel_ops.h"
+#include <esp_lcd_panel_vendor.h>
-#include "esp_lcd_panel_vendor.h"
+#include <esp_lvgl_port.h>
-#include "esp_lvgl_port.h"
 
 #define TAG "tdeck_display"
 

Boards/LilygoTdeck/Source/hal/TdeckDisplay.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <esp_lcd_types.h>
-#include "lvgl.h"
+#include <lvgl.h>
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 
 extern lv_disp_t* displayHandle;
 

Boards/LilygoTdeck/Source/hal/TdeckKeyboard.cpp

@@ -1,5 +1,5 @@
 #include "TdeckKeyboard.h"
-#include "hal/i2c/I2c.h"
+#include <Tactility/hal/i2c/I2c.h>
 #include <driver/i2c.h>
 
 #define TAG "tdeck_keyboard"

Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "hal/Keyboard.h"
+#include <Tactility/hal/Keyboard.h>
-#include <TactilityCore.h>
+#include <Tactility/TactilityCore.h>
-#include "esp_lcd_panel_io_interface.h"
+#include <esp_lcd_panel_io_interface.h>
-#include "esp_lcd_touch.h"
+#include <esp_lcd_touch.h>
 
 class TdeckKeyboard : public tt::hal::Keyboard {
 private:

Boards/LilygoTdeck/Source/hal/TdeckPower.cpp

@@ -1,7 +1,6 @@
 #include "TdeckPower.h"
 
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "CoreDefines.h"
 
 #define TAG "power"
 

Boards/LilygoTdeck/Source/hal/TdeckPower.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Power.h"
+#include <Tactility/hal/Power.h>
 #include <esp_adc/adc_oneshot.h>
 #include <memory>
 

Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp

@@ -1,10 +1,9 @@
 #include "TdeckSdCard.h"
 
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "hal/SpiSdCard.h"
+#include <Tactility/hal/SpiSdCard.h>
 
 #include <esp_vfs_fat.h>
-#include <sdmmc_cmd.h>
 
 #define TDECK_SDCARD_PIN_CS GPIO_NUM_39
 #define TDECK_LCD_PIN_CS GPIO_NUM_12

Boards/LilygoTdeck/Source/hal/TdeckSdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/LilygoTdeck/Source/hal/TdeckTouch.cpp

@@ -1,9 +1,9 @@
 #include "TdeckTouch.h"
 
-#include "esp_err.h"
+#include <esp_err.h>
-#include "esp_lcd_touch_gt911.h"
+#include <esp_lcd_touch_gt911.h>
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "esp_lvgl_port.h"
+#include <esp_lvgl_port.h>
 
 #define TAG "tdeck_touch"
 

Boards/LilygoTdeck/Source/hal/TdeckTouch.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
-#include "esp_lcd_panel_io_interface.h"
+#include <esp_lcd_panel_io_interface.h>
-#include "esp_lcd_touch.h"
+#include <esp_lcd_touch.h>
 
 class TdeckTouch : public tt::hal::Touch {
 private:

Boards/M5stackCore2/Source/InitBoot.cpp

@@ -1,11 +1,13 @@
+#include "hal/Core2DisplayConstants.h"
+#include "axp192/axp192.h"
+
+#include <Tactility/Log.h>
+#include <Tactility/hal/i2c/I2c.h>
+#include <Tactility/CoreDefines.h>
+
 #include <driver/i2c.h>
 #include <driver/spi_master.h>
 #include <esp_intr_types.h>
-#include "Log.h"
-#include "hal/Core2DisplayConstants.h"
-#include "axp192/axp192.h"
-#include "hal/i2c/I2c.h"
-#include "CoreDefines.h"
 
 #define TAG "core2"
 

Boards/M5stackCore2/Source/InitLvgl.cpp

@@ -1,6 +1,6 @@
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "Thread.h"
+#include <Tactility/Thread.h>
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
 #include "esp_lvgl_port.h"
 
 #define TAG "core2"

Boards/M5stackCore2/Source/M5stackCore2.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "hal/Configuration.h"
+#include <Tactility/hal/Configuration.h>
 
 extern const tt::hal::Configuration m5stack_core2;

Boards/M5stackCore2/Source/hal/Core2Display.cpp

@@ -1,17 +1,15 @@
 #include "Core2Display.h"
 #include "Core2DisplayConstants.h"
-#include "Log.h"
-
-#include <TactilityCore.h>
-#include <esp_lcd_panel_commands.h>
-
-#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 <driver/gpio.h>
+#include <esp_lcd_panel_commands.h>
+#include <esp_err.h>
+#include <esp_lcd_ili9341.h>
+#include <esp_lcd_panel_ops.h>
+#include <esp_lvgl_port.h>
+#include <Tactility/Log.h>
+
 #define TAG "core2_display"
 
 bool Core2Display::start() {

Boards/M5stackCore2/Source/hal/Core2Display.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "lvgl.h"
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 
 #include <esp_lcd_types.h>
 

Boards/M5stackCore2/Source/hal/Core2Power.cpp

@@ -1,5 +1,5 @@
 #include "Core2Power.h"
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 #include "axp192/axp192.h"
 
 #define TAG "core2_power"

Boards/M5stackCore2/Source/hal/Core2Power.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Power.h"
+#include <Tactility/hal/Power.h>
 #include <memory>
 
 using namespace tt::hal;

Boards/M5stackCore2/Source/hal/Core2SdCard.cpp

@@ -1,7 +1,7 @@
 #include "Core2SdCard.h"
 
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "hal/SpiSdCard.h"
+#include <Tactility/hal/SpiSdCard.h>
 
 #include <esp_vfs_fat.h>
 

Boards/M5stackCore2/Source/hal/Core2SdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/M5stackCore2/Source/hal/Core2Touch.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 #include "ft6x36/FT6X36.h"
 
 class Core2Touch : public tt::hal::Touch {

Boards/M5stackCoreS3/Source/Aw9523/Aw9523.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/i2c/I2cDevice.h"
+#include <Tactility/hal/i2c/I2cDevice.h>
 
 #define AW9523_ADDRESS 0x58
 

Boards/M5stackCoreS3/Source/Axp2101/Axp2101.cpp

@@ -1,5 +1,5 @@
 #include "Axp2101.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 
 bool Axp2101::getBatteryVoltage(float& vbatMillis) const {
     return readRegister14(0x34, vbatMillis);

Boards/M5stackCoreS3/Source/Axp2101/Axp2101.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/i2c/I2cDevice.h"
+#include <Tactility/hal/i2c/I2cDevice.h>
 
 #define AXP2101_ADDRESS 0x34
 

Boards/M5stackCoreS3/Source/InitBoot.cpp

@@ -1,11 +1,12 @@
+#include "hal/CoreS3DisplayConstants.h"
+#include "Axp2101/Axp2101.h"
+#include "Aw9523/Aw9523.h"
+
+#include <Tactility/Log.h>
+#include <Tactility/kernel/Kernel.h>
 #include <driver/i2c.h>
 #include <driver/spi_master.h>
 #include <esp_intr_types.h>
-#include "Log.h"
-#include "hal/CoreS3DisplayConstants.h"
-#include "kernel/Kernel.h"
-#include "Axp2101/Axp2101.h"
-#include "Aw9523/Aw9523.h"
 
 #define TAG "core2"
 

Boards/M5stackCoreS3/Source/InitLvgl.cpp

@@ -1,7 +1,7 @@
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "Thread.h"
+#include <Tactility/Thread.h>
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "esp_lvgl_port.h"
+#include <esp_lvgl_port.h>
 
 #define TAG "core2"
 

Boards/M5stackCoreS3/Source/M5stackCoreS3.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include "hal/Configuration.h"
+#include <Tactility/hal/Configuration.h>
 
 extern const tt::hal::Configuration m5stack_cores3;

Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp

@@ -1,16 +1,15 @@
 #include "CoreS3Display.h"
 #include "CoreS3DisplayConstants.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 
-#include <TactilityCore.h>
+#include <Tactility/hal/i2c/I2c.h>
 #include <esp_lcd_panel_commands.h>
 
-#include "driver/gpio.h"
+#include <driver/gpio.h>
-#include "esp_err.h"
+#include <esp_err.h>
-#include "esp_lcd_ili9341.h"
+#include <esp_lcd_ili9341.h>
-#include "esp_lcd_panel_ops.h"
+#include <esp_lcd_panel_ops.h>
-#include "esp_lvgl_port.h"
+#include <esp_lvgl_port.h>
-#include "hal/i2c/I2c.h"
 #include "CoreS3Constants.h"
 #include "CoreS3Touch.h"
 

Boards/M5stackCoreS3/Source/hal/CoreS3Display.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "lvgl.h"
+#include <lvgl.h>
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
-
 #include <esp_lcd_types.h>
 
 extern lv_disp_t* displayHandle;

Boards/M5stackCoreS3/Source/hal/CoreS3Power.cpp

@@ -1,5 +1,5 @@
 #include "CoreS3Power.h"
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 
 #define TAG "core2_power"
 

Boards/M5stackCoreS3/Source/hal/CoreS3Power.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "hal/Power.h"
 #include "Axp2101/Axp2101.h"
+
+#include <Tactility/hal/Power.h>
 #include <memory>
 
 using namespace tt::hal;

Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.cpp

@@ -1,7 +1,7 @@
 #include "CoreS3SdCard.h"
 
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "hal/SpiSdCard.h"
+#include <Tactility/hal/SpiSdCard.h>
 
 #include <esp_vfs_fat.h>
 

Boards/M5stackCoreS3/Source/hal/CoreS3SdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/M5stackCoreS3/Source/hal/CoreS3Touch.cpp

@@ -1,5 +1,5 @@
 #include "CoreS3Touch.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 #include "driver/i2c.h"
 #include "esp_err.h"
 #include "esp_lcd_touch_ft5x06.h"

Boards/M5stackCoreS3/Source/hal/CoreS3Touch.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
 #include <esp_lcd_touch.h>
 
 class CoreS3Touch : public tt::hal::Touch {

Boards/Simulator/Source/LvglTask.cpp

@@ -1,11 +1,11 @@
 #include "LvglTask.h"
 
-#include "lvgl.h"
+#include <Tactility/Log.h>
-#include "Log.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "Thread.h"
+#include <Tactility/Mutex.h>
-#include "lvgl/LvglSync.h"
+#include <Tactility/Thread.h>
 
-#include "Mutex.h"
+#include <lvgl.h>
 
 #define TAG "lvgl_task"
 

Boards/Simulator/Source/Main.cpp

@@ -1,6 +1,6 @@
 #include "Main.h"
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
-#include "Thread.h"
+#include <Tactility/Thread.h>
 
 #include "FreeRTOS.h"
 #include "task.h"

Boards/Simulator/Source/Simulator.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "hal/Configuration.h"
 #include "Main.h"
+#include <Tactility/hal/Configuration.h>
 
 namespace simulator {
     /** Set the function pointer of the real app_main() */

Boards/Simulator/Source/hal/Configuration.cpp

@@ -1,5 +1,4 @@
-#include "Tactility.h"
+#include <Tactility/hal/Configuration.h>
-#include "hal/Configuration.h"
 #include "hal/SimulatorPower.h"
 #include "LvglTask.h"
 #include "src/lv_init.h"

Boards/Simulator/Source/hal/SdlDisplay.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "SdlTouch.h"
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 
 extern lv_disp_t* displayHandle;
 

Boards/Simulator/Source/hal/SdlKeyboard.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "hal/Keyboard.h"
+#include <Tactility/hal/Keyboard.h>
-
+#include <Tactility/TactilityCore.h>
-#include <TactilityCore.h>
 
 class SdlKeyboard : public tt::hal::Keyboard {
 private:

Boards/Simulator/Source/hal/SdlTouch.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-
+#include <Tactility/TactilityCore.h>
-#include <TactilityCore.h>
 
 class SdlTouch : public tt::hal::Touch {
 private:

Boards/Simulator/Source/hal/SimulatorPower.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Power.h"
+#include <Tactility/hal/Power.h>
 #include <memory>
 
 using namespace tt::hal;

Boards/Simulator/Source/hal/SimulatorSdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/UnPhone/Source/InitHardware.cpp

@@ -1,6 +1,6 @@
-#include "TactilityCore.h"
 #include "hal/UnPhoneDisplayConstants.h"
 #include "hx8357/disp_spi.h"
+#include <Tactility/TactilityCore.h>
 #include <driver/spi_common.h>
 #include <soc/gpio_num.h>
 #include <lvgl.h>

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 <Tactility/Log.h>
+#include <Tactility/Thread.h>
+#include <Tactility/lvgl/LvglSync.h>
+#include <esp_lvgl_port.h>
+
 #define TAG "unphone_lvgl"
 
 // LVGL

Boards/UnPhone/Source/PowerOn.cpp

@@ -1,6 +1,6 @@
-#include "Preferences.h"
-#include "TactilityCore.h"
 #include "UnPhoneFeatures.h"
+#include <Tactility/Preferences.h>
+#include <Tactility/TactilityCore.h>
 #include <esp_sleep.h>
 
 #define TAG "unphone"

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 <Tactility/hal/Configuration.h>
 
 bool unPhoneInitPower();
 bool unPhoneInitHardware();

Boards/UnPhone/Source/UnPhone.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <hal/Configuration.h>
+#include <Tactility/hal/Configuration.h>
 
 extern const tt::hal::Configuration unPhone;

Boards/UnPhone/Source/UnPhoneFeatures.cpp

@@ -1,8 +1,8 @@
 #include "UnPhoneFeatures.h"
-#include "FreeRTOS-Kernel/include/FreeRTOS.h"
+
-#include "Log.h"
+#include <Tactility/Log.h>
-#include "kernel/Kernel.h"
+#include <Tactility/kernel/Kernel.h>
-#include "service/loader/Loader.h"
+#include <Tactility/service/loader/Loader.h>
 #include <driver/gpio.h>
 #include <driver/rtc_io.h>
 #include <esp_sleep.h>

Boards/UnPhone/Source/UnPhoneFeatures.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Thread.h"
 #include "bq24295/Bq24295.h"
+#include <Tactility/Thread.h>
 #include <esp_io_expander_tca95xx_16bit.h>
 
 /**

Boards/UnPhone/Source/bq24295/Bq24295.cpp

@@ -1,5 +1,5 @@
 #include "Bq24295.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 
 #define TAG "bq24295"
 

Boards/UnPhone/Source/bq24295/Bq24295.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/i2c/I2cDevice.h"
+#include <Tactility/hal/i2c/I2cDevice.h>
 
 #define BQ24295_ADDRESS 0x6BU
 

Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp

@@ -1,9 +1,9 @@
 #include "UnPhoneDisplay.h"
 #include "UnPhoneDisplayConstants.h"
 #include "UnPhoneTouch.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 
-#include <TactilityCore.h>
+#include <Tactility/TactilityCore.h>
 
 #include "UnPhoneFeatures.h"
 #include "esp_err.h"

Boards/UnPhone/Source/hal/UnPhoneDisplay.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <esp_lcd_types.h>
-#include "lvgl.h"
+#include <lvgl.h>
-#include "hal/Display.h"
+#include <Tactility/hal/Display.h>
 
 extern lv_disp_t* displayHandle;
 

Boards/UnPhone/Source/hal/UnPhonePower.cpp

@@ -1,6 +1,6 @@
 #include "UnPhonePower.h"
 #include "UnPhoneTouch.h"
-#include "Log.h"
+#include <Tactility/Log.h>
 
 #define TAG "unphone_power"
 

Boards/UnPhone/Source/hal/UnPhonePower.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/Power.h"
+#include <Tactility/hal/Power.h>
 #include <memory>
 
 using namespace tt::hal;

Boards/UnPhone/Source/hal/UnPhoneSdCard.cpp

@@ -1,7 +1,7 @@
 #include "UnPhoneSdCard.h"
 
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
-#include "hal/SpiSdCard.h"
+#include <Tactility/hal/SpiSdCard.h>
 
 #include <esp_vfs_fat.h>
 

Boards/UnPhone/Source/hal/UnPhoneSdCard.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hal/SdCard.h"
+#include <Tactility/hal/SdCard.h>
 
 using namespace tt::hal;
 

Boards/UnPhone/Source/hal/UnPhoneTouch.cpp

@@ -1,10 +1,10 @@
 #include "UnPhoneTouch.h"
 
-#include "Log.h"
+#include <Tactility/Log.h>
 #include "esp_err.h"
 #include "esp_lcd_touch_xpt2046.h"
 #include "esp_lvgl_port.h"
-#include "lvgl/LvglSync.h"
+#include <Tactility/lvgl/LvglSync.h>
 
 #define TAG "unphone_touch"
 

Boards/UnPhone/Source/hal/UnPhoneTouch.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "hal/Touch.h"
+#include <Tactility/hal/Touch.h>
-#include "TactilityCore.h"
+#include <Tactility/TactilityCore.h>
-#include "esp_lcd_panel_io_interface.h"
+#include <esp_lcd_panel_io_interface.h>
-#include "esp_lcd_touch.h"
+#include <esp_lcd_touch.h>
 
 class UnPhoneTouch : public tt::hal::Touch {
 

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
+cp TactilityC/Include/* $find_target_dir
-find -name '*.h' | cpio -pdm $find_target_dir
 cd -
 cp Documentation/license-tactilitysdk.md $build_dir/$tactility_library_path/LICENSE.md
 

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.

ExternalApps/HelloWorld/main/Source/main.c

@@ -1,5 +1,5 @@
-#include "tt_app_manifest.h"
+#include <tt_app_manifest.h>
-#include "tt_lvgl_toolbar.h"
+#include <tt_lvgl_toolbar.h>
 
 /**
  * Note: LVGL and Tactility methods need to be exposed manually from TactilityC/Source/tt_init.cpp

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()

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*")

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

Tactility/Include/Tactility/Tactility.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "app/AppManifest.h"
+#include "Tactility/app/AppManifest.h"
-#include "hal/Configuration.h"
+
-#include "service/ServiceManifest.h"
+#include <Tactility/hal/Configuration.h>
-#include "TactilityConfig.h"
+#include <Tactility/service/ServiceManifest.h>
+#include <Tactility/TactilityConfig.h>
 
 namespace tt {
 

Tactility/Include/Tactility/TactilityConfig.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef ESP_PLATFORM
-#include "sdkconfig.h"
+#include <sdkconfig.h>
 #endif
 
 #define TT_CONFIG_FORCE_ONSCREEN_KEYBOARD false // for development/debug purposes

Tactility/Include/Tactility/app/App.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "AppContext.h"
+#include "Tactility/app/AppContext.h"
-#include "Bundle.h"
+
-#include <Mutex.h>
+#include <Tactility/Bundle.h>
+#include <Tactility/Mutex.h>
+
 #include <string>
 
 // Forward declarations

Tactility/Include/Tactility/app/AppContext.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Bundle.h"
+#include <Tactility/Bundle.h>
 #include <memory>
 
 namespace tt::app {

Tactility/Include/Tactility/app/AppManifest.h

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "CoreDefines.h"
+#include "Tactility/app/ManifestRegistry.h"
-#include "ManifestRegistry.h"
+
-#include <Bundle.h>
+#include <Tactility/CoreDefines.h>
+#include <Tactility/Bundle.h>
+
 #include <string>
 
 // Forward declarations

Tactility/Include/Tactility/app/alertdialog/AlertDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/files/Files.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "View.h"
+#include "app/files/View.h"
-#include "State.h"
+#include "app/files/State.h"
 #include "app/AppManifest.h"
 
 #include <lvgl.h>

Tactility/Include/Tactility/app/inputdialog/InputDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/selectiondialog/SelectionDialog.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Tactility/Bundle.h>
+
 #include <string>
 #include <vector>
-#include "Bundle.h"
 
 /**
  * Start the app by its ID and provide:

Tactility/Include/Tactility/app/wifimanage/WifiManage.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace tt::app::wifimanage {
+
+void start();
+
+} // namespace