1. S2E Ip Configuration Support. 2. add bonjour.zip and dll.rar for Windows

WubinXia · WubinXia · commit 36379b932a49 · 2022-05-25T14:59:17.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,10 @@
+.vscode
 .vs
+*.user
+*.aps
+obj
+output
+*.ipch
 *.sdf
 sdk/obj
 **/ipch
diff --git a/app/frame_grabber/MainFrm.cpp b/app/frame_grabber/MainFrm.cpp
@@ -120,12 +120,14 @@ LRESULT CMainFrame::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/
     }
 	ipConfigMenu_.CreateMenu();
 	lidarType = 1;
-	if ((devInfo.model >> 4) > LIDAR_T_SERIES_MINUM_MAJOR_ID) {
-        LidarMgr::GetInstance().lidar_drv->getDeviceMacAddr(devMac.macaddr);
-        m_CmdBar.GetMenu().GetSubMenu(1).AppendMenuA(MF_STRING, IPCONFIG_SUB, TEXT("Ip Config"));
-        support_motor_ctrl = true;
-		lidarType = 2;
-        
+	if ((devInfo.model >> 4) > (LIDAR_S_SERIES_MINUM_MAJOR_ID+1)) {
+        sl_result  ans = LidarMgr::GetInstance().lidar_drv->getDeviceMacAddr(devMac.macaddr);
+        if (SL_IS_OK(ans)) {
+            m_CmdBar.GetMenu().GetSubMenu(1).AppendMenuA(MF_STRING, IPCONFIG_SUB, TEXT("Ip Config"));
+            support_motor_ctrl = true;
+            lidarType = 2;
+        }
+       
     }
 	
     MotorCtrlSupport motorSupport;
@@ -179,7 +181,7 @@ void CMainFrame::ipConfig()
 
     onSwitchMode(WORKING_MODE_IDLE);
     CIpConfigDlg dlg;
-    dlg.initIpconfig(channelRecord_.network.ip, NULL, NULL);
+    dlg.initIpconfig(channelRecord_.network.ip, "255.255.255.0", "192.168.11.1");
     dlg.DoModal();
     if (dlg.getIpConfResult())
     {
diff --git a/app/frame_grabber/scanView.cpp b/app/frame_grabber/scanView.cpp
@@ -167,7 +167,7 @@ void CScanView::onDrawSelf(CDCHandle dc)
         memDC.FillSolidRect((int)endptX-1,(int)endptY-1, 2, 2,RGB(255,0,0));
 
         memDC.SetTextColor(RGB(255,0,0));
-        sprintf(txtBuffer, "Current: %.2f Deg: %.2f", _scan_data[picked_point].dist,  _scan_data[picked_point].angle);
+        sprintf(txtBuffer, "Current: %.2f Deg: %.2f,Quality:%d", _scan_data[picked_point].dist,  _scan_data[picked_point].angle, _scan_data[picked_point].quality);
         memDC.TextOutA(DEF_MARGIN, DEF_MARGIN + 20, txtBuffer);
 
         memDC.SetTextColor(RGB(255,255,255));
diff --git a/bonjour.zip b/bonjour.zip
diff --git a/dll.rar b/dll.rar
diff --git a/sdk/src/sl_udp_channel.cpp b/sdk/src/sl_udp_channel.cpp
@@ -78,7 +78,7 @@ namespace sl {
 
         int write(const void* data, size_t size)
         {
-            return _binded_socket->sendTo(NULL, data, size);
+            return _binded_socket->sendTo(_socket, data, size);
         }
 
         int read(void* buffer, size_t size)

-Original file line number
+Diff line change
@@ @@ -1,4 +1,10 @@ @@
 +.vscode
 .vs
 +*.user
 +*.aps
 +obj
 +output
 +*.ipch
 *.sdf
 sdk/obj
 **/ipch
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace sl {`
`78`	`78`
`79`	`79`	`int write(const void* data, size_t size)`
`80`	`80`	`{`
`81`		`- return _binded_socket->sendTo(NULL, data, size);`
	`81`	`+ return _binded_socket->sendTo(_socket, data, size);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`int read(void* buffer, size_t size)`