Merge branch 'renlixin'

# Conflicts:
#	html/config/calibrate.php
This commit is contained in:
2022-02-16 10:58:45 +08:00

View File

@ -14,7 +14,7 @@ ob_implicit_flush(1);//将打开或关闭绝对(隐式)刷送。绝对(隐
echo "application beging<br>"; echo "application beging<br>";
//$cmd = 'ping 127.0.0.1'; //$cmd = 'ping 127.0.0.1';
$ini=parse_ini_file("/home/data/Setting/DeviceSettings.ini",true); $ini=parse_ini_file("/home/data/Setting/DeviceSettings.ini",true);
var_dump($ini);
$numberofsensor=intval($ini['DEVICE INFO']['TotalSpectrometer']); $numberofsensor=intval($ini['DEVICE INFO']['TotalSpectrometer']);
$numberofFS=0; $numberofFS=0;
for($i=0;$i<$numberofsensor;$i++){ for($i=0;$i<$numberofsensor;$i++){
@ -46,13 +46,13 @@ if ($position==1)
{ {
if($sensorType=="OSIFAlpha"||$sensorType=="OSIFBeta") if($sensorType=="OSIFAlpha"||$sensorType=="OSIFBeta")
{ {
$cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OceanOptics -t 30 -slfs ocean_optics.lmp --cfon FSN'.sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite; $cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OceanOptics -t 30 -slfs ocean_optics.lmp --cfon FSN'.$sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite;
} }
else{ else{
$port=$ini['FS'.$i+1]['Port']; $port=$ini['FS'.$i+1]['Port'];
getonestring($port,'/'); getonestring($port,'/');
getonestring($port,'/'); getonestring($port,'/');
$cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OPTOSKY --serialPort '.$port.' -t 30 -slfs ocean_optics.lmp --cfon FSN'.sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite; $cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OPTOSKY --serialPort '.$port.' -t 30 -slfs ocean_optics.lmp --cfon FSN'.$sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite;
} }
@ -62,12 +62,12 @@ else
{ {
if($sensorType=="OSIFAlpha"||$sensorType=="OSIFBeta") if($sensorType=="OSIFAlpha"||$sensorType=="OSIFBeta")
{ {
$cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OceanOptics -t 30 -slfs 4000nit.dat --cfon FSNsdfsd'.sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite; $cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OceanOptics -t 30 -slfs 4000nit.dat --cfon FSN'.$sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite;
}else{ }else{
$port=$ini['FS'.$i+1]['Port']; $port=$ini['FS'.$i+1]['Port'];
getonestring($port,'/'); getonestring($port,'/');
getonestring($port,'/'); getonestring($port,'/');
$cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OPTOSKY --serialPort '.$port.' -t 30 -slfs 4000nit.dat --cfon FSNsdfsd'.sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite; $cmd = 'sudo /home/pi/bin/ocean_optics_calibration_console --deviceType OPTOSKY --serialPort '.$port.' -t 30 -slfs 4000nit.dat --cfon FSN'.$sensorType.$position.'.data --position '.$position.' --integratingSphereDetectorValue '.$nite;
} }
} }