Commit 4ab23331 authored by Andrey Filippov's avatar Andrey Filippov

Merge branch 'master' of

parents bbde16ff e0d3046f
......@@ -344,13 +344,14 @@ function decodeGet ($encoded_get) {
/// _time - will look at FPGA time and program both FPGA and system, _stime - unconditionally program both
case "_time":
$toRead["req_ts"]=$value; /// Request time stamp, as received. Will be used by sender
if (elphel_get_fpga_time() > 100000000) break; // time already set
$a=((float) $value)/1000;
if (abs(elphel_get_fpga_time()-$a) < 24*3600) break; // time already set
case "_stime":
$a=((float) $value)/1000;
elphel_set_fpga_time ($a); // set FPGA time
exec("date -s ".date("mdHiY.s",(int)$a),$out,$ret); // set system time
exec("date -s ".@date("Y-m-d H:i:s.u",(int)$a),$out,$ret); // set system time
exec("hwclock --systohc");
case "imgsrv":
// $toRead["imgsrv"]='http://'.$_SERVER['HTTP_HOST'].':8081/';
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