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`)
This commit is contained in:
committed by
GitHub
parent
7856827ecf
commit
c87200a80d
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <hal/Configuration.h>
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
extern const tt::hal::Configuration unPhone;
|
||||
|
||||
@@ -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 <Tactility/Log.h>
|
||||
#include <Tactility/kernel/Kernel.h>
|
||||
#include <Tactility/service/loader/Loader.h>
|
||||
#include <driver/gpio.h>
|
||||
#include <driver/rtc_io.h>
|
||||
#include <esp_sleep.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>
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "Bq24295.h"
|
||||
#include "Log.h"
|
||||
#include <Tactility/Log.h>
|
||||
|
||||
#define TAG "bq24295"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/i2c/I2cDevice.h"
|
||||
#include <Tactility/hal/i2c/I2cDevice.h>
|
||||
|
||||
#define BQ24295_ADDRESS 0x6BU
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <esp_lcd_types.h>
|
||||
#include "lvgl.h"
|
||||
#include "hal/Display.h"
|
||||
#include <lvgl.h>
|
||||
#include <Tactility/hal/Display.h>
|
||||
|
||||
extern lv_disp_t* displayHandle;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "UnPhonePower.h"
|
||||
#include "UnPhoneTouch.h"
|
||||
#include "Log.h"
|
||||
#include <Tactility/Log.h>
|
||||
|
||||
#define TAG "unphone_power"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Power.h"
|
||||
#include <Tactility/hal/Power.h>
|
||||
#include <memory>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "UnPhoneSdCard.h"
|
||||
|
||||
#include "lvgl/LvglSync.h"
|
||||
#include "hal/SpiSdCard.h"
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <Tactility/hal/SpiSdCard.h>
|
||||
|
||||
#include <esp_vfs_fat.h>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/SdCard.h"
|
||||
#include <Tactility/hal/SdCard.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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 <Tactility/hal/Touch.h>
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <esp_lcd_panel_io_interface.h>
|
||||
#include <esp_lcd_touch.h>
|
||||
|
||||
class UnPhoneTouch : public tt::hal::Touch {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user