Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-web-393
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-web-393
Commits
454f21c1
Commit
454f21c1
authored
Aug 19, 2016
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'framepars' of
https://github.com/Elphel/elphel-web-393
into framepars
parents
726f0dcb
13512700
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
704 additions
and
6 deletions
+704
-6
Makefile
src/php_top/Makefile
+10
-6
autocampars.xml
src/php_top/autocampars.xml
+690
-0
framepars.php
src/php_top/framepars.php
+4
-0
No files found.
src/php_top/Makefile
View file @
454f21c1
DOCUMENTROOT
=
$(DESTDIR)
/
www/pages
DOCUMENTROOT
=
www/pages
OWN
=
-o
root
-g
root
INSTDOCS
=
0644
INSTALL
=
install
DOCS
=
favicon.ico
\
robots.txt
CONFS
=
autocampars.xml
SYSCONFDIR
=
etc
CONFDIR
=
$(SYSCONFDIR)
/elphel393
PHP_SCRIPTS
=
camvars.php
\
ccam.php
\
...
...
@@ -19,10 +22,11 @@ all:
install
:
@
echo
"make install in src"
$(INSTALL)
$(OWN)
-d
$(DOCUMENTROOT)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(DOCS)
$(DOCUMENTROOT)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(PHP_SCRIPTS)
$(DOCUMENTROOT)
@
echo
"REMOTE_IP =
$(REMOTE_IP)
"
@
echo
"REMOTE_USER =
$(REMOTE_USER)
"
$(INSTALL)
$(OWN)
-d
$(DESTDIR)
/
$(DOCUMENTROOT)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(DOCS)
$(DESTDIR)
/
$(DOCUMENTROOT)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(PHP_SCRIPTS)
$(DESTDIR)
/
$(DOCUMENTROOT)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)
/
$(SYSCONFDIR)
$(INSTALL)
$(OWN)
-d
$(DESTDIR)
/
$(CONFDIR)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(CONFS)
$(DESTDIR)
/
$(CONFDIR)
clean
:
@
echo
"make clean in src"
src/php_top/autocampars.xml
0 → 100644
View file @
454f21c1
This diff is collapsed.
Click to expand it.
src/php_top/framepars.php
View file @
454f21c1
...
...
@@ -412,6 +412,10 @@ CAPTION;
fclose
(
$framepars_file
);
}
else
if
(
$value
==
"init"
)
{
$framepars_file
=
fopen
(
$GLOBALS
[
'framepars_paths'
]
[
$sensor_port
],
"w+"
);
//r" );
// NC393 - added IRQs ON
// $xml->addChild ( 'irqon_result' . strval ( $sensor_port ), fseek ( $framepars_file, ELPHEL_LSEEK_INTERRUPT_ON, SEEK_END ) ); // #define LSEEK_INTERRUPT_ON 0x24 /// enable camera interrupts
// $xml->addChild ( 'compressor_irqon_result', fseek ( $framepars_file, ELPHEL_LSEEK_INTERRUPT_ON, SEEK_END ) ); // #define LSEEK_INTERRUPT_ON 0x24 /// enable camera interrupts
$xml
->
addChild
(
'DEBUG_01_'
.
strval
(
$sensor_port
),
$GLOBALS
[
'framepars_paths'
]
[
$sensor_port
]);
$xml
->
addChild
(
'LSEEK_FRAMEPARS_INIT'
.
strval
(
$sensor_port
),
fseek
(
$framepars_file
,
ELPHEL_LSEEK_FRAMEPARS_INIT
,
SEEK_END
)
);
$xml
->
addChild
(
'elphel_set_P_value'
.
strval
(
$sensor_port
),
elphel_set_P_value
(
$sensor_port
,
ELPHEL_SENSOR
,
0x00
,
0
,
ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC
)
);
// / will start detection
...
...
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