Commit 076f137b authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

+ initial exposure before restroring the saved one

parent e1281cfb
Loading
Loading
Loading
Loading
+168 −161
Original line number Original line Diff line number Diff line
@@ -901,7 +901,8 @@ function init_cameras(){ // $page) { init can only be from default page as page
	$mask = 1; // init parameters
	$mask = 1; // init parameters
	// TODO: Fix TRIG_MASTER early, before anything else
	// TODO: Fix TRIG_MASTER early, before anything else
//	$trig_last_names =   array();
//	$trig_last_names =   array();
	$trig_par_names =    array('TRIG', 'TRIG_CONDITION', 'TRIG_MASTER','TRIG_PERIOD', 'TRIG_OUT');
	// adding EXPOS - because setting with normal pars can desync
	$trig_par_names =    array('TRIG', 'TRIG_CONDITION', 'TRIG_MASTER','TRIG_PERIOD', 'TRIG_OUT', 'EXPOS');
	$delayed_par_names = array('COMPRESSOR_RUN', 'SENSOR_RUN', 'DAEMON_EN',
	$delayed_par_names = array('COMPRESSOR_RUN', 'SENSOR_RUN', 'DAEMON_EN',
			'DAEMON_EN_AUTOEXPOSURE', 'DAEMON_EN_STREAMER',
			'DAEMON_EN_AUTOEXPOSURE', 'DAEMON_EN_STREAMER',
			'DAEMON_EN_CCAMFTP','DAEMON_EN_CAMOGM', 'DAEMON_EN_TEMPERATURE');
			'DAEMON_EN_CCAMFTP','DAEMON_EN_CAMOGM', 'DAEMON_EN_TEMPERATURE');
@@ -985,9 +986,15 @@ function init_cameras(){ // $page) { init can only be from default page as page
				$frame_to_set = elphel_get_frame ( $GLOBALS ['master_port'] ) + 0; // ELPHEL_CONST_FRAME_DEAFAULT_AHEAD;
				$frame_to_set = elphel_get_frame ( $GLOBALS ['master_port'] ) + 0; // ELPHEL_CONST_FRAME_DEAFAULT_AHEAD;
				log_msg ( "port ".$port. " setting @".$frame_to_set." (now ".elphel_get_frame ( $GLOBALS ['master_port']).
				log_msg ( "port ".$port. " setting @".$frame_to_set." (now ".elphel_get_frame ( $GLOBALS ['master_port']).
						"): " .print_r($all_parToSet[$port],1));
						"): " .print_r($all_parToSet[$port],1));

				//set initial exposure - the correct value will be set at PARAMETERS_PRESET
				log_msg ( "port ".$port. " setting @".$frame_to_set." init exposure: EXPOS= 1000" );
				elphel_set_P_value ( $port, ELPHEL_EXPOS, 1000, $frame_to_set, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC );

				// set all in ASAP mode
				// set all in ASAP mode
				elphel_set_P_arr ( $port, $all_parToSet[$port], $frame_to_set, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC );
				elphel_set_P_arr ( $port, $all_parToSet[$port], $frame_to_set, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC );



				$frame_to_set += 2; // frame #2
				$frame_to_set += 2; // frame #2
				log_msg ( "port ".$port. " setting @".$frame_to_set." SENSOR_RUN= " . $all_sensor_run[$port]['SENSOR_RUN'],0);
				log_msg ( "port ".$port. " setting @".$frame_to_set." SENSOR_RUN= " . $all_sensor_run[$port]['SENSOR_RUN'],0);
				elphel_set_P_arr ( $port,$all_sensor_run[$port],     $frame_to_set, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC );
				elphel_set_P_arr ( $port,$all_sensor_run[$port],     $frame_to_set, ELPHEL_CONST_FRAMEPAIR_FORCE_NEWPROC );
@@ -1037,7 +1044,7 @@ function init_cameras(){ // $page) { init can only be from default page as page
			// Camera should be left in a free running mode?
			// Camera should be left in a free running mode?


			log_msg ('Finalizing, current frames: '.file_get_contents('/sys/devices/soc0/elphel393-framepars@0/all_frames'));
			log_msg ('Finalizing, current frames: '.file_get_contents('/sys/devices/soc0/elphel393-framepars@0/all_frames'));
			log_msg ("Remainig trigger parameters: ".print_r($GLOBALS['trig_pars'],1));
			log_msg ("Remaining trigger parameters: ".print_r($GLOBALS['trig_pars'],1));




			if (array_key_exists('TRIG',$GLOBALS['trig_pars']) && ($GLOBALS['trig_pars']['TRIG'] === 0)){
			if (array_key_exists('TRIG',$GLOBALS['trig_pars']) && ($GLOBALS['trig_pars']['TRIG'] === 0)){