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

Add PSRAM detection in ESP420

Browse Source 
Stop hardware when starting board to allow http working at boot thanks Seppel
This commit is contained in:
Luc 2020-10-15 10:11:23 +02:00
parent 694f502fb0
commit 50cb4f6294
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp3d/src/core/settings_esp3d.cpp
View File

@ -1240,7 +1240,11 @@ String Settings_ESP3D::IPtoString(uint32_t ip_int)
const char * Settings_ESP3D::TargetBoard()
{
#ifdef ARDUINO_ARCH_ESP32
#ifdef BOARD_HAS_PSRAM
return "ESP32 (PSRAM)";
#else
return "ESP32";
#endif //BOARD_HAS_PSRAM
#endif //ARDUINO_ARCH_ESP32
#ifdef ARDUINO_ARCH_ESP8266
return "ESP82XX";

2
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H
//version and sources location
#define FW_VERSION "3.0.0.a63"
#define FW_VERSION "3.0.0.a64"
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H

2
esp3d/src/modules/network/netservices.cpp
View File

@ -268,7 +268,7 @@ bool NetServices::begin()
#ifdef CAMERA_DEVICE
if (!esp3d_camera.begin()) {
output.printMSG("Failed start camera streaming server");
}
} else esp3d_camera.stopHardware();
#endif //CAMERA_DEVICE
if (!res) {
end();