Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-imgsrv
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-apps-imgsrv
Commits
90486df4
Commit
90486df4
authored
8 years ago
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed .gitignore, minor edits
parent
817de061
master
framepars
rocko
thud
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
25 deletions
+37
-25
.gitignore
.gitignore
+10
-6
Makefile
Makefile
+16
-10
imgsrv.c
imgsrv.c
+9
-7
imu_setup.php
imu_setup.php
+1
-1
start_gps_compass.php
start_gps_compass.php
+1
-1
No files found.
.gitignore
View file @
90486df4
html/*
html/*
.project
attic/*
.cproject
/.project
.externalToolBuilders
/.cproject
.settings
/.pydevproject
*.directory
/.externalToolBuilders
/.settings
.directory
generated*
sysroots
bitbake-logs
This diff is collapsed.
Click to expand it.
Makefile
View file @
90486df4
...
@@ -5,11 +5,17 @@ CONFIGS = Exif_template.xml
...
@@ -5,11 +5,17 @@ CONFIGS = Exif_template.xml
SRCS
=
imgsrv.c
SRCS
=
imgsrv.c
OBJS
=
imgsrv.o
OBJS
=
imgsrv.o
INSTALL
=
install
INSTMODE
=
0755
INSTDOCS
=
0644
OWN
=
-o
root
-g
root
#CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
#CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
CFLAGS
+=
-Wall
-I
$(STAGING_DIR_HOST)
/usr/include-uapi
/elphel
CFLAGS
+=
-Wall
-I
$(STAGING_DIR_HOST)
/usr/include-uapi
SYSCONFDIR
=
/etc
/
SYSCONFDIR
=
/etc
BINDIR
=
/usr/bin
/
BINDIR
=
/usr/bin
WWW_PAGES
=
/www/pages
WWW_PAGES
=
/www/pages
all
:
$(PROGS)
all
:
$(PROGS)
...
@@ -17,13 +23,13 @@ all: $(PROGS)
...
@@ -17,13 +23,13 @@ all: $(PROGS)
$(PROGS)
:
$(OBJS)
$(PROGS)
:
$(OBJS)
$(CC)
$(LDFLAGS)
$^
$(LDLIBS)
-o
$@
$(CC)
$(LDFLAGS)
$^
$(LDLIBS)
-o
$@
install
:
install
:
$(PROGS) $(PHPCLI) $(CONFIGS)
install
-d
$(DESTDIR)$(BINDIR)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(BINDIR)
install
-m
0755
-t
$(DESTDIR)$(BINDIR)
$(PROGS
)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(SYSCONFDIR
)
install
-d
$(DESTDIR)$(SYSCONFDIR
)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)$(WWW_PAGES
)
install
-m
0644
-t
$(DESTDIR)$(SYSCONFDIR)
$(CONFIGS
)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PROGS)
$(DESTDIR)$(BINDIR
)
install
-d
$(DESTDIR)$(WWW_PAGES)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(CONFIGS)
$(DESTDIR)$(SYSCONFDIR)
install
-m
0755
-t
$(DESTDIR)$(WWW_PAGES)
$(PHPCLI
)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PHPCLI)
$(DESTDIR)$(WWW_PAGES
)
clean
:
clean
:
rm
-rf
$(PROGS)
*
.o core
rm
-rf
$(PROGS)
*
.o core
...
...
This diff is collapsed.
Click to expand it.
imgsrv.c
View file @
90486df4
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
#include <netinet/in.h>
#include <netinet/in.h>
#include <sys/mman.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/ioctl.h>
#include <c313a.h>
#include <exifa.h>
#include <asm/byteorder.h>
#include <asm/byteorder.h>
#include <x393_devices.h>
#include <elphel/c313a.h>
#include <elphel/exifa.h>
#include <elphel/x393_devices.h>
#undef ELPHEL_DEBUG
#undef ELPHEL_DEBUG
#if ELPHEL_DEBUG
#if ELPHEL_DEBUG
...
@@ -122,8 +122,10 @@ const char *jhead_fnames[] = {
...
@@ -122,8 +122,10 @@ const char *jhead_fnames[] = {
};
};
#endif
#endif
static
const
char
*
exif_dev_names
[
SENSOR_PORTS
]
=
{
EXIF_DEV_NAMES
};
static
const
char
*
exif_dev_names
[
SENSOR_PORTS
]
=
{
DEV393_PATH
(
DEV393_EXIF0
),
DEV393_PATH
(
DEV393_EXIF1
),
static
const
char
*
exifmeta_dev_names
[
SENSOR_PORTS
]
=
{
EXIFMETA_DEV_NAMES
};
DEV393_PATH
(
DEV393_EXIF2
),
DEV393_PATH
(
DEV393_EXIF3
)};
static
const
char
*
exifmeta_dev_names
[
SENSOR_PORTS
]
=
{
DEV393_PATH
(
DEV393_EXIF_META0
),
DEV393_PATH
(
DEV393_EXIF_META1
),
DEV393_PATH
(
DEV393_EXIF_META2
),
DEV393_PATH
(
DEV393_EXIF_META3
)};
const
char
app_args
[]
=
"Usage:
\n
%s -p <port_number_1> [<port_number_2> <port_number_3> <port_number_4>]
\n
"
\
const
char
app_args
[]
=
"Usage:
\n
%s -p <port_number_1> [<port_number_2> <port_number_3> <port_number_4>]
\n
"
\
"Start image server, bind it to ports <port_number_1> <port_number_2> <port_number_3> <port_number_4>
\n
"
\
"Start image server, bind it to ports <port_number_1> <port_number_2> <port_number_3> <port_number_4>
\n
"
\
...
@@ -192,9 +194,9 @@ int printExifXML(int exif_page, struct file_set *fset)
...
@@ -192,9 +194,9 @@ int printExifXML(int exif_page, struct file_set *fset)
// Create Exif directory
// Create Exif directory
// Read the size of the Exif data
// Read the size of the Exif data
fd_exifdir
=
open
(
EXIFDIR_DEV_NAME
,
O_RDONLY
);
fd_exifdir
=
open
(
DEV393_PATH
(
DEV393_EXIF_METADIR
)
,
O_RDONLY
);
if
(
fd_exifdir
<
0
)
{
if
(
fd_exifdir
<
0
)
{
printf
(
"<error>
\"
Opening %s
\"
</error>
\n
"
,
EXIFDIR_DEV_NAME
);
printf
(
"<error>
\"
Opening %s
\"
</error>
\n
"
,
DEV393_PATH
(
DEV393_EXIF_METADIR
)
);
return
-
2
;
// Error opening Exif directory
return
-
2
;
// Error opening Exif directory
}
}
for
(
indx
=
0
;
indx
<
ExifKmlNumber
;
indx
++
)
exif_dir
[
indx
].
ltag
=
0
;
for
(
indx
=
0
;
indx
<
ExifKmlNumber
;
indx
++
)
exif_dir
[
indx
].
ltag
=
0
;
...
...
This diff is collapsed.
Click to expand it.
imu_setup.php
View file @
90486df4
#!/usr/
local/sbin/
php -q
#!/usr/
bin/env
php -q
<?php
<?php
/*
/*
*! FILE NAME : imu_setup.php
*! FILE NAME : imu_setup.php
...
...
This diff is collapsed.
Click to expand it.
start_gps_compass.php
View file @
90486df4
#!/usr/
local/sbin/
php -q
#!/usr/
bin/env
php -q
<?php
<?php
/*
/*
*! FILE NAME : start_gps_compass.php
*! FILE NAME : start_gps_compass.php
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment