--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/02 08:49:18	120
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/02 12:03:03	121
@@ -5,6 +5,7 @@
 #include "FlisServer.h"
 #include "FlisServerDlg.h"
 #include <vector>
+#include ".\flisserverdlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -64,9 +65,9 @@
 	ON_WM_QUERYDRAGICON()
 	ON_MESSAGE(UWM_MYMESSAGE, OnShowString)
 	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDC_test, OnBnClickedtest)
 	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
 	ON_BN_CLICKED(IDC_GSMPIN, OnBnClickedGsmpin)
+	ON_BN_CLICKED(IDC_Start, OnBnClickedStart)
 END_MESSAGE_MAP()
 
 
@@ -102,15 +103,7 @@
 	// TODO: Add extra initialization here
 	StartSerial();
 	DBConnect();
-	continueThread = 1;
 	ResetSms = 0;
-	/*
-////////////Start Tråd////////////////////////
-	MyThread *t = new MyThread(AfxGetMainWnd());
-	t->start();
-////////////Start Tråd////////////////////////
-*/
-	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -191,47 +184,7 @@
 	}
 	return buf;
 }
-void CFlisServerDlg::OnBnClickedtest()
-{
-	// TODO: Add your control notification handler code here
-
-/*	
-///////////////Send sms stuff/////////////////
-	vector<unsigned char> tlfnr;
-	vector<unsigned char> smsdata;
-	tlfnr.push_back('2');
-	tlfnr.push_back('9');
-	tlfnr.push_back('7');
-	tlfnr.push_back('2');
-	tlfnr.push_back('2');
-	tlfnr.push_back('6');
-	tlfnr.push_back('0');
-	tlfnr.push_back('3');
-
-	SendSmsHead(tlfnr);
 
-	 //35:29860132:75 <--- demo pakke;
-	 vector<unsigned char> smsdata;
-	smsdata.push_back('3');
-	smsdata.push_back('5');
-	smsdata.push_back(':');
-	smsdata.push_back('2');
-	smsdata.push_back('9');
-	smsdata.push_back('8');
-	smsdata.push_back('6');
-	smsdata.push_back('0');
-	smsdata.push_back('1');
-	smsdata.push_back('3');
-	smsdata.push_back('2');
-	smsdata.push_back(':');
-	smsdata.push_back('7');
-	smsdata.push_back('5');
-
-	SendSmsData(smsdata);
-///////////////Send sms stuff/////////////////
-*/
-
-}
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
 	for (int i=0; i<data.size(); i++)
@@ -438,7 +391,7 @@
 	FremFejl = Splitter(FyrData);
 	PowerFail = Splitter(FyrData);
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
+///////////////////// Her skal sendes data til databasen ////NÅR HEDIN KAN SENDE SMS///////////////////
 		m_Textwindow.GetWindowText(oldtekst);
 		oldtekst.Append("\r\n");
 		oldtekst.Append("På næste linie kommer SmsCount. \r\n");
@@ -502,7 +455,8 @@
 {
 	// TODO: Add your control notification handler code here
 	SetPin();
-	//Sleep(5000);
+	Sleep(35000);
+	OnBnClickedStart();
 }
 void CFlisServerDlg::DeleteSms()
 {
@@ -637,6 +591,7 @@
 						writeFrame(data);
 						Sleep(200);
 						ReadSms();
+						ResetSms++;
 
 				}
 				else if(command = "wind")
