From fae9d30e3ad546faa567c24c46b57c639ebfb003 Mon Sep 17 00:00:00 2001 From: GW_MC <72297530+GWMCwing@users.noreply.github.com> Date: Tue, 20 Jan 2026 20:15:44 +0800 Subject: [PATCH] feat: refactor header files and add info for psram --- main/display/display.h | 8 +++++++- main/info/info.cpp | 17 +++++++++++++++-- main/info/info.h | 9 --------- main/touch/touch.h | 8 +++++++- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/main/display/display.h b/main/display/display.h index 7f3921f..b31efe7 100644 --- a/main/display/display.h +++ b/main/display/display.h @@ -1,4 +1,10 @@ -#include "info/info.h" +#pragma once + +#include +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "esp_system.h" typedef void (*shutdown_display_handlerFunc)(void); typedef void (*restart_display_handlerFunc)(void); diff --git a/main/info/info.cpp b/main/info/info.cpp index 9e52d13..421ae2e 100644 --- a/main/info/info.cpp +++ b/main/info/info.cpp @@ -1,3 +1,12 @@ +#include +#include +#include "sdkconfig.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "esp_chip_info.h" +#include "esp_flash.h" +#include "esp_system.h" +#include "esp_psram.h" #include "info.h" void display_chip_info() { @@ -6,13 +15,15 @@ void display_chip_info() { esp_chip_info_t chip_info; uint32_t flash_size; esp_chip_info(&chip_info); - printf("This is %s chip with %d CPU core(s), %s%s%s%s, ", + printf("This is %s chip with %d CPU core(s), %s%s%s%s%s, ", CONFIG_IDF_TARGET, chip_info.cores, (chip_info.features & CHIP_FEATURE_WIFI_BGN) ? "WiFi/" : "", (chip_info.features & CHIP_FEATURE_BT) ? "BT" : "", (chip_info.features & CHIP_FEATURE_BLE) ? "BLE" : "", - (chip_info.features & CHIP_FEATURE_IEEE802154) ? ", 802.15.4 (Zigbee/Thread)" : ""); + (chip_info.features & CHIP_FEATURE_IEEE802154) ? ", 802.15.4 (Zigbee/Thread), " : "", + // psram + (chip_info.features & CHIP_FEATURE_EMB_PSRAM) ? "with embedded PSRAM, " : ""); unsigned major_rev = chip_info.revision / 100; unsigned minor_rev = chip_info.revision % 100; @@ -26,5 +37,7 @@ void display_chip_info() { (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); printf("Minimum free heap size: %" PRIu32 " bytes\n", esp_get_minimum_free_heap_size()); + // psram + printf("PSRAM size: %u bytes\n", esp_psram_get_size()); } \ No newline at end of file diff --git a/main/info/info.h b/main/info/info.h index 286bd9d..2b324f4 100644 --- a/main/info/info.h +++ b/main/info/info.h @@ -1,10 +1 @@ -#include -#include -#include "sdkconfig.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "esp_chip_info.h" -#include "esp_flash.h" -#include "esp_system.h" - void display_chip_info(); diff --git a/main/touch/touch.h b/main/touch/touch.h index 899c050..a06796c 100644 --- a/main/touch/touch.h +++ b/main/touch/touch.h @@ -1,4 +1,10 @@ -#include "info/info.h" +#pragma once + +#include +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "esp_system.h" class TouchHandler { public: