adfasdfa

myis11/project/is3/cmake-build-debug-visual-studio/.ninja_log

@@ -35,3 +35,41 @@
 7	2468	7648558369448975	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
 2469	4862	7648558394069943	iris_is3lib.dll	5b4e6d9afd7a8d3b
 2469	4862	7648558394069943	iris_is3lib.lib	5b4e6d9afd7a8d3b
+27	1534	7659530823093737	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	1760a32e6d699e47
+45	1537	7659530823267783	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj	4cf07b1ddd923f7f
+61	1539	7659530823427016	CMakeFiles/is3test.dir/testmain.cpp.obj	f9a821fdc5f4dfa5
+52	1870	7659530823343095	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1870	2801	7659530844002496	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1870	2801	7659530844002496	iris_is3lib.lib	5b4e6d9afd7a8d3b
+2807	3576	7659530850884136	is3test.exe	e3d0835beaceb407
+2	362	7659531091789070	CMakeFiles/is3test.dir/testmain.cpp.obj	f9a821fdc5f4dfa5
+362	877	7659531095396844	is3test.exe	e3d0835beaceb407
+2	1058	7659575529047811	CMakeFiles/is3test.dir/testmain.cpp.obj	f9a821fdc5f4dfa5
+1059	1728	7659575539628497	is3test.exe	e3d0835beaceb407
+3	1133	7659595832311402	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	1760a32e6d699e47
+1134	1905	7659595843630372	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1134	1905	7659595843630372	iris_is3lib.lib	5b4e6d9afd7a8d3b
+6	1834	7659604039413995	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1835	2466	7659604057692676	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1835	2466	7659604057692676	iris_is3lib.lib	5b4e6d9afd7a8d3b
+3	1528	7659605136374824	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1529	2637	7659605151634600	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1529	2637	7659605151634600	iris_is3lib.lib	5b4e6d9afd7a8d3b
+4	1093	7659606426153089	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1093	1676	7659606437045322	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1093	1676	7659606437045322	iris_is3lib.lib	5b4e6d9afd7a8d3b
+4	1078	7659649757606260	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1078	1572	7659649768353232	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1078	1572	7659649768353232	iris_is3lib.lib	5b4e6d9afd7a8d3b
+4	336	7659649925474676	CMakeFiles/is3test.dir/testmain.cpp.obj	f9a821fdc5f4dfa5
+339	877	7659649928823835	is3test.exe	e3d0835beaceb407
+1	378	7659650322325542	CMakeFiles/is3test.dir/testmain.cpp.obj	f9a821fdc5f4dfa5
+378	857	7659650326089674	is3test.exe	e3d0835beaceb407
+12	904	7659654240820684	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj	4cf07b1ddd923f7f
+4	1039	7659654240731033	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	1760a32e6d699e47
+22	1641	7659654240906402	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	d4b2b2a6612cce8d
+1641	2407	7659654257106178	iris_is3lib.dll	5b4e6d9afd7a8d3b
+1641	2407	7659654257106178	iris_is3lib.lib	5b4e6d9afd7a8d3b
+2	357	7659654741705661	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	1760a32e6d699e47
+357	811	7659654745261843	iris_is3lib.dll	5b4e6d9afd7a8d3b
+357	811	7659654745261843	iris_is3lib.lib	5b4e6d9afd7a8d3b

myis11/project/is3/cmake-build-release-visual-studio/.ninja_log

@@ -32,3 +32,16 @@
 2	730	7648556753624547	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	4364cfe7f408eeb7
 731	1321	7648556760919003	iris_is3lib.dll	c7564dfa3e9c17a2
 731	1321	7648556760919003	iris_is3lib.lib	c7564dfa3e9c17a2
