diff --git a/document/20211105会议记录.md b/document/20211105会议记录.md index 429c884..3309171 100644 --- a/document/20211105会议记录.md +++ b/document/20211105会议记录.md @@ -3,41 +3,36 @@ 参会人员:任立新 韩善龍 张卓 1. **文件名称定义** - - 英文地名_起始时间_结束时间 精确到秒 时间 年_月_日_时_分_秒 + + 英文地名_起始时间_结束时间 精确到秒 时间 年_月_日_时_分_秒 2. **路径定义** - + ``` 总路径 /home/data - /Setting - /Data - /2021_10_15 - /Beijing_2021_10_15_15_31_00_2021_10_15_15_31_50.csv - /2021_10_16 - /Log - 其他 - + /Setting + /Data + /2021_10_15 + /Beijing_2021_10_15_15_31_00_2021_10_15_15_31_50.csv + /2021_10_16 + /Log + 其他 ``` - - 3. **数据内容确定** - + ``` 按照《SIF加地物光谱仪本地数据存储格式说明.pdf》存储 ``` - - 4. **shutter切换顺序** - + ``` U1->D1->D2->D3 U1是向上光纤 D1、D2、D3由用户定义 ``` 5. **自动曝光上限及方式** - + ``` 上限:40秒 IS1曝光完成后 等待ISIF自动曝光 @@ -45,14 +40,14 @@ ``` 6. **数据采集流程** - + ``` 自动曝光->暗电流->采集数据 执行过程中 IS1需要等待ISIF往常当前步骤 在执行下一操作 ``` 7. **异常报警** - + ``` 以下情况需要推送异常 1、不返回数据 @@ -63,18 +58,13 @@ ``` 8. **采集时间间隔** - + ``` 采用间隔法 采集间隔最小30分钟 ``` 9. **添加温湿度传感器** - + ``` 添加温湿度传感器 ``` - - - - - diff --git a/html/config/LocationCali.php b/html/config/LocationCali.php index 8e55441..16102f9 100644 --- a/html/config/LocationCali.php +++ b/html/config/LocationCali.php @@ -7,6 +7,8 @@ $shuter=$_GET['shutterTime']; set_time_limit(0); ob_end_clean();//清空(擦除)缓冲区并关闭输出缓冲 ob_implicit_flush(1);//将打开或关闭绝对(隐式)刷送。绝对(隐式)刷送将导致在每次输出调用后有一次刷送操作,以便不再需要对 flush() 的显式调用 +system("sudo gpio mode 1 out"); +system("sudo gpio write 1 1"); system("sudo pkill shutter_calibrate"); diff --git a/othersoft/findtty.sh b/othersoft/findtty.sh new file mode 100644 index 0000000..046397b --- /dev/null +++ b/othersoft/findtty.sh @@ -0,0 +1,133 @@ + +stty -F /dev/ttyUSB0 raw speed 9600 +sleep 1s +stty -F /dev/ttyUSB0 raw speed 9600 +echo -e "0 dev\n" > /dev/ttyUSB0 +cat /dev/ttyUSB0 > 1.txt & +sleep 1s +pkill cat +if test -s 1.txt;then + echo '/dev/ttyUSB0 may be linermotor'> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB1 raw speed 9600 +sleep 1s +stty -F /dev/ttyUSB1 raw speed 9600 +echo -e "0 dev\n" > /dev/ttyUSB1 +cat /dev/ttyUSB1 > 1.txt & +sleep 1s +pkill cat +if test -s 1.txt;then + echo '/dev/ttyUSB1 may be linermotor'> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB2 raw speed 9600 +sleep 1s +stty -F /dev/ttyUSB2 raw speed 9600 +echo -e "0 dev\n" > /dev/ttyUSB2 +cat /dev/ttyUSB2 > 1.txt & +sleep 1s +pkill cat +if test -s 1.txt;then + echo '/dev/ttyUSB2 may be linermotor'> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB3 raw speed 9600 +sleep 1s +stty -F /dev/ttyUSB3 raw speed 9600 +echo -e "0 dev\n" > /dev/ttyUSB3 +cat /dev/ttyUSB3 > 1.txt & +sleep 1s +pkill cat +if test -s 1.txt;then + echo '/dev/ttyUSB3 may be linermotor'> /home/data/Setting/tryfindtty.txt +fi + + +stty -F /dev/ttyS1 raw speed 115200 +sleep 1s +stty -F /dev/ttyS1 raw speed 115200 +cat -e /dev/ttyS1 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyS1 +sleep 1s +pkill cat +sleep 1s + +if test -s 1.txt;then + echo '/dev/ttyS1 is ISIF or IS2'>> /home/data/Setting/tryfindtty.txt +fi + + +stty -F /dev/ttyS2 raw speed 115200 +sleep 1s +stty -F /dev/ttyS2 raw speed 115200 +cat -e /dev/ttyS2 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyS2 +sleep 1s +pkill cat +sleep 1s + +if test -s 1.txt;then + echo '/dev/ttyS2 is ISIF or IS2'>> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB0 raw speed 115200 +sleep 1s +stty -F /dev/ttyUSB0 raw speed 115200 +cat -e /dev/ttyUSB0 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyUSB0 +sleep 1s +pkill cat +sleep 1s + +if test -s 1.txt;then + echo '/dev/ttyUSB0 is IS1'>> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB1 raw speed 115200 +sleep 1s +stty -F /dev/ttyUSB1 raw speed 115200 +cat -e /dev/ttyUSB1 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyS1 +sleep 1s +pkill cat +sleep 1s +if test -s 1.txt;then + echo '/dev/ttyUSB1 is IS1'>> /home/data/Setting/tryfindtty.txt +fi + +stty -F /dev/ttyUSB2 raw speed 115200 +sleep 1s +stty -F /dev/ttyUSB2 raw speed 115200 +cat -e /dev/ttyUSB2 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyUSB2 +sleep 1s +pkill cat +sleep 1s +if test -s 1.txt;then + echo '/dev/ttyUSB2 is IS1'>> /home/data/Setting/tryfindtty.txt +fi + + +stty -F /dev/ttyUSB3 raw speed 115200 +sleep 1s +stty -F /dev/ttyUSB3 raw speed 115200 +cat -e /dev/ttyUSB3 > 1.txt & +sleep 1s +echo aa5500040307 | xxd -r -ps > /dev/ttyUSB3 +sleep 1s +pkill cat +sleep 1s + +if test -s 1.txt;then + echo '/dev/ttyUSB3 is IS1'>> /home/data/Setting/tryfindtty.txt +fi + + + + diff --git a/othersoft/shuttercali/project/LocationCali/main.cpp b/othersoft/shuttercali/project/LocationCali/main.cpp index 295916d..a7a4587 100644 --- a/othersoft/shuttercali/project/LocationCali/main.cpp +++ b/othersoft/shuttercali/project/LocationCali/main.cpp @@ -181,7 +181,7 @@ int main(int argc, char* argv[]) vector location1point = DengJianJu(loction1[i], 5000, 25); vector valuepoint; int lennow = location1point.size(); - cout1<<"Detail find "<"<"<loction2 = FindFeng(location1point, valuepinghua); if (loction2.size() == 1) - { cout1<<"find "<"<"<
"<