From 3c0b0cdbb1097cd0a105a8eab9b8c1867c613afa Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Wed, 26 Oct 2022 17:30:02 +0200 Subject: [PATCH] Fixed everything --- components/TFT_eSPI | 2 +- configs/sdkconfig_comred_new | 1 + configs/sdkconfig_testdevice2 | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/TFT_eSPI b/components/TFT_eSPI index 4dacb61..39dd567 160000 --- a/components/TFT_eSPI +++ b/components/TFT_eSPI @@ -1 +1 @@ -Subproject commit 4dacb617bec71ef793b14b69629b2214e06bea28 +Subproject commit 39dd567a9ed2de0ef8f655d7b23cbccc15666320 diff --git a/configs/sdkconfig_comred_new b/configs/sdkconfig_comred_new index 571a106..ee90172 100644 --- a/configs/sdkconfig_comred_new +++ b/configs/sdkconfig_comred_new @@ -1774,6 +1774,7 @@ CONFIG_TFT_LOAD_FONT7=y CONFIG_TFT_LOAD_FONT8=y CONFIG_TFT_LOAD_GFXFF=y CONFIG_TFT_SMOOTH_FONT=y +# CONFIG_TFT_IS_AUTOBAHN is not set # end of Fonts # diff --git a/configs/sdkconfig_testdevice2 b/configs/sdkconfig_testdevice2 index 24b653a..4d84b15 100644 --- a/configs/sdkconfig_testdevice2 +++ b/configs/sdkconfig_testdevice2 @@ -180,6 +180,7 @@ CONFIG_SOC_WIFI_WAPI_SUPPORT=y CONFIG_SOC_WIFI_CSI_SUPPORT=y CONFIG_SOC_WIFI_MESH_SUPPORT=y CONFIG_SOC_BLE_SUPPORTED=y +CONFIG_SOC_BLE_MESH_SUPPORTED=y CONFIG_SOC_BT_CLASSIC_SUPPORTED=y CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y @@ -665,6 +666,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # MCPWM Configuration # # CONFIG_MCPWM_ISR_IRAM_SAFE is not set +# CONFIG_MCPWM_CTRL_FUNC_IN_IRAM is not set # CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set # CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set # end of MCPWM Configuration @@ -1773,6 +1775,7 @@ CONFIG_TFT_LOAD_FONT7=y CONFIG_TFT_LOAD_FONT8=y CONFIG_TFT_LOAD_GFXFF=y CONFIG_TFT_SMOOTH_FONT=y +# CONFIG_TFT_IS_AUTOBAHN is not set # end of Fonts #