Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-autocampars
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-autocampars
Commits
720bde32
Commit
720bde32
authored
Dec 23, 2016
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved config for missing 10389 to a separate file
parent
96733a43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
Makefile
src/Makefile
+3
-0
autocampars.php
src/autocampars.php
+2
-2
No files found.
src/Makefile
View file @
720bde32
LN
=
ln
LN
=
ln
PROGS
=
autocampars launch_php_script
PROGS
=
autocampars launch_php_script
XMLS
=
default_10389.xml
#PHPSCRIPTS = autocampars.php
#PHPSCRIPTS = autocampars.php
PYSCRIPTS
=
autocampars.py
PYSCRIPTS
=
autocampars.py
WWW_PAGES
=
/www/pages
WWW_PAGES
=
/www/pages
...
@@ -40,6 +41,8 @@ install: $(PROGS) $(PHPSCRIPTS) $(PYSCRIPTS)
...
@@ -40,6 +41,8 @@ install: $(PROGS) $(PHPSCRIPTS) $(PYSCRIPTS)
$(INSTALL)
-d
$(DESTDIR)$(WWW_PAGES)
$(INSTALL)
-d
$(DESTDIR)$(WWW_PAGES)
$(INSTALL)
-d
$(DESTDIR)$(SYSCONFDIR)
$(INSTALL)
-d
$(DESTDIR)$(SYSCONFDIR)
$(INSTALL)
-d
$(DESTDIR)$(CONFDIR)
$(INSTALL)
-d
$(DESTDIR)$(CONFDIR)
$(INSTALL)
$(OWN)
-m
$(INSTDOCS)
$(XMLS)
$(DESTDIR)$(CONFDIR)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PROGS)
$(DESTDIR)$(BINDIR)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PROGS)
$(DESTDIR)$(BINDIR)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PYSCRIPTS)
$(DESTDIR)$(BINDIR)
$(INSTALL)
$(OWN)
-m
$(INSTMODE)
$(PYSCRIPTS)
$(DESTDIR)$(BINDIR)
# $(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DESTDIR)$(BINDIR)
# $(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DESTDIR)$(BINDIR)
...
...
src/autocampars.php
View file @
720bde32
...
@@ -1346,8 +1346,8 @@ function get_application_mode() {
...
@@ -1346,8 +1346,8 @@ function get_application_mode() {
if
(
$info_10389
!=
""
){
if
(
$info_10389
!=
""
){
$xml
=
simplexml_load_string
(
$info_10389
);
// read contents of
$xml
=
simplexml_load_string
(
$info_10389
);
// read contents of
}
else
{
}
else
{
log_msg
(
"10389 board is not present, loading
default
xml"
);
log_msg
(
"10389 board is not present, loading
/etc/elphel393/default_10389.
xml"
);
$xml
=
simplexml_load_string
(
"<board><model>10389 not present</model><rev>B</rev><serial>F80000</serial><app>MT9P006</app><mode>15</mode></board>"
);
$xml
=
simplexml_load_string
(
file_get_contents
(
"/etc/elphel393/default_10389.xml"
)
);
}
}
if
(
$xml
===
false
)
{
if
(
$xml
===
false
)
{
...
...
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