| 2022-12-22 | v1.0 | impressionyang | 内容
+ *
+ */
+#include "app_task_display.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_err.h"
+#include "esp_log.h"
+#include "st7789.h"
+#include "CST816T.h"
+
+TFT_t dev;
+
+TickType_t FillTest(TFT_t* dev, int width, int height)
+{
+ TickType_t startTick, endTick, diffTick;
+ startTick = xTaskGetTickCount();
+
+ lcdFillScreen(dev, RED);
+ vTaskDelay(50);
+ lcdFillScreen(dev, GREEN);
+ vTaskDelay(50);
+ lcdFillScreen(dev, BLUE);
+ vTaskDelay(50);
+
+ endTick = xTaskGetTickCount();
+ diffTick = endTick - startTick;
+ ESP_LOGI(__FUNCTION__, "elapsed time[ms]:%d", diffTick * portTICK_PERIOD_MS);
+ return diffTick;
+}
+
+void cst_scan_gesture()
+{
+ int index = 0;
+ while (1) {
+ vTaskDelay(1);
+ if (index++ == 500) {
+ index = 0;
+ lcdBacklightOff(&dev);
+ }
+ if (cst816t_available()) {
+ /*printf("gesture.id %u \n", data.gestureID);
+ printf("points %u \n", data.points);
+ printf("event %u \n", data.event);*/
+ printf("x %i \n", data.x);
+ printf("y %i \n", data.y);
+ lcdBacklightOn(&dev);
+
+ switch (data.gestureID) {
+ case NONE:
+ // printf("NONE");
+ break;
+ case SWIPE_DOWN:
+ printf("SWIPE DOWN \n");
+ break;
+ case SWIPE_UP:
+ printf("SWIPE UP \n");
+ break;
+ case SWIPE_LEFT:
+ printf("SWIPE LEFT \n");
+ break;
+ case SWIPE_RIGHT:
+ printf("SWIPE RIGHT \n");
+ break;
+ case SINGLE_CLICK:
+ printf("SINGLE CLICK \n");
+ break;
+ case DOUBLE_CLICK:
+ printf("DOUBLE CLICK \n");
+ break;
+ case LONG_PRESS:
+ printf("LONG PRESS \n");
+ break;
+ default:
+ printf("UNKNOWN \n");
+ break;
+ }
+ }
+ }
+}
+
+static void _display_thread_entry()
+{
+ while (1) {
+ FillTest(&dev, CONFIG_WIDTH, CONFIG_HEIGHT);
+ vTaskDelay(500);
+ }
+}
+
+uint8_t app_task_display_start()
+{
+ cst816t_begin(34, 33, 35, 36);
+ xTaskCreatePinnedToCore(cst_scan_gesture, "sct test", 4096, NULL, 4, NULL, tskNO_AFFINITY);
+ spi_master_init(&dev, CONFIG_MOSI_GPIO, CONFIG_SCLK_GPIO, CONFIG_CS_GPIO, CONFIG_DC_GPIO, CONFIG_RESET_GPIO,
+ CONFIG_BL_GPIO);
+ // lcdBacklightOn(&dev);
+ // vTaskDelay(1000);
+ lcdInit(&dev, CONFIG_WIDTH, CONFIG_HEIGHT, CONFIG_OFFSETX, CONFIG_OFFSETY);
+ // lcdBacklightOn(&dev);
+ xTaskCreatePinnedToCore(_display_thread_entry, "dsp test", 4096, NULL, 4, NULL, tskNO_AFFINITY);
+
+#if CONFIG_INVERSION
+ // ESP_LOGI(TAG, "Enable Display Inversion");
+ lcdInversionOn(&dev);
+#endif
+
+ return 0;
+}
+
+uint8_t app_task_display_stop()
+{
+ return 0;
+}
diff --git a/main/APP/app_task_display/app_task_display.h b/main/APP/app_task_display/app_task_display.h
new file mode 100644
index 0000000..37337a7
--- /dev/null
+++ b/main/APP/app_task_display/app_task_display.h
@@ -0,0 +1,51 @@
+/**
+ * @file app_hello_task.h
+ * @author impressionyang (impressionyang@outlook.com)
+ * @brief
+ * @version 0.1
+ * @date 2022-09-28
+ * _ _
+ * (_)_ _ ___ _______ ___ ___ (_)__ ___ __ _____ ____ ___ _
+ * / / ' \/ _ \/ __/ -_|_-<(_-
+ * |
| 2022-12-22 | v1.0 | impressionyang | 内容
+ *
+ */
+#ifndef __APP_TASK_DISPLAY_H__
+#define __APP_TASK_DISPLAY_H__
+#include
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *
+ * @brief
+ * @author impressionyang (impressionyang@outlook.com)
+ * @return uint8_t
+ *
+ * @details
+ */
+uint8_t app_task_display_start();
+
+/**
+ *
+ * @brief
+ * @author impressionyang (impressionyang@outlook.com)
+ * @return uint8_t
+ *
+ * @details
+ */
+uint8_t app_task_display_stop();
+
+#ifdef __cplusplus
+}
+#endif
+#endif//__APP_TASK_DISPLAY_H__
\ No newline at end of file
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 985efda..76ae7a0 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -6,6 +6,7 @@ idf_component_register(
SRC_DIRS
"."
"APP/app_task_hello"
+ "APP/app_task_display"
# "APP/app_task_wifi"
# "APP/app_task_mqtt"
# "APP/app_task_sensors"
@@ -20,6 +21,7 @@ idf_component_register(
INCLUDE_DIRS
"."
"APP/app_task_hello"
+ "APP/app_task_display"
# "APP/app_task_wifi"
# "APP/app_task_mqtt"
# "APP/app_task_sensors"
diff --git a/main/app_main.c b/main/app_main.c
index 4d9114b..9b4f564 100644
--- a/main/app_main.c
+++ b/main/app_main.c
@@ -17,16 +17,16 @@
#include "esp_log.h"
#include "app_task_hello.h"
+#include "app_task_display.h"
// #include "app_task_wifi.h"
// #include "app_task_mqtt.h"
// #include "app_task_sensors.h"
-#include "st7789.h"
-#include "CST816T.h"
+
#include "app_main.h"
#include "shell_port.h"
// #include "msg_queue.h"
-static app_main_handle_t sg_app_main_handle = {0};
+static app_main_handle_t sg_app_main_handle = { 0 };
static void _init_esp()
{
@@ -36,71 +36,7 @@ static void _init_esp()
ESP_ERROR_CHECK(nvs_flash_erase());
ret = nvs_flash_init();
}
- ESP_ERROR_CHECK( ret );
-}
-
-TickType_t FillTest(TFT_t * dev, int width, int height) {
- TickType_t startTick, endTick, diffTick;
- startTick = xTaskGetTickCount();
-
- lcdFillScreen(dev, RED);
- vTaskDelay(50);
- lcdFillScreen(dev, GREEN);
- vTaskDelay(50);
- lcdFillScreen(dev, BLUE);
- vTaskDelay(50);
-
- endTick = xTaskGetTickCount();
- diffTick = endTick - startTick;
- ESP_LOGI(__FUNCTION__, "elapsed time[ms]:%d",diffTick*portTICK_PERIOD_MS);
- return diffTick;
-}
-
-void cst_scan_gesture()
-{
- while (1)
- {
- vTaskDelay(1);
- if (cst816t_available())
- {
- /*printf("gesture.id %u \n", data.gestureID);
- printf("points %u \n", data.points);
- printf("event %u \n", data.event);*/
- printf("x %i \n", data.x);
- printf("y %i \n", data.y);
-
- switch (data.gestureID)
- {
- case NONE:
- // printf("NONE");
- break;
- case SWIPE_DOWN:
- printf("SWIPE DOWN \n");
- break;
- case SWIPE_UP:
- printf("SWIPE UP \n");
- break;
- case SWIPE_LEFT:
- printf("SWIPE LEFT \n");
- break;
- case SWIPE_RIGHT:
- printf("SWIPE RIGHT \n");
- break;
- case SINGLE_CLICK:
- printf("SINGLE CLICK \n");
- break;
- case DOUBLE_CLICK:
- printf("DOUBLE CLICK \n");
- break;
- case LONG_PRESS:
- printf("LONG PRESS \n");
- break;
- default:
- printf("UNKNOWN \n");
- break;
- }
- }
- }
+ ESP_ERROR_CHECK(ret);
}
void app_main(void)
@@ -112,6 +48,7 @@ void app_main(void)
vTaskDelay(10);
_init_esp();
+ app_task_display_start();
// app_hello_task_start();
// app_task_wifi_start();
// app_task_mqtt_start();
@@ -119,36 +56,16 @@ void app_main(void)
userShellInit();
- cst816t_begin(34, 33, 35, 36);
-
- xTaskCreatePinnedToCore(cst_scan_gesture, "sct test", 4096, NULL, 4, NULL, tskNO_AFFINITY);
-
-
- TFT_t dev;
- spi_master_init(&dev, CONFIG_MOSI_GPIO, CONFIG_SCLK_GPIO, CONFIG_CS_GPIO, CONFIG_DC_GPIO, CONFIG_RESET_GPIO, CONFIG_BL_GPIO);
- // lcdBacklightOn(&dev);
- // vTaskDelay(1000);
- lcdInit(&dev, CONFIG_WIDTH, CONFIG_HEIGHT, CONFIG_OFFSETX, CONFIG_OFFSETY);
- // lcdBacklightOn(&dev);
-
-#if CONFIG_INVERSION
- // ESP_LOGI(TAG, "Enable Display Inversion");
- lcdInversionOn(&dev);
-#endif
-
/* Print chip information */
esp_chip_info_t chip_info;
esp_chip_info(&chip_info);
- printf("This is %s chip with %d CPU core(s), WiFi%s%s, ",
- CONFIG_IDF_TARGET,
- chip_info.cores,
- (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
- (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
+ printf("This is %s chip with %d CPU core(s), WiFi%s%s, ", CONFIG_IDF_TARGET, chip_info.cores,
+ (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
printf("silicon revision %d, ", chip_info.revision);
printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024),
- (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
+ (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size());
@@ -156,15 +73,12 @@ void app_main(void)
// printf("ret = %d\r\n", ret);
// msg_data_t msg_data = {0};
- for (int i = 10; ; ) {
+ for (int i = 10;;) {
// printf("Restarting in %d seconds...\n", i);
// app_task_wifi_get_info(&wifi_info);
// sg_app_main_handle.have_network = wifi_info.is_wifi_conneted;
- FillTest(&dev, CONFIG_WIDTH, CONFIG_HEIGHT);
+ // FillTest(&dev, CONFIG_WIDTH, CONFIG_HEIGHT);
vTaskDelay(5000 / portTICK_PERIOD_MS);
- // if (!msg_queue_recive_msg("mqtt_task", &msg_data, 100)) {
- // printf("msg queue get data = %d\r\n", msg_data.msg_type);
- // }
}
printf("Restarting now.\n");
fflush(stdout);
@@ -176,17 +90,17 @@ uint8_t app_main_handle_get_nework_state()
return sg_app_main_handle.have_network;
}
-static void _show_build_time(int argc, char **argv)
+static void _show_build_time(int argc, char** argv)
{
printf("build at %s %s\n", __DATE__, __TIME__);
}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), show_build_time, _show_build_time, show the build time);
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), show_build_time, _show_build_time,
+ show the build time);
-static void _reboot(int argc, char **argv)
+static void _reboot(int argc, char** argv)
{
esp_restart();
}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), reboot, _reboot, reboot system);
-
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0) | SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN), reboot, _reboot, reboot system);
diff --git a/main/drivers/st7789/st7789.c b/main/drivers/st7789/st7789.c
index c5cad27..40d9f57 100644
--- a/main/drivers/st7789/st7789.c
+++ b/main/drivers/st7789/st7789.c
@@ -1090,6 +1090,7 @@ void lcdUnsetFontUnderLine(TFT_t * dev) {
void lcdBacklightOff(TFT_t * dev) {
if(dev->_bl >= 0) {
gpio_set_level( dev->_bl, 0 );
+ printf("%s\r\n", __func__);
}
}
diff --git a/sdkconfig.old b/sdkconfig.old
index ba31434..d676400 100644
--- a/sdkconfig.old
+++ b/sdkconfig.old
@@ -149,7 +149,7 @@ CONFIG_GPIO_RANGE_MAX=46
CONFIG_WIDTH=240
CONFIG_HEIGHT=280
CONFIG_OFFSETX=0
-CONFIG_OFFSETY=0
+CONFIG_OFFSETY=20
CONFIG_MOSI_GPIO=11
CONFIG_SCLK_GPIO=12
CONFIG_CS_GPIO=-1
|