ryan/esp32cam-rtsp
1
0
Fork 0
forked from external-repos/esp32cam-rtsp
Code Pull Requests Activity

Merge branch 'feature/ota' into feature/html_gzip

Browse Source
This commit is contained in:
Rene Zeldenthuis
2022-09-20 15:11:23 +02:00
parent e69f33c6a2 cc132876e7
commit fb7ee1db3e
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/settings.h
View File

@@ -7,6 +7,8 @@
#define WIFI_PASSWORD nullptr #define WIFI_PASSWORD nullptr
#define CONFIG_VERSION "1.1" #define CONFIG_VERSION "1.1"
#define OTA_PASSWORD "ESP32CAM-RTSP"
#define RTSP_PORT 554 #define RTSP_PORT 554
#define DEFAULT_CAMERA_CONFIG "AI THINKER" #define DEFAULT_CAMERA_CONFIG "AI THINKER"
#define DEFAULT_FRAME_DURATION "20" #define DEFAULT_FRAME_DURATION "20"

29
src/main.cpp
View File

@@ -1,4 +1,5 @@
#include <Arduino.h> #include <Arduino.h>
#include <ArduinoOTA.h>
#include <soc/rtc_cntl_reg.h> #include <soc/rtc_cntl_reg.h>
#include <IotWebConf.h> #include <IotWebConf.h>
#include <IotWebConfTParameter.h> #include <IotWebConfTParameter.h>
@@ -245,15 +246,35 @@ void setup()
web_server.onNotFound([]() web_server.onNotFound([]()
{ iotWebConf.handleNotFound(); }); { iotWebConf.handleNotFound(); });
// Set DNS to thing name ArduinoOTA
MDNS.begin(iotWebConf.getThingName()); .onStart([]()
// Add service to mDNS - http { log_w("Starting OTA update: %s", ArduinoOTA.getCommand() == U_FLASH ? "sketch" : "filesystem"); })
MDNS.addService("http", "tcp", 80); .onEnd([]()
{ log_w("OTA update done!"); })
.onProgress([](unsigned int progress, unsigned int total)
{ log_i("OTA Progress: %u%%\r", (progress / (total / 100))); })
.onError([](ota_error_t error)
{
switch (error)
{
case OTA_AUTH_ERROR: log_e("OTA: Auth Failed"); break;
case OTA_BEGIN_ERROR: log_e("OTA: Begin Failed"); break;
case OTA_CONNECT_ERROR: log_e("OTA: Connect Failed"); break;
case OTA_RECEIVE_ERROR: log_e("OTA: Receive Failed"); break;
case OTA_END_ERROR: log_e("OTA: End Failed"); break;
default: log_e("OTA error: %u", error);
} });
ArduinoOTA.setPassword(OTA_PASSWORD);
// Start (OTA) Over The Air programming when connected
iotWebConf.setWifiConnectionCallback([]()
{ ArduinoOTA.begin(); });
} }
void loop() void loop()
{ {
iotWebConf.doLoop(); iotWebConf.doLoop();
ArduinoOTA.handle();
if (camera_server) if (camera_server)
camera_server->doLoop(); camera_server->doLoop();