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,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