--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/06 12:53:06	174
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/10 07:25:35	209
@@ -254,8 +254,24 @@
 			AppendText(tekst);
 	}
 	Sleep(5);
-	if (tekst.MakeLower() == "+cpin: sim pin")
+	tekst.MakeLower();
+	int pos = tekst.Find("+cpin: ",0);
+	if (pos != -1)
 	{
+		tekst = tekst.Right( tekst.GetLength() - pos -1);
+	}
+
+	if (tekst == "cpin: sim pin")
+	{
+		CString pin;
+		ConfigFile config;
+		try {
+			config.ReadSettings();
+		} catch(...) {
+			MessageBox("Could not open config file");
+		}
+		Sleep(50);
+
 		data.clear();
 		data.push_back('a');
 		data.push_back('t');
@@ -265,10 +281,10 @@
 		data.push_back('i');
 		data.push_back('n');
 		data.push_back('=');
-		data.push_back('2');
-		data.push_back('5');
-		data.push_back('9');
-		data.push_back('5');
+		for (int i = 0; i<config.pincode.GetLength(); i++)
+		{
+		data.push_back(config.pincode[i]);
+		}
 
 		writeFrame(data);
 
@@ -301,13 +317,13 @@
 			Sleep(10); //Small delay to avoid busy wait
 		}
 	}
-	else if (tekst.MakeLower() == "+cpin: ready")
+	else if (tekst == "cpin: ready")
 	{
 		AppendText("No pincode needed");
 	}
 	else
 	{
-		AppendText("Error in pincode message");
+		AppendText("Error in set pin part of the code");
 	}
 }
 void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
@@ -409,7 +425,7 @@
 }
 void CFlisServerDlg::ReadSms()
 {
-	CString tekst, oldtekst;
+	CString tekst;
 	Sleep(950);		//Holder en pause for at lade hele sms'en komme ind i serial køen.
 	if(Serial.getComstat().cbInQue > 0)
 	{
@@ -430,9 +446,7 @@
 }
 void CFlisServerDlg::SmsSplit(CString data)
 {
-	CString FyrData, TlfNr, SmsCount, Temper, Flamme, Flis, FremFejl, PowerFail, oldtekst;
-	char CharData[150];
-	strcpy(CharData,data);
+	CString FyrData, TlfNr, SmsCount, Temper, Flamme, Flis, FremFejl, PowerFail;
 	TlfNr = data.Mid(24,8);
 	FyrData = data.Mid(57,data.GetLength()-59);
 	FyrData.Append(":");
@@ -567,7 +581,7 @@
 			Sleep(250);
 			std::vector<unsigned char> answer = readFrame();
 			Sleep(500);
-			CString tekst, oldtekst;
+			CString tekst;
 		
 			for (int i=0; i<answer.size(); i++)
 			{
@@ -607,7 +621,7 @@
 			{
 				if (command.MakeLower() == "cmti")
 				{
-					CString smscount, oldteskst;
+					CString smscount;
 					int pos = tekst.Find(',',0);
 					if (pos != -1)
 					{
@@ -615,32 +629,25 @@
 						smscount.Remove(':');
 						ResetSms++;
 					}
-						////////////////Read sms ting//////////////////
-						std::vector<unsigned char> data;
-						data.push_back('a');
-						data.push_back('t');
-						data.push_back('+');
-						data.push_back('c');
-						data.push_back('m');
-						data.push_back('g');
-						data.push_back('r');
-						data.push_back('=');
-						
-						for (int i=0; i< smscount.GetLength(); i++)
-						{
-							data.push_back(smscount[i]);
-						}
-						m_Textwindow.GetWindowText(oldteskst);
-						oldteskst.Append("\r\n");
-						for (int i=0; i<data.size();i++)
-						{
-							oldteskst.AppendChar(data[i]);
-						}
-						m_Textwindow.SetWindowText(oldteskst);
-						writeFrame(data);
-						Sleep(200);
-						ReadSms();
-						ResetSms++;
+
+					std::vector<unsigned char> data;
+					data.push_back('a');
+					data.push_back('t');
+					data.push_back('+');
+					data.push_back('c');
+					data.push_back('m');
+					data.push_back('g');
+					data.push_back('r');
+					data.push_back('=');
+					
+					for (int i=0; i< smscount.GetLength(); i++)
+					{
+						data.push_back(smscount[i]);
+					}
+					AppendText(CString(&data[0]));
+					writeFrame(data);
+					Sleep(200);
+					ReadSms();
 
 				}
 				else if(command.MakeLower() == "wind")
@@ -846,7 +853,7 @@
 {
 // TODO: Add your control notification handler code here
 
-	m_Textwindow.SetWindowText("Indsætter Pinkode, og venter på modem bliver klar, hvis pinkode er nødvendig");
+	AppendText("Indsætter Pinkode, og venter på modem bliver klar, hvis pinkode er nødvendig");
 	UpdateWindow();
 	SetPin();
 	
@@ -856,20 +863,24 @@
 		Serial.readByte(); //Flush the incoming queue
 		Sleep(1);
 	}
-    
+    Sleep(5);
+
 	continueThread = 1;
 	keepaliveandread();
 	Sleep(150);
-	m_Textwindow.SetWindowText(CString("Server phonenr read from db: ") + Alive.Phonenr );
+	AppendText(CString("Server phonenr read from db: ") + Alive.Phonenr );
 	AppendText("Started");
 	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 }
 void CFlisServerDlg::AppendText(CString s)
 {
+	CTime now = CTime::GetCurrentTime();
 	CString Tekst;
 	m_Textwindow.GetWindowText(Tekst);
-	Tekst.Append("\r\n");
+	Tekst.AppendFormat("%02d:%02d:%02d : ", now.GetHour(), now.GetMinute(), now.GetSecond());
 	Tekst.Append(s);
+	Tekst.Append("\r\n");
+
 	m_Textwindow.SetWindowText(Tekst);
 	Sleep(5);
 	int g = m_Textwindow.GetScrollLimit(SB_VERT);
@@ -908,6 +919,8 @@
 				database = value;
 			else if (key == "comport")
 				comport = value;
+			else if (key == "pincode")
+				pincode = value;
 		}
 
 	}