Michal
/
Prusa-Firmware-ESP32-Cam
mirror of https://github.com/prusa3d/Prusa-Firmware-ESP32-Cam
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update logs

pull/60/head
Miroslav Pivovarsky 2024-06-29 14:09:07 +02:00
parent 7eec29558f
commit d792a1c714
10 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ESP32_PrusaConnectCam/cfg.cpp
View File

@ -100,7 +100,7 @@ void Configuration::ReadCfg() {
@return bool - status
*/
bool Configuration::CheckFirstMcuStart() {
Log->AddEvent(LogLevel_Info, F("Read FirstMcuStart: "));
Log->AddEvent(LogLevel_Info, F("Read FirstMcuStart FLAG"));
uint8_t flag = EEPROM.read(EEPROM_ADDR_FIRST_MCU_START_FLAG_START);
if (CFG_FIRST_MCU_START_NAK == flag) {

3
ESP32_PrusaConnectCam/module_AI_Thinker_ESP32-CAM.h
View File

@ -46,8 +46,9 @@
#define PCLK_GPIO_NUM 22 ///< Pixel clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("AI Thinker ESP32-CAM") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION true ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
#define ENABLE_PSRAM true ///< Enable PSRAM
/* --------------- OTA UPDATE CFG --------------*/
#define OTA_UPDATE_FW_FILE PSTR("ESP32_PrusaConnectCam.ino.bin") ///< OTA update firmware file name

19
ESP32_PrusaConnectCam/module_ESP32-S3-CAM.h
View File

@ -35,6 +35,7 @@
#define PCLK_GPIO_NUM 13 ///< Pixel clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("ESP32-S3-CAM") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
@ -44,21 +45,21 @@
#define FW_STATUS_LED_LEVEL_ON HIGH ///< GPIO pin level for status LED ON
/* --------------- FLASH LED CFG ---------------*/
#define ENABLE_CAMERA_FLASH false ///< Enable camera flash function
#define ENABLE_CAMERA_FLASH false ///< Enable camera flash function
#define CAMERA_FLASH_DIGITAL_CTRL false ///< Enable camera flash digital control
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 48 ///< Flash control pin. RGB LED NeoPixel
#define FLASH_OFF_STATUS 0 ///< PWM intensity LED for OFF. 0-2^FLASH_PWM_RESOLUTION = 0-255
#define FLASH_ON_STATUS 205 ///< PWM intensity LED for ON. limitation to 80%. 2^FLASH_PWM_RESOLUTION * 0.8% = 204
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 48 ///< Flash control pin. RGB LED NeoPixel
#define FLASH_OFF_STATUS 0 ///< value for turn off flash
#define FLASH_ON_STATUS 205 ///< value for turn on flash
//#define FLASH_PWM_FREQ 2000 ///< frequency of pwm [240MHz / (100 prescale * pwm cycles)] = frequency
//#define FLASH_PWM_CHANNEL 0 ///< channel 0
//#define FLASH_PWM_RESOLUTION 8 ///< range 1-20bit. 8bit = 0-255 range
/* --------------- SD CARD CFG ---------------*/
#define ENABLE_SD_CARD false ///< Enable SD card function
#define SD_PIN_CLK 14 ///< GPIO pin for SD card clock
#define SD_PIN_CMD 15 ///< GPIO pin for SD card command
#define SD_PIN_DATA0 2 ///< GPIO pin for SD card data 0
#define ENABLE_SD_CARD true ///< Enable SD card function
#define SD_PIN_CLK 39 ///< GPIO pin for SD card clock
#define SD_PIN_CMD 38 ///< GPIO pin for SD card command
#define SD_PIN_DATA0 40 ///< GPIO pin for SD card data 0
/* ---------- RESET CFG CONFIGURATION ----------*/
#define CFG_RESET_PIN 12 ///< GPIO 16 is for reset CFG to default

5
ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h
View File

@ -57,6 +57,7 @@
#define XCLK_GPIO_NUM 15 ///< External clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("ESP32-S3-EYE_2.2") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
@ -70,8 +71,8 @@
#define CAMERA_FLASH_DIGITAL_CTRL true ///< Enable camera flash digital control
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 48 ///< Flash control pin. This is pin for enable LCD backlight
#define FLASH_OFF_STATUS LOW ///< PWM intensity LED for OFF. 0-2^FLASH_PWM_RESOLUTION = 0-255
#define FLASH_ON_STATUS HIGH ///< PWM intensity LED for ON. limitation to 80%. 2^FLASH_PWM_RESOLUTION * 0.8% = 204
#define FLASH_OFF_STATUS LOW ///< Value for turn off flash
#define FLASH_ON_STATUS HIGH ///< Value for turn on flash
//#define FLASH_PWM_FREQ 2000 ///< frequency of pwm [240MHz / (100 prescale * pwm cycles)] = frequency
//#define FLASH_PWM_CHANNEL 0 ///< channel 0
//#define FLASH_PWM_RESOLUTION 8 ///< range 1-20bit. 8bit = 0-255 range

7
ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h
View File

@ -45,8 +45,9 @@
#define PCLK_GPIO_NUM 22 ///< Pixel clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("ESP32-WROVER-DEV") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION true ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
#define ENABLE_PSRAM true ///< Enable PSRAM
/* --------------- OTA UPDATE CFG --------------*/
#define OTA_UPDATE_FW_FILE PSTR("ESP32_WROVERDEV.bin") ///< OTA update firmware file name
@ -58,8 +59,8 @@
#define CAMERA_FLASH_DIGITAL_CTRL true ///< Enable camera flash digital control
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 14 ///< Flash control pin
#define FLASH_OFF_STATUS LOW ///< PWM intensity LED for OFF. 0-2^FLASH_PWM_RESOLUTION = 0-255
#define FLASH_ON_STATUS HIGH ///< PWM intensity LED for ON. limitation to 80%. 2^FLASH_PWM_RESOLUTION * 0.8% = 204
#define FLASH_OFF_STATUS LOW ///< value for flash OFF
#define FLASH_ON_STATUS HIGH ///< value for flash ON
//#define FLASH_PWM_FREQ 2000 ///< frequency of pwm [240MHz / (100 prescale * pwm cycles)] = frequency
//#define FLASH_PWM_CHANNEL 0 ///< channel 0
//#define FLASH_PWM_RESOLUTION 8 ///< range 1-20bit. 8bit = 0-255 range

9
ESP32_PrusaConnectCam/module_ESP32_S3_DEV_CAM.h
View File

@ -47,15 +47,16 @@
#define Y8_GPIO_NUM 9 ///< SCCB: Y8 pin
#define Y7_GPIO_NUM 8 ///< SCCB: Y7 pin
#define Y6_GPIO_NUM 6 ///< SCCB: Y6 pin
#define Y5_GPIO_NUM 4 ///< SCCB: Y5 pin
#define Y5_GPIO_NUM 4 ///< SCCB: Y5 pin
#define Y4_GPIO_NUM 2 ///< SCCB: Y4 pin
#define Y3_GPIO_NUM 3 ///< SCCB: Y3 pin
#define Y2_GPIO_NUM 5 ///< SCCB: Y2 pin
#define VSYNC_GPIO_NUM 13 ///< Vertical sync pin
#define HREF_GPIO_NUM 12 ///< Line sync pin
#define PCLK_GPIO_NUM 7 ///< Pixel clock pin
#define PCLK_GPIO_NUM 7 ///< Pixel clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("ESP32-S3 DEV CAM") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
@ -66,9 +67,9 @@
/* --------------- FLASH LED CFG ---------------*/
#define ENABLE_CAMERA_FLASH false ///< Enable camera flash function
#define CAMERA_FLASH_DIGITAL_CTRL true ///< Enable camera flash digital control
#define CAMERA_FLASH_DIGITAL_CTRL false ///< Enable camera flash digital control
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 4 ///< Flash control pin
#define FLASH_GPIO_NUM -1 ///< Flash control pin
#define FLASH_OFF_STATUS 0 ///< PWM intensity LED for OFF. 0-2^FLASH_PWM_RESOLUTION = 0-255
#define FLASH_ON_STATUS 205 ///< PWM intensity LED for ON. limitation to 80%. 2^FLASH_PWM_RESOLUTION * 0.8% = 204
#define FLASH_PWM_FREQ 2000 ///< frequency of pwm [240MHz / (100 prescale * pwm cycles)] = frequency

5
ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h
View File

@ -38,6 +38,7 @@
#define XCLK_GPIO_NUM 10 ///< External clock pin
/* ------------------ MCU CFG ------------------*/
#define BOARD_NAME F("XIAO ESP32-S3 Sense cam") ///< Board name
#define ENABLE_BROWN_OUT_DETECTION false ///< Enable brown out detection
#define ENABLE_PSRAM true ///< Enable PSRAM
@ -51,8 +52,8 @@
#define CAMERA_FLASH_DIGITAL_CTRL true ///< Enable camera flash digital control
#define CAMERA_FLASH_PWM_CTRL false ///< Enable camera flash PWM control
#define FLASH_GPIO_NUM 4 ///< Flash control pin. This is pin for enable LCD backlight
#define FLASH_OFF_STATUS LOW ///< PWM intensity LED for OFF. 0-2^FLASH_PWM_RESOLUTION = 0-255
#define FLASH_ON_STATUS HIGH ///< PWM intensity LED for ON. limitation to 80%. 2^FLASH_PWM_RESOLUTION * 0.8% = 204
#define FLASH_OFF_STATUS LOW ///< value for flash OFF
#define FLASH_ON_STATUS HIGH ///< value for flash ON
//#define FLASH_PWM_FREQ 2000 ///< frequency of pwm [240MHz / (100 prescale * pwm cycles)] = frequency
//#define FLASH_PWM_CHANNEL 0 ///< channel 0
//#define FLASH_PWM_RESOLUTION 8 ///< range 1-20bit. 8bit = 0-255 range

23
ESP32_PrusaConnectCam/system.cpp
View File

@ -18,6 +18,9 @@
*/
void System_Init() {
SystemLog.AddEvent(LogLevel_Info, F("Init system lib"));
SystemLog.AddEvent(LogLevel_Info, "SW Version: " + String(SW_VERSION) + " Build: " + String(SW_BUILD));
SystemLog.AddEvent(LogLevel_Info, "Board name: " + String(BOARD_NAME));
/* show last reset status */
String reason_simple = System_printMcuResetReasonSimple();
SystemLog.AddEvent(LogLevel_Warning, "CPU reset reason: " + reason_simple);
@ -28,10 +31,12 @@ void System_Init() {
SystemLog.AddEvent(LogLevel_Warning, "CPU1 reset reason: " + reason_core1);
SystemLog.AddEvent(LogLevel_Info, "MCU Temperature: " + String(temperatureRead()) + " *C");
SystemLog.AddEvent(LogLevel_Info, "Internal Total heap: " + String(ESP.getHeapSize()) + " ,internal Free Heap: " + String(ESP.getFreeHeap()));
SystemLog.AddEvent(LogLevel_Info, "SPIRam Total heap: " + String(ESP.getPsramSize()) + " ,SPIRam Free Heap: " + String(ESP.getFreePsram()));
SystemLog.AddEvent(LogLevel_Info, "ChipRevision: " + String(ESP.getChipRevision()) + " ,Cpu Freq: " + String(ESP.getCpuFreqMHz()) + " ,SDK Version: " + String(ESP.getSdkVersion()));
SystemLog.AddEvent(LogLevel_Info, "Flash Size: " + String(ESP.getFlashChipSize()) + " ,Flash Speed " + String(ESP.getFlashChipSpeed()));
SystemLog.AddEvent(LogLevel_Info, "Internal Total heap: " + String(ESP.getHeapSize()) + " B, Internal Free Heap: " + String(ESP.getFreeHeap()));
SystemLog.AddEvent(LogLevel_Info, "PSRAM Total heap: " + String(ESP.getPsramSize()) + " B, PSRAM Free Heap: " + String(ESP.getFreePsram()));
SystemLog.AddEvent(LogLevel_Info, "Chip model: " + String(ESP.getChipModel()) + ", ChipRevision: " + String(ESP.getChipRevision()) + ", Cpu Freq: " + String(ESP.getCpuFreqMHz()));
SystemLog.AddEvent(LogLevel_Info, "SDK Version: " + String(ESP.getSdkVersion()) + ", Core Version: " + String(ESP.getCoreVersion()));
SystemLog.AddEvent(LogLevel_Info, "Flash Size: " + String(ESP.getFlashChipSize()) + ", Flash Speed " + String(ESP.getFlashChipSpeed()) + ", Flash Mode: " + String(ESP.getFlashChipMode()));
System_CheckIfPsramIsUsed();
}
@ -49,9 +54,11 @@ void System_LoadCfg() {
@param none
@return none
*/
void System_CheckIfPsramIsUsed() {
bool System_CheckIfPsramIsUsed() {
bool ret = false;
if (psramFound()) {
SystemLog.AddEvent(LogLevel_Info, F("PSRAM is used."));
ret = true;
void *ptr = malloc(100);
if (ptr != NULL) {
@ -67,6 +74,8 @@ void System_CheckIfPsramIsUsed() {
} else {
SystemLog.AddEvent(LogLevel_Info, F("PSRAM is not used."));
}
return ret;
}
/**
@ -450,8 +459,8 @@ void System_TaskWifiManagement(void *pvParameters) {
/* wifi reconnect after signal lost */
SystemWifiMngt.WiFiReconnect();
SystemLog.AddEvent(LogLevel_Info, "Free RAM: " + String(ESP.getFreeHeap()) + " B");
SystemLog.AddEvent(LogLevel_Info, "Free SPIRAM: " + String(ESP.getFreePsram()) + " B");
SystemLog.AddEvent(LogLevel_Info, "Free RAM: " + String(ESP.getFreeHeap()) + " B" + ", Min: " + String(ESP.getMinFreeHeap()));
SystemLog.AddEvent(LogLevel_Info, "Free PSRAM: " + String(ESP.getFreePsram()) + " B" + ", Min: " + String(ESP.getMinFreePsram()));
SystemLog.AddEvent(LogLevel_Info, "Temperature: " + String(McuTemperature.TemperatureCelsius) + " *C");
SystemLog.AddEvent(LogLevel_Verbose, F("WiFiManagement task. Stack free size: "), String(uxTaskGetStackHighWaterMark(NULL)) + "B");
SystemLog.AddEvent(LogLevel_Verbose, F("WiFi status: "), String(WiFi.status()));

2
ESP32_PrusaConnectCam/system.h
View File

@ -46,7 +46,7 @@
void System_Init();
void System_LoadCfg();
void System_CheckIfPsramIsUsed();
bool System_CheckIfPsramIsUsed();
void System_Main();
void System_UpdateInit();

2
ESP32_PrusaConnectCam/wifi_mngt.cpp
View File

@ -61,7 +61,6 @@ void WiFiMngt::LoadCfgFromEeprom() {
void WiFiMngt::Init() {
/* check WI-FI mode */
system_led.setTimer(STATUS_LED_WIFI_AP);
log->AddEvent(LogLevel_Info, "WiFi MAC: " + WiFi.macAddress());
/* Set Wi-Fi networks */
SetWifiEvents();
@ -93,6 +92,7 @@ void WiFiMngt::Init() {
} else {
log->AddEvent(LogLevel_Info, F("STA IP Method: DHCP"));
}
log->AddEvent(LogLevel_Info, "WiFi MAC: " + WiFi.macAddress());
esp_wifi_set_ps(WIFI_PS_NONE);
WiFi.setHostname(DEVICE_HOSTNAME);