mirror of
https://github.com/EyeTrackVR/OpenIris.git
synced 2025-11-04 15:39:42 +08:00
update
- Disable Brownout detection - Begin adding camera settings handlers to API - fix ADHOC stream server issue
This commit is contained in:
parent
1127f3d767
commit
2ea338d0cd
@ -119,3 +119,25 @@ int CameraHandler::setHFlip(int direction)
|
||||
{
|
||||
return camera_sensor->set_hmirror(camera_sensor, direction);
|
||||
}
|
||||
|
||||
//! either hardware(1) or software(0)
|
||||
// TODO: Add to API
|
||||
void CameraHandler::resetCamera(bool type)
|
||||
{
|
||||
if (type == 1)
|
||||
{
|
||||
// power cycle the camera module (handy if camera stops responding)
|
||||
digitalWrite(PWDN_GPIO_NUM, HIGH); // turn power off to camera module
|
||||
delay(300);
|
||||
digitalWrite(PWDN_GPIO_NUM, LOW);
|
||||
delay(300);
|
||||
setupCamera();
|
||||
}
|
||||
else
|
||||
{
|
||||
// reset via software (handy if you wish to change resolution or image type etc. - see test procedure)
|
||||
esp_camera_deinit();
|
||||
delay(50);
|
||||
setupCamera();
|
||||
}
|
||||
}
|
||||
@ -19,4 +19,5 @@ public:
|
||||
int setHFlip(int direction);
|
||||
int setVieWindow(int offsetX, int offsetY, int outputX, int outputY);
|
||||
void update(ObserverEvent::Event event);
|
||||
void resetCamera(bool type = 0);
|
||||
};
|
||||
|
||||
@ -127,8 +127,8 @@ void WiFiHandler::iniSTA()
|
||||
if (this->ssid.size() == 0)
|
||||
{
|
||||
log_e("No networks passed into the constructor");
|
||||
this->setUpADHOC();
|
||||
stateManager->setState(WiFiState_e::WiFiState_Error);
|
||||
this->setUpADHOC();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -295,3 +295,137 @@ void BaseAPI::setCamera(AsyncWebServerRequest *request)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//! TODO: Optimize this!!
|
||||
void BaseAPI::getCameraStatus(AsyncWebServerRequest *request)
|
||||
{
|
||||
static char json_response[1024];
|
||||
|
||||
sensor_t *s = esp_camera_sensor_get();
|
||||
if (s == NULL)
|
||||
{
|
||||
request->send(501);
|
||||
return;
|
||||
}
|
||||
char *p = json_response;
|
||||
*p++ = '{';
|
||||
|
||||
p += sprintf(p, "\"framesize\":%u,", s->status.framesize);
|
||||
p += sprintf(p, "\"quality\":%u,", s->status.quality);
|
||||
p += sprintf(p, "\"brightness\":%d,", s->status.brightness);
|
||||
p += sprintf(p, "\"contrast\":%d,", s->status.contrast);
|
||||
p += sprintf(p, "\"saturation\":%d,", s->status.saturation);
|
||||
p += sprintf(p, "\"sharpness\":%d,", s->status.sharpness);
|
||||
p += sprintf(p, "\"special_effect\":%u,", s->status.special_effect);
|
||||
p += sprintf(p, "\"wb_mode\":%u,", s->status.wb_mode);
|
||||
p += sprintf(p, "\"awb\":%u,", s->status.awb);
|
||||
p += sprintf(p, "\"awb_gain\":%u,", s->status.awb_gain);
|
||||
p += sprintf(p, "\"aec\":%u,", s->status.aec);
|
||||
p += sprintf(p, "\"aec2\":%u,", s->status.aec2);
|
||||
p += sprintf(p, "\"denoise\":%u,", s->status.denoise);
|
||||
p += sprintf(p, "\"ae_level\":%d,", s->status.ae_level);
|
||||
p += sprintf(p, "\"aec_value\":%u,", s->status.aec_value);
|
||||
p += sprintf(p, "\"agc\":%u,", s->status.agc);
|
||||
p += sprintf(p, "\"agc_gain\":%u,", s->status.agc_gain);
|
||||
p += sprintf(p, "\"gainceiling\":%u,", s->status.gainceiling);
|
||||
p += sprintf(p, "\"bpc\":%u,", s->status.bpc);
|
||||
p += sprintf(p, "\"wpc\":%u,", s->status.wpc);
|
||||
p += sprintf(p, "\"raw_gma\":%u,", s->status.raw_gma);
|
||||
p += sprintf(p, "\"lenc\":%u,", s->status.lenc);
|
||||
p += sprintf(p, "\"hmirror\":%u,", s->status.hmirror);
|
||||
p += sprintf(p, "\"vflip\":%u,", s->status.vflip);
|
||||
p += sprintf(p, "\"dcw\":%u,", s->status.dcw);
|
||||
p += sprintf(p, "\"colorbar\":%u", s->status.colorbar);
|
||||
*p++ = '}';
|
||||
*p++ = 0;
|
||||
|
||||
AsyncWebServerResponse *response = request->beginResponse(200, MIMETYPE_JSON, json_response);
|
||||
response->addHeader("Access-Control-Allow-Origin", "*");
|
||||
request->send(response);
|
||||
}
|
||||
|
||||
//! TODO: Optimize this!!
|
||||
void BaseAPI::setCameraVar(AsyncWebServerRequest *request)
|
||||
{
|
||||
if (!request->hasArg("var") || !request->hasArg("val"))
|
||||
{
|
||||
request->send(404);
|
||||
return;
|
||||
}
|
||||
String var = request->arg("var");
|
||||
const char *variable = var.c_str();
|
||||
int val = atoi(request->arg("val").c_str());
|
||||
|
||||
sensor_t *s = esp_camera_sensor_get();
|
||||
if (s == NULL)
|
||||
{
|
||||
request->send(501);
|
||||
return;
|
||||
}
|
||||
|
||||
int res = 0;
|
||||
if (!strcmp(variable, "framesize"))
|
||||
res = s->set_framesize(s, (framesize_t)val);
|
||||
else if (!strcmp(variable, "quality"))
|
||||
res = s->set_quality(s, val);
|
||||
else if (!strcmp(variable, "contrast"))
|
||||
res = s->set_contrast(s, val);
|
||||
else if (!strcmp(variable, "brightness"))
|
||||
res = s->set_brightness(s, val);
|
||||
else if (!strcmp(variable, "saturation"))
|
||||
res = s->set_saturation(s, val);
|
||||
else if (!strcmp(variable, "sharpness"))
|
||||
res = s->set_sharpness(s, val);
|
||||
else if (!strcmp(variable, "gainceiling"))
|
||||
res = s->set_gainceiling(s, (gainceiling_t)val);
|
||||
else if (!strcmp(variable, "colorbar"))
|
||||
res = s->set_colorbar(s, val);
|
||||
else if (!strcmp(variable, "awb"))
|
||||
res = s->set_whitebal(s, val);
|
||||
else if (!strcmp(variable, "agc"))
|
||||
res = s->set_gain_ctrl(s, val);
|
||||
else if (!strcmp(variable, "aec"))
|
||||
res = s->set_exposure_ctrl(s, val);
|
||||
else if (!strcmp(variable, "hmirror"))
|
||||
res = s->set_hmirror(s, val);
|
||||
else if (!strcmp(variable, "vflip"))
|
||||
res = s->set_vflip(s, val);
|
||||
else if (!strcmp(variable, "awb_gain"))
|
||||
res = s->set_awb_gain(s, val);
|
||||
else if (!strcmp(variable, "agc_gain"))
|
||||
res = s->set_agc_gain(s, val);
|
||||
else if (!strcmp(variable, "aec_value"))
|
||||
res = s->set_aec_value(s, val);
|
||||
else if (!strcmp(variable, "aec2"))
|
||||
res = s->set_aec2(s, val);
|
||||
else if (!strcmp(variable, "denoise"))
|
||||
res = s->set_denoise(s, val);
|
||||
else if (!strcmp(variable, "dcw"))
|
||||
res = s->set_dcw(s, val);
|
||||
else if (!strcmp(variable, "bpc"))
|
||||
res = s->set_bpc(s, val);
|
||||
else if (!strcmp(variable, "wpc"))
|
||||
res = s->set_wpc(s, val);
|
||||
else if (!strcmp(variable, "raw_gma"))
|
||||
res = s->set_raw_gma(s, val);
|
||||
else if (!strcmp(variable, "lenc"))
|
||||
res = s->set_lenc(s, val);
|
||||
else if (!strcmp(variable, "special_effect"))
|
||||
res = s->set_special_effect(s, val);
|
||||
else if (!strcmp(variable, "wb_mode"))
|
||||
res = s->set_wb_mode(s, val);
|
||||
else if (!strcmp(variable, "ae_level"))
|
||||
res = s->set_ae_level(s, val);
|
||||
|
||||
else
|
||||
{
|
||||
log_e("unknown setting %s", var.c_str());
|
||||
request->send(404);
|
||||
return;
|
||||
}
|
||||
log_d("Got setting %s with value %d. Res: %d", var.c_str(), val, res);
|
||||
|
||||
AsyncWebServerResponse *response = request->beginResponse(200);
|
||||
response->addHeader("Access-Control-Allow-Origin", "*");
|
||||
request->send(response);
|
||||
}
|
||||
@ -7,6 +7,7 @@
|
||||
class BaseAPI : public API_Utilities
|
||||
{
|
||||
protected:
|
||||
|
||||
struct LocalWifiConfig
|
||||
{
|
||||
std::string ssid;
|
||||
@ -55,11 +56,18 @@ protected:
|
||||
void rebootDevice(AsyncWebServerRequest *request);
|
||||
void deleteRoute(AsyncWebServerRequest *request);
|
||||
|
||||
/* Camera Handler */
|
||||
void sendBMP(AsyncWebServerRequest *request);
|
||||
void sendJpg(AsyncWebServerRequest *request);
|
||||
void streamJpg(AsyncWebServerRequest *request);
|
||||
void getCameraStatus(AsyncWebServerRequest *request);
|
||||
void setCameraVar(AsyncWebServerRequest *request);
|
||||
|
||||
/* Camera Handler */
|
||||
void setCamera(AsyncWebServerRequest *request);
|
||||
|
||||
using call_back_function_t = void (BaseAPI::*)(AsyncWebServerRequest *);
|
||||
typedef call_back_function_t (*call_back_function_ptr)(AsyncWebServerRequest *);
|
||||
//using call_back_function_t = void (BaseAPI::*)(AsyncWebServerRequest *);
|
||||
//typedef call_back_function_t (*call_back_function_ptr)(AsyncWebServerRequest *);
|
||||
|
||||
/* Route Command types */
|
||||
using route_method = void (BaseAPI::*)(AsyncWebServerRequest *);
|
||||
|
||||
@ -41,6 +41,9 @@ void APIServer::setupServer()
|
||||
routes.emplace("setCamera", &APIServer::setCamera);
|
||||
routes.emplace("deleteRoute", &APIServer::deleteRoute);
|
||||
|
||||
// Camera Routes
|
||||
|
||||
|
||||
//! reserve enough memory for all routes - must be called after adding routes and before adding routes to route_map
|
||||
indexes.reserve(routes.size()); // this is done to avoid reallocation of memory and copying of data
|
||||
addRouteMap("builtin", routes, indexes); // add new route map to the route_map
|
||||
|
||||
@ -61,7 +61,6 @@ esp_err_t StreamHelpers::stream(httpd_req_t *req)
|
||||
fb = NULL;
|
||||
_jpg_buf = NULL;
|
||||
}
|
||||
|
||||
else if (_jpg_buf)
|
||||
{
|
||||
free(_jpg_buf);
|
||||
@ -84,6 +83,7 @@ esp_err_t StreamHelpers::stream(httpd_req_t *req)
|
||||
|
||||
int StreamServer::startStreamServer()
|
||||
{
|
||||
WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); //! Turn-off the 'brownout detector'
|
||||
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
|
||||
config.max_uri_handlers = 1;
|
||||
config.server_port = this->STREAM_SERVER_PORT;
|
||||
|
||||
@ -3,9 +3,17 @@
|
||||
#define STREAM_SERVER_HPP
|
||||
#define PART_BOUNDARY "123456789000000000000987654321"
|
||||
#include <Arduino.h>
|
||||
// Used to disable brownout detection
|
||||
#include "soc/soc.h"
|
||||
#include "soc/rtc_cntl_reg.h"
|
||||
|
||||
// Camera includes
|
||||
#include "esp_camera.h"
|
||||
#include "esp_http_server.h"
|
||||
|
||||
#include "esp_timer.h"
|
||||
#include "fb_gfx.h"
|
||||
#include "img_converters.h"
|
||||
//#include "fd_forward.h"
|
||||
namespace StreamHelpers
|
||||
{
|
||||
esp_err_t stream(httpd_req_t *req);
|
||||
|
||||
@ -53,8 +53,6 @@ void setup()
|
||||
break;
|
||||
}
|
||||
case WiFiState_e::WiFiState_ADHOC:
|
||||
{
|
||||
}
|
||||
case WiFiState_e::WiFiState_Connected:
|
||||
{
|
||||
streamServer.startStreamServer();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user