Commit fcfa1fc1 authored by Andrey Filippov's avatar Andrey Filippov

reduced set time tolerance

parent 487095a2
...@@ -528,6 +528,7 @@ function startStopRefresh (){ ...@@ -528,6 +528,7 @@ function startStopRefresh (){
function init_port(cam_i,port_i){ function init_port(cam_i,port_i){
var date_time=new Date(); var date_time=new Date();
var url = "http://"+cams[cam_i].ip+"/parsedit.php?immediate&sensor_port="+cams[cam_i].ports[port_i].index+"&WB_EN"+"&_time="+date_time.getTime(); var url = "http://"+cams[cam_i].ip+"/parsedit.php?immediate&sensor_port="+cams[cam_i].ports[port_i].index+"&WB_EN"+"&_time="+date_time.getTime();
// alert("multicam3.js:init_port(): url="+url);
$.ajax({ $.ajax({
url: url, url: url,
cam_i: cam_i, cam_i: cam_i,
......
...@@ -1111,7 +1111,7 @@ function parseGetNames() { ...@@ -1111,7 +1111,7 @@ function parseGetNames() {
if (!$embedImageScale) $embedImageScale=$defaultEmbedImageScale; if (!$embedImageScale) $embedImageScale=$defaultEmbedImageScale;
} else if (($key=='_time') || ($key=='_stime')) { } else if (($key=='_time') || ($key=='_stime')) {
$time = ((float) $value)/1000; $time = ((float) $value)/1000;
if (($key=='_stime') || (abs(elphel_get_fpga_time()-$time) < 24*3600)){ // time is not already set or forced if (($key=='_stime') || (abs(elphel_get_fpga_time()-$time) > 10)){ // 24*3600)){ // time is not already set or forced
elphel_set_fpga_time ($time); // set FPGA time elphel_set_fpga_time ($time); // set FPGA time
exec("date -s '".@date("Y-m-d H:i:s.u",(int)$time)."'",$out,$ret); // set system time exec("date -s '".@date("Y-m-d H:i:s.u",(int)$time)."'",$out,$ret); // set system time
exec("hwclock --systohc"); exec("hwclock --systohc");
......
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