--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/29 16:16:34	103
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/11/30 07:24:35	105
@@ -66,6 +66,7 @@
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDC_test, OnBnClickedtest)
 	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
+	ON_BN_CLICKED(IDC_GSMPIN, OnBnClickedGsmpin)
 END_MESSAGE_MAP()
 
 
@@ -100,7 +101,6 @@
 
 	// TODO: Add extra initialization here
 	StartSerial();
-	//SetPin();
 	DBConnect();
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
@@ -249,28 +249,6 @@
 	smsdata.push_back('5');
 
 	SendSmsData(smsdata);
-	Sleep(2000);
-	if(Serial.getComstat().cbInQue > 0)
-	{
-		CString tekst;
-		std::vector<unsigned char> answer = readFrame();
-		Sleep(50);
-			char array1[25];
-			int i;
-			for (int i=0; i<answer.size(); i++)
-			{
-				array1[i] = answer[i];
-			}
-		
-			for (int i=0; i<answer.size(); i++)
-			{
-				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
-				{
-					tekst.AppendChar(array1[i]);
-				}
-			}
-			m_Textwindow.SetWindowText(tekst);
-	}
 ///////////////Send sms stuff/////////////////
 */
 }
@@ -335,7 +313,28 @@
 		Sleep(5);
 	}
 	Serial.writeByte(0x1A);
-	Sleep(500);
+	Sleep(3000);
+	if(Serial.getComstat().cbInQue > 0)
+	{
+		CString tekst;
+		std::vector<unsigned char> answer = readFrame();
+		Sleep(50);
+			char array1[25];
+			int i;
+			for (int i=0; i<answer.size(); i++)
+			{
+				array1[i] = answer[i];
+			}
+		
+			for (int i=0; i<answer.size(); i++)
+			{
+				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
+				{
+					tekst.AppendChar(array1[i]);
+				}
+			}
+			m_Textwindow.SetWindowText(tekst);
+	}
 
 }
 void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> data)
@@ -509,3 +508,9 @@
 	}
 	OnOK();
 }
+
+void CFlisServerDlg::OnBnClickedGsmpin()
+{
+	// TODO: Add your control notification handler code here
+	SetPin();
+}