From 991c9c9a78b299c696fccbda991bcb5aef4f9642 Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Fri, 9 Aug 2024 17:38:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doc/交互逻辑.xls                              | Bin 69632 -> 69632 bytes
 .../HandleAiUi-new/algo/ALGO_Inspection.h     |   2 +-
 HanddleAI/HandleAiUi-new/algo/ALGO_MAIN.h     |   1 +
 .../HandleAiUi-new/algo/CISCO_APEXSMALL.hpp   |   2 +-
 HanddleAI/HandleAiUi-new/algo/simpleAlgo.h    |   4 ++
 HanddleAI/HandleAiUi-new/back/detData.h       |   2 +-
 HanddleAI/HandleAiUi-new/detProcess.hpp       |  24 +++++--
 HanddleAI/HandleAiUi-new/main.cpp             |   4 ++
 .../uiModule_imageDoubleCheckQdialog.h        |  62 +++++++++++++++---
 lib/Hd_3DCameraLMI_module_PointLazer.exp      | Bin 772 -> 798 bytes
 lib/Hd_3DCameraLMI_module_PointLazer.lib      | Bin 2276 -> 2276 bytes
 lib/Hd_DalsaCamera_module.exp                 | Bin 751 -> 777 bytes
 lib/Hd_DalsaCamera_module.lib                 | Bin 2120 -> 2120 bytes
 lib/Hd_FinsTcp_module.exp                     | Bin 743 -> 769 bytes
 lib/Hd_FinsTcp_module.lib                     | Bin 2064 -> 2064 bytes
 lib/Hd_MvCamera_module_GENTL.exp              | Bin 756 -> 782 bytes
 lib/Hd_MvCamera_module_GENTL.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_MvCamera_module_GIGE.exp               | Bin 755 -> 781 bytes
 lib/Hd_MvCamera_module_GIGE.lib               | Bin 2148 -> 2148 bytes
 lib/Hd_ResultsSummary_module.exp              | Bin 756 -> 782 bytes
 lib/Hd_ResultsSummary_module.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_SocketModule_ModbusTcp.exp             | Bin 1501 -> 1527 bytes
 lib/Hd_SocketModule_ModbusTcp.lib             | Bin 3446 -> 3446 bytes
 23 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/Doc/交互逻辑.xls b/Doc/交互逻辑.xls
