xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 11:49:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'renlixin'

Browse Source
This commit is contained in:
任立新
2022-02-15 17:25:16 +08:00
parent c5d551345c f7b1bc3c58
commit db164c6e9e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/config/calibrate.php
View File

@ -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; $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;
}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; $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;
} }
} }

2
html/config/location.php
View File

@ -39,7 +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 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="定标">';