--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/29 16:16:34	103
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/03 11:46:03	132
@@ -4,8 +4,8 @@
 #include "stdafx.h"
 #include "FlisServer.h"
 #include "FlisServerDlg.h"
-#include ".\flisserverdlg.h"
 #include <vector>
+#include ".\flisserverdlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -63,9 +63,11 @@
 	ON_WM_SYSCOMMAND()
 	ON_WM_PAINT()
 	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()
 
 
@@ -100,8 +102,8 @@
 
 	// TODO: Add extra initialization here
 	StartSerial();
-	//SetPin();
 	DBConnect();
+	ResetSms = 0;
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -160,11 +162,13 @@
 	CString SerialPort = "COM3";
 
 	Baud = 1200;
-	if( Serial.isOpen() ){
+	if( Serial.isOpen() )
+	{
 		Serial.close();
 		Serial.open( SerialPort, Baud );
 	}
-	else {
+	else 
+	{
 		Serial.open( SerialPort, Baud );
 	}
 
@@ -176,104 +180,13 @@
 	std::vector<unsigned char> buf;
 	while(Serial.getComstat().cbInQue > 0)
 	{
-	unsigned char data = Serial.readByte();
+		unsigned char data = Serial.readByte();
 
-	buf.push_back(data);
+		buf.push_back(data);
 	}
 	return buf;
 }
-void CFlisServerDlg::OnBnClickedtest()
-{
-	// TODO: Add your control notification handler code here
-/*	
-////////////////Read sms ting//////////////////
-	CString tekst;
-	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('=');
-	data.push_back('1');
 
-	writeFrame(data);
-	ReadSms();
-////////////////Read sms ting//////////////////
-*/
-/*
-////////////////DBRead stuff//////////////////
-	CString testdata;
-	std::vector<Commands> data;
-	data = DBRead();
-	for (int i=0; i<data.size(); i++)
-	{
-		testdata.Append(data[i].IDnr);
-		testdata.Append(data[i].CommandID);
-		testdata.Append(data[i].InstallationsID);
-	}
-	m_Textwindow.SetWindowText(testdata);
-////////////////DBRead stuff//////////////////	
-*/
-/*	
-///////////////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;
-	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);
-	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/////////////////
-*/
-}
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
 	for (int i=0; i<data.size(); i++)
@@ -285,7 +198,7 @@
 	Sleep(100);
 
 }
-int CFlisServerDlg::SetPin(void)
+void CFlisServerDlg::SetPin()
 {
 	CString tekst;
 	std::vector<unsigned char> data;
@@ -303,12 +216,23 @@
 	data.push_back('5');
 
 	writeFrame(data);
-	Sleep(750);
+}
+void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
+{	
+	
+	for (int i=0; i<data.size(); i++)
+	{
+		Serial.writeByte( data[i] );
+		Sleep(5);
+	}
+	Serial.writeByte(0x1A);
+	Sleep(3000);
 	if(Serial.getComstat().cbInQue > 0)
 	{
+		CString tekst;
 		std::vector<unsigned char> answer = readFrame();
 		Sleep(50);
-			char array1[25];
+			char array1[150];
 			int i;
 			for (int i=0; i<answer.size(); i++)
 			{
@@ -324,18 +248,6 @@
 			}
 			m_Textwindow.SetWindowText(tekst);
 	}
-return 0;
-}
-void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
-{	
-	
-	for (int i=0; i<data.size(); i++)
-	{
-		Serial.writeByte( data[i] );
-		Sleep(5);
-	}
-	Serial.writeByte(0x1A);
-	Sleep(500);
 
 }
 void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> data)
@@ -370,7 +282,8 @@
 void CFlisServerDlg::DBConnect()
 {
 	CString dsn;
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");
+	//dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=t-hoerup.dk; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");	//Torben
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=192.168.134.132; uid=serrenab;password=furnacemonitor;database=flisfyr;sslmode=prefer");   //skole server
 	db.OpenEx(dsn, CDatabase::noOdbcDialog);
 }
 vector<Commands> CFlisServerDlg::DBRead(void)
