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

Fix recursive deadloop on esp32 with pinMode thanks Aneantisor

Browse Source 
Add SDIO one bit  mode  setting in configuration.h thanks  Aneantisor
Fix typo in comments
This commit is contained in:
Luc 2020-09-22 15:47:01 +02:00
parent 4341efedfd
commit a7e97d873f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp3d/src/core/hal.cpp
View File

@ -65,7 +65,7 @@ void Hal::pinMode(uint8_t pin, uint8_t mode)
return; return;
} }
#endif #endif
pinMode(pin, mode); ::pinMode(pin, mode);
} }
void Hal::toneESP(uint8_t pin, unsigned int frequency, unsigned int duration, bool sync) void Hal::toneESP(uint8_t pin, unsigned int frequency, unsigned int duration, bool sync)

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

@ -60,7 +60,7 @@
#define VSYNC_GPIO_NUM 25 #define VSYNC_GPIO_NUM 25
#define HREF_GPIO_NUM 23 #define HREF_GPIO_NUM 23
#define PCLK_GPIO_NUM 22 #define PCLK_GPIO_NUM 22
#endif //CAMERA_MODEL_AI_THINKER #endif //CAMERA_MODEL_CUSTOM
#if CAMERA_DEVICE == CAMERA_MODEL_WROVER_KIT #if CAMERA_DEVICE == CAMERA_MODEL_WROVER_KIT
#define CAM_LED_PIN -1 #define CAM_LED_PIN -1

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

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

4
esp3d/src/modules/filesystem/sd/sdio_esp32.cpp
View File

@ -57,7 +57,7 @@ uint8_t ESP_SD::getState(bool refresh)
if (!lastinitok) { if (!lastinitok) {
log_esp3d("last init was failed try sd_mmc begin"); log_esp3d("last init was failed try sd_mmc begin");
//SD_MMC.end(); //SD_MMC.end();
if (SD_MMC.begin()) { if (SD_MMC.begin("/sdcard", SD_ONE_BIT_MODE)) {
log_esp3d("sd_mmc begin succeed"); log_esp3d("sd_mmc begin succeed");
if (SD_MMC.cardType() != CARD_NONE ) { if (SD_MMC.cardType() != CARD_NONE ) {
_state = ESP_SDCARD_IDLE; _state = ESP_SDCARD_IDLE;
@ -78,7 +78,7 @@ uint8_t ESP_SD::getState(bool refresh)
lastinitok = false; lastinitok = false;
log_esp3d("Soft sd check failed"); log_esp3d("Soft sd check failed");
//SD_MMC.end(); //SD_MMC.end();
if (SD_MMC.begin()) { if (SD_MMC.begin("/sdcard", SD_ONE_BIT_MODE)) {
log_esp3d("new sd_mmc begin succeed"); log_esp3d("new sd_mmc begin succeed");
if ( SD_MMC.cardType() != CARD_NONE ) { if ( SD_MMC.cardType() != CARD_NONE ) {
_state = ESP_SDCARD_IDLE; _state = ESP_SDCARD_IDLE;