+21	907	7659725145667238	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj	3c5858a3264438b4
+33	941	7659725145778173	CMakeFiles/is3test.dir/testmain.cpp.obj	905a72b1ea8bf22c
+12	1146	7659725145573082	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	96f167c4e5f0d851
+27	1400	7659725145725854	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj	4364cfe7f408eeb7
+1400	2205	7659725161260404	iris_is3lib.dll	c7564dfa3e9c17a2
+1400	2205	7659725161260404	iris_is3lib.lib	c7564dfa3e9c17a2
+2206	3648	7659725167509900	is3test.exe	81439074008edbcf
+18	1841	7669097762710254	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	96f167c4e5f0d851
+1842	2743	7669097780945612	iris_is3lib.dll	c7564dfa3e9c17a2
+1842	2743	7669097780945612	iris_is3lib.lib	c7564dfa3e9c17a2
+2	616	7669134105668608	CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj	96f167c4e5f0d851
+617	1030	7669134111816719	iris_is3lib.dll	c7564dfa3e9c17a2
+617	1030	7669134111816719	iris_is3lib.lib	c7564dfa3e9c17a2

myis11/project/is3/testmain.cpp

@@ -63,7 +63,7 @@ int main() {
     for (int i = 0; i < portNameList.size(); ++i) {
         printf("portName:%s\n",portNameList[i].portName);
     }
-    std::string portname="COM20";
+    std::string portname="COM24";
     serialport->init(portname.c_str(),BaudRate921600 ,ParityNone,DataBits8,StopOne,FlowNone,512*512);
     serialport->setOperateMode(SynchronousOperate);
      //serialport->setReadIntervalTimeout(10000);
@@ -82,6 +82,15 @@ int main() {
     IS3Set_Serial_FUN(SerialWrite,SerailRead);
     IS3SensorInit();
     uint16_t *buffforread=new uint16_t[1000];
+    // while (1) {
+    //     IS3SetShutterOpen(0);
+    //     IS3GetData(buffforread,1000);
+    //     IS3SetShutterOpen(1);
+    // }
+
+
+
+
    STRsensorinfo_C info= IS3Get_SensorInfo();
     //输出info
     printf("--------------------------------------\nSensorName:%s\n",info.SensorName);
@@ -103,7 +112,7 @@ int main() {
     printf("a3:%f\n",info.a3);
     printf("a4:%f\n",info.a4 );
 
-   // IS3OptSnenser(80);
+    IS3OptSnenser(80);
     while (1) {
         IS3GetData(buffforread,200);
     }

myis11/src/IRIS_IS3/IS3Comon.cpp

@@ -96,11 +96,11 @@ size_t SendGetData(int shutter)
     SerialWrite(BufferFortempWrite, lenthforwrite);
     for (int i=0;i<10;i++)
     {
-        size_t retunnumber = GetInfoBackFromSensorinTime(GET_DATA_FROM_SENSOR,shutter+2000);
-        if (retunnumber!=OVERTIME ) {
+        size_t retunnumber = GetInfoBackFromSensorinTime(GET_DATA_FROM_SENSOR,2*shutter+2000);
+        if (retunnumber<OVERTIME) {
             return retunnumber;
         }
-        if (i%2==0) {
+        if (i%5==0) {
             printf("send command again\n");
             SerialWrite(BufferFortempWrite, lenthforwrite);
 
@@ -196,7 +196,7 @@ size_t GetInfoBackFromSensor(uint8_t Command) // big
 
 size_t GetInfoBackFromSensorinTime(uint8_t Command,uint32_t waittime) // big <20><>ָ<EFBFBD>ü<EFBFBD><C3BC><EFBFBD><EFBFBD>ֽڱ<D6BD>ʾ<EFBFBD><CABE><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD> <20><>ʱֻ<CAB1><D6BB><EFBFBD>ֲɼ<D6B2><C9BC><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֽ<EFBFBD>
 {
-    delay(1);
+   delay(1);
     //<2F><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
     size_t begintime= get_system_uptime_ms();
 
@@ -227,6 +227,11 @@ size_t GetInfoBackFromSensorinTime(uint8_t Command,uint32_t waittime) // big
         //     delay(1000);
         // }
     }
+    if (BufferForRead[2]==0x40) {
+        printf("warning: sensor busy\n");
+        return SENSORBUSY;
+
+    }
     int lenth = BufferForRead[3] * 256 + BufferForRead[4];
     while (TotalIndexNow < lenth + 7)
     {

myis11/src/IRIS_IS3/IS3Comon.h

@@ -19,6 +19,7 @@
 #define COMMAND_MULTSET 0x10
 #define POLYNOMIAL 0xa001  //modbus crc
 #define OVERTIME 1000000000
+#define SENSORBUSY 1000000000
 #include "comon.h"
 
 

myis11/src/IRIS_IS3/IS3_INST.cpp

@@ -71,4 +71,10 @@ int IS3GetData(uint16_t *outdata, int shuttertime) {
     // printf("a[0]=%f\n",a[0]);
      thissensorIS3->SetWeaveLenthCoeff(a,lenth);
     return 1;
+}
+
+void IS3SetShutterOpen(int isopen) {
+    thissensorIS3->SetShutter(isopen);
+    // printf("IS3SetShutterOpen\n");
+    // printf("isopen=%d\n",isopen);
 }

myis11/src/IRIS_IS3/IS3_INST.h

@@ -26,7 +26,7 @@ __declspec(dllexport) STRsensorinfo_C IS3Get_SensorInfo();
 __declspec(dllexport) int IS3OptSnenser(int percent);
 __declspec(dllexport) int IS3GetData(uint16_t *outdata,int shuttertime);
     __declspec(dllexport) int IS3SetWeaveLenthCoeff(double *a,int lenth);
-
+__declspec(dllexport) void IS3SetShutterOpen(int isopen);
 #ifdef __cplusplus
 }
 #endif

myis11/src/IRIS_IS3/SensorIS3.cpp

@@ -145,6 +145,23 @@ void SensorIS3::SetShutter(int id)
             break;
         }
     }
+#else
+    switch (id) {
+
+        case 0: {
+            u_char a=1;
+            SendSettingCommand(SET_SHUTTER_CLOSE,1, &a, 1);
+            break;
+        }
+        case 1: {
+            u_char a=1;
+            //SendSettingCommand(SET_SHUTTER_CLOSE,1, &a, 1);
+            SendSettingCommand(SET_SHUTTER_OPEN,1, &a, 1);
+            break;
+        }
+
+    }
+
 #endif
 }
 
@@ -188,6 +205,7 @@ void SensorIS3::GetOneDate(int msc)
     }
     shutternow=msc;
    size_t retsize= SendGetData(shutternow);
+
    memcpy(DATABUFF,DataRetrun,515*2);
    //shortLittletoBiG(DATABUFF, SensorInfo.BandNum*2);
     
@@ -198,7 +216,7 @@ void SensorIS3::GetOneDate(int msc)
 
 int SensorIS3::OptSnenser(int persent)
 {
-
+    long minshuttertime=12;
     long maxtime = 10000;
     int maxvalue=SensorInfo.maxValue*1.0*persent / 100;
     int maxvaluenow = 0;
@@ -208,6 +226,7 @@ int SensorIS3::OptSnenser(int persent)
 
     int numberoftry = 0;
     while (maxvaluenow<maxvalue*0.95 || maxvaluenow>maxvalue) {
+
         if (maxvaluenow > maxvalue)
         {
             shutternow = shutternow *0.7;
@@ -225,6 +244,11 @@ int SensorIS3::OptSnenser(int persent)
             shutternow = maxtime;
             break;
         }
+        if (shutternow < minshuttertime)
+        {
+            shutternow = minshuttertime;
+            break;
+        }
         GetOneDate(shutternow);
         maxvaluenow= Getmaxvalue(DATABUFF, SensorInfo.BandNum);
 #ifdef ARDUINO