@@ -386,17 +299,17 @@
 		rs.MoveFirst();
 		while(!rs.IsEOF())
 		{
-		Commands Mycom;
-		rs.GetFieldValue((short)0, IDnr);
-		rs.GetFieldValue(3, CommandID);
-		rs.GetFieldValue(4, InstallationsID);
-		
-		Mycom.IDnr = IDnr;
-		Mycom.CommandID = CommandID;
-		Mycom.InstallationsID = InstallationsID;
+			Commands Mycom;
+			rs.GetFieldValue((short)0, IDnr);
+			rs.GetFieldValue(3, CommandID);
+			rs.GetFieldValue(4, InstallationsID);
+			
+			Mycom.IDnr = IDnr;
+			Mycom.CommandID = CommandID;
+			Mycom.InstallationsID = InstallationsID;
 
-		buffer.push_back(Mycom);
-		rs.MoveNext();
+			buffer.push_back(Mycom);
+			rs.MoveNext();
 		}
 	}
 	rs.Close();
@@ -438,14 +351,14 @@
 	char CharData[150];
 	strcpy(CharData,data);
 
-	int s=22;
+	int s=24;
 	for (int i=0; i<=7; i++)
 	{
 		TlfNr.AppendChar(CharData[s]);
 		s++;
 	}
 
-	for (int s=55; s<=(data.GetLength()-3); s++)
+	for (int s=57; s<=(data.GetLength()-3); s++)
 	{
 		FyrData.AppendChar(CharData[s]);
 	}
@@ -457,28 +370,28 @@
 	Flis = Splitter(FyrData);
 	FremFejl = Splitter(FyrData);
 	PowerFail = Splitter(FyrData);
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
-		m_Textwindow.GetWindowText(oldtekst);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer SmsCount. \r\n");
-		oldtekst.Append(SmsCount);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer Temper. \r\n");
-		oldtekst.Append(Temper);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer Flamme. \r\n");
-		oldtekst.Append(Flamme);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer Flis. \r\n");
-		oldtekst.Append(Flis);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer FremFejl. \r\n");
-		oldtekst.Append(FremFejl);
-		oldtekst.Append("\r\n");
-		oldtekst.Append("På næste linie kommer PowerFail. \r\n");
-		oldtekst.Append(PowerFail);
-		m_Textwindow.SetWindowText(oldtekst);
+		
+		CString SQL, Textwindow, InstallNR;
+		SQL.Format("select ID from installation where installationphonenr=%s",TlfNr);
+	
+		CRecordset rs(&db);
+		rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+		if (rs.GetRecordCount()>0)
+		{
+			rs.MoveFirst();		
+			rs.GetFieldValue((short)0,InstallNR);
+		}
+		rs.Close();
+
+		SQL.Format("insert into logtable (logtime,temperature,flamedetector,solidfuelempty,conveyorerror,powerfailure,messagenr,installationnr) Values (now(),%s,'%s','%s','%s','%s',%s,%s)",Temper, Flamme, Flis, FremFejl, PowerFail, SmsCount,InstallNR);
+		db.ExecuteSQL(SQL);
+
+		m_Textwindow.GetWindowText(Textwindow);
+		Textwindow.Append("\r\n");
+		Textwindow.Append("Sms added to Log");
+		m_Textwindow.SetWindowText(Textwindow);
+		Sleep(150);
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////// Her skal sendes data til databasen //////////////////////////////////////////////
 }
