GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-02 22:40:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add free PSRAM size if any in report

Browse Source
This commit is contained in:
Luc 2020-10-15 14:17:49 +02:00
parent c2d7a22006
commit a700546b8c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
esp3d/configuration.h
View File

@ -157,7 +157,7 @@
//FS_FLASH mount Flash FS //FS_FLASH mount Flash FS
//FS_SD mount SD FS //FS_SD mount SD FS
//FS_USBDISK mount USB disk FS //FS_USBDISK mount USB disk FS
//#define FTP_FEATURE FS_ROOT #define FTP_FEATURE FS_ROOT
//DIRECT_PIN_FEATURE: allow to access pin using ESP201 command //DIRECT_PIN_FEATURE: allow to access pin using ESP201 command
#define DIRECT_PIN_FEATURE #define DIRECT_PIN_FEATURE
@ -210,6 +210,13 @@
//#define CAMERA_DEVICE_FLIP_HORIZONTALY//comment to disable //#define CAMERA_DEVICE_FLIP_HORIZONTALY//comment to disable
#define CUSTOM_CAMERA_NAME "ESP32-CAM" #define CUSTOM_CAMERA_NAME "ESP32-CAM"
////////////////////////////////////////////////
//Warning until fix is found
#if defined(CAMERA_DEVICE) && defined(FTP_FEATURE)
#warning currently Camera and FTP server do not work together, disabling FTP SERVER
#undef FTP_FEATURE
#endif
//Allow remote access by enabling cross origin access //Allow remote access by enabling cross origin access
//check https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS //check https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
//this should be enabled only in specific cases //this should be enabled only in specific cases

9
esp3d/src/core/espcmd/ESP420.cpp
View File

@ -150,6 +150,15 @@ bool Commands::ESP420(const char* cmd_params, level_authenticate_type auth_type,
output->print (": "); output->print (": ");
} }
output->print(ESP_FileSystem::formatBytes (ESP.getFreeHeap()).c_str()); output->print(ESP_FileSystem::formatBytes (ESP.getFreeHeap()).c_str());
#ifdef ARDUINO_ARCH_ESP32
#ifdef BOARD_HAS_PSRAM
output->print(" - PSRAM:");
output->print(ESP_FileSystem::formatBytes (ESP.getFreePsram()).c_str());
#endif //BOARD_HAS_PSRAM
#endif //ARDUINO_ARCH_ESP32
if (!plain) { if (!plain) {
output->print ("\"}"); output->print ("\"}");
} else { } else {