From 600f415b564ef298a68092f19c4f380aa252bf51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=AB=8B=E6=96=B0?= <renlixin@iris-rs.cn>
Date: Mon, 17 Jan 2022 09:56:18 +0800
Subject: [PATCH] =?UTF-8?q?html=20=E5=8F=8Ainstall=E3=80=82sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/config/LocationCali.php | 26 ++++++++++++++++++
 html/config/position.html    | 51 ++++++++++++++++++++++++++++++++++++
 othersoft/install.sh         | 15 ++++++++++-
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 html/config/LocationCali.php

diff --git a/html/config/LocationCali.php b/html/config/LocationCali.php
new file mode 100644
index 0000000..8e55441
--- /dev/null
+++ b/html/config/LocationCali.php
@@ -0,0 +1,26 @@
+<?php
+//var_dump($_GET);
+$sensor=$_GET['sensor'];
+$number=$_GET['positionnumber'];
+$shuter=$_GET['shutterTime'];
+
+set_time_limit(0);
+ob_end_clean();//清空（擦除）缓冲区并关闭输出缓冲
+ob_implicit_flush(1);//将打开或关闭绝对（隐式）刷送。绝对（隐式）刷送将导致在每次输出调用后有一次刷送操作，以便不再需要对 flush() 的显式调用
+system("sudo pkill shutter_calibrate");
+
+
+$cmd = 'sudo /home/pi/bin/shutter_calibrate '.$sensor." ".$number.' '.$shuter;
+echo $cmd.'<br>';
+
+while(@ ob_end_flush());
+
+$proc = popen($cmd, 'r');
+
+
+while(!feof($proc)){
+    echo fread($proc, 4096);
+    @ flush();
+}
+echo "<br>";
+echo "finish";
\ No newline at end of file
diff --git a/html/config/position.html b/html/config/position.html
index c13621f..9960a69 100644
--- a/html/config/position.html
+++ b/html/config/position.html
@@ -11,5 +11,56 @@
 <a href="/fileup/location.php?p=4">位置4</a>
 <a href="/fileup/location.php?p=5">位置5</a>
 <a href="/fileup/location.php?p=12">位置try</a>
+
+<form action="LocationCali.php" method="get">
+    <table>
+        <tr>
+            <td>
+                位置自动计算:
+            </td>
+            <td>
+                
+            </td>
+            <td>设备<input id="sensor" name="sensor" type="text" list="typelist" placeholder="请选择">
+
+                <datalist id="typelist">
+                    　　<option>IS1</option>
+                    　　<option>IS2</option>
+                    　　<option>ISIF</option>
+                    　　<option>OSIFAlpha</option>
+                    <option>OSIFBeta</option>
+                </datalist>
+            </td>
+            <td>
+                预估位置数量
+                <input id="positionnumber" name="positionnumber" type="number" list="positionnumbertypelist" placeholder="请选择">
+
+                <datalist id="positionnumbertypelist">
+                    　　<option>1</option>
+                    　　<option>2</option>
+                    　　<option>3</option>
+                    　　<option>4</option>
+                    <option>5</option>
+                    　　<option>6</option>
+                    　　<option>7</option>
+                    　　<option>8</option>
+                    　　<option>9</option>
+                    <option>10</option>
+                </datalist>
+            </td>
+            <td>
+                曝光事件
+                <input id="shutterTime" name="shutterTime" type="number" value="10">ms
+            </td>
+            <td>
+                <input type="submit" value="开始">
+            </td>
+
+        </tr>
+    </table>
+
+
+</form>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/othersoft/install.sh b/othersoft/install.sh
index 6b732b9..d1de410 100644
--- a/othersoft/install.sh
+++ b/othersoft/install.sh
@@ -1,5 +1,6 @@
 mkdir build
 cd build
+
 mkdir movingliner
 cd movingliner
 cmake ../../movingliner
@@ -7,12 +8,24 @@ make -j4
 mkdir /home/pi/bin
 cp ./movingliner /home/pi/bin
 echo beging build shuttercali
+
 cd ../
+
 mkdir shuttercali
 cd shuttercali
 cmake ../../shuttercali/project/LocationCali
 make -j4 
 cp ./shutter_calibrate /home/pi/bin
-cd ../../../
+
+cd ../
+
+mkdir console
+cd console
+cmake ../../calibration_console
+make -j4
+cp ./ocean_optics_calibration_console /home/pi/bin
+cd ../
+
+cd ../../
 cp -r ./html/* /var/www/html
 chmod +x /var/www/html/php/*.sh