Commit 3baf9ed3 authored by Mikhail Karpenko's avatar Mikhail Karpenko

Merge remote-tracking branch 'origin/framepars'

parents 8aa648ec 13aea621
......@@ -9,5 +9,5 @@ attic/*
generated*
sysroots
bitbake-logs
/imgsrv.o
/imgsrv
src/imgsrv.o
src/imgsrv
......@@ -35,7 +35,7 @@
#include <elphel/exifa.h>
#include <elphel/x393_devices.h>
#undef ELPHEL_DEBUG
#define ELPHEL_DEBUG 0
#if ELPHEL_DEBUG
#define ELPHEL_DEBUG_THIS 1
#else
......@@ -109,9 +109,9 @@ const char *circbuf_fnames[] = {
};
const char *jhead_fnames[] = {
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0)
DEV393_PATH(DEV393_JPEGHEAD1),
DEV393_PATH(DEV393_JPEGHEAD2),
DEV393_PATH(DEV393_JPEGHEAD3)
};
static const char *exif_dev_names[SENSOR_PORTS] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment