Add support for OV5640 (#135)

Also:
- Add advanced settings
- Add more resolutions and aspect ratios support.
pull/136/head
Me No Dev 2020-03-12 13:27:48 +02:00 committed by GitHub
parent 162bf29246
commit 7937d37e14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 2549 additions and 87 deletions

@ -1 +1 @@
Subproject commit 193b090df99dd73e18df4d8ab494ebd32d433648
Subproject commit 4af111a5e274a2973fa10cd3c1ec69174a1bdb93

View File

@ -5,7 +5,7 @@
To run this example, you need the following components:
* An ESP32 Module: Either **ESP32-WROVER-KIT** or **ESP-EYE**, which we highly recommend for beginners, is used in this example.
* A Camera Module: Either **OV2640** or **OV3660** image sensor, which we highly recommend for beginners, is used in this example.
* A Camera Module: Either **OV2640** or **OV3660** or **OV5640** image sensor, which we highly recommend for beginners, is used in this example.
# Quick Start
@ -17,5 +17,6 @@ After you've completed the hardware settings, please follow the steps below:
4. **Open Your Browser** and point it to `http://[ip-of-esp32]/`;
5. **To Get Image** press `Get Still` or `Start Stream`;
6. **Use The Options** to enable/disable Face Detection, Face Recognition and more;
t. **View The Stream** in a player like VLC: Open Network `http://[ip-of-esp32]:81/stream`;
For more details of the http handler, please refer to [esp32-camera](https://github.com/espressif/esp32-camera).

View File

@ -11,6 +11,7 @@ set(COMPONENT_REQUIRES
set(COMPONENT_EMBED_FILES
"www/index_ov2640.html.gz"
"www/index_ov3660.html.gz")
"www/index_ov3660.html.gz"
"www/index_ov5640.html.gz")
register_component()

View File

@ -100,6 +100,8 @@ choice CAMERA_MODEL
config CAMERA_MODEL_WROVER_KIT
bool "WROVER-KIT With OV2640 Module"
config CAMERA_MODEL_ESP32_CAM_BOARD
bool "ESP32 Camera Development Board"
config CAMERA_MODEL_ESP_EYE
bool "ESP_EYE DevKit"
config CAMERA_MODEL_M5STACK_PSRAM

View File

@ -30,7 +30,7 @@ static const char *TAG = "app_camera";
void app_camera_main ()
{
#if CONFIG_CAMERA_MODEL_ESP_EYE
#if CONFIG_CAMERA_MODEL_ESP_EYE || CONFIG_CAMERA_MODEL_ESP32_CAM_BOARD
/* IO13, IO14 is designed for JTAG by default,
* to use it as generalized input,
* firstly declair it as pullup input */
@ -97,7 +97,7 @@ void app_camera_main ()
config.xclk_freq_hz = 20000000;
config.pixel_format = PIXFORMAT_JPEG;
//init with high specs to pre-allocate larger buffers
config.frame_size = FRAMESIZE_UXGA;
config.frame_size = FRAMESIZE_QSXGA;
config.jpeg_quality = 10;
config.fb_count = 2;
@ -116,5 +116,5 @@ void app_camera_main ()
s->set_saturation(s, -2);//lower the saturation
}
//drop down frame size for higher initial frame rate
s->set_framesize(s, FRAMESIZE_QVGA);
s->set_framesize(s, FRAMESIZE_HD);
}

View File

@ -75,7 +75,7 @@ typedef struct
#define PART_BOUNDARY "123456789000000000000987654321"
static const char *_STREAM_CONTENT_TYPE = "multipart/x-mixed-replace;boundary=" PART_BOUNDARY;
static const char *_STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n";
static const char *_STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n";
static const char *_STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\nX-Timestamp: %d.%06d\r\n\r\n";
httpd_handle_t stream_httpd = NULL;
httpd_handle_t camera_httpd = NULL;
@ -341,6 +341,10 @@ static esp_err_t capture_handler(httpd_req_t *req)
httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.jpg");
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
char ts[32];
snprintf(ts, 32, "%ld.%06ld", fb->timestamp.tv_sec, fb->timestamp.tv_usec);
httpd_resp_set_hdr(req, "X-Timestamp", (const char *)ts);
#if CONFIG_ESP_FACE_DETECT_ENABLED
size_t out_len, out_width, out_height;
uint8_t *out_buf;
@ -437,10 +441,11 @@ static esp_err_t capture_handler(httpd_req_t *req)
static esp_err_t stream_handler(httpd_req_t *req)
{
camera_fb_t *fb = NULL;
struct timeval _timestamp;
esp_err_t res = ESP_OK;
size_t _jpg_buf_len = 0;
uint8_t *_jpg_buf = NULL;
char *part_buf[64];
char *part_buf[128];
#if CONFIG_ESP_FACE_DETECT_ENABLED
dl_matrix3du_t *image_matrix = NULL;
bool detected = false;
@ -465,6 +470,7 @@ static esp_err_t stream_handler(httpd_req_t *req)
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
httpd_resp_set_hdr(req, "X-Framerate", "60");
#ifdef CONFIG_LED_ILLUMINATOR_ENABLED
enable_led(true);
@ -486,6 +492,8 @@ static esp_err_t stream_handler(httpd_req_t *req)
}
else
{
_timestamp.tv_sec = fb->timestamp.tv_sec;
_timestamp.tv_usec = fb->timestamp.tv_usec;
#if CONFIG_ESP_FACE_DETECT_ENABLED
fr_start = esp_timer_get_time();
fr_ready = fr_start;
@ -593,7 +601,7 @@ static esp_err_t stream_handler(httpd_req_t *req)
}
if (res == ESP_OK)
{
size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len);
size_t hlen = snprintf((char *)part_buf, 128, _STREAM_PART, _jpg_buf_len, _timestamp.tv_sec, _timestamp.tv_usec);
res = httpd_resp_send_chunk(req, (const char *)part_buf, hlen);
}
if (res == ESP_OK)
@ -654,60 +662,49 @@ static esp_err_t stream_handler(httpd_req_t *req)
return res;
}
static esp_err_t cmd_handler(httpd_req_t *req)
static esp_err_t parse_get(httpd_req_t *req, char **obuf)
{
char *buf;
size_t buf_len;
char variable[32] = {
0,
};
char value[32] = {
0,
};
char *buf = NULL;
size_t buf_len = 0;
buf_len = httpd_req_get_url_query_len(req) + 1;
if (buf_len > 1)
{
if (buf_len > 1) {
buf = (char *)malloc(buf_len);
if (!buf)
{
if (!buf) {
httpd_resp_send_500(req);
return ESP_FAIL;
}
if (httpd_req_get_url_query_str(req, buf, buf_len) == ESP_OK)
{
if (httpd_query_key_value(buf, "var", variable, sizeof(variable)) == ESP_OK &&
httpd_query_key_value(buf, "val", value, sizeof(value)) == ESP_OK)
{
}
else
{
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
}
else
{
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
if (httpd_req_get_url_query_str(req, buf, buf_len) == ESP_OK) {
*obuf = buf;
return ESP_OK;
}
free(buf);
}
else
{
httpd_resp_send_404(req);
return ESP_FAIL;
}
static esp_err_t cmd_handler(httpd_req_t *req)
{
char *buf = NULL;
char variable[32];
char value[32];
if (parse_get(req, &buf) != ESP_OK ||
httpd_query_key_value(buf, "var", variable, sizeof(variable)) != ESP_OK ||
httpd_query_key_value(buf, "val", value, sizeof(value)) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
free(buf);
int val = atoi(value);
ESP_LOGI(TAG, "%s = %d", variable, val);
sensor_t *s = esp_camera_sensor_get();
int res = 0;
if (!strcmp(variable, "framesize"))
{
if (!strcmp(variable, "framesize")) {
if (s->pixformat == PIXFORMAT_JPEG)
res = s->set_framesize(s, (framesize_t)val);
}
@ -758,8 +755,7 @@ static esp_err_t cmd_handler(httpd_req_t *req)
else if (!strcmp(variable, "ae_level"))
res = s->set_ae_level(s, val);
#ifdef CONFIG_LED_ILLUMINATOR_ENABLED
else if (!strcmp(variable, "led_intensity"))
{
else if (!strcmp(variable, "led_intensity")) {
led_duty = val;
if (isStreaming)
enable_led(true);
@ -767,12 +763,10 @@ static esp_err_t cmd_handler(httpd_req_t *req)
#endif
#if CONFIG_ESP_FACE_DETECT_ENABLED
else if (!strcmp(variable, "face_detect"))
{
else if (!strcmp(variable, "face_detect")) {
detection_enabled = val;
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
if (!detection_enabled)
{
if (!detection_enabled) {
recognition_enabled = 0;
}
#endif
@ -780,23 +774,19 @@ static esp_err_t cmd_handler(httpd_req_t *req)
#if CONFIG_ESP_FACE_RECOGNITION_ENABLED
else if (!strcmp(variable, "face_enroll"))
is_enrolling = val;
else if (!strcmp(variable, "face_recognize"))
{
else if (!strcmp(variable, "face_recognize")) {
recognition_enabled = val;
if (recognition_enabled)
{
if (recognition_enabled) {
detection_enabled = val;
}
}
#endif
#endif
else
{
else {
res = -1;
}
if (res)
{
if (res) {
return httpd_resp_send_500(req);
}
@ -804,6 +794,10 @@ static esp_err_t cmd_handler(httpd_req_t *req)
return httpd_resp_send(req, NULL, 0);
}
static int print_reg(char * p, sensor_t * s, uint16_t reg, uint32_t mask){
return sprintf(p, "\"0x%x\":%u,", reg, s->get_reg(s, reg, mask));
}
static esp_err_t status_handler(httpd_req_t *req)
{
static char json_response[1024];
@ -812,6 +806,35 @@ static esp_err_t status_handler(httpd_req_t *req)
char *p = json_response;
*p++ = '{';
if(s->id.PID == OV5640_PID || s->id.PID == OV3660_PID){
for(int reg = 0x3400; reg < 0x3406; reg+=2){
p+=print_reg(p, s, reg, 0xFFF);//12 bit
}
p+=print_reg(p, s, 0x3406, 0xFF);
p+=print_reg(p, s, 0x3500, 0xFFFF0);//16 bit
p+=print_reg(p, s, 0x3503, 0xFF);
p+=print_reg(p, s, 0x350a, 0x3FF);//10 bit
p+=print_reg(p, s, 0x350c, 0xFFFF);//16 bit
for(int reg = 0x5480; reg <= 0x5490; reg++){
p+=print_reg(p, s, reg, 0xFF);
}
for(int reg = 0x5380; reg <= 0x538b; reg++){
p+=print_reg(p, s, reg, 0xFF);
}
for(int reg = 0x5580; reg < 0x558a; reg++){
p+=print_reg(p, s, reg, 0xFF);
}
p+=print_reg(p, s, 0x558a, 0x1FF);//9 bit
} else {
p+=print_reg(p, s, 0xd3, 0xFF);
p+=print_reg(p, s, 0x111, 0xFF);
p+=print_reg(p, s, 0x132, 0xFF);
}
p += sprintf(p, "\"framesize\":%u,", s->status.framesize);
p += sprintf(p, "\"quality\":%u,", s->status.quality);
p += sprintf(p, "\"brightness\":%d,", s->status.brightness);
@ -855,6 +878,169 @@ static esp_err_t status_handler(httpd_req_t *req)
return httpd_resp_send(req, json_response, strlen(json_response));
}
static esp_err_t xclk_handler(httpd_req_t *req)
{
char *buf = NULL;
char _xclk[32];
if (parse_get(req, &buf) != ESP_OK ||
httpd_query_key_value(buf, "xclk", _xclk, sizeof(_xclk)) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
free(buf);
int xclk = atoi(_xclk);
ESP_LOGI(TAG, "Set XCLK: %d MHz", xclk);
sensor_t *s = esp_camera_sensor_get();
int res = s->set_xclk(s, LEDC_TIMER_0, xclk);
if (res) {
return httpd_resp_send_500(req);
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
return httpd_resp_send(req, NULL, 0);
}
static esp_err_t reg_handler(httpd_req_t *req)
{
char *buf = NULL;
char _reg[32];
char _mask[32];
char _val[32];
if (parse_get(req, &buf) != ESP_OK ||
httpd_query_key_value(buf, "reg", _reg, sizeof(_reg)) != ESP_OK ||
httpd_query_key_value(buf, "mask", _mask, sizeof(_mask)) != ESP_OK ||
httpd_query_key_value(buf, "val", _val, sizeof(_val)) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
free(buf);
int reg = atoi(_reg);
int mask = atoi(_mask);
int val = atoi(_val);
ESP_LOGI(TAG, "Set Register: reg: 0x%02x, mask: 0x%02x, value: 0x%02x", reg, mask, val);
sensor_t *s = esp_camera_sensor_get();
int res = s->set_reg(s, reg, mask, val);
if (res) {
return httpd_resp_send_500(req);
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
return httpd_resp_send(req, NULL, 0);
}
static esp_err_t greg_handler(httpd_req_t *req)
{
char *buf = NULL;
char _reg[32];
char _mask[32];
if (parse_get(req, &buf) != ESP_OK ||
httpd_query_key_value(buf, "reg", _reg, sizeof(_reg)) != ESP_OK ||
httpd_query_key_value(buf, "mask", _mask, sizeof(_mask)) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
free(buf);
int reg = atoi(_reg);
int mask = atoi(_mask);
sensor_t *s = esp_camera_sensor_get();
int res = s->get_reg(s, reg, mask);
if (res < 0) {
return httpd_resp_send_500(req);
}
ESP_LOGI(TAG, "Get Register: reg: 0x%02x, mask: 0x%02x, value: 0x%02x", reg, mask, res);
char buffer[20];
const char * val = itoa(res, buffer, 10);
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
return httpd_resp_send(req, val, strlen(val));
}
static int parse_get_var(char *buf, const char * key, int def)
{
char _int[16];
if(httpd_query_key_value(buf, key, _int, sizeof(_int)) != ESP_OK){
return def;
}
return atoi(_int);
}
static esp_err_t pll_handler(httpd_req_t *req)
{
char *buf = NULL;
if (parse_get(req, &buf) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
int bypass = parse_get_var(buf, "bypass", 0);
int mul = parse_get_var(buf, "mul", 0);
int sys = parse_get_var(buf, "sys", 0);
int root = parse_get_var(buf, "root", 0);
int pre = parse_get_var(buf, "pre", 0);
int seld5 = parse_get_var(buf, "seld5", 0);
int pclken = parse_get_var(buf, "pclken", 0);
int pclk = parse_get_var(buf, "pclk", 0);
free(buf);
ESP_LOGI(TAG, "Set Pll: bypass: %d, mul: %d, sys: %d, root: %d, pre: %d, seld5: %d, pclken: %d, pclk: %d", bypass, mul, sys, root, pre, seld5, pclken, pclk);
sensor_t *s = esp_camera_sensor_get();
int res = s->set_pll(s, bypass, mul, sys, root, pre, seld5, pclken, pclk);
if (res) {
return httpd_resp_send_500(req);
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
return httpd_resp_send(req, NULL, 0);
}
static esp_err_t win_handler(httpd_req_t *req)
{
char *buf = NULL;
if (parse_get(req, &buf) != ESP_OK) {
free(buf);
httpd_resp_send_404(req);
return ESP_FAIL;
}
int startX = parse_get_var(buf, "sx", 0);
int startY = parse_get_var(buf, "sy", 0);
int endX = parse_get_var(buf, "ex", 0);
int endY = parse_get_var(buf, "ey", 0);
int offsetX = parse_get_var(buf, "offx", 0);
int offsetY = parse_get_var(buf, "offy", 0);
int totalX = parse_get_var(buf, "tx", 0);
int totalY = parse_get_var(buf, "ty", 0);
int outputX = parse_get_var(buf, "ox", 0);
int outputY = parse_get_var(buf, "oy", 0);
bool scale = parse_get_var(buf, "scale", 0) == 1;
bool binning = parse_get_var(buf, "binning", 0) == 1;
free(buf);
ESP_LOGI(TAG, "Set Window: Start: %d %d, End: %d %d, Offset: %d %d, Total: %d %d, Output: %d %d, Scale: %u, Binning: %u", startX, startY, endX, endY, offsetX, offsetY, totalX, totalY, outputX, outputY, scale, binning);
sensor_t *s = esp_camera_sensor_get();
int res = s->set_res_raw(s, startX, startY, endX, endY, offsetX, offsetY, totalX, totalY, outputX, outputY, scale, binning);
if (res) {
return httpd_resp_send_500(req);
}
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
return httpd_resp_send(req, NULL, 0);
}
static esp_err_t index_handler(httpd_req_t *req)
{
extern const unsigned char index_ov2640_html_gz_start[] asm("_binary_index_ov2640_html_gz_start");
@ -865,22 +1051,22 @@ static esp_err_t index_handler(httpd_req_t *req)
extern const unsigned char index_ov3660_html_gz_end[] asm("_binary_index_ov3660_html_gz_end");
size_t index_ov3660_html_gz_len = index_ov3660_html_gz_end - index_ov3660_html_gz_start;
extern const unsigned char index_ov5640_html_gz_start[] asm("_binary_index_ov5640_html_gz_start");
extern const unsigned char index_ov5640_html_gz_end[] asm("_binary_index_ov5640_html_gz_end");
size_t index_ov5640_html_gz_len = index_ov5640_html_gz_end - index_ov5640_html_gz_start;
httpd_resp_set_type(req, "text/html");
httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
sensor_t *s = esp_camera_sensor_get();
if (s != NULL)
{
if (s->id.PID == OV3660_PID)
{
if (s != NULL) {
if (s->id.PID == OV3660_PID) {
return httpd_resp_send(req, (const char *)index_ov3660_html_gz_start, index_ov3660_html_gz_len);
}
else
{
} else if (s->id.PID == OV5640_PID) {
return httpd_resp_send(req, (const char *)index_ov5640_html_gz_start, index_ov5640_html_gz_len);
} else {
return httpd_resp_send(req, (const char *)index_ov2640_html_gz_start, index_ov2640_html_gz_len);
}
}
else
{
} else {
ESP_LOGE(TAG, "Camera sensor not found");
return httpd_resp_send_500(req);
}
@ -889,6 +1075,7 @@ static esp_err_t index_handler(httpd_req_t *req)
void app_httpd_main()
{
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
config.max_uri_handlers = 10;
httpd_uri_t index_uri = {
.uri = "/",
@ -920,6 +1107,36 @@ void app_httpd_main()
.handler = stream_handler,
.user_ctx = NULL};
httpd_uri_t xclk_uri = {
.uri = "/xclk",
.method = HTTP_GET,
.handler = xclk_handler,
.user_ctx = NULL};
httpd_uri_t reg_uri = {
.uri = "/reg",
.method = HTTP_GET,
.handler = reg_handler,
.user_ctx = NULL};
httpd_uri_t greg_uri = {
.uri = "/greg",
.method = HTTP_GET,
.handler = greg_handler,
.user_ctx = NULL};
httpd_uri_t pll_uri = {
.uri = "/pll",
.method = HTTP_GET,
.handler = pll_handler,
.user_ctx = NULL};
httpd_uri_t win_uri = {
.uri = "/resolution",
.method = HTTP_GET,
.handler = win_handler,
.user_ctx = NULL};
ra_filter_init(&ra_filter, 20);
#if CONFIG_ESP_FACE_DETECT_ENABLED
@ -956,6 +1173,12 @@ void app_httpd_main()
httpd_register_uri_handler(camera_httpd, &cmd_uri);
httpd_register_uri_handler(camera_httpd, &status_uri);
httpd_register_uri_handler(camera_httpd, &capture_uri);
httpd_register_uri_handler(camera_httpd, &xclk_uri);
httpd_register_uri_handler(camera_httpd, &reg_uri);
httpd_register_uri_handler(camera_httpd, &greg_uri);
httpd_register_uri_handler(camera_httpd, &pll_uri);
httpd_register_uri_handler(camera_httpd, &win_uri);
}
config.server_port += 1;

View File

@ -8,3 +8,4 @@
#
COMPONENT_EMBED_FILES := www/index_ov2640.html.gz
COMPONENT_EMBED_FILES += www/index_ov3660.html.gz
COMPONENT_EMBED_FILES += www/index_ov5640.html.gz

View File

@ -43,6 +43,25 @@
#define HREF_GPIO_NUM 23
#define PCLK_GPIO_NUM 22
#elif CONFIG_CAMERA_MODEL_ESP32_CAM_BOARD
#define PWDN_GPIO_NUM 32
#define RESET_GPIO_NUM 33
#define XCLK_GPIO_NUM 4
#define SIOD_GPIO_NUM 18
#define SIOC_GPIO_NUM 23
#define Y9_GPIO_NUM 36
#define Y8_GPIO_NUM 19
#define Y7_GPIO_NUM 21
#define Y6_GPIO_NUM 39
#define Y5_GPIO_NUM 35
#define Y4_GPIO_NUM 14
#define Y3_GPIO_NUM 13
#define Y2_GPIO_NUM 34
#define VSYNC_GPIO_NUM 5
#define HREF_GPIO_NUM 27
#define PCLK_GPIO_NUM 25
#elif CONFIG_CAMERA_MODEL_ESP_EYE
#define PWDN_GPIO_NUM -1
#define RESET_GPIO_NUM -1

View File

@ -345,6 +345,38 @@
.hidden {
display: none
}
input[type=text] {
border: 1px solid #363636;
font-size: 14px;
height: 20px;
margin: 1px;
outline: 0;
border-radius: 5px
}
.inline-button {
line-height: 20px;
margin: 2px;
padding: 1px 4px 2px 4px;
}
label.toggle-section-label {
cursor: pointer;
display: block
}
input.toggle-section-button {
outline: 0;
opacity: 0;
width: 0;
height: 0
}
input.toggle-section-button:checked+section.toggle-section {
display: none
}
</style>
</head>
<body>
@ -356,24 +388,41 @@
<div id="sidebar">
<input type="checkbox" id="nav-toggle-cb" checked="checked">
<nav id="menu">
<section id="xclk-section" class="nothidden">
<div class="input-group" id="set-xclk-group">
<label for="set-xclk">XCLK MHz</label>
<div class="text">
<input id="xclk" type="text" minlength="1" maxlength="2" size="2" value="20">
</div>
<button class="inline-button" id="set-xclk">Set</button>
</div>
</section>
<div class="input-group" id="framesize-group">
<label for="framesize">Resolution</label>
<select id="framesize" class="default-action">
<option value="10">UXGA(1600x1200)</option>
<option value="9">SXGA(1280x1024)</option>
<option value="8">XGA(1024x768)</option>
<option value="7">SVGA(800x600)</option>
<option value="6">VGA(640x480)</option>
<option value="5" selected="selected">CIF(400x296)</option>
<option value="4">QVGA(320x240)</option>
<!-- 2MP -->
<option value="13">UXGA(1600x1200)</option>
<option value="12">SXGA(1280x1024)</option>
<option value="11">HD(1280x720)</option>
<option value="10">XGA(1024x768)</option>
<option value="9">SVGA(800x600)</option>
<option value="8">VGA(640x480)</option>
<option value="7">HVGA(480x320)</option>
<option value="6">CIF(400x296)</option>
<option value="5">QVGA(320x240)</option>
<option value="4">240x240</option>
<option value="3">HQVGA(240x176)</option>
<option value="0">QQVGA(160x120)</option>
<option value="2">QCIF(176x144)</option>
<option value="1">QQVGA(160x120)</option>
<option value="0">96x96</option>
</select>
</div>
<div class="input-group" id="quality-group">
<label for="quality">Quality</label>
<div class="range-min">10</div>
<input type="range" id="quality" min="10" max="63" value="10" class="default-action">
<div class="range-min">4</div>
<input type="range" id="quality" min="4" max="63" value="10" class="default-action">
<div class="range-max">63</div>
</div>
<div class="input-group" id="brightness-group">
@ -556,6 +605,99 @@
<button id="toggle-stream">Start Stream</button>
<button id="face_enroll" class="disabled" disabled="disabled">Enroll Face</button>
</section>
<div style="margin-top: 8px;"><center><span style="font-weight: bold;">Advanced Settings</span></center></div>
<hr style="width:100%">
<label for="nav-toggle-reg" class="toggle-section-label">&#9776;&nbsp;&nbsp;Register Get/Set</label><input type="checkbox" id="nav-toggle-reg" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<!--h4>Set Register</h4-->
<div class="input-group" id="set-reg-group">
<label for="set-reg">Reg, Mask, Value</label>
<div class="text">
<input id="reg-addr" type="text" minlength="4" maxlength="6" size="6" value="0x111">
</div>
<div class="text">
<input id="reg-mask" type="text" minlength="4" maxlength="4" size="4" value="0x80">
</div>
<div class="text">
<input id="reg-value" type="text" minlength="4" maxlength="4" size="4" value="0x80">
</div>
<button class="inline-button" id="set-reg">Set</button>
</div>
<hr style="width:50%">
<!--h4>Get Register</h4-->
<div class="input-group" id="get-reg-group">
<label for="get-reg">Reg, Mask</label>
<div class="text">
<input id="get-reg-addr" type="text" minlength="4" maxlength="6" size="6" value="0x111">
</div>
<div class="text">
<input id="get-reg-mask" type="text" minlength="4" maxlength="6" size="6" value="0x80">
</div>
<button class="inline-button" id="get-reg">Get</button>
</div>
<div class="input-group">
<label for="get-reg-value">Value</label>
<div class="text">
<span id="get-reg-value">0x1234</span>
</div>
</div>
</section>
<hr style="width:100%">
<label for="nav-toggle-2640pll" class="toggle-section-label">&#9776;&nbsp;&nbsp;CLK</label><input type="checkbox" id="nav-toggle-2640pll" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group"><label for="2640pll1">CLK 2X</label><div class="switch"><input id="2640pll1" type="checkbox" class="reg-action" reg="0x111" offset="7" mask="0x01"><label class="slider" for="2640pll1"></label></div></div>
<div class="input-group"><label for="2640pll3">CLK DIV</label><div class="text">0<input id="2640pll3" type="text" minlength="1" maxlength="2" size="2" value="1" class="reg-action" reg="0x111" offset="0" mask="0x3f">63</div></div>
<div class="input-group"><label for="2640pll5">Auto PCLK</label><div class="switch"><input id="2640pll5" type="checkbox" class="reg-action" reg="0xd3" offset="7" mask="0x01"><label class="slider" for="2640pll5"></label></div></div>
<div class="input-group"><label for="2640pll4">PCLK DIV</label><div class="text">0<input id="2640pll4" type="text" minlength="1" maxlength="3" size="3" value="4" class="reg-action" reg="0xd3" offset="0" mask="0x7f">127</div></div>
</section>
<hr style="width:100%">
<label for="nav-toggle-win" class="toggle-section-label">&#9776;&nbsp;&nbsp;Window</label><input type="checkbox" id="nav-toggle-win" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group">
<label for="start-x">Sensor Resolution</label><select id="start-x">
<option value="2">CIF (400x296)</option>
<option value="1">SVGA (800x600)</option>
<option value="0" selected="selected">UXGA (1600x1200)</option>
</select>
</div>
<div class="input-group" id="set-offset-res-group">
<label for="offset-x">Offset</label>
<div class="text">
X:<input id="offset-x" type="text" minlength="1" maxlength="3" size="6" value="400">
</div>
<div class="text">
Y:<input id="offset-y" type="text" minlength="1" maxlength="3" size="6" value="300">
</div>
</div>
<div class="input-group" id="set-total-res-group">
<label for="total-x">Window Size</label>
<div class="text">
X:<input id="total-x" type="text" minlength="1" maxlength="4" size="6" value="800">
</div>
<div class="text">
Y:<input id="total-y" type="text" minlength="1" maxlength="4" size="6" value="600">
</div>
</div>
<div class="input-group" id="set-output-res-group">
<label for="output-x">Output Size</label>
<div class="text">
X:<input id="output-x" type="text" minlength="1" maxlength="4" size="6" value="320">
</div>
<div class="text">
Y:<input id="output-y" type="text" minlength="1" maxlength="4" size="6" value="240">
</div>
</div>
<button id="set-resolution">Set Resolution</button>
</section>
</nav>
</div>
<figure>
@ -572,6 +714,187 @@ document.addEventListener('DOMContentLoaded', function (event) {
var baseHost = document.location.origin
var streamUrl = baseHost + ':81'
function fetchUrl(url, cb){
fetch(url)
.then(function (response) {
if (response.status !== 200) {
cb(response.status, response.statusText);
} else {
response.text().then(function(data){
cb(200, data);
}).catch(function(err) {
cb(-1, err);
});
}
})
.catch(function(err) {
cb(-1, err);
});
}
function setReg(reg, offset, mask, value, cb){
//console.log('Set Reg', '0x'+reg.toString(16), offset, '0x'+mask.toString(16), '0x'+value.toString(16), '('+value+')');
value = (value & mask) << offset;
mask = mask << offset;
fetchUrl(`${baseHost}/reg?reg=${reg}&mask=${mask}&val=${value}`, cb);
}
function getReg(reg, offset, mask, cb){
mask = mask << offset;
fetchUrl(`${baseHost}/greg?reg=${reg}&mask=${mask}`, function(code, txt){
let value = 0;
if(code == 200){
value = parseInt(txt);
value = (value & mask) >> offset;
txt = ''+value;
}
cb(code, txt);
});
}
function setXclk(xclk, cb){
fetchUrl(`${baseHost}/xclk?xclk=${xclk}`, cb);
}
function setWindow(start_x, start_y, end_x, end_y, offset_x, offset_y, total_x, total_y, output_x, output_y, scaling, binning, cb){
fetchUrl(`${baseHost}/resolution?sx=${start_x}&sy=${start_y}&ex=${end_x}&ey=${end_y}&offx=${offset_x}&offy=${offset_y}&tx=${total_x}&ty=${total_y}&ox=${output_x}&oy=${output_y}&scale=${scaling}&binning=${binning}`, cb);
}
const setRegButton = document.getElementById('set-reg')
setRegButton.onclick = () => {
let reg = parseInt(document.getElementById('reg-addr').value);
let mask = parseInt(document.getElementById('reg-mask').value);
let value = parseInt(document.getElementById('reg-value').value);
setReg(reg, 0, mask, value, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const getRegButton = document.getElementById('get-reg')
getRegButton.onclick = () => {
let reg = parseInt(document.getElementById('get-reg-addr').value);
let mask = parseInt(document.getElementById('get-reg-mask').value);
let value = document.getElementById('get-reg-value');
getReg(reg, 0, mask, function(code, txt){
if(code != 200){
value.innerHTML = 'Error['+code+']: '+txt;
} else {
value.innerHTML = '0x'+parseInt(txt).toString(16)+' ('+txt+')';
}
});
}
const setXclkButton = document.getElementById('set-xclk')
setXclkButton.onclick = () => {
let xclk = parseInt(document.getElementById('xclk').value);
setXclk(xclk, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const setResButton = document.getElementById('set-resolution')
setResButton.onclick = () => {
let start_x = parseInt(document.getElementById('start-x').value);
let offset_x = parseInt(document.getElementById('offset-x').value);
let offset_y = parseInt(document.getElementById('offset-y').value);
let total_x = parseInt(document.getElementById('total-x').value);
let total_y = parseInt(document.getElementById('total-y').value);
let output_x = parseInt(document.getElementById('output-x').value);
let output_y = parseInt(document.getElementById('output-y').value);
setWindow(start_x, 0, 0, 0, offset_x, offset_y, total_x, total_y, output_x, output_y, false, false, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const setRegValue = (el) => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255;
let value = 0;
switch (el.type) {
case 'checkbox':
value = el.checked ? mask : 0;
break;
case 'range':
case 'text':
case 'select-one':
value = el.value;
break
default:
return;
}
setReg(reg, offset, mask, value, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
// Attach on change action for register elements
document
.querySelectorAll('.reg-action')
.forEach(el => {
if (el.type === 'text') {
el.onkeyup = function(e){
if(e.keyCode == 13){
setRegValue(el);
}
}
} else {
el.onchange = () => setRegValue(el)
}
})
const updateRegValue = (el, value, updateRemote) => {
let initialValue;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = (el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255) << offset;
value = (value & mask) >> offset;
if (el.type === 'checkbox') {
initialValue = el.checked
value = !!value
el.checked = value
} else {
initialValue = el.value
el.value = value
}
}
const printReg = (el) => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255;
let value = 0;
switch (el.type) {
case 'checkbox':
value = el.checked ? mask : 0;
break;
case 'range':
case 'select-one':
value = el.value;
break
default:
return;
}
value = (value & mask) << offset;
return '0x'+reg.toString(16)+', 0x'+value.toString(16);
}
const hide = el => {
el.classList.add('hidden')
}
@ -669,6 +992,15 @@ document.addEventListener('DOMContentLoaded', function (event) {
.forEach(el => {
updateValue(el, state[el.id], false)
})
document
.querySelectorAll('.reg-action')
.forEach(el => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
if(reg == 0){
return;
}
updateRegValue(el, state['0x'+reg.toString(16)], false)
})
})
const view = document.getElementById('stream')

View File

@ -361,6 +361,23 @@
padding: 1px 4px 2px 4px;
}
label.toggle-section-label {
cursor: pointer;
display: block
}
input.toggle-section-button {
outline: 0;
opacity: 0;
width: 0;
height: 0
}
input.toggle-section-button:checked+section.toggle-section {
display: none
}
</style>
</head>
<body>
@ -372,19 +389,40 @@
<div id="sidebar">
<input type="checkbox" id="nav-toggle-cb" checked="checked">
<nav id="menu">
<section id="xclk-section" class="nothidden">
<div class="input-group" id="set-xclk-group">
<label for="set-xclk">XCLK MHz</label>
<div class="text">
<input id="xclk" type="text" minlength="1" maxlength="2" size="2" value="20">
</div>
<button class="inline-button" id="set-xclk">Set</button>
</div>
</section>
<div class="input-group" id="framesize-group">
<label for="framesize">Resolution</label>
<select id="framesize" class="default-action">
<option value="11">QXGA(2048x1564)</option>
<option value="10">UXGA(1600x1200)</option>
<option value="9">SXGA(1280x1024)</option>
<option value="8">XGA(1024x768)</option>
<option value="7">SVGA(800x600)</option>
<option value="6">VGA(640x480)</option>
<option value="5" selected="selected">CIF(400x296)</option>
<option value="4">QVGA(320x240)</option>
<!-- 3MP -->
<option value="17">QXGA(2048x1564)</option>
<option value="16">P 3MP(864x1564)</option>
<option value="15">P HD(720x1280)</option>
<option value="14">FHD(1920x1080)</option>
<!-- 2MP -->
<option value="13">UXGA(1600x1200)</option>
<option value="12">SXGA(1280x1024)</option>
<option value="11">HD(1280x720)</option>
<option value="10">XGA(1024x768)</option>
<option value="9">SVGA(800x600)</option>
<option value="8">VGA(640x480)</option>
<option value="7">HVGA(480x320)</option>
<option value="6">CIF(400x296)</option>
<option value="5">QVGA(320x240)</option>
<option value="4">240x240</option>
<option value="3">HQVGA(240x176)</option>
<option value="0">QQVGA(160x120)</option>
<option value="2">QCIF(176x144)</option>
<option value="1">QQVGA(160x120)</option>
<option value="0">96x96</option>
</select>
</div>
<div class="input-group" id="quality-group">
@ -585,6 +623,277 @@
<button id="toggle-stream">Start Stream</button>
<button id="face_enroll" class="disabled" disabled="disabled">Enroll Face</button>
</section>
<div style="margin-top: 8px;"><center><span style="font-weight: bold;">Advanced Settings</span></center></div>
<hr style="width:100%">
<label for="nav-toggle-reg" class="toggle-section-label">&#9776;&nbsp;&nbsp;Register Get/Set</label><input type="checkbox" id="nav-toggle-reg" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<!--h4>Set Register</h4-->
<div class="input-group" id="set-reg-group">
<label for="set-reg">Reg, Mask, Value</label>
<div class="text">
<input id="reg-addr" type="text" minlength="4" maxlength="6" size="6" value="0x3008">
</div>
<div class="text">
<input id="reg-mask" type="text" minlength="4" maxlength="4" size="4" value="0xff">
</div>
<div class="text">
<input id="reg-value" type="text" minlength="4" maxlength="4" size="4" value="0x02">
</div>
<button class="inline-button" id="set-reg">Set</button>
</div>
<hr style="width:50%">
<!--h4>Get Register</h4-->
<div class="input-group" id="get-reg-group">
<label for="get-reg">Reg, Mask</label>
<div class="text">
<input id="get-reg-addr" type="text" minlength="4" maxlength="6" size="6" value="0x3008">
</div>
<div class="text">
<input id="get-reg-mask" type="text" minlength="4" maxlength="6" size="6" value="0x00ff">
</div>
<button class="inline-button" id="get-reg">Get</button>
</div>
<div class="input-group">
<label for="get-reg-value">Value</label>
<div class="text">
<span id="get-reg-value">0x1234</span>
</div>
</div>
</section>
<hr style="width:100%">
<label for="nav-toggle-pll" class="toggle-section-label">&#9776;&nbsp;&nbsp;PLL</label><input type="checkbox" id="nav-toggle-pll" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group" id="bypass-pll-group">
<label for="bypass-pll">Bypass PLL</label>
<div class="switch">
<input id="bypass-pll" type="checkbox">
<label class="slider" for="bypass-pll"></label>
</div>
</div>
<div class="input-group" id="set-mul-pll-group">
<label for="mul-pll">Multiplier (0 - 31)</label>
<div class="text">
<input id="mul-pll" type="text" minlength="1" maxlength="2" size="18" value="30">
</div>
</div>
<div class="input-group" id="root-pll-group">
<label for="root-pll">Root Multiplier</label>
<select id="root-pll">
<option value="0" selected="selected">1x</option>
<option value="1">2x</option>
</select>
</div>
<div class="input-group" id="set-sys-pll-group">
<label for="sys-pll">System Div (0 - 15)</label>
<div class="text">
<input id="sys-pll" type="text" minlength="1" maxlength="2" size="18" value="1">
</div>
</div>
<div class="input-group" id="set-pre-pll-group">
<label for="pre-pll">Pre Div</label>
<select id="pre-pll">
<option value="0">1x</option>
<option value="1">1.5x</option>
<option value="2">2x</option>
<option value="3" selected="selected">3x</option>
</select>
</div>
<div class="input-group" id="set-seld5-pll-group">
<label for="seld5-pll">Seld5 Div</label>
<select id="seld5-pll">
<option value="0" selected="selected">1x</option>
<option value="1">1x</option>
<option value="2">2x</option>
<option value="3">2.5x</option>
</select>
</div>
<div class="input-group" id="pclk-en-group">
<label for="pclk-en">PCLK Manual</label>
<div class="switch">
<input id="pclk-en" type="checkbox" checked="checked">
<label class="slider" for="pclk-en"></label>
</div>
</div>
<div class="input-group" id="set-pclk-pll-group">
<label for="pclk-pll">PCLK Div (0 - 31)</label>
<div class="text">
<input id="pclk-pll" type="text" minlength="1" maxlength="2" size="18" value="10">
</div>
</div>
<button id="set-pll">Set PLL</button>
</section>
<hr style="width:100%">
<label for="nav-toggle-win" class="toggle-section-label">&#9776;&nbsp;&nbsp;Window</label><input type="checkbox" id="nav-toggle-win" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group" id="set-start-res-group">
<label for="start-x">Adress Start</label>
<div class="text">
X:<input id="start-x" type="text" minlength="1" maxlength="4" size="6" value="0">
</div>
<div class="text">
Y:<input id="start-y" type="text" minlength="1" maxlength="4" size="6" value="0">
</div>
</div>
<div class="input-group" id="set-end-res-group">
<label for="end-x">Adress End</label>
<div class="text">
X:<input id="end-x" type="text" minlength="1" maxlength="4" size="6" value="2079">
</div>
<div class="text">
Y:<input id="end-y" type="text" minlength="1" maxlength="4" size="6" value="1547">
</div>
</div>
<div class="input-group" id="set-offset-res-group">
<label for="offset-x">Offset</label>
<div class="text">
X:<input id="offset-x" type="text" minlength="1" maxlength="3" size="6" value="16">
</div>
<div class="text">
Y:<input id="offset-y" type="text" minlength="1" maxlength="3" size="6" value="6">
</div>
</div>
<div class="input-group" id="set-total-res-group">
<label for="total-x">Total Size</label>
<div class="text">
X:<input id="total-x" type="text" minlength="1" maxlength="4" size="6" value="2300">
</div>
<div class="text">
Y:<input id="total-y" type="text" minlength="1" maxlength="4" size="6" value="1564">
</div>
</div>
<div class="input-group" id="set-output-res-group">
<label for="output-x">Output Size</label>
<div class="text">
X:<input id="output-x" type="text" minlength="1" maxlength="4" size="6" value="2048">
</div>
<div class="text">
Y:<input id="output-y" type="text" minlength="1" maxlength="4" size="6" value="1536">
</div>
</div>
<div class="input-group" id="scaling-group">
<label for="scaling">Scaling</label>
<div class="switch">
<input id="scaling" type="checkbox">
<label class="slider" for="scaling"></label>
</div>
</div>
<div class="input-group" id="binning-group">
<label for="binning">Binning</label>
<div class="switch">
<input id="binning" type="checkbox">
<label class="slider" for="binning"></label>
</div>
</div>
<button id="set-resolution">Set Resolution</button>
</section>
<hr style="width:100%">
<label for="nav-toggle-gamma" class="toggle-section-label">&#9776;&nbsp;&nbsp;Gamma</label><input type="checkbox" id="nav-toggle-gamma" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group"><label for="gamma-bias">Gamma Bias Plus</label><div class="switch"><input id="gamma-bias" type="checkbox" class="reg-action" reg="0x5480" offset="0" mask="0x01"><label class="slider" for="gamma-bias"></label></div></div>
<div class="input-group"><label for="gamma-1">Gamma 0</label><input type="range" id="gamma-1" min="0" max="255" value="0" class="reg-action" reg="0x5481" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-2">Gamma 1</label><input type="range" id="gamma-2" min="0" max="255" value="0" class="reg-action" reg="0x5482" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-3">Gamma 2</label><input type="range" id="gamma-3" min="0" max="255" value="0" class="reg-action" reg="0x5483" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-4">Gamma 3</label><input type="range" id="gamma-4" min="0" max="255" value="0" class="reg-action" reg="0x5484" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-5">Gamma 4</label><input type="range" id="gamma-5" min="0" max="255" value="0" class="reg-action" reg="0x5485" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-6">Gamma 5</label><input type="range" id="gamma-6" min="0" max="255" value="0" class="reg-action" reg="0x5486" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-7">Gamma 6</label><input type="range" id="gamma-7" min="0" max="255" value="0" class="reg-action" reg="0x5487" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-8">Gamma 7</label><input type="range" id="gamma-8" min="0" max="255" value="0" class="reg-action" reg="0x5488" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-9">Gamma 8</label><input type="range" id="gamma-9" min="0" max="255" value="0" class="reg-action" reg="0x5489" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-10">Gamma 9</label><input type="range" id="gamma-10" min="0" max="255" value="0" class="reg-action" reg="0x548a" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-11">Gamma 10</label><input type="range" id="gamma-11" min="0" max="255" value="0" class="reg-action" reg="0x548b" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-12">Gamma 11</label><input type="range" id="gamma-12" min="0" max="255" value="0" class="reg-action" reg="0x548c" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-13">Gamma 12</label><input type="range" id="gamma-13" min="0" max="255" value="0" class="reg-action" reg="0x548d" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-14">Gamma 13</label><input type="range" id="gamma-14" min="0" max="255" value="0" class="reg-action" reg="0x548e" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-15">Gamma 14</label><input type="range" id="gamma-15" min="0" max="255" value="0" class="reg-action" reg="0x548f" offset="0" mask="0xff"></div>
<div class="input-group"><label for="gamma-16">Gamma 15</label><input type="range" id="gamma-16" min="0" max="255" value="0" class="reg-action" reg="0x5490" offset="0" mask="0xff"></div>
<div class="input-group"><label for="get-gamma"></label><button class="inline-button" id="get-gamma">Get Gamma Config</button></div>
</section>
<hr style="width:100%">
<label for="nav-toggle-sde" class="toggle-section-label">&#9776;&nbsp;&nbsp;SDE</label><input type="checkbox" id="nav-toggle-sde" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group"><label for="sde2">Negative</label><div class="switch"><input id="sde2" type="checkbox" class="reg-action" reg="0x5580" offset="6" mask="0x01"><label class="slider" for="sde2"></label></div></div>
<div class="input-group"><label for="sde3">Gray</label><div class="switch"><input id="sde3" type="checkbox" class="reg-action" reg="0x5580" offset="5" mask="0x01"><label class="slider" for="sde3"></label></div></div>
<hr style="width:50%">
<div class="input-group"><label for="sde1">Fixed Y</label><div class="switch"><input id="sde1" type="checkbox" class="reg-action" reg="0x5580" offset="7" mask="0x01"><label class="slider" for="sde1"></label></div></div>
<div class="input-group"><label for="sde5">Fixed U</label><div class="switch"><input id="sde5" type="checkbox" class="reg-action" reg="0x5580" offset="3" mask="0x01"><label class="slider" for="sde5"></label></div></div>
<div class="input-group"><label for="sde4">Fixed V</label><div class="switch"><input id="sde4" type="checkbox" class="reg-action" reg="0x5580" offset="4" mask="0x01"><label class="slider" for="sde4"></label></div></div>
<div class="input-group"><label for="sde22">UV Thresh 1</label><input type="range" id="sde22" min="0" max="255" value="0" class="reg-action" reg="0x5589" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde23">UV Thresh 2</label><input type="range" id="sde23" min="0" max="511" value="0" class="reg-action" reg="0x558a" offset="0" mask="0x1ff"></div>
<hr style="width:50%">
<div class="input-group"><label for="sde8">Hue</label><div class="switch"><input id="sde8" type="checkbox" class="reg-action" reg="0x5580" offset="0" mask="0x01"><label class="slider" for="sde8"></label></div></div>
<div class="input-group"><label for="sde9">Hue Cos</label><input type="range" id="sde9" min="0" max="255" value="0" class="reg-action" reg="0x5581" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde17">Hue U Cos Neg</label><div class="switch"><input id="sde17" type="checkbox" class="reg-action" reg="0x5588" offset="4" mask="0x01"><label class="slider" for="sde17"></label></div></div>
<div class="input-group"><label for="sde16">Hue V Cos Neg</label><div class="switch"><input id="sde16" type="checkbox" class="reg-action" reg="0x5588" offset="5" mask="0x01"><label class="slider" for="sde16"></label></div></div>
<div class="input-group"><label for="sde10">Hue Sin</label><input type="range" id="sde10" min="0" max="255" value="0" class="reg-action" reg="0x5582" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde21">Hue U Sin Neg</label><div class="switch"><input id="sde21" type="checkbox" class="reg-action" reg="0x5588" offset="0" mask="0x01"><label class="slider" for="sde21"></label></div></div>
<div class="input-group"><label for="sde20">Hue V Sin Neg</label><div class="switch"><input id="sde20" type="checkbox" class="reg-action" reg="0x5588" offset="1" mask="0x01"><label class="slider" for="sde20"></label></div></div>
<hr style="width:50%">
<div class="input-group"><label for="sde6">Contrast</label><div class="switch"><input id="sde6" type="checkbox" class="reg-action" reg="0x5580" offset="2" mask="0x01"><label class="slider" for="sde6"></label></div></div>
<div class="input-group"><label for="sde13">Contrast Y Offset</label><input type="range" id="sde13" min="0" max="255" value="0" class="reg-action" reg="0x5585" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde19">Contrast Y Offset Neg</label><div class="switch"><input id="sde19" type="checkbox" class="reg-action" reg="0x5588" offset="2" mask="0x01"><label class="slider" for="sde19"></label></div></div>
<div class="input-group"><label for="sde15">Contrast Y Bright</label><input type="range" id="sde15" min="0" max="255" value="0" class="reg-action" reg="0x5587" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde18">Contrast Y Bright Neg</label><div class="switch"><input id="sde18" type="checkbox" class="reg-action" reg="0x5588" offset="3" mask="0x01"><label class="slider" for="sde18"></label></div></div>
<div class="input-group"><label for="sde14">Contrast Y Gain</label><input type="range" id="sde14" min="0" max="255" value="0" class="reg-action" reg="0x5586" offset="0" mask="0xff"></div>
<hr style="width:50%">
<div class="input-group"><label for="sde7">Saturation</label><div class="switch"><input id="sde7" type="checkbox" class="reg-action" reg="0x5580" offset="1" mask="0x01"><label class="slider" for="sde7"></label></div></div>
<div class="input-group"><label for="sde11">U Saturation</label><input type="range" id="sde11" min="0" max="255" value="0" class="reg-action" reg="0x5583" offset="0" mask="0xff"></div>
<div class="input-group"><label for="sde12">V Saturation</label><input type="range" id="sde12" min="0" max="255" value="0" class="reg-action" reg="0x5584" offset="0" mask="0xff"></div>
</section>
<hr style="width:100%">
<label for="nav-toggle-cmx" class="toggle-section-label">&#9776;&nbsp;&nbsp;CMX</label><input type="checkbox" id="nav-toggle-cmx" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group">
<label for="cmx-precision">CMX Precision</label><select id="cmx-precision" class="reg-action" reg="0x5380" offset="1" mask="0x01">
<option value="1">2.6 Mode</option>
<option value="0" selected="selected">1.7 Mode</option>
</select>
</div>
<div class="input-group"><label for="cmx1">CMX1 for Y</label><div class="switch"><input id="cmx1" type="checkbox" class="reg-action" reg="0x5381" offset="1" mask="0x01"><label class="slider" for="cmx1"></label></div></div>
<div class="input-group"><label for="cmx11">CMX1 for Y Neg</label><div class="switch"><input id="cmx11" type="checkbox" class="reg-action" reg="0x538b" offset="0" mask="0x01"><label class="slider" for="cmx11"></label></div></div>
<div class="input-group"><label for="cmx2">CMX2 for Y</label><input type="range" id="cmx2" min="0" max="255" value="0" class="reg-action" reg="0x5382" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx12">CMX2 for Y Neg</label><div class="switch"><input id="cmx12" type="checkbox" class="reg-action" reg="0x538b" offset="1" mask="0x01"><label class="slider" for="cmx12"></label></div></div>
<div class="input-group"><label for="cmx3">CMX3 for Y</label><input type="range" id="cmx3" min="0" max="255" value="0" class="reg-action" reg="0x5383" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx13">CMX3 for Y Neg</label><div class="switch"><input id="cmx13" type="checkbox" class="reg-action" reg="0x538b" offset="2" mask="0x01"><label class="slider" for="cmx13"></label></div></div>
<div class="input-group"><label for="cmx4">CMX4 for Y</label><input type="range" id="cmx4" min="0" max="255" value="0" class="reg-action" reg="0x5384" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx14">CMX4 for Y Neg</label><div class="switch"><input id="cmx14" type="checkbox" class="reg-action" reg="0x538b" offset="3" mask="0x01"><label class="slider" for="cmx14"></label></div></div>
<div class="input-group"><label for="cmx5">CMX5 for Y</label><input type="range" id="cmx5" min="0" max="255" value="0" class="reg-action" reg="0x5385" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx15">CMX5 for Y Neg</label><div class="switch"><input id="cmx15" type="checkbox" class="reg-action" reg="0x538b" offset="4" mask="0x01"><label class="slider" for="cmx15"></label></div></div>
<div class="input-group"><label for="cmx6">CMX6 for Y</label><input type="range" id="cmx6" min="0" max="255" value="0" class="reg-action" reg="0x5386" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx16">CMX6 for Y Neg</label><div class="switch"><input id="cmx16" type="checkbox" class="reg-action" reg="0x538b" offset="5" mask="0x01"><label class="slider" for="cmx16"></label></div></div>
<div class="input-group"><label for="cmx7">CMX7 for Y</label><input type="range" id="cmx7" min="0" max="255" value="0" class="reg-action" reg="0x5387" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx17">CMX7 for Y Neg</label><div class="switch"><input id="cmx17" type="checkbox" class="reg-action" reg="0x538b" offset="6" mask="0x01"><label class="slider" for="cmx17"></label></div></div>
<div class="input-group"><label for="cmx8">CMX8 for Y</label><input type="range" id="cmx8" min="0" max="255" value="0" class="reg-action" reg="0x5388" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx18">CMX8 for Y Neg</label><div class="switch"><input id="cmx18" type="checkbox" class="reg-action" reg="0x538b" offset="7" mask="0x01"><label class="slider" for="cmx18"></label></div></div>
<div class="input-group"><label for="cmx9">CMX9 for Y</label><input type="range" id="cmx9" min="0" max="255" value="0" class="reg-action" reg="0x5389" offset="0" mask="0xff"></div>
<div class="input-group"><label for="cmx10">CMX9 for Y Neg</label><div class="switch"><input id="cmx10" type="checkbox" class="reg-action" reg="0x538a" offset="0" mask="0x01"><label class="slider" for="cmx10"></label></div></div>
</section>
<hr style="width:100%">
<label for="nav-toggle-awbg" class="toggle-section-label">&#9776;&nbsp;&nbsp;AWB Gain</label><input type="checkbox" id="nav-toggle-awbg" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group"><label for="awbg1">Manual AWB Gain</label><div class="switch"><input id="awbg1" type="checkbox" class="reg-action" reg="0x3406" offset="0" mask="0x01"><label class="slider" for="awbg1"></label></div></div>
<div class="input-group"><label for="awbg2">AWB R Gain</label><input type="range" id="awbg2" min="0" max="4095" value="0" class="reg-action" reg="0x3400" offset="0" mask="0xfff"></div>
<div class="input-group"><label for="awbg3">AWB G Gain</label><input type="range" id="awbg3" min="0" max="4095" value="0" class="reg-action" reg="0x3402" offset="0" mask="0xfff"></div>
<div class="input-group"><label for="awbg4">AWB B Gain</label><input type="range" id="awbg4" min="0" max="4095" value="0" class="reg-action" reg="0x3404" offset="0" mask="0xfff"></div>
</section>
<hr style="width:100%">
<label for="nav-toggle-aecagc" class="toggle-section-label">&#9776;&nbsp;&nbsp;AEC/AGC Control</label><input type="checkbox" id="nav-toggle-aecagc" class="hidden toggle-section-button" checked="checked">
<section class="toggle-section">
<div class="input-group"><label for="aecagc1">Manual AGC</label><div class="switch"><input id="aecagc1" type="checkbox" class="reg-action" reg="0x3503" offset="1" mask="0x01"><label class="slider" for="aecagc1"></label></div></div>
<div class="input-group"><label for="aecagc2">Manual AEC</label><div class="switch"><input id="aecagc2" type="checkbox" class="reg-action" reg="0x3503" offset="0" mask="0x01"><label class="slider" for="aecagc2"></label></div></div>
<div class="input-group"><label for="aecagc3">AEC PK Exposure</label><input type="range" id="aecagc3" min="0" max="65535" value="0" class="reg-action" reg="0x3500" offset="0" mask="0xffff0"></div>
<div class="input-group"><label for="aecagc4">AEC PK Real Gain</label><input type="range" id="aecagc4" min="0" max="1023" value="0" class="reg-action" reg="0x350a" offset="0" mask="0x3ff"></div>
<div class="input-group"><label for="aecagc5">AEC PK VTS</label><input type="range" id="aecagc5" min="0" max="65535" value="0" class="reg-action" reg="0x350c" offset="0" mask="0xffff"></div>
</section>
</nav>
</div>
<figure>
@ -601,6 +910,212 @@ document.addEventListener('DOMContentLoaded', function (event) {
var baseHost = document.location.origin
var streamUrl = baseHost + ':81'
function fetchUrl(url, cb){
fetch(url)
.then(function (response) {
if (response.status !== 200) {
cb(response.status, response.statusText);
} else {
response.text().then(function(data){
cb(200, data);
}).catch(function(err) {
cb(-1, err);
});
}
})
.catch(function(err) {
cb(-1, err);
});
}
function setReg(reg, offset, mask, value, cb){
console.log('Set Reg', '0x'+reg.toString(16), offset, '0x'+mask.toString(16), '0x'+value.toString(16), '('+value+')');
value = (value & mask) << offset;
mask = mask << offset;
fetchUrl(`${baseHost}/reg?reg=${reg}&mask=${mask}&val=${value}`, cb);
}
function getReg(reg, offset, mask, cb){
mask = mask << offset;
fetchUrl(`${baseHost}/greg?reg=${reg}&mask=${mask}`, function(code, txt){
let value = 0;
if(code == 200){
value = parseInt(txt);
value = (value & mask) >> offset;
txt = ''+value;
}
cb(code, txt);
});
}
function setXclk(xclk, cb){
fetchUrl(`${baseHost}/xclk?xclk=${xclk}`, cb);
}
function setPll(bypass, mul, sys, root_, pre, seld5, pclken, pclk, cb){
fetchUrl(`${baseHost}/pll?bypass=${bypass}&mul=${mul}&sys=${sys}&root=${root_}&pre=${pre}&seld5=${seld5}&pclken=${pclken}&pclk=${pclk}`, cb);
}
function setWindow(start_x, start_y, end_x, end_y, offset_x, offset_y, total_x, total_y, output_x, output_y, scaling, binning, cb){
fetchUrl(`${baseHost}/resolution?sx=${start_x}&sy=${start_y}&ex=${end_x}&ey=${end_y}&offx=${offset_x}&offy=${offset_y}&tx=${total_x}&ty=${total_y}&ox=${output_x}&oy=${output_y}&scale=${scaling}&binning=${binning}`, cb);
}
const setRegButton = document.getElementById('set-reg')
setRegButton.onclick = () => {
let reg = parseInt(document.getElementById('reg-addr').value);
let mask = parseInt(document.getElementById('reg-mask').value);
let value = parseInt(document.getElementById('reg-value').value);
setReg(reg, 0, mask, value, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const getRegButton = document.getElementById('get-reg')
getRegButton.onclick = () => {
let reg = parseInt(document.getElementById('get-reg-addr').value);
let mask = parseInt(document.getElementById('get-reg-mask').value);
let value = document.getElementById('get-reg-value');
getReg(reg, 0, mask, function(code, txt){
if(code != 200){
value.innerHTML = 'Error['+code+']: '+txt;
} else {
value.innerHTML = '0x'+parseInt(txt).toString(16)+' ('+txt+')';
}
});
}
const setXclkButton = document.getElementById('set-xclk')
setXclkButton.onclick = () => {
let xclk = parseInt(document.getElementById('xclk').value);
setXclk(xclk, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const setResButton = document.getElementById('set-resolution')
setResButton.onclick = () => {
let start_x = parseInt(document.getElementById('start-x').value);
let start_y = parseInt(document.getElementById('start-y').value);
let end_x = parseInt(document.getElementById('end-x').value);
let end_y = parseInt(document.getElementById('end-y').value);
let offset_x = parseInt(document.getElementById('offset-x').value);
let offset_y = parseInt(document.getElementById('offset-y').value);
let total_x = parseInt(document.getElementById('total-x').value);
let total_y = parseInt(document.getElementById('total-y').value);
let output_x = parseInt(document.getElementById('output-x').value);
let output_y = parseInt(document.getElementById('output-y').value);
let scaling = document.getElementById('scaling').checked?1:0;
let binning = document.getElementById('binning').checked?1:0;
setWindow(start_x, start_y, end_x, end_y, offset_x, offset_y, total_x, total_y, output_x, output_y, scaling, binning, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const setPllButton = document.getElementById('set-pll')
setPllButton.onclick = () => {
var bypass = document.getElementById('bypass-pll').checked?1:0;
var mul = parseInt(document.getElementById('mul-pll').value);
var sys = parseInt(document.getElementById('sys-pll').value);
var root_ = parseInt(document.getElementById('root-pll').value);
var pre = parseInt(document.getElementById('pre-pll').value);
var seld5 = parseInt(document.getElementById('seld5-pll').value);
var pclken = document.getElementById('pclk-en').checked?1:0;
var pclk = parseInt(document.getElementById('pclk-pll').value);
setPll(bypass, mul, sys, root_, pre, seld5, pclken, pclk, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
const setRegValue = (el) => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255;
let value = 0;
switch (el.type) {
case 'checkbox':
value = el.checked ? mask : 0;
break;
case 'range':
case 'text':
case 'select-one':
value = el.value;
break
default:
return;
}
setReg(reg, offset, mask, value, function(code, txt){
if(code != 200){
alert('Error['+code+']: '+txt);
}
});
}
// Attach on change action for register elements
document
.querySelectorAll('.reg-action')
.forEach(el => {
if (el.type === 'text') {
el.onkeyup = function(e){
if(e.keyCode == 13){
setRegValue(el);
}
}
} else {
el.onchange = () => setRegValue(el)
}
})
const updateRegValue = (el, value, updateRemote) => {
let initialValue;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = (el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255) << offset;
value = (value & mask) >> offset;
if (el.type === 'checkbox') {
initialValue = el.checked
value = !!value
el.checked = value
} else {
initialValue = el.value
el.value = value
}
}
const printReg = (el) => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
let offset = el.attributes.offset?parseInt(el.attributes.offset.nodeValue):0;
let mask = el.attributes.mask?parseInt(el.attributes.mask.nodeValue):255;
let value = 0;
switch (el.type) {
case 'checkbox':
value = el.checked ? mask : 0;
break;
case 'range':
case 'select-one':
value = el.value;
break
default:
return;
}
value = (value & mask) << offset;
return '0x'+reg.toString(16)+', 0x'+value.toString(16);
}
const hide = el => {
el.classList.add('hidden')
}
@ -696,6 +1211,15 @@ document.addEventListener('DOMContentLoaded', function (event) {
.forEach(el => {
updateValue(el, state[el.id], false)
})
document
.querySelectorAll('.reg-action')
.forEach(el => {
let reg = el.attributes.reg?parseInt(el.attributes.reg.nodeValue):0;
if(reg == 0){
return;
}
updateRegValue(el, state['0x'+reg.toString(16)], false)
})
})
const view = document.getElementById('stream')

File diff suppressed because it is too large Load Diff