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,5 +1,5 @@
|
||||
#include "TactilityCore.h"
|
||||
#include "hal/TdeckDisplayConstants.h"
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <driver/spi_common.h>
|
||||
#include <soc/gpio_num.h>
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <hal/Configuration.h>
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
extern const tt::hal::Configuration lilygo_tdeck;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <driver/gpio.h>
|
||||
#include "TactilityCore.h"
|
||||
#include <Tactility/TactilityCore.h>
|
||||
|
||||
#define TAG "tdeck"
|
||||
|
||||
|
||||
@@ -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/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 <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>
|
||||
|
||||
#define TAG "tdeck_display"
|
||||
|
||||
|
||||
@@ -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,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"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Keyboard.h"
|
||||
#include <TactilityCore.h>
|
||||
#include "esp_lcd_panel_io_interface.h"
|
||||
#include "esp_lcd_touch.h"
|
||||
#include <Tactility/hal/Keyboard.h>
|
||||
#include <Tactility/TactilityCore.h>
|
||||
#include <esp_lcd_panel_io_interface.h>
|
||||
#include <esp_lcd_touch.h>
|
||||
|
||||
class TdeckKeyboard : public tt::hal::Keyboard {
|
||||
private:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include "TdeckPower.h"
|
||||
|
||||
#include "Log.h"
|
||||
#include "CoreDefines.h"
|
||||
#include <Tactility/Log.h>
|
||||
|
||||
#define TAG "power"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/Power.h"
|
||||
#include <Tactility/hal/Power.h>
|
||||
#include <esp_adc/adc_oneshot.h>
|
||||
#include <memory>
|
||||
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
#include "TdeckSdCard.h"
|
||||
|
||||
#include "lvgl/LvglSync.h"
|
||||
#include "hal/SpiSdCard.h"
|
||||
#include <Tactility/lvgl/LvglSync.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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "hal/SdCard.h"
|
||||
#include <Tactility/hal/SdCard.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
|
||||
@@ -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 <esp_err.h>
|
||||
#include <esp_lcd_touch_gt911.h>
|
||||
#include <Tactility/Log.h>
|
||||
#include <esp_lvgl_port.h>
|
||||
|
||||
#define TAG "tdeck_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 TdeckTouch : public tt::hal::Touch {
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user