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
edaa3147
Commit
edaa3147
authored
Jul 08, 2023
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More status from camogm, timing of debug messages, start record behavior
parent
5a1a4d6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
23 deletions
+35
-23
multicam3.js
src/multicam/multicam3.js
+35
-23
No files found.
src/multicam/multicam3.js
View file @
edaa3147
...
@@ -93,7 +93,8 @@ var refresh_status_intvl;
...
@@ -93,7 +93,8 @@ var refresh_status_intvl;
var
refresh_previews_intvl
;
var
refresh_previews_intvl
;
var
exp_ms
=
50
;
var
exp_ms
=
50
;
var
quality
=
97
;
var
quality
=
97
;
var
refresh_during_record
=
false
;
// when false - disable image refresh during recording
const
start_date
=
Date
.
now
();
$
(
function
(){
$
(
function
(){
init
();
init
();
...
@@ -314,26 +315,28 @@ function check_camogm_status(cam_i){ // full check, slow
...
@@ -314,26 +315,28 @@ function check_camogm_status(cam_i){ // full check, slow
se
.
find
(
"#s_space"
).
html
(
free_space
+
" GB"
);
se
.
find
(
"#s_space"
).
html
(
free_space
+
" GB"
);
var
bgcol
=
sdd_found
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
// add yellow for low space
var
bgcol
=
sdd_found
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
// add yellow for low space
se
.
find
(
"#s_space"
).
attr
(
"style"
,
"background-color:"
+
bgcol
+
";"
);
se
.
find
(
"#s_space"
).
attr
(
"style"
,
"background-color:"
+
bgcol
+
";"
);
var
min_free
=
parseInt
(
$
(
res
).
find
(
'buf_mfree'
).
text
().
replace
(
/"/gm
,
''
));
var
mmin_free
=
parseInt
(
$
(
res
).
find
(
'buf_mmin'
).
text
().
replace
(
/"/gm
,
''
));
var
error_restarts
=
parseInt
(
$
(
res
).
find
(
'error_restarts'
).
text
().
replace
(
/"/gm
,
''
));
cam
.
restarts
=
error_restarts
;
se
.
find
(
"#s_restarts"
).
html
(
cam
.
restarts
);
se
.
find
(
"#s_restarts"
).
html
(
cam
.
restarts
);
var
bgcol_restarts
=
cam
.
camogm
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
var
bgcol_restarts
=
cam
.
camogm
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
se
.
find
(
"#s_restarts"
).
attr
(
"style"
,
"background-color:"
+
bgcol_restarts
+
";"
);
se
.
find
(
"#s_restarts"
).
attr
(
"style"
,
"background-color:"
+
bgcol_restarts
+
";"
);
// find free buffer size - minimum of all ports
var
buf_free_coll
=
$
(
res
).
find
(
'buffer_free'
);
console
.
log
(
"min_free="
+
min_free
);
// console.log(buf_free_coll);
console
.
log
(
"mmin_free="
+
mmin_free
);
var
min_free
=
full_buf
;
console
.
log
(
"error_restarts="
+
error_restarts
);
var
this_free
;
for
(
var
i
=
0
;
i
<
buf_free_coll
.
length
;
i
++
){
var
free_buf
=
Math
.
round
(
100
*
min_free
/
full_buf
);
this_free
=
parseInt
(
buf_free_coll
[
i
].
innerHTML
);
var
mfree_buf
=
Math
.
round
(
100
*
mmin_free
/
full_buf
);
if
(
this_free
<
min_free
)
min_free
=
this_free
;
console
.
log
(
free_buf
+
"% - min free="
+
min_free
+
" ("
+
full_buf
+
"), "
+
mfree_buf
+
"% - min free="
+
mmin_free
+
" ("
+
full_buf
+
"), "
);
// console.log(buf_free_coll[i]);
// console.log(i+":"+buf_free_coll[i].innerHTML);
}
var
free_buf
=
Math
.
round
(
100
*
min_free
/
full_buf
);
console
.
log
(
free_buf
+
"% - min free="
+
min_free
+
" ("
+
full_buf
+
"), "
);
se
.
find
(
"#s_buf"
).
html
(
free_buf
+
'%'
);
se
.
find
(
"#s_buf"
).
html
(
free_buf
+
'%'
);
var
bgcol_buf
=
(
free_buf
>
25
)
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
var
bgcol_buf
=
(
free_buf
>
25
)
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
se
.
find
(
"#s_buf"
).
attr
(
"style"
,
"background-color:"
+
bgcol_buf
+
";"
);
se
.
find
(
"#s_buf"
).
attr
(
"style"
,
"background-color:"
+
bgcol_buf
+
";"
);
se
.
find
(
"#s_mbuf"
).
html
(
mfree_buf
+
'%'
);
var
bgcol_buf
=
(
mfree_buf
>
25
)
?
"rgb(200, 255, 200)"
:
"rgb(255, 100,100)"
;
se
.
find
(
"#s_mbuf"
).
attr
(
"style"
,
"background-color:"
+
bgcol_buf
+
";"
);
}
}
}
}
}).
fail
(
function
(
data
,
status
){
}).
fail
(
function
(
data
,
status
){
...
@@ -385,6 +388,7 @@ function rec_button_update_state(){
...
@@ -385,6 +388,7 @@ function rec_button_update_state(){
var
all_ready
=
true
;
var
all_ready
=
true
;
var
any_running
=
false
;
var
any_running
=
false
;
var
any_stopped
=
false
;
var
any_stopped
=
false
;
const
elapsed_millis
=
Date
.
now
()
-
start_date
;
for
(
var
i
=
0
;
i
<
cams
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
cams
.
length
;
i
++
){
if
(
cams
[
i
].
init
){
if
(
cams
[
i
].
init
){
if
((
cams
[
i
].
camogm
==
'on'
)
&&
(
!
cams
[
i
].
recording
)){
if
((
cams
[
i
].
camogm
==
'on'
)
&&
(
!
cams
[
i
].
recording
)){
...
@@ -403,7 +407,7 @@ function rec_button_update_state(){
...
@@ -403,7 +407,7 @@ function rec_button_update_state(){
if
(
all_ready
){
if
(
all_ready
){
if
(
any_running
&&
any_stopped
){
if
(
any_running
&&
any_stopped
){
console
.
log
(
"WARNING: some camogms are running, some are stopped"
);
// false
console
.
log
(
"WARNING: some camogms are running, some are stopped
, time="
+
(
elapsed_millis
/
1000
)
+
"s
"
);
// false
for
(
var
i
=
0
;
i
<
cams
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
cams
.
length
;
i
++
){
console
.
log
(
i
+
": "
+
cams
[
i
].
recording
);
console
.
log
(
i
+
": "
+
cams
[
i
].
recording
);
}
}
...
@@ -434,7 +438,7 @@ function rec_button_update_state(){
...
@@ -434,7 +438,7 @@ function rec_button_update_state(){
}
}
function
startStopRefresh
(){
function
startStopRefresh
(){
if
(
refresh_en
)
{
if
(
refresh_en
&&
(
!
recording
||
refresh_during_record
)
)
{
if
(
!
skip_previews
)
{
if
(
!
skip_previews
)
{
if
(
refresh_previews_intvl
)
{
if
(
refresh_previews_intvl
)
{
clearInterval
(
refresh_previews_intvl
);
clearInterval
(
refresh_previews_intvl
);
...
@@ -443,24 +447,31 @@ function startStopRefresh (){
...
@@ -443,24 +447,31 @@ function startStopRefresh (){
refresh_previews_intvl
=
setInterval
(
refresh_previews
,
multicam_rperiod
*
1000
);
refresh_previews_intvl
=
setInterval
(
refresh_previews
,
multicam_rperiod
*
1000
);
refresh_previews
();
// first time - immediately
refresh_previews
();
// first time - immediately
}
}
console
.
log
(
"setInterval(refresh_previews_intvl); refresh_previews_intvl="
+
refresh_previews_intvl
+
', period='
+
(
multicam_rperiod
*
1000
));
}
else
{
clearInterval
(
refresh_previews_intvl
);
console
.
log
(
"clearInterval(refresh_previews_intvl); refresh_previews_intvl="
+
refresh_previews_intvl
);
refresh_previews_intvl
=
null
;
blankBackground
(
$
(
'#display_previews'
));
}
if
(
refresh_en
)
{
if
(
refresh_status_intvl
)
{
if
(
refresh_status_intvl
)
{
clearInterval
(
refresh_status_intvl
);
clearInterval
(
refresh_status_intvl
);
refresh_status_intvl
=
null
;
refresh_status_intvl
=
null
;
}
}
refresh_status_intvl
=
setInterval
(
refresh_status
,
multicam_speriod
*
1000
);
refresh_status_intvl
=
setInterval
(
refresh_status
,
multicam_speriod
*
1000
);
refresh_status
();
// first time - immediately
refresh_status
();
// first time - immediately
console
.
log
(
"setInterval(refresh_previews_intvl); refresh_previews_intvl="
+
refresh_previews_intvl
+
', period='
+
(
multicam_rperiod
*
1000
));
console
.
log
(
"setInterval(refresh_status_intvl); refresh_status_intvl="
+
refresh_status_intvl
+
', period='
+
(
multicam_speriod
*
1000
));
console
.
log
(
"setInterval(refresh_status_intvl); refresh_status_intvl="
+
refresh_status_intvl
+
', period='
+
(
multicam_speriod
*
1000
));
}
else
{
}
else
{
clearInterval
(
refresh_previews_intvl
);
clearInterval
(
refresh_status_intvl
);
clearInterval
(
refresh_status_intvl
);
console
.
log
(
"clearInterval(refresh_previews_intvl); refresh_previews_intvl="
+
refresh_previews_intvl
);
console
.
log
(
"clearInterval(refresh_status_intvl); refresh_status_intvl="
+
refresh_status_intvl
);
console
.
log
(
"clearInterval(refresh_status_intvl); refresh_status_intvl="
+
refresh_status_intvl
);
refresh_previews_intvl
=
null
;
refresh_status_intvl
=
null
;
refresh_status_intvl
=
null
;
blankBackground
(
$
(
'#display_previews'
));
blankBackground
(
$
(
'#display_status'
));
blankBackground
(
$
(
'#display_status'
));
}
}
console
.
log
(
"startStopRefresh(): "
+
refresh_en
)
console
.
log
(
"startStopRefresh(): "
+
refresh_en
)
}
}
...
@@ -619,7 +630,8 @@ function init3(index){
...
@@ -619,7 +630,8 @@ function init3(index){
'<td id=
\'
s_space
\'
></td>'
,
'<td id=
\'
s_space
\'
></td>'
,
'<td id=
\'
s_errors
\'
></td>'
,
'<td id=
\'
s_errors
\'
></td>'
,
'<td id=
\'
s_restarts
\'
></td>'
,
'<td id=
\'
s_restarts
\'
></td>'
,
'<td id=
\'
s_buf
\'
></td>'
'<td id=
\'
s_buf
\'
></td>'
,
'<td id=
\'
s_mbuf
\'
></td>'
].
join
(
'
\
n'
);
].
join
(
'
\
n'
);
$
(
"#display_status"
).
find
(
"tr[ip=
\
'"
+
cam
.
ip
+
"
\
']"
).
html
(
$
(
status_str
));
$
(
"#display_status"
).
find
(
"tr[ip=
\
'"
+
cam
.
ip
+
"
\
']"
).
html
(
$
(
status_str
));
...
...
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