@@ -497,7 +410,10 @@
 void CFlisServerDlg::OnBnClickedClose()
 {
 	// TODO: Add your control notification handler code here
-	
+	continueThread = 0;
+	DeleteSms();
+
+	Sleep(500);
 	if( Serial.isOpen() )
 	{
 		Serial.close();
@@ -505,7 +421,359 @@
 	
 	if(db.IsOpen())
 	{
-	db.Close();
+		db.Close();
 	}
+	
 	OnOK();
+
+}
+
+void CFlisServerDlg::OnBnClickedGsmpin()
+{
+	// TODO: Add your control notification handler code here
+	m_Textwindow.SetWindowText("Indsætter Pinkode, efterfuldt af 60sec pause");
+	UpdateWindow();
+	SetPin();
+	Sleep(50000);
+
+	while (Serial.getComstat().cbInQue > 0)
+	{
+		Serial.readByte(); //Flush the incoming queue
+	}
+
+	OnBnClickedStart();
+}
+void CFlisServerDlg::DeleteSms()
+{
+	vector<unsigned char> atcommand;
+	atcommand.push_back('a');
+	atcommand.push_back('t');
+	atcommand.push_back('+');
+	atcommand.push_back('c');
+	atcommand.push_back('m');
+	atcommand.push_back('g');
+	atcommand.push_back('d');
+	atcommand.push_back('=');
+	atcommand.push_back('1');
+	atcommand.push_back(',');
+	atcommand.push_back('3');
+
+	writeFrame(atcommand);
+	Sleep(500);
+}
+LRESULT CFlisServerDlg::OnShowString(WPARAM wParam, LPARAM lParam)
+{
+	CString *s = (CString*) lParam;
+	GetDlgItem(IDC_Textwindow)->SetWindowText(*s);
+
+	delete s;
+	return 0;
+
+}UINT threadWrapper(LPVOID thread)
+{
+	CFlisServerDlg *t = (CFlisServerDlg*) thread;
+	t->runthread();
+	return 0;
+}
+
+void CFlisServerDlg::startthread()
+{
+	AfxBeginThread(threadWrapper, (LPVOID) this);
+}
+
+void CFlisServerDlg::runthread()
+{
+	while (continueThread != 0) 
+	{
+		Reader();
+	}
+}
+void CFlisServerDlg::Reader()
+{
+	if(Serial.getComstat().cbInQue > 0)
+		{
+			Sleep(250);
+			std::vector<unsigned char> answer = readFrame();
+			Sleep(500);
+			CString tekst, oldtekst;
+			int lol;
+			char array1[250];
+			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]);
+				}
+			}
+			tekst.Append(":");
+
+			CString command;
+			bool plus;
+				int pos = tekst.Find('+',0);
+				if (pos != -1)
+				{
+					plus = true;
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+					pos = tekst.Find(':');
+					command = tekst.Left(pos);
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+				}
+			
+			
+			if(tekst == "OK")
+			{	
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("OK tekst modtaget");
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			else if (tekst == "error")
+			{
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("error tekst");
+				oldtekst.Append(tekst);
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			else if (plus = true)
+			{
+				if (command = "cmti")
+				{
+					CString smscount, oldteskst;
+					int pos = tekst.Find(',',0);
+					if (pos != -1)
+					{
+						smscount = tekst.Right( tekst.GetLength() - pos -1);
+						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++;
+
+				}
+				else if(command = "wind")
+				{
+					m_Textwindow.GetWindowText(oldtekst);
+					oldtekst.Append("\r\n");
+					oldtekst.Append("Først lidt tekst på næste linie\r\n");
+					oldtekst.Append(tekst);
+					m_Textwindow.SetWindowText(oldtekst);
+				}
+			}
+			else
+			{
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("Anden tekst end forventet");
+				oldtekst.Append("\r\n");
+				oldtekst.Append(tekst);
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+			if(ResetSms == 20)
+			{
+				DeleteSms();
+				m_Textwindow.GetWindowText(oldtekst);
+				oldtekst.Append("\r\n");
+				oldtekst.Append("Slettet Sendte og læste beskeder da vi nåede grænsen.");
+				m_Textwindow.SetWindowText(oldtekst);
+			}
+
+		}
+		if (continueThread = 1)
+		{
+			
+			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID, sImei;
+			int commandtest = 0;
+			int iAll = 1;
+			std::vector<Commands> data;
+			data = DBRead();
+			for (int i=0; i<data.size(); i++)
+			{
+				testdata.Append(data[i].IDnr);
+				testdata.Append(":");
+				testdata.Append(data[i].CommandID);
+				testdata.Append(":");
+				commandtest = atoi(data[i].CommandID);
+
+				if(commandtest > 1)
+				{
+					testdata.Append(data[i].InstallationsID);
+					testdata.Append(":");
+				}
+			}
+			sIDnr = Splitter(testdata);
+			sCommandID = Splitter(testdata);
+			sInstallationsID = "0";
+			if (commandtest > 1)
+			{
+				sInstallationsID = Splitter(testdata);
+				iAll = 0;
+			}
+
+			if (sIDnr.GetLength() > 0)
+			{
+				DBReadData(sIDnr,sCommandID,sInstallationsID);
+			}
+			Sleep(500);
+		}
+}
+void CFlisServerDlg::DBReadData(CString IDnr,CString CommandID,CString InstallationsID)
+{
+	CString ServerTlfNr;
+	int i = 0;
+	ServerTlfNr = "29860132";
+		
+	
+	std::vector<Installation> inst;
+	inst = DBReadPhone(InstallationsID);
+	while (i < inst.size())
+	{
+		CString TlfNr, Imei, updaterate;
+		TlfNr.Empty();
+		Imei.Empty();
+		updaterate.Empty();
+
+		CString dataen = inst[i].InstPhoneNr;
+		TlfNr.Append(dataen);
+		CString Imeidata = inst[i].Imei;
+		Imei.Append(Imeidata);
+		CString updaterat = inst[i].Updaterate;
+		updaterate.Append(updaterat);
+		i++;
+	
+	vector<unsigned char> tlfnr;
+	for (int i=0; i<TlfNr.GetLength(); i++)
+	{
+		tlfnr.push_back(TlfNr[i]);
+	}
+	
+	int calcimei; 
+	__int64 buf;
+
+	buf = atof(Imei);
+	
+	calcimei = tversum(buf);
+	
+	Imei.Format("%d",calcimei);
+	
+	SendSmsHead(tlfnr);
+	Sleep(250);
+	
+	vector<unsigned char> smsdata;
+	
+	for (int i=0; i<Imei.GetLength(); i++)
+	{
+		smsdata.push_back(Imei[i]);
+	}
+	smsdata.push_back(':');
+	for (int i=0; i<ServerTlfNr.GetLength(); i++)
+	{
+		smsdata.push_back(ServerTlfNr[i]);
+	}
+	smsdata.push_back(':');
+	for (int i=0; i<updaterate.GetLength(); i++)
+	{
+		smsdata.push_back(updaterate[i]);
+	}
+
+	SendSmsData(smsdata);
+	Sleep(500);
+	
+	}
+		CString SQL, Textwindow;
+		SQL.Format("update command set executed=now() where id=%s",IDnr);
+		db.ExecuteSQL(SQL);
+		m_Textwindow.GetWindowText(Textwindow);
+		Textwindow.Append("\r\n");
+		Textwindow.Append("Command executed");
+		m_Textwindow.SetWindowText(Textwindow);
+		Sleep(150);
+
+}
+vector<Installation> CFlisServerDlg::DBReadPhone(CString sInstallationsID)
+{
+	vector<Installation> buffer;
+
+	CString SQL, phonenr, imei, updaterate;
+	int installernull;
+	Installation Myinst;
+	installernull = atoi(sInstallationsID);
+	if (installernull > 1)
+	{
+		SQL.Format("select installationphonenr, imei, updaterate from installation WHERE id = %s", sInstallationsID);
+	}
+	else if(installernull < 2)
+	{
+		SQL.Format("select installationphonenr, imei, updaterate from installation");
+	}
+	CRecordset rs(&db);
+	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+	if (rs.GetRecordCount()>0) 
+	{
+		rs.MoveFirst();
+		while(!rs.IsEOF())
+		{
+		
+			rs.GetFieldValue((short)0,phonenr);
+			rs.GetFieldValue(1,imei);
+			rs.GetFieldValue(2,updaterate);
+
+			Myinst.InstPhoneNr = phonenr;
+			Myinst.Imei = imei;
+			Myinst.Updaterate = updaterate;
+
+			buffer.push_back(Myinst);
+			rs.MoveNext();
+		}
+	}
+	rs.Close();
+	return buffer;
+}
+int CFlisServerDlg::tversum(__int64 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;
+	m_Textwindow.SetWindowText("Started");
+	AfxBeginThread(threadWrapper,AfxGetMainWnd());
 }