index d6fb30bf2fe86770bd70822a7c45553eef1ea88c..0dfe195a5fa13d538f237c8d5207e5a76eb89af1 100644
GIT binary patch
delta 543
zcmX|<Ur5tY6vxl``P**gD1R6cEZQLK2fgX)p(boir;yczZMyBZDFl&FirYgkp>0Kf
z2u8?BB6?X5Z4W(cbg2<Rfe($IB0@}xfh02;Od&}`TAkmB?!)JP@4er1@0Y_(=hSpg
zEnQKq>7nE>{-Bh48^6hIb<=~})aW17G#~J=Zsg4AEI=m>_&v(F^6;Y#V{+L)?XdNN
z)A>1na_(q2@Lq;59(1a`u#B`ao|Vm8=TXer;#}*O!8=}?CIC-eDore8er7B8R{~o>
zBJ#BPAy13sveq8~*q_L~4{F+>->?U|!3z7}G?&jR=4uys0ZLcBwE6TN`sjLou&eLi
zp&Jw!2G~e>%|bV{K?wT!YzcbcJJs`DI6zwA2#(Q-!Vm^!rtn-~kd7C149R%$mB0`k
zDC-!eOd%k%<%D2af1~3F#ft%X;qA0w`RSdGqb<jo%7kEPIwCE{u@CHsm>ZVpVSbp3
z)pK(H(v-j`-K^@|t!LE*fiaq@=@#R^W34tR(4cTb$2iS2lFapn3lpt7Q|n2=a`l(a
zxy@Y0)@8x6(sXh5ou-3B+y6K?shc@M26L3IF(dSt8Ku|E7=2+Hw8Koy+tGnz^KSID
eoBaep?rZmpyV!>>6`a{^`P#uBp?sqqXVt$l^uXi*

delta 502
zcmW-dO-LJ26oubS$GilyFav@hH3M3uT@;D9C<rlsCNV#gM5GH51#zK>q}?k~XaikT
z!!@McXjX{}HPY9bwvYzgh}fdG3%d#tVV2QFAruPs&b-C<&K%Bp!@cQ(lrBhzOOp9w
zzhk3%gD<7ma3KCle_YVOrY~T(dKew^-8=mXGA84g-({LG<u7fJ6xaTg!}h!QEZaY+
zo{lg@5!3Ts3N|Jz(g?c*vG(d0@U(4;x;`<L8MWaax*qu0Ha2m{{PR6yT0snKX?A>E
zd;@O$SPXy%{}sEfUaDL%C;N^{=@C4^u~IK2aj_JJ0J>YMXxp9RB$Zkxu9js8ifs7{
zhoE81R%8enspHBtC#lp1U>vh$Rpe_aPExNuJdq(xspledGRsNosfdx9Ij2;_Frs*-
zB}C|InM2g5{iw?j6OH;YhnQh})?`q{nf8r?Y8X3B8RGb%`GVMYI|K>+O`JKmi1O_M
zr%(OwPg^qW&)xdUX)N8a-}lfwgZB;^B2Elpia3s&#4sKbBX~iK;vF%T>i`F+xj|wg
q7bhljDe$yAnS~Yyv^eLdDtG}4{^27NtXSK+*4|ccD(mgAD*Xq92D!%o

diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
index 822fd6e3..3ad7276b 100644
--- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
+++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
@@ -16,7 +16,7 @@ bool pinHalconEvaluate(std::shared_ptr <detData> data, cv::Rect& Result, cv::Mat
 std::vector<handdleAI::Bbox> pinDetEvaluate(std::shared_ptr <detData> data, cv::Mat& src, handleAiModelManager* _handleAiModelManager)
 {
     std::vector<handdleAI::Bbox> result;
-    handleAiModelDet* detPtr = _handleAiModelManager->getDetModel(data->_productDataStruct.handleAiData.detModelName);
+    handleAiModelDet* detPtr = _handleAiModelManager->getDetModel("connectorDet.BHD");
     if (detPtr == nullptr)
         return std::vector<handdleAI::Bbox>();
     detPtr->Evaluate(src, result);
diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_MAIN.h b/HanddleAI/HandleAiUi-new/algo/ALGO_MAIN.h
index 437b60f0..29287504 100644
--- a/HanddleAI/HandleAiUi-new/algo/ALGO_MAIN.h
+++ b/HanddleAI/HandleAiUi-new/algo/ALGO_MAIN.h
@@ -23,6 +23,7 @@ bool processAlgo(std::shared_ptr <detData> data, handleAiModelManager* _handleAi
 	catch (const std::exception& e)
 	{
 		std::cerr << "Caught exception: " << e.what() << std::endl;
+		std::cout << "Caught exception: " << e.what() << std::endl;
 		return false;
 	}
 	return false;
diff --git a/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp b/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp
index 148f9a01..b465082c 100644
--- a/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp
+++ b/HanddleAI/HandleAiUi-new/algo/CISCO_APEXSMALL.hpp
@@ -62,7 +62,7 @@ static void apexSmallHalconPaint(cv::Mat& out, std::vector<startAndEndPoints>xLi
 static cv::Mat apexSmallHalconAlgo(std::shared_ptr<detData>data, cv::Mat& src)
 {
     cv::Mat halconImg;
-    src(cv::Rect(50, 50, src.cols - 100, src.rows - 150)).copyTo(halconImg);
+    src.copyTo(halconImg);
     HTuple hv_out_OK_Pings;
     HTuple hv_out_NG_Pings;
     HTuple hv_out_Flag_INS;
diff --git a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
index 778229e7..50b77585 100644
--- a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
+++ b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
@@ -706,6 +706,10 @@ struct rectAndData
 //ƽÆÌͼÏñ
 static cv::Mat tiledImages(std::vector<cv::Mat>& imgs)
 {
+    if (imgs.size() == 0)
+        return cv::imread("./noimg.png",-1);
+    if (imgs.size() == 1)
+        return imgs[0];
     //×ÜͼÏñ´óС ƽÆÌÏÔʾ
     int matWidth = 0, matHeight = 0;
     for (auto& mat : imgs)
diff --git a/HanddleAI/HandleAiUi-new/back/detData.h b/HanddleAI/HandleAiUi-new/back/detData.h
index 23577b81..6f010672 100644
--- a/HanddleAI/HandleAiUi-new/back/detData.h
+++ b/HanddleAI/HandleAiUi-new/back/detData.h
@@ -84,7 +84,7 @@ public:
     std::vector<std::string>imgSaveFileParameter;//ÃüÃû¹æÔò str1_str2... µÚÒ»¸ö²ÎÊýÒÑĬÈÏΪÏà»úÃû£¬ÔÚ¹¹Ô캯Êý
 
     //ÐèÒª´æÈëµÄSQLÊý¾Ý
-    std::vector<std::pair<std::string, double>> sqlVec;
+    std::vector<std::pair<std::string, std::string>> sqlVec;
     detData(std::string IN_cameraKeyName)
     {
         cameraKeyName = IN_cameraKeyName;
diff --git a/HanddleAI/HandleAiUi-new/detProcess.hpp b/HanddleAI/HandleAiUi-new/detProcess.hpp
index afeec8aa..8314b959 100644
--- a/HanddleAI/HandleAiUi-new/detProcess.hpp
+++ b/HanddleAI/HandleAiUi-new/detProcess.hpp
@@ -259,6 +259,8 @@ public:
     //¼ì²â½á¹û´¦Àí
     void detectionResultHandle(std::shared_ptr<detData>data)
     {
+        data->sqlVec.push_back({ "SN",data->SNcode });
+        data->sqlVec.push_back({ "ARMPOS",std::to_string(data->armPos)});
         //·¢ËÍͼƬ
         if (data->resultImgs.size() > 0)
         {
@@ -292,25 +294,26 @@ public:
             emit _core._qtFunc.addDashBoardData(1, data->aiDetOK);
             emit _core._qtFunc.uiModuleLocationMap_SetProductSignStatus(data->armPos,
                 (data->halconOK==true&& data->aiDetOK==true)?2:3);
-            bool finalOk = (data->halconOK == true || data->aiDetOK == true)? true :false;
-            if(finalOk=false)
+            bool finalOk = (data->halconOK == true && data->aiDetOK == true);
+            if(finalOk == false)
             {
-                for (auto showMat : data->resultImgs)
+                for (auto& showMat : data->resultImgs)
                 {
                     QPixmap pixmap;
                     cvMatToQPixMap(showMat, pixmap);
-                    showImgPack* pack = new showImgPack();
+                    //showImgPack* pack = new showImgPack();
                     emit _core._qtFunc.uiModuleImageDoubleCheckQdialog_ShowWindows(pixmap);
                 }
             }
             auto productData = _core._productDataCache.get(currentSn);
-            if (finalOk = false)
+            if (finalOk == false)
                 productData->ngCount++;
             perConnector _perConnectorData;
             _perConnectorData.aiOk = data->aiDetOK;
             _perConnectorData.halconOk = data->halconOK;
             _perConnectorData.maxPinDetValue = data->maxPinDetValue;
             productData->connectorResults.push_back(_perConnectorData);
+            data->sqlVec.push_back({ "Result",std::to_string(finalOk)});
         }
         //ct¼ÆËãÒÔ¼°·¢Ë͵½½çÃæ
         auto totalCt = std::chrono::duration_cast<std::chrono::milliseconds>(data->halconEndTime - data->algoStartTime);
@@ -322,11 +325,13 @@ public:
             emit _core._qtFunc.addCtData(1, aiCt.count());
         if (halconCt.count() > 0)
             emit _core._qtFunc.addCtData(2, halconCt.count());
-
+        data->sqlVec.push_back({ "totalCt",std::to_string(totalCt.count()) });
+        data->sqlVec.push_back({ "aiCt",std::to_string(aiCt.count()) });
+        data->sqlVec.push_back({ "halconCt",std::to_string(halconCt.count()) });
         //SQL
         std::vector<sqlData> sqlDatas;
         for (auto sqlData : data->sqlVec)
-            sqlDatas.push_back({ sqlData.first, std::to_string(sqlData.second) });
+            sqlDatas.push_back({ sqlData.first, sqlData.second });
         _core._appConfig._sqlManager.addData(data->SNcode, sqlDatas);
 
         //дÈëplc
@@ -364,5 +369,10 @@ public slots:
 		_triggerManager.sendFinsMsg("write_short_350_" + QString::number(_core._appConfig.productDatas[productTypeIn].indexOfArm));
 		_triggerManager.sendFinsMsg("write_short_351_1");
 	}
+    //È˹¤¸´ÅÌ°´ÏÂNG
+    void uiModuleImageDoubleCheckQdialog_pressNG()
+    {
+        _triggerManager.sendFinsMsg("write_short_363_1");
+    }
 };
 #pragma once
\ No newline at end of file
diff --git a/HanddleAI/HandleAiUi-new/main.cpp b/HanddleAI/HandleAiUi-new/main.cpp
index a80d82d5..659ab3c9 100644
--- a/HanddleAI/HandleAiUi-new/main.cpp
+++ b/HanddleAI/HandleAiUi-new/main.cpp
@@ -107,8 +107,12 @@ void connectSignalAndSlots(MainWindow* front, appCore* _core, detProcess* _detPr
         front->_displayWidget->_uiModuleLocationMap, &uiModuleLocationMap::resetToDefault);
     QObject::connect(&_core->_qtFunc, &qtFunction::uiModuleLocationMap_SetProductSignStatus,
         front, &MainWindow::uiModuleLocationMapSetProductSignStatus);
+    //uiModuleImageDoubleCheckQdialog
     QObject::connect(&_core->_qtFunc, &qtFunction::uiModuleImageDoubleCheckQdialog_ShowWindows,
         front, [=](QPixmap map) {front->_imageDoubleCheckQdialog->showAndSetImg(map); });
+    QObject::connect(front->_imageDoubleCheckQdialog,&imageDoubleCheckQdialog::ngSignal,
+        _detProcess, &detProcess::uiModuleImageDoubleCheckQdialog_pressNG);
+    //uiModuleSummaryDataManager
     QObject::connect(&_core->_qtFunc, &qtFunction::uiModuleSummaryDataManager_SetSummaryResultText,
         front, [=](QString text, Qt::GlobalColor color)
         {front->_displayWidget->_summaryDataManager->setSummaryResult(text, color); });
diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageDoubleCheckQdialog.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageDoubleCheckQdialog.h
index 9025dd05..3d966ba1 100644
--- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageDoubleCheckQdialog.h
+++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_imageDoubleCheckQdialog.h
@@ -17,6 +17,8 @@ public:
 	QPushButton* closeBtn = new QPushButton(this);
 	fancyButtonText* okBtn = new fancyButtonText(120, 40, "OK", "¼ÌÐø");
 	fancyButtonText* ngBtn = new fancyButtonText(120, 40, "NG", "¼ÌÐø");
+	QMutex mutex;
+	QQueue< QPixmap>imgqueue;
 	imageDoubleCheckQdialog()
 	{
 		QPalette paletteWhite, paletteRed, paletteGreen;
@@ -81,21 +83,21 @@ public:
 		menuBarLayoutRight->addWidget(closeBtn);
 
 		QObject::connect(closeBtn, &QPushButton::clicked, this, &QDialog::close);
-			
+
 		QHBoxLayout* imageViewLayout = new QHBoxLayout();
 		imageViewLayout->addWidget(_ImageWidgetManager);
 
 		_ImageWidgetManager->createViewer("");
 		_ImageWidgetManager->disableAllSwitchBtn();
-		
+
 		QHBoxLayout* okngBtnLayout = new QHBoxLayout();
 		okngBtnLayout->addWidget(okBtn);
 		okngBtnLayout->addWidget(ngBtn);
 
-		QObject::connect(okBtn, &QPushButton::clicked, this, &QDialog::close);
-		QObject::connect(ngBtn, &QPushButton::clicked, this, &QDialog::close);
-		QObject::connect(okBtn, &QPushButton::clicked, this, [=]() {emit okSignal(); });
-		QObject::connect(ngBtn, &QPushButton::clicked, this, [=]() {emit ngSignal(); });
+		//QObject::connect(okBtn, &QPushButton::clicked, this, &QDialog::close);
+		//QObject::connect(ngBtn, &QPushButton::clicked, this, &QDialog::close);
+		QObject::connect(okBtn, &QPushButton::clicked, this, [=]() {pressOK(); });
+		QObject::connect(ngBtn, &QPushButton::clicked, this, [=]() {pressNG(); });
 
 		layout->addWidget(menuBarWidget, 0, 0);
 		layout->addLayout(imageViewLayout, 1, 0);
@@ -105,13 +107,57 @@ public:
 	}
 	void showAndSetImg(QPixmap img)
 	{
-		_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
-		this->show();
+		mutex.lock();
+		std::cout << isShowing<<"-" << imgqueue.size()<< std::endl;
+		if (isShowing == false && imgqueue.size() == 0)
+		{
+			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+			this->show();
+			isShowing = true;
+		}
+		else
+		{
+			imgqueue.enqueue(img);
+		}
+		mutex.unlock();
 	}
 signals:
 	void okSignal();
 	void ngSignal();
 private:
+	void pressOK()
+	{
+		mutex.lock();
+		emit okSignal();
+		if (imgqueue.size() > 0)
+		{
+			QPixmap img = imgqueue.dequeue();
+			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+		}
+		else
+		{
+			isShowing = false;
+			close();
+		}
+		mutex.unlock();
+	}
+	void pressNG()
+	{
+		mutex.lock();
+		emit ngSignal();
+		if (imgqueue.size() > 0)
+		{
+			QPixmap img = imgqueue.dequeue();
+			_ImageWidgetManager->showImg(img, imgWidgetShowType::imgWidgetOri, 0);
+		}
+		else
+		{
+			isShowing = false;
+			close();
+		}
+		mutex.unlock();
+	}
+	bool isShowing = false;
 	bool isMoving = false;	
 	bool isResizing = false;
 	int minWidth = 720, minHeight = 480;
diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp
index d8e955a08830ce97f26c66b802d0659eea1b677e..97d8b87b5a54ed11f0f0bf06624e98e39c3ad3b0 100644
GIT binary patch
delta 186
zcmZo+o5#kP(#FK_9|)W#aym20P4vCbE5yjaV9UTL$N&V+lPwv&>NOYyS{N97Gn0$*
zi}TY;6f}Y~6?{DXyct><Yy}yT%TpMftzwchi<9#m^D{#;WAaN&Vv<TTb5dd|%uIBH
zQgc!hi&Gg=D^fw~0)qVAgB<G&V|+cGgZzW*jAD!ojErKO{e68y{eZ$@&M_hR`8mZg
fzQI7Ip^1qBTb-evv9ZPEcZ^O<0xgq`m@WYT5i&Ra

delta 179
zcmbQo*22b_(#FK_9|$xiaym1zO!U3a`-6dj!Ipth5J)k2PPSz9s#j<D+{D1(o0(jc
zU!0#-qM#9^so>-3=gpAKU@ORwT%N+<X%&;4S)82jn4cM%8IxaH5|dP#nUfMzVP>N1
zlA2VS&X8J>%HU!Z6BcY_U}O{%<{T4}pPy44;~NZQ8k*=CTk07bn;KfiBxUBsc;pwC
Y0Cj?N$K+(@O_pKOWBS}Q*@x*809VmC6aWAK

diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib
index b04150d66d0bd6f8780c0ea27f1bb8d8c729edd8..36c75b149f315b6d9f39a25471404d60a91a35ae 100644
GIT binary patch
delta 118
zcmaDN_(X8S0VbAS@rnN@A7MJqqQM~0GP$3*m<dSDVwc)1$6~<9nX_N`$t4B`2Byg;
wnWQHdvDU+ssZXB3&H+_A*?}#NGhnUn*>6ylW|Qx-^}tjrLsf2`#qPxj05HBKZU6uP

delta 118
zcmaDN_(X8S0VbAz%oEN}KEiaIMV;Yu)8u~UVkRIpi(P879E$-XXW8l7S1&OzFfdI%
w$s|3wh_xQ3OnveMb`Gf0$qsCBoC?-nr@ui}noYjT)&o<i3{|;#7P}WC0EkK}1poj5

diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp
index 27cfbc168fcf45adf98783ffef0c6a66d4ad2515..ab118790922bdf283ca963bb9e26af2406b92951 100644
GIT binary patch
delta 164
zcmaFQ+R4V5(#FK_9|&|Oayl~!Gfwoo!pqLcz+l9{D98W=&Xe^S?Ugkc1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>LxNuy9cG_q$U=pGNe|dGB{hs1O)lJ2RYUm
z#`t<V2l)rr8O0bG7#YPl`}_Ka`T>Q*oMS@r^K*)0e1m~ZLlYB&Izv5UV~fc*8J(B}
KS|-afT>=2WYcBEt

delta 138
zcmeBVd(X<5(#FK_9|(jeaym2pWSHo8h4(E31A`F*qacuC@SLpAXs@i!@VSYB!8bFx
zD8D#Atwcd1NK?Vb)6bhBo55C)A-OySsBR*ow605PQfWFvYDFr8i&acmu#th0QB0U~
lOh|ryPH~KHFpz0zqGxQWXKZY0XgT>aqZ8BTrpe|^mjGNtDWm`Z

diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib
index 9c451b2ec75fbfd47c5b293388f4274cb1b1aa9e..cc2d36e5dd6097c8d1dffea4f0e34dc019fb0ad6 100644
GIT binary patch
delta 109
zcmX>ha6({12NTODh23{1_b}~Y(O?j0ne4-y&IF|7*`+q0XO?DUVSi@ub@DrwDKJ^}
s$!l3TpeiO`WQ}DF@!xsr_2l;~@{`vvNl(sYYlNv(hN|2w&#uV`01D?LO#lD@

delta 109
zcmX>ha6({12NTP2)AOe%_b}~YQD^wvG}(taoe4<EvrBD0&n(TzvW$Dpjmhs=rod#?
sC$DAYfU1~$ku{dJU8(lz>&fp~<R`CTlAfH))(BIn3{|;Vo?Vj>02Rk5eE<Le

diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp
index 8842446e1ca7d74eaf131fa9904afaa3c5dcc781..05dc8bab1af3b651c13ef7421da5f9dc9813f651 100644
GIT binary patch
delta 164
zcmaFP+Q`P4(#FK_9|%+@aym2dGfwooz{||Yz@W##D98W=&Xctnt(7$x1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>N**v-GfqdQWJ|)8B!}!8Jw+R0)qVAgB<G&
zV|+cGgZzW*jAD!ojErKO{e68y{eZ$@&M_hR`8mZgzQI7Ip^1q>ouQtwvBl(zj804f
KEt5r=E&%|cvo5Lt

delta 138
zcmZo<d(O(4(#FK_9|*W7aym18Wtix9f%hc?1A`s|qacuC@SLp8XsxWy@VSYB!8bFx
zD8D#Atwcd1NK?Vb)6bhBo55C)A-OySsIHSyTGu5tsWhD-wIY?l#VRH&*vP=hC??D~
lCL}*Ur#Qwp7|1j<(KEKxGd4Cgw4D5!(TVAE(`0?7O8`SVDO>;m

diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib
index f679fdae9df129fa1e4d394f63100284f9d61348..a50e177e10f90e3993f56c5a13e462416b8c93d4 100644
GIT binary patch
delta 113
zcmbOrFhO8L2@@y(r?ji`j0_AMllj@qCU0h{Wzk>|Xqg<xsy;cI*@g+o>}QqQyqQ^;
wk>!eB#hJ;cSSG+!=tE@7S(vllUz^OuwgV=i%;k`rpIe}pnF7_$%g)RQ0BqkOCjbBd

delta 113
zcmbOrFhO8L2@~f(^@6+dj0_AMllj@qCU0h{Wl?AN+%!3kRef?avkeoF+0QDqc{8&x
wBa6wYtap=7u}pxe(1*yDvp75wyE2)JZ3j$3nad$LKes?HGX<)hmz|jr0D+b!iU0rr

diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp
index ebd6dce5c4074d58a4d8a8aeb34c9ed2980064e3..cd7a09856f41e935ba31f1206b025b5c61669f5f 100644
GIT binary patch
delta 187
zcmeyu+Q-J3(#FK_9|(*laym1KF;4Wm#>>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<a>-xOad*Fm6$F805$nH{{R30

delta 180
zcmeBU`@+hZ(#FK_9|$BSaym2pVVLN5jrRis1A{38qacuC@SJSO=v1%H@VSYB!8bFx
zD8D#Atwcd1NK?Vb)6bhBo55C)A-Oz-!P6=xIkPx9-!VTkG&3f@v?L~}G&3h9rozlb
z*CjQnG@T)}B9+0#Dkd!0$iT=bCd@e|BtJi=IL0>^$TT$3Gq%(-Ha0c1j7iGOi}A=W
ZE&=KU>5j?C%$v-^q{sBRX|fH|B>)@kITQc@

diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib
index 578b535ee41c6c12f7e6ab81feeae0134eac1aaf..a65c613a9788aa36e3530d6a5ccb1cad49b8c1da 100644
GIT binary patch
delta 118
zcmew&@I_$53?`PsF#ive=P>PO(O?j0nH<lY%_PvW`3$oaBj@vl$A6z<U|?XHypTzH
zvKDJOOo{sBGprmyWs}b^OHKa38pnBPYw*i=P?ctrd)ZoGDwPo`r8md2i!%ZMl}aY@

delta 118
zcmew&@I_$53?`PPzk+^Dp2M`CMV;Yu)8u&OY^Kjmo6j&?F><Q1D%?25z`(#Xc_EYZ
yWG&Wmm=g8LXIMFa$|j#-mYV#5HICDzJLm2@s7kZRy=*NomC6W}(wk%1#Tfxr1S(Vj

diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp
index 1d1dc4c0453f660b1f35f811b334bd8c15b9fffd..564b8062f8555ebcb08fc3e6204792c4fdc08f62 100644
GIT binary patch
delta 187
zcmey&+RMh7(#FK_9|#O5aym1KGEVfn#>>gbz+l3_D98W=&XWxp9qTn11X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<hzVcOad*F6`3vp05MEA_5c6?

delta 180
zcmeBW`^?Ij(#FK_9|*)Jaym2pW|-)AjrTnR1A_?zqacuC@SJSO=vc4L@VSYB!8bFx
zD8D#Atwcd1NK?Vb)6bhBo55C)A-Oz-!P6=xIkPx9-!VTkG&3f@v?L~}G&3h9rozlb
z*CjQnG@T)}B9+0#Dkd!0$iT=bCd@e|BtJi=IL0>^$TT$3Gq%(-Ha0c1j7iGOi}A=W
ZE&=KU>5j?C%$v;3q{sBRX|grbB>)$3IST*)

diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib
index f5ba12df64b2f2e149f3a1b7a1622e6c2dd11692..b1396b9be8cfc2bad5039077ec72d4077da69fd6 100644
GIT binary patch
delta 108
zcmaDN@I+w4Bqo*{N6bD?p2oC~MT0@0W%4Xm^~v?jPE0`NX;!JtcbVlGS(crsyEln-
s8ccycM6#TfyL!>nx04xJ<tL}H&4bA*b2%jE=N9N?ra+DGXBTAz0Bl4hE&u=k

delta 108
zcmaDN@I+w4BqkQ4S+m|wp2oC~MV;Yu)8tvK>XYl4otS{k)2vdP?=s6XvY5Ryxjl(>
s8ccycM6#SUOQrAa+sTZq@{`lp=D}o@xg3)7a|`q`Q=mrpvx_nU04H}TWB>pF

diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp
index 98647907b2b4e1df2047e01da5a2bdbd7906bfd5..1880b09b51e497f37aa5ae54de155d56902c2475 100644
GIT binary patch
delta 187
zcmeyu+Q-J3(#FK_9|(*laym1KF;4Wm#>>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<a>-xOad*Fm6$F805$nH{{R30

delta 180
zcmeBU`@+hZ(#FK_9|$BSaym2pVVLN5jrRis1A{38qacuC@SJSO=v1%H@VSYB!8bFx
zD8D#Atwcd1NK?Vb)6bhBo55C)A-Oz-!P6=xIkPx9-!VTkG&3f@v?L~}G&3h9rozlb
z*CjQnG@T)}B9+0#Dkd!0$iT=bCd@e|BtJi=IL0>^$TT$3Gq%(-Ha0c1j7iGOi}A=W
ZE&=KU>5j?C%$v-^q{sBRX|fH|B>)@kITQc@

diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib
index ff33633f3db52aec9c9ccb88fc9c624c2109a9d1..a61fbd40216d4091ba157f7b97afab308e79a4fe 100644
GIT binary patch
delta 118
zcmew&@I_$53?`PJ|NEa$p2M`CMT0@0WpX@oHj_Zh<}=JzjGU7uUOIM)fq{W(@<Jx*
z$y%)CFeU1f&#-a;l}$dwEH(K9YaHiu*4kt5peoHK_p-IXR4OA>N^g#37iR<j>$WFG

delta 118
zcmew&@I_$53?`Pswa5QWp2M`CMV;Yu)8u&OY^Kjmo6j&?F>?O9FyY}T1_lPE$qSjJ
zCu^~m!<48`KEuiZR5tkxv()4dtZ|%fSC*cB2UTe{xtFa4rcxQ9QhIYNyEr2N6TK|m

diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp
index 30c37bd291ea123424cd8e8b26775ebc78ae748e..f97806414b3a4e971708daad71c818bffbb5409f 100644
GIT binary patch
delta 165
zcmcc1{hgaLrHzT<KM=g0$mz_ud!z4bM&9*|3=C!rjDie6;5^xt$yr&0L7;_!!8bFx
zD8D#Atwcd1NK?Vb)6bismBCh!A-OySsBSfrw0lr$PHJLtDnn{TDuc6COhAyodyr$D
zVT`Y*bC7><ol%UDfss*+v%jxzs2@-`%sD0`KR>59#y1$qG&C_Ws58_vHny1jndupm
LK+ERa%uGxGpbavn

delta 139
zcmey)eV3avrHzT<KM-7;$mz_uaHH>QM&7B63=C!rjDie6;5pfq$yr&Q;d2uMgKuVX
zQGRiLT8V;2kfwr<r=K@NHiNAoLvncvP~B=KX<e7pq|$VT)QVIF7ps`CU?T$~qnI$~
nn2`MZoZ=YYU?9`bM9<h#&)C@1&~h>_^E0N;O`E?mGcf@G_CqRL

diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib
index 7d987e797c1925944487933e8b6ed09e14a3773c..5ec47732196dc7452962b23c04a9ae6b8cb23ce6 100644
GIT binary patch
delta 108
zcmew+^-XHSI~LBiA5)I%Gcqu6Oy0<0Hd&Xol|_R=pk)$=`sBN;E=&R~lMOkfHrui(
wGqS!kFaLLX@>&l0$t~;^P*wU673D03ub!ToyoTcdSbTB;r#4LMcFz6G0MnZzxBvhE

delta 108
zcmew+^-XHSI~GpM+Y9dLGcqu6Oy0<0Hd&Xol|`N5bJHXa^~rZxU6?*MO*Z6^+HA|F
w%*Z-jM&-ik$!j^}C%3RyKvn5ORFt#4P6>N7c@4(_u=wNxPHmXh?VS6W0bcJXg#Z8m


From eeed6a9f82aba728e2138df1e682587a2a3f31a9 Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Fri, 9 Aug 2024 17:39:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/productConfig/ASR1006.json         |   2 +
 .../config/productConfig/ASR1009.json         |   2 +
 configBackup/config/productConfig/C9504.json  |   2 +
 configBackup/config/productConfig/CS9600.json |   2 +
 .../config/productConfig/MDS9706.json         |   2 +
 .../config/productConfig/MDS9706B.json        |  51 ++
 .../config/productConfig/MDS9710.json         |  20 +
 .../config/productConfig/MDS9710B.json        |  51 ++
 .../config/productConfig/MDS9718.json         | 745 ++++++++++++++++--
 .../config/productConfig/MDS9718B.json        | 707 +++++++++++++++--
 10 files changed, 1475 insertions(+), 109 deletions(-)
 create mode 100644 configBackup/config/productConfig/MDS9706B.json
 create mode 100644 configBackup/config/productConfig/MDS9710B.json

diff --git a/configBackup/config/productConfig/ASR1006.json b/configBackup/config/productConfig/ASR1006.json
index d6900317..ac76443c 100644
--- a/configBackup/config/productConfig/ASR1006.json
+++ b/configBackup/config/productConfig/ASR1006.json
@@ -11,6 +11,8 @@
     "baseRz":-0.676582,
     "connectorAmout":12,
     "halconAlgoIndex":0,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
diff --git a/configBackup/config/productConfig/ASR1009.json b/configBackup/config/productConfig/ASR1009.json
index ae0c9fc0..0f58b8c7 100644
--- a/configBackup/config/productConfig/ASR1009.json
+++ b/configBackup/config/productConfig/ASR1009.json
@@ -12,6 +12,8 @@
     "baseRz":0.676582,
     "connectorAmout":18,
     "halconAlgoIndex":0,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
diff --git a/configBackup/config/productConfig/C9504.json b/configBackup/config/productConfig/C9504.json
index 3dbd4a4c..736443b5 100644
--- a/configBackup/config/productConfig/C9504.json
+++ b/configBackup/config/productConfig/C9504.json
@@ -12,6 +12,8 @@
     "baseRz":0.00,
     "connectorAmout":-1,
     "halconAlgoIndex":1,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
diff --git a/configBackup/config/productConfig/CS9600.json b/configBackup/config/productConfig/CS9600.json
index 1de650f9..0c318d64 100644
--- a/configBackup/config/productConfig/CS9600.json
+++ b/configBackup/config/productConfig/CS9600.json
@@ -12,6 +12,8 @@
     "baseRz":0.00,
     "connectorAmout":-1,
     "halconAlgoIndex":0,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
diff --git a/configBackup/config/productConfig/MDS9706.json b/configBackup/config/productConfig/MDS9706.json
index a1b458c6..e5571a7a 100644
--- a/configBackup/config/productConfig/MDS9706.json
+++ b/configBackup/config/productConfig/MDS9706.json
@@ -12,6 +12,8 @@
     "baseRz":0.00,
     "connectorAmout":-1,
     "halconAlgoIndex":1,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
diff --git a/configBackup/config/productConfig/MDS9706B.json b/configBackup/config/productConfig/MDS9706B.json
new file mode 100644
index 00000000..80eced5e
--- /dev/null
+++ b/configBackup/config/productConfig/MDS9706B.json
@@ -0,0 +1,51 @@
+{
+    "productName":"APEX6B",
+    "customerPartNumber":"DS-C9706B",
+    "foxconnPartNumber":"1A211UH00B",
+    "imgPosPath":"./imgPosTip/Test1.jpg",
+    "productIndex":8,
+    "baseX":0.00,
+    "baseY":0.00,
+    "baseZ":0.00,
+    "baseRx":0.00,
+    "baseRy":0.00,
+    "baseRz":0.00,
+    "connectorAmout":-1,
+    "halconAlgoIndex":1,
+    "isBackExist":false,
+    "backArmIndex":-1,
+    "cameraSetting":
+    {
+        "0":"Gain:60/Expouse:25000"
+    },
+    "lightSetting":
+    {
+        "0":255
+    },
+    "disableHandleAiConfig":false,
+    "enableCodedAlgo":false,
+    "codedAlgoIndex":-1,
+    "HandleAi":
+    {
+        "detModelName":"connectorDet.BHD",
+        "detGpuIndex":0,
+        "segHandle":
+        [
+            {
+                "detResultIndex":[0],
+                "segModelName":"ASR-Seg.BHD",
+                "segNgIndex":[0,1,2],
+                "segGpuIndex":0,
+                "clsModelName":"ASR-Cls.BHD",
+                "clsNgIndex":[0,1,2],
+                "clsResultHandle":
+                {
+                    "0":"OK,0,255,0",
+                    "1":"NG,255,0,0"
+                } 
+            }
+        ]
+    }
+
+    
+}
\ No newline at end of file
diff --git a/configBackup/config/productConfig/MDS9710.json b/configBackup/config/productConfig/MDS9710.json
index d9642beb..3289befc 100644
--- a/configBackup/config/productConfig/MDS9710.json
+++ b/configBackup/config/productConfig/MDS9710.json
@@ -12,6 +12,8 @@
     "baseRz":0.00,
     "connectorAmout":-1,
     "halconAlgoIndex":0,
+    "isBackExist":true,
+    "backArmIndex":9,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
@@ -25,6 +27,24 @@
     "codedAlgoIndex":-1,
     "HandleAi":
     {
+        "detModelName":"connectorDet.BHD",
+        "detGpuIndex":0,
+        "segHandle":
+        [
+            {
+                "detResultIndex":[0],
+                "segModelName":"ASR-Seg.BHD",
+                "segNgIndex":[0,1,2],
+                "segGpuIndex":0,
+                "clsModelName":"ASR-Cls.BHD",
+                "clsNgIndex":[0,1,2],
+                "clsResultHandle":
+                {
+                    "0":"OK,0,255,0",
+                    "1":"NG,255,0,0"
+                } 
+            }
+        ]
     }
 
     
diff --git a/configBackup/config/productConfig/MDS9710B.json b/configBackup/config/productConfig/MDS9710B.json
new file mode 100644
index 00000000..4a4ed4c6
--- /dev/null
+++ b/configBackup/config/productConfig/MDS9710B.json
@@ -0,0 +1,51 @@
+{
+    "productName":"APEX10B",
+    "customerPartNumber":"DS-C9710B",
+    "foxconnPartNumber":"800-39628-05B",
+    "imgPosPath":"./imgPosTip/Test1.jpg",
+    "productIndex":9,
+    "baseX":0.00,
+    "baseY":0.00,
+    "baseZ":0.00,
+    "baseRx":0.00,
+    "baseRy":0.00,
+    "baseRz":0.00,
+    "connectorAmout":-1,
+    "halconAlgoIndex":0,
+    "isBackExist":false,
+    "backArmIndex":-1,
+    "cameraSetting":
+    {
+        "0":"Gain:60/Expouse:25000"
+    },
+    "lightSetting":
+    {
+        "0":255
+    },
+    "disableHandleAiConfig":false,
+    "enableCodedAlgo":false,
+    "codedAlgoIndex":-1,
+    "HandleAi":
+    {
+        "detModelName":"connectorDet.BHD",
+        "detGpuIndex":0,
+        "segHandle":
+        [
+            {
+                "detResultIndex":[0],
+                "segModelName":"ASR-Seg.BHD",
+                "segNgIndex":[0,1,2],
+                "segGpuIndex":0,
+                "clsModelName":"ASR-Cls.BHD",
+                "clsNgIndex":[0,1,2],
+                "clsResultHandle":
+                {
+                    "0":"OK,0,255,0",
+                    "1":"NG,255,0,0"
+                } 
+            }
+        ]
+    }
+
+    
+}
\ No newline at end of file
diff --git a/configBackup/config/productConfig/MDS9718.json b/configBackup/config/productConfig/MDS9718.json
index 01d28c16..094c6945 100644
--- a/configBackup/config/productConfig/MDS9718.json
+++ b/configBackup/config/productConfig/MDS9718.json
@@ -10,8 +10,10 @@
     "baseRx":0.00,
     "baseRy":0.00,
     "baseRz":0.00,
-    "connectorAmout":96,
+    "connectorAmout":-1,
     "halconAlgoIndex":0,
+    "isBackExist":true,
+    "backArmIndex":7,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
@@ -31,7 +33,7 @@
         [
             {
                 "detResultIndex":[0],
-                "segModelName":"APEX-Seg.BHD",
+                "segModelName":"ASR-Seg.BHD",
                 "segNgIndex":[0,1,2],
                 "segGpuIndex":0,
                 "clsModelName":"ASR-Cls.BHD",
@@ -44,66 +46,681 @@
             }
         ]
     },
-    "productSign":
-    {
-        "1": {
-            "x": 1305,
-            "y": 10,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行1"
-        },
-        "2": {
-            "x": 1305,
-            "y": 170,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行2"
-        },
-        "3": {
-            "x": 1305,
-            "y": 330,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行3"
-        },
-        "4": {
-            "x": 1305,
-            "y": 490,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行4"
-        },
-        "5": {
-            "x": 1305,
-            "y": 650,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行5"
-        },
-        "6": {
-            "x": 1305,
-            "y": 810,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行6"
-        },
-        "7": {
-            "x": 1305,
-            "y": 970,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行7"
-        },
-        "8": {
-            "x": 1305,
-            "y": 1130,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行8"
-        }
+  "productSign": {
+    "1": {
+      "x": 1305,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行1"
+    },
+    "2": {
+      "x": 1305,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行2"
+    },
+    "3": {
+      "x": 1305,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行3"
+    },
+    "4": {
+      "x": 1305,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行4"
+    },
+    "5": {
+      "x": 1305,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行5"
+    },
+    "6": {
+      "x": 1305,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行6"
+    },
+    "7": {
+      "x": 1305,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行7"
+    },
+    "8": {
+      "x": 1305,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行8"
+    },
+    "9": {
+      "x": 1095,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行8"
+    },
+    "10": {
+      "x": 1095,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行7"
+    },
+    "11": {
+      "x": 1095,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行6"
+    },
+    "12": {
+      "x": 1095,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行5"
+    },
+    "13": {
+      "x": 1095,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行4"
+    },
+    "14": {
+      "x": 1095,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行3"
+    },
+    "15": {
+      "x": 1095,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行2"
+    },
+    "16": {
+      "x": 1095,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行1"
+    },
+    "17": {
+      "x": 875,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行1"
+    },
+    "18": {
+      "x": 875,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行2"
+    },
+    "19": {
+      "x": 875,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行3"
+    },
+    "20": {
+      "x": 875,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行4"
+    },
+    "21": {
+      "x": 875,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行5"
+    },
+    "22": {
+      "x": 875,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行6"
+    },
+    "23": {
+      "x": 875,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行7"
+    },
+    "24": {
+      "x": 875,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行8"
+    },
+    "25": {
+      "x": 655,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行8"
+    },
+    "26": {
+      "x": 655,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行7"
+    },
+    "27": {
+      "x": 655,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行6"
+    },
+    "28": {
+      "x": 655,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行5"
+    },
+    "29": {
+      "x": 655,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行4"
+    },
+    "30": {
+      "x": 655,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行3"
+    },
+    "31": {
+      "x": 655,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行2"
+    },
+    "32": {
+      "x": 655,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行1"
+    },
+    "33": {
+      "x": 405,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行1"
+    },
+    "34": {
+      "x": 405,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行2"
+    },
+    "35": {
+      "x": 405,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行3"
+    },
+    "36": {
+      "x": 405,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行4"
+    },
+    "37": {
+      "x": 405,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行5"
+    },
+    "38": {
+      "x": 405,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行6"
+    },
+    "39": {
+      "x": 405,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行7"
+    },
+    "40": {
+      "x": 405,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行8"
+    },
+    "41": {
+      "x": 155,
+      "y": 1130,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行1"
+    },
+    "42": {
+      "x": 155,
+      "y": 970,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行2"
+    },
+    "43": {
+      "x": 155,
+      "y": 810,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行3"
+    },
+    "44": {
+      "x": 155,
+      "y": 650,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行4"
+    },
+    "45": {
+      "x": 155,
+      "y": 490,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行5"
+    },
+    "46": {
+      "x": 155,
+      "y": 330,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行6"
+    },
+    "47": {
+      "x": 155,
+      "y": 170,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行7"
+    },
+    "48": {
+      "x": 155,
+      "y": 10,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行8"
+    },
+    "49": {
+      "x": 1305,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行9"
+    },
+    "50": {
+      "x": 1305,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行10"
+    },
+    "51": {
+      "x": 1305,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行11"
+    },
+    "52": {
+      "x": 1305,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行12"
+    },
+    "53": {
+      "x": 1305,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行13"
+    },
+    "54": {
+      "x": 1305,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行14"
+    },
+    "55": {
+      "x": 1305,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行15"
+    },
+    "56": {
+      "x": 1305,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列1行16"
+    },
+    "57": {
+      "x": 1095,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行16"
+    },
+    "58": {
+      "x": 1095,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行15"
+    },
+    "59": {
+      "x": 1095,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行14"
+    },
+    "60": {
+      "x": 1095,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行13"
+    },
+    "61": {
+      "x": 1095,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行12"
+    },
+    "62": {
+      "x": 1095,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行11"
+    },
+    "63": {
+      "x": 1095,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行10"
+    },
+    "64": {
+      "x": 1095,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列2行9"
+    },
+    "65": {
+      "x": 875,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行9"
+    },
+    "66": {
+      "x": 875,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行10"
+    },
+    "67": {
+      "x": 875,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行11"
+    },
+    "68": {
+      "x": 875,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行12"
+    },
+    "69": {
+      "x": 875,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行13"
+    },
+    "70": {
+      "x": 875,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行14"
+    },
+    "71": {
+      "x": 875,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行15"
+    },
+    "72": {
+      "x": 875,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列3行16"
+    },
+    "73": {
+      "x": 655,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行16"
+    },
+    "74": {
+      "x": 655,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行15"
+    },
+    "75": {
+      "x": 655,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行14"
+    },
+    "76": {
+      "x": 655,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行13"
+    },
+    "77": {
+      "x": 655,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行12"
+    },
+    "78": {
+      "x": 655,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行11"
+    },
+    "79": {
+      "x": 655,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行10"
+    },
+    "80": {
+      "x": 655,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列4行9"
+    },
+    "81": {
+      "x": 405,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行9"
+    },
+    "82": {
+      "x": 405,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行10"
+    },
+    "83": {
+      "x": 405,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行11"
+    },
+    "84": {
+      "x": 405,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行12"
+    },
+    "85": {
+      "x": 405,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行13"
+    },
+    "86": {
+      "x": 405,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行14"
+    },
+    "87": {
+      "x": 405,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行15"
+    },
+    "88": {
+      "x": 405,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列5行16"
+    },
+    "89": {
+      "x": 155,
+      "y": 2480,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行16"
+    },
+    "90": {
+      "x": 155,
+      "y": 2320,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行15"
+    },
+    "91": {
+      "x": 155,
+      "y": 2160,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行14"
+    },
+    "92": {
+      "x": 155,
+      "y": 2000,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行13"
+    },
+    "93": {
+      "x": 155,
+      "y": 1840,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行12"
+    },
+    "94": {
+      "x": 155,
+      "y": 1680,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行11"
+    },
+    "95": {
+      "x": 155,
+      "y": 1520,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行10"
+    },
+    "96": {
+      "x": 155,
+      "y": 1360,
+      "w": 150,
+      "h": 160,
+      "sign": "列6行9"
     }
-    
-    
-    
-}
\ No newline at end of file
+  }
+
+
+
+  }
\ No newline at end of file
diff --git a/configBackup/config/productConfig/MDS9718B.json b/configBackup/config/productConfig/MDS9718B.json
index 1cf6e18a..99ab485d 100644
--- a/configBackup/config/productConfig/MDS9718B.json
+++ b/configBackup/config/productConfig/MDS9718B.json
@@ -10,8 +10,10 @@
     "baseRx":0.00,
     "baseRy":0.00,
     "baseRz":0.00,
-    "connectorAmout":96,
+    "connectorAmout":-1,
     "halconAlgoIndex":0,
+    "isBackExist":false,
+    "backArmIndex":-1,
     "cameraSetting":
     {
         "0":"Gain:60/Expouse:25000"
@@ -31,7 +33,7 @@
         [
             {
                 "detResultIndex":[0],
-                "segModelName":"APEX-Seg.BHD",
+                "segModelName":"ASR-Seg.BHD",
                 "segNgIndex":[0,1,2],
                 "segGpuIndex":0,
                 "clsModelName":"ASR-Cls.BHD",
@@ -44,64 +46,679 @@
             }
         ]
     },
-"productSign":
-    {
+    "productSign": {
         "1": {
-            "x": 1305,
-            "y": 10,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行1"
+          "x": 1305,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行1"
         },
         "2": {
-            "x": 1305,
-            "y": 170,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行2"
+          "x": 1305,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行2"
         },
         "3": {
-            "x": 1305,
-            "y": 330,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行3"
+          "x": 1305,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行3"
         },
         "4": {
-            "x": 1305,
-            "y": 490,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行4"
+          "x": 1305,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行4"
         },
         "5": {
-            "x": 1305,
-            "y": 650,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行5"
+          "x": 1305,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行5"
         },
         "6": {
-            "x": 1305,
-            "y": 810,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行6"
+          "x": 1305,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行6"
         },
         "7": {
-            "x": 1305,
-            "y": 970,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行7"
+          "x": 1305,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行7"
         },
         "8": {
-            "x": 1305,
-            "y": 1130,
-            "w": 150,
-            "h": 160,
-            "sign": "列1行8"
+          "x": 1305,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行8"
+        },
+        "9": {
+          "x": 1095,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行8"
+        },
+        "10": {
+          "x": 1095,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行7"
+        },
+        "11": {
+          "x": 1095,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行6"
+        },
+        "12": {
+          "x": 1095,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行5"
+        },
+        "13": {
+          "x": 1095,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行4"
+        },
+        "14": {
+          "x": 1095,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行3"
+        },
+        "15": {
+          "x": 1095,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行2"
+        },
+        "16": {
+          "x": 1095,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行1"
+        },
+        "17": {
+          "x": 875,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行1"
+        },
+        "18": {
+          "x": 875,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行2"
+        },
+        "19": {
+          "x": 875,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行3"
+        },
+        "20": {
+          "x": 875,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行4"
+        },
+        "21": {
+          "x": 875,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行5"
+        },
+        "22": {
+          "x": 875,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行6"
+        },
+        "23": {
+          "x": 875,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行7"
+        },
+        "24": {
+          "x": 875,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行8"
+        },
+        "25": {
+          "x": 655,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行8"
+        },
+        "26": {
+          "x": 655,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行7"
+        },
+        "27": {
+          "x": 655,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行6"
+        },
+        "28": {
+          "x": 655,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行5"
+        },
+        "29": {
+          "x": 655,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行4"
+        },
+        "30": {
+          "x": 655,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行3"
+        },
+        "31": {
+          "x": 655,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行2"
+        },
+        "32": {
+          "x": 655,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行1"
+        },
+        "33": {
+          "x": 405,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行1"
+        },
+        "34": {
+          "x": 405,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行2"
+        },
+        "35": {
+          "x": 405,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行3"
+        },
+        "36": {
+          "x": 405,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行4"
+        },
+        "37": {
+          "x": 405,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行5"
+        },
+        "38": {
+          "x": 405,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行6"
+        },
+        "39": {
+          "x": 405,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行7"
+        },
+        "40": {
+          "x": 405,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行8"
+        },
+        "41": {
+          "x": 155,
+          "y": 1130,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行1"
+        },
+        "42": {
+          "x": 155,
+          "y": 970,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行2"
+        },
+        "43": {
+          "x": 155,
+          "y": 810,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行3"
+        },
+        "44": {
+          "x": 155,
+          "y": 650,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行4"
+        },
+        "45": {
+          "x": 155,
+          "y": 490,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行5"
+        },
+        "46": {
+          "x": 155,
+          "y": 330,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行6"
+        },
+        "47": {
+          "x": 155,
+          "y": 170,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行7"
+        },
+        "48": {
+          "x": 155,
+          "y": 10,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行8"
+        },
+        "49": {
+          "x": 1305,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行9"
+        },
+        "50": {
+          "x": 1305,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行10"
+        },
+        "51": {
+          "x": 1305,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行11"
+        },
+        "52": {
+          "x": 1305,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行12"
+        },
+        "53": {
+          "x": 1305,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行13"
+        },
+        "54": {
+          "x": 1305,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行14"
+        },
+        "55": {
+          "x": 1305,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行15"
+        },
+        "56": {
+          "x": 1305,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列1行16"
+        },
+        "57": {
+          "x": 1095,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行16"
+        },
+        "58": {
+          "x": 1095,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行15"
+        },
+        "59": {
+          "x": 1095,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行14"
+        },
+        "60": {
+          "x": 1095,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行13"
+        },
+        "61": {
+          "x": 1095,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行12"
+        },
+        "62": {
+          "x": 1095,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行11"
+        },
+        "63": {
+          "x": 1095,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行10"
+        },
+        "64": {
+          "x": 1095,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列2行9"
+        },
+        "65": {
+          "x": 875,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行9"
+        },
+        "66": {
+          "x": 875,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行10"
+        },
+        "67": {
+          "x": 875,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行11"
+        },
+        "68": {
+          "x": 875,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行12"
+        },
+        "69": {
+          "x": 875,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行13"
+        },
+        "70": {
+          "x": 875,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行14"
+        },
+        "71": {
+          "x": 875,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行15"
+        },
+        "72": {
+          "x": 875,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列3行16"
+        },
+        "73": {
+          "x": 655,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行16"
+        },
+        "74": {
+          "x": 655,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行15"
+        },
+        "75": {
+          "x": 655,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行14"
+        },
+        "76": {
+          "x": 655,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行13"
+        },
+        "77": {
+          "x": 655,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行12"
+        },
+        "78": {
+          "x": 655,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行11"
+        },
+        "79": {
+          "x": 655,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行10"
+        },
+        "80": {
+          "x": 655,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列4行9"
+        },
+        "81": {
+          "x": 405,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行9"
+        },
+        "82": {
+          "x": 405,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行10"
+        },
+        "83": {
+          "x": 405,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行11"
+        },
+        "84": {
+          "x": 405,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行12"
+        },
+        "85": {
+          "x": 405,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行13"
+        },
+        "86": {
+          "x": 405,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行14"
+        },
+        "87": {
+          "x": 405,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行15"
+        },
+        "88": {
+          "x": 405,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列5行16"
+        },
+        "89": {
+          "x": 155,
+          "y": 2480,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行16"
+        },
+        "90": {
+          "x": 155,
+          "y": 2320,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行15"
+        },
+        "91": {
+          "x": 155,
+          "y": 2160,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行14"
+        },
+        "92": {
+          "x": 155,
+          "y": 2000,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行13"
+        },
+        "93": {
+          "x": 155,
+          "y": 1840,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行12"
+        },
+        "94": {
+          "x": 155,
+          "y": 1680,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行11"
+        },
+        "95": {
+          "x": 155,
+          "y": 1520,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行10"
+        },
+        "96": {
+          "x": 155,
+          "y": 1360,
+          "w": 150,
+          "h": 160,
+          "sign": "列6行9"
         }
-    }
+      }
     
 }
\ No newline at end of file

From 9ef9f515ea98faad5015dc068097da3fad24606f Mon Sep 17 00:00:00 2001
From: RCi <15089880081@163.com>
Date: Mon, 12 Aug 2024 01:37:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dstargazer=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandleAiUi-new/algo/ALGO_Inspection.h     |   9 ++++++++-
 .../HandleAiUi-new/algo/CISCO_STARGAZER.hpp   |   4 ++--
 HanddleAI/HandleAiUi-new/algo/simpleAlgo.h    |   5 +++++
 lib/Hd_3DCameraLMI_module_PointLazer.exp      | Bin 798 -> 774 bytes
 lib/Hd_3DCameraLMI_module_PointLazer.lib      | Bin 2276 -> 2276 bytes
 lib/Hd_DalsaCamera_module.exp                 | Bin 777 -> 753 bytes
 lib/Hd_DalsaCamera_module.lib                 | Bin 2120 -> 2120 bytes
 lib/Hd_FinsTcp_module.exp                     | Bin 769 -> 745 bytes
 lib/Hd_FinsTcp_module.lib                     | Bin 2064 -> 2064 bytes
 lib/Hd_MvCamera_module_GENTL.exp              | Bin 782 -> 758 bytes
 lib/Hd_MvCamera_module_GENTL.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_MvCamera_module_GIGE.exp               | Bin 781 -> 757 bytes
 lib/Hd_MvCamera_module_GIGE.lib               | Bin 2148 -> 2148 bytes
 lib/Hd_ResultsSummary_module.exp              | Bin 782 -> 758 bytes
 lib/Hd_ResultsSummary_module.lib              | Bin 2164 -> 2164 bytes
 lib/Hd_SocketModule_ModbusTcp.exp             | Bin 1527 -> 1503 bytes
 lib/Hd_SocketModule_ModbusTcp.lib             | Bin 3446 -> 3446 bytes
 17 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
index 3ad7276b..097e6aaa 100644
--- a/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
+++ b/HanddleAI/HandleAiUi-new/algo/ALGO_Inspection.h
@@ -327,7 +327,14 @@ void ALGO_Inspection(std::shared_ptr <detData> data, handleAiModelManager* _hand
             case 5://STARGAZER
                 halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector))));
                 data->handleAiEndTime = std::chrono::high_resolution_clock::now();
-                aiImgResult.push_back(stargazerHandleAiAlgo(data, _handleAiModelManager));
+                aiImgResult.push_back(stargazerHandleAiAlgo(data, src(BboxToRect(connector)), _handleAiModelManager));
+                data->halconEndTime = std::chrono::high_resolution_clock::now();
+                tempCompared = true;
+                break;
+            case 6://STARGAZER HUGE
+                halconImgResult.push_back(stargazerHalconAlgo(data, src(BboxToRect(connector))));
+                data->handleAiEndTime = std::chrono::high_resolution_clock::now();
+                aiImgResult.push_back(stargazerHandleAiAlgo(data, src(BboxToRect(connector)), _handleAiModelManager));
                 data->halconEndTime = std::chrono::high_resolution_clock::now();
                 tempCompared = true;
                 break;
diff --git a/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp b/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp
index 5b33d34b..e6a06846 100644
--- a/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp
+++ b/HanddleAI/HandleAiUi-new/algo/CISCO_STARGAZER.hpp
@@ -90,10 +90,10 @@ static cv::Mat stargazerHalconAlgo(std::shared_ptr<detData>data, cv::Mat& src)
 }
 
 //ÊäÈëdetÇгöµÄÁ¬½ÓÆ÷ͼƬ
-static cv::Mat stargazerHandleAiAlgo(std::shared_ptr<detData>data, handleAiModelManager* _handleAiModelManager)
+static cv::Mat stargazerHandleAiAlgo(std::shared_ptr<detData>data, cv::Mat& src, handleAiModelManager* _handleAiModelManager)
 {
 	handleAiModelSeg* segPtr = _handleAiModelManager->getSegModel("APEX-Seg");
 	handleAiModelCls* clsPtr = _handleAiModelManager->getClsModel("APEX-Cls");
-    return cv::Mat();
+    return src;
 }
 #pragma once
\ No newline at end of file
diff --git a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
index 50b77585..c15f9b2e 100644
--- a/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
+++ b/HanddleAI/HandleAiUi-new/algo/simpleAlgo.h
@@ -710,6 +710,11 @@ static cv::Mat tiledImages(std::vector<cv::Mat>& imgs)
         return cv::imread("./noimg.png",-1);
     if (imgs.size() == 1)
         return imgs[0];
+    for (auto& img : imgs)
+    {
+        if (img.channels() == 1)
+            cv::cvtColor(img, img, cv::COLOR_GRAY2BGR);
+    }
     //×ÜͼÏñ´óС ƽÆÌÏÔʾ
     int matWidth = 0, matHeight = 0;
     for (auto& mat : imgs)
diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp
index 97d8b87b5a54ed11f0f0bf06624e98e39c3ad3b0..4d888b40a9c5375f642662f99829c7d90e8cb894 100644
GIT binary patch
delta 179
zcmbQo*2cz}(#FK_9|*K2aym1zP4vCb`-_2r!Ipth5J)k&Otxh7s#jykYGh#W%}g%J
zFV0UZQP2p|RPgci^Jd6puoYxTE>B@_v5HB~EKbgM%+CzXjL9!8iAgHW%t?u<Ff-9D
zO3g`4EKX%etw;r_3oAA<Ffxh>bB+ng&(A52@eKwt4NdfnE%c0y4UG+Ak}~sRJo1Z6
WfO<jtV{#@-F&QvrHBR<nx&#0!J2y4}

delta 186
zcmZo;o5#kP(#FK_9|)W#aym20P4vCbE5yjaV9UTL$N&V+lPwv&>NOYyS{N97Gn0$*
zi}TY;6f}Y~6?{DXyct><Yy}yT%TpMftzwchi<9#m^D{#;WAaN&Vv<TTb5dd|%uIBH
zQgc!hi&Gg=D^fw~0)qVAgB<G&V|+cGgZzW*jAD!ojErKO{e68y{eZ$@&M_hR`8mZg
fzQI7Ip^1qBTb-evv9ZPE4~$Ms0xgqGm@WYT62LeF

diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib
index 36c75b149f315b6d9f39a25471404d60a91a35ae..b506c2adaff32453f920896da4a99bad9470fc31 100644
GIT binary patch
delta 118
zcmaDN_(X8S0VWpXY46@lKEiaIMU5e=adJO%F%yuQ#V)m3j>UkH^Ptn_hnE-_7?>uX
wWRjj-#99wirapNBI|o$hWCyl5&b6m&4}62FG@E>vtp}!38LD#gEOswO00)UE^Z)<=

delta 118
zcmaDN_(X8S0VbAS@rnN@A7MJqqQM~0GP$3*m<dSDVwc)1$6~<9nX_N`$t4B`2Byg;
wnWQHdvDU+ssZXB3&H+_A*?}#NGhnUn*>6ylW|Qx-^}tjrLsf2`#qPxj05HBKZU6uP

diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp
index ab118790922bdf283ca963bb9e26af2406b92951..aa3d9ca6a80e0b228fa45c86b6ad4c82a79749e8 100644
GIT binary patch
delta 140
zcmeBV`^d_f(#FK_9|%Mzaym2pW|-)Ah4(!J1A`F*qacuCaG9*nXs@iskk!b*;G3CT
zlwX{mR-&L0q^aQJ>F3Rm%U~<WkX)VuR5y`PTE8eYCpED+l_9kvmBGa-Cal=Vz{n^j
n%sD0`KR>59#y1$qG&IpOw$L*+HZ(Sv{F%{-DXVd^InyNolHe(y

delta 164
zcmey!+R4V5(#FK_9|&|Oayl~!Gfwoo!pqLcz+l9{D98W=&Xe^S?Ugkc1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>LxNuy9cG_q$U=pGNe|dGB{hs1O)lJ2RYUm
z#`t<V2l)rr8O0bG7#YPl`}_Ka`T>Q*oMS@r^K*)0e1m~ZLlYB&Izv5UV~feR8J(B}
KS|-agT>=2X%`W%=

diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib
index cc2d36e5dd6097c8d1dffea4f0e34dc019fb0ad6..c271a24edcc0cf6762f83aa447cf44b73e509d54 100644
GIT binary patch
delta 109
zcmX>ha6({12NR3#l2yki_b}~YQDewzob1D#&IF|7*`+q0XO?DU5oOG{G5H<K6qu~~
s<h86EP!*Fevc|HW@BI7X_2l;~@{`vvNl(sYYlNv(hN|2w&#uV`06hvNJpcdz

delta 109
zcmX>ha6({12NTODh23{1_b}~Y(O?j0ne4-y&IF|7*`+q0XO?DUVSi@ub@DrwDKJ^}
s$!l3TpeiO`WQ}DF@!xsr_2l;~@{`vvNl(sYYlNv(hN|2w&#uV`01D?LO#lD@

diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp
index 05dc8bab1af3b651c13ef7421da5f9dc9813f651..578514104377e7b47192dbe7bc547dd9da0eba5a 100644
GIT binary patch
delta 140
zcmZo<d&$a~(#FK_9|(9Saym18XPD@Bf%i271A`s|qacuCaG9*lXsxWqkk!b*;G3CT
zlwX{mR-&L0q^aQJ>F3Rm%U~<WkX)VuRM*KUtzVRylbTqZ%8*)-%HU!Z6IN_wU}O{%
n<{T4}pPy44;~NZQ8k*=CTj&`Z8yXu-e$D8_l+`#{pXm|+d1xtD

delta 164
zcmaFK+Q`P4(#FK_9|%+@aym2dGfwooz{||Yz@W##D98W=&Xctnt(7$x1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL(o>N**v-GfqdQWJ|)8B!}!8Jw+R0)qVAgB<G&
zV|+cGgZzW*jAD!ojErKO{e68y{eZ$@&M_hR`8mZgzQI7Ip^1q>ouQtwvBl)ej804f
KEtAEWE&%|e6)vy<

diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib
index a50e177e10f90e3993f56c5a13e462416b8c93d4..e7784b3ea75952388bfd4c57a0b8fb3be8e54022 100644
GIT binary patch
delta 113
zcmbOrFhO8L2@@xiS>+3PMg|6s$^2|)lQ%QfvZyg+HBOFWRi7NqY{LX(_OnWD-pnk_
w$nsyM=EdYwEE8ZV^dYk4EOPCyj!oub+X0hM=5k2R&n?i)Oo3|WWoKpt0HB~E>;M1&

delta 113
zcmbOrFhO8L2@@y(r?ji`j0_AMllj@qCU0h{Wzk>|Xqg<xsy;cI*@g+o>}QqQyqQ^;
wk>!eB#hJ;cSSG+!=tE@7S(vllUz^OuwgV=i%;k`rpIe}pnF7_$%g)RQ0BqkOCjbBd

diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp
index cd7a09856f41e935ba31f1206b025b5c61669f5f..baf006bd011aee4aa70aba1d534a1396c11e5b8d 100644
GIT binary patch
delta 180
zcmeBU`^L(d(#FK_9|)u-aym2pW0>f7jrS7+1A{38qacuCaG7k#=v1%9kk!b*;G3CT
zlwX{mR-&L0q^aQJ>F3Rm%U~<WkX)X^;9?b%oLQWl@0gz%ni-Q{S`w2~nwgUlQ(<PJ
zTa=oUnpm95kXn%nQWsWiWME_z6XqNflAoVb9OD}dWEz_28C&QX8ygxM#3W_r#dzcw
XmjLyG^vC2(=3+8n%4(c!!*mG%?oK#1

delta 187
zcmeyy+Q-J3(#FK_9|(*laym1KF;4Wm#>>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<OhsSOad*FRhTXT05^#^1poj5

diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib
index a65c613a9788aa36e3530d6a5ccb1cad49b8c1da..4010f0a3da11c6819056f7133313cf8a23370e79 100644
GIT binary patch
delta 118
zcmew&@I_$53?`O;Zc(o%&tclnqQ;QbI60m<n<=Yt^BHC<M$WYxj6R)WU|?XHypTzH
yvKDJOOo{sBGprmyWs}b^OHKa38po+!d+_r+s7kZRy=*NomC6W}(wk%1#TfzcPAFIa

delta 118
zcmew&@I_$53?`PsF#ive=P>PO(O?j0nH<lY%_PvW`3$oaBj@vl$A6z<U|?XHypTzH
zvKDJOOo{sBGprmyWs}b^OHKa38pnBPYw*i=P?ctrd)ZoGDwPo`r8md2i!%ZMl}aY@

diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp
index 564b8062f8555ebcb08fc3e6204792c4fdc08f62..3f62ab5a87cdabaff6f1d22791ed15cd3d8bd608 100644
GIT binary patch
delta 180
zcmeBW`^w6h(#FK_9|$BTaym2pWtix9jrSu11A_?zqacuCaG7k#=vc4Dkk!b*;G3CT
zlwX{mR-&L0q^aQJ>F3Rm%U~<WkX)X^;9?b%oLQWl@0gz%ni-Q{S`w2~nwgUlQ(<PJ
zTa=oUnpm95kXn%nQWsWiWME_z6XqNflAoVb9OD}dWEz_28C&QX8ygxM#3W_r#dzcw
XmjLyG^vC2(=43Kp%4(c!&2$L>>C!kY

delta 187
zcmey$+RMh7(#FK_9|#O5aym1KGEVfn#>>gbz+l3_D98W=&XWxp9qTn11X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<ok?HOad*Fm6<L905aS+`~Uy|

diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib
index b1396b9be8cfc2bad5039077ec72d4077da69fd6..110ae8d714ae9a153c870b6ea7d31787466ae1f1 100644
GIT binary patch
delta 108
zcmaDN@I+w4Bqo;p>l@!pp2oC~MU5e=aq=uy^~v?jPE0`NX;!JtcbVlGnV<DBPyWv`
s9i~7ZB3aIQ)aT5(x04xJ<tL}H&4bA*b2%jE=N9N?ra+DGXBTAz0ONWmng9R*

delta 108
zcmaDN@I+w4Bqo*{N6bD?p2oC~MT0@0W%4Xm^~v?jPE0`NX;!JtcbVlGnU|fYoBW?;
sI!u8+M6#TfyL!>nx04xJ<tL}H&4bA*b2%jE=N9N?ra+DGXBTAz0CVvrPXGV_

diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp
index 1880b09b51e497f37aa5ae54de155d56902c2475..d575f63f09fb61afd1b239332f2dfe9e5811ad61 100644
GIT binary patch
delta 180
zcmeBU`^L(d(#FK_9|)u-aym2pW0>f7jrS7+1A{38qacuCaG7k#=v1%9kk!b*;G3CT
zlwX{mR-&L0q^aQJ>F3Rm%U~<WkX)X^;9?b%oLQWl@0gz%ni-Q{S`w2~nwgUlQ(<PJ
zTa=oUnpm95kXn%nQWsWiWME_z6XqNflAoVb9OD}dWEz_28C&QX8ygxM#3W_r#dzcw
XmjLyG^vC2(=3+8n%4(c!!*mG%?oK#1

delta 187
zcmeyy+Q-J3(#FK_9|(*laym1KF;4Wm#>>UXz+lS2D98W=&XWxpo$56h1X>svd^3}a
z@{9A+N)$ALG!=Y2{k$1k8Egd^lFL&VoULM#GmDe+9rH6oGh^~gOJb5rGjmd6D$GoD
zgHm%+6N^(BQY%tH>H>oN-GdzK3}bvforC;?>x^QI42+Cooc(=$L;ZllVa_oj`T04;
gF}}e-rlE<60b8A+p0TmT<OhsSOad*FRhTXT05^#^1poj5

diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib
index a61fbd40216d4091ba157f7b97afab308e79a4fe..8baafc1c7adb77e35051dfe8ea37dc3b629b4297 100644
GIT binary patch
delta 118
zcmew&@I_$53?>$>dz1c6p2M`CMU5e=adJF!Hd9vP<}=JzjGP~AlKz}xU|?XHypTzH
zvKDJOOo{sBGprmyWs}b^OHKa38pru=hQq~oP?ctrd)ZoGDwPo`r8md2i!%ZM19K>=

delta 118
zcmew&@I_$53?`PJ|NEa$p2M`CMT0@0WpX@oHj_Zh<}=JzjGU7uUOIM)fq{W(@<Jx*
z$y%)CFeU1f&#-a;l}$dwEH(K9YaHiu*4kt5peoHK_p-IXR4OA>N^g#37iR<j>$WFG

diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp
index f97806414b3a4e971708daad71c818bffbb5409f..525105f5eacaed499a94ba2026795b88d98dab5a 100644
GIT binary patch
delta 141
zcmey)eV>~%rHzT<KM-7=$mz_uc%$!YM&9X+3=C!rjDie6;4;~j$yr&AA*+#r!8bFx
zD8D#Atwcd1NK?Vb)6bhBm%&z$A-OySsBSfrw0==)PHJLtDnn{TDuatvOjxmzfss*6
om~%`>etu4IjBhZIX=tKnY@ugtY-nsSnV0z)Q&!{VugpwL04}yFRsaA1

delta 165
zcmcc5{hgaLrHzT<KM=g0$mz_ud!z4bM&9*|3=C!rjDie6;5^xt$yr&0L7;_!!8bFx
zD8D#Atwcd1NK?Vb)6bismBCh!A-OySsBSfrw0lr$PHJLtDnn{TDuc6COhAyodyr$D
zVT`Y*bC7><ol%UDfss*+v%jxzs2@-`%sD0`KR>59#y1$qG&C_Ws58_vHny1jmFXFi
LK+ER4%uGxGp>;B>

diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib
index 5ec47732196dc7452962b23c04a9ae6b8cb23ce6..b3ff8f19c2b7f22a232105edac9723e1a30fca2a 100644
GIT binary patch
delta 108
zcmew+^-XHSI~LA!vnzk<Gcqu6Oy0<0Hd&Xol|_vqt8o&C`sBN;E=*aClMOkfHrui(
wGqM(DI=(qQc`b+h<QDb{s49JkigFgyZwZelui-cV7N1<esSVS*opV1k00IFd)&Kwi

delta 108
zcmew+^-XHSI~LBiA5)I%Gcqu6Oy0<0Hd&Xol|_R=pk)$=`sBN;E=&R~lMOkfHrui(
wGqS!kFaLLX@>&l0$t~;^P*wU673D03ub!ToyoTcdSbTB;r#4LMcFz6G0MnZzxBvhE