@@ -658,7 +613,7 @@
 		{
 			
 			////////////////DBRead stuff//////////////////
-			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID;
+			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID, sImei;
 			std::vector<Commands> data;
 			data = DBRead();
 			for (int i=0; i<data.size(); i++)
@@ -674,17 +629,6 @@
 			sCommandID = Splitter(testdata);
 			sInstallationsID = Splitter(testdata);
 
-			testprint.Append("sIDnr på næste linie\r\n");
-			testprint.Append(sIDnr);
-			testprint.Append("\r\n");
-			testprint.Append("sCommandID på næste linie\r\n");
-			testprint.Append(sCommandID);
-			testprint.Append("\r\n");
-			testprint.Append("sInstallationsID på næste linie\r\n");
-			testprint.Append(sInstallationsID);
-			m_Textwindow.SetWindowText(testprint);
-			
-			
 			if (sIDnr.GetLength() > 0)
 			{
 				DBReadData(sIDnr,sCommandID,sInstallationsID);
@@ -695,7 +639,9 @@
 }
 void CFlisServerDlg::DBReadData(CString IDnr,CString CommandID,CString InstallationsID)
 {
-	CString TlfNr;
+	CString TlfNr, Imei, ServerTlfNr, updaterate;
+
+	ServerTlfNr = "29860132";
 		
 	//kald dbreadphone som du kalder dbread
 	std::vector<Installation> inst;
@@ -704,31 +650,46 @@
 	{
 		CString dataen = inst[i].InstPhoneNr;
 		TlfNr.Append(dataen);
+		CString Imeidata = inst[i].Imei;
+		Imei.Append(Imeidata);
+		CString updaterat = inst[i].Updaterate;
+		updaterate.Append(updaterat);
 	}
 	vector<unsigned char> tlfnr;
 	for (int i=0; i<TlfNr.GetLength(); i++)
 	{
 		tlfnr.push_back(TlfNr[i]);
 	}
+	
+	int calcimei; 
+	double buf;
+	Imei.Remove('0');
 
+	buf = atof(Imei);
+	
+	calcimei = tversum(buf);
+	
+	Imei.Format("%d",calcimei);
+	
 	SendSmsHead(tlfnr);
 	Sleep(500);
 	//35:29860132:75 <--- demo pakke;
 	vector<unsigned char> smsdata;
-	smsdata.push_back('3');
-	smsdata.push_back('5');
+	
+	for (int i=0; i<Imei.GetLength(); i++)
+	{
+		smsdata.push_back(Imei[i]);
+	}
 	smsdata.push_back(':');
-	smsdata.push_back('2');
-	smsdata.push_back('9');
-	smsdata.push_back('8');
-	smsdata.push_back('6');
-	smsdata.push_back('0');
-	smsdata.push_back('1');
-	smsdata.push_back('3');
-	smsdata.push_back('2');
+	for (int i=0; i<ServerTlfNr.GetLength(); i++)
+	{
+		smsdata.push_back(ServerTlfNr[i]);
+	}
 	smsdata.push_back(':');
-	smsdata.push_back('7');
-	smsdata.push_back('5');
+	for (int i=0; i<updaterate.GetLength(); i++)
+	{
+		smsdata.push_back(updaterate[i]);
+	}
 
 	SendSmsData(smsdata);
 	Sleep(250);
@@ -738,13 +699,14 @@
 	SQL.Format("update command set executed=now() where id=%s",IDnr);
 	db.ExecuteSQL(SQL);
 	Sleep(150);
+
 }
 vector<Installation> CFlisServerDlg::DBReadPhone(CString sInstallationsID)
 {
 	vector<Installation> buffer;
 
-	CString SQL, phonenr;
-	SQL.Format("select installationphonenr from installation WHERE id = %s",sInstallationsID);
+	CString SQL, phonenr, imei, updaterate;
+	SQL.Format("select installationphonenr, imei, updaterate from installation WHERE id = %s",sInstallationsID);
 	CRecordset rs(&db);
 	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
 	if (rs.GetRecordCount()>0) 
@@ -754,8 +716,12 @@
 		{
 		Installation Myinst;
 		rs.GetFieldValue((short)0,phonenr);
+		rs.GetFieldValue(1,imei);
+		rs.GetFieldValue(2,updaterate);
 
 		Myinst.InstPhoneNr.Append(phonenr);
+		Myinst.Imei.Append(imei);
+		Myinst.Updaterate.Append(updaterate);
 
 		buffer.push_back(Myinst);
 		rs.MoveNext();
@@ -763,4 +729,22 @@
 	}
 	rs.Close();
 	return buffer;
-}
\ No newline at end of file
+}
+int CFlisServerDlg::tversum(unsigned input)
+{
+	int sum = 0;
+	while (input > 0)
+	{
+		sum += (input %10);
+		input /= 10;
+	}
+	return sum;
+}
+void CFlisServerDlg::OnBnClickedStart()
+{
+// TODO: Add your control notification handler code here
+
+	continueThread = 1;
+
+	AfxBeginThread(threadWrapper,AfxGetMainWnd());
+}