Merge branch 'renlixin'

This commit is contained in:
2022-02-15 15:13:51 +08:00
2 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,7 @@
<?php <?php
$position=$_GET["p"]; $position=$_GET["p"];
$sensorType=$_GET["sensor"]; $sensorType=$_GET["sensor"];
$nite=$_GET['nite'];
if ($position==0) if ($position==0)
{ {
echo "error"; echo "error";
@ -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; $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; $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;
} }

View File

@ -39,6 +39,7 @@ echo '设备<input id="sensor" name="sensor" type="text" list="typelist" placeho
  <option>OSIFAlpha</option>   <option>OSIFAlpha</option>
<option>OSIFBeta</option> <option>OSIFBeta</option>
</datalist>'; </datalist>';
echo '尼特 <input type="number" name="nite" id="nite"/>'
echo '<input id="p" name="p" type="hidden" value="'.$a.'">'; echo '<input id="p" name="p" type="hidden" value="'.$a.'">';
echo '<input type="submit" value="定标">'; echo '<input type="submit" value="定标">';