Commit 368ff4f9 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

Merge branch 'master' of https://github.com/Elphel/elphel-web-393

parents 7712de7a 2eafe4e1

src/php_top/parsedit.php

+6 −20
Original line number Original line Diff line number Diff line
@@ -809,31 +809,20 @@ function applyPost_debug($todo,$noFinalWait=false) { 
     }

     }

     $broadcast_sorted=split_broadcast($pgmpars);

     $broadcast_sorted=split_broadcast($pgmpars);

     ksort($broadcast_sorted);

     ksort($broadcast_sorted);

     $frame_to_apply = $frame_zero+$since;

     if ($since<0){

     	$frame_to_apply = ELPHEL_CONST_FRAME_IMMED;

     }

     foreach($broadcast_sorted as $bcast=>$params){

     foreach($broadcast_sorted as $bcast=>$params){

     	if ($bcast){

     	if ($bcast){

     		elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars, $frame_zero+$since,ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC,$bcast);

     		elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars,$frame_to_apply, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC, $bcast);

     	} else {

     	} else {

     		elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars, $frame_zero+$since,ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC); /// Are these flags needed?

     		elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars,$frame_to_apply, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC); /// Are these flags needed?

     	}

     	}

     }

     }

//     elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars, $frame_zero+$since,ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC); /// Are these flags needed?

//     if ($showSeqMode > 0) {

//     	printf ( "frame_zero=%d, since=%d",$frame_zero,$since);

//     	printf ( "elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars, $frame_zero+$since,ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC)");

//     	ob_flush ();

//     	flush ();

//     }

   }

   }

   if (!$noFinalWait) {

   if (!$noFinalWait) {

     $frame_now=$since+$frame_zero+1; /// wait just 1 frame longer that the target of the last command in $todo

     $frame_now=$since+$frame_zero+1; /// wait just 1 frame longer that the target of the last command in $todo

//     $frame_now+=256;

     //     if ($showSeqMode > 0) {

//     	printf ( "frame_zero=%d, since=%d",$frame_zero,$since);

//     	printf ( "elphel_set_P_arr ($GLOBALS [sensor_port], $pgmpars, $frame_zero+$since,ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC)");

//     	ob_flush ();

//     	flush ();

//     }

      

     //   echo "since=$since\n"; ob_flush();  flush();

     //   echo "since=$since\n"; ob_flush();  flush();

     if ($showSeqMode>0) {printf ("(final) waiting frame %d (0x%x) ... ",$frame_now,$frame_now);  ob_flush();  flush();}

     if ($showSeqMode>0) {printf ("(final) waiting frame %d (0x%x) ... ",$frame_now,$frame_now);  ob_flush();  flush();}

     if ($waitingEnabled) {

     if ($waitingEnabled) {
@@ -847,9 +836,6 @@ function applyPost_debug($todo,$noFinalWait=false) { 
       }

       }

     }

     }

   }

   }

//   $rslt2 = elphel_wait_frame_abs($GLOBALS [sensor_port], 100);

//   $rslt3 = elphel_wait_frame_abs($GLOBALS [sensor_port], $frame_now);

//   $rslt4 = elphel_skip_frames($GLOBALS [sensor_port],4);

    

    

   if ($showSeqMode>0) {printf ("done, frame is %d, rslt=%d, frame_now was %d, waitingEnabled=%d\n",

   if ($showSeqMode>0) {printf ("done, frame is %d, rslt=%d, frame_now was %d, waitingEnabled=%d\n",

   		elphel_get_frame($GLOBALS [sensor_port]), $rslt, $frame_now, $waitingEnabled);

   		elphel_get_frame($GLOBALS [sensor_port]), $rslt, $frame_now, $waitingEnabled);