--- trunk/FlisServer/FlisServerDlg.h	2007/11/27 15:26:42	70
+++ trunk/FlisServer/FlisServerDlg.h	2007/12/04 13:26:00	144
@@ -3,8 +3,13 @@
 
 #pragma once
 #include "afxwin.h"
+#include "stdafx.h"
 #include <vector>
-
+#include <list>
+#include "Containers.h"
+#include "Serial.h"
+#include <iostream>
+#include <fstream>
 
 // CFlisServerDlg dialog
 class CFlisServerDlg : public CDialog
@@ -13,14 +18,9 @@
 public:
 	CFlisServerDlg(CWnd* pParent = NULL);	// standard constructor
 	CSerial Serial;
-	int StartSerial(void);
-	std::vector<unsigned char> readFrame();
-	void writeFrame(std::vector<unsigned char> data);
-	void SendSmsData(std::vector<unsigned char> data);
-	void SendSmsHead(std::vector<unsigned char> data);
-	int SetPin(void);
-	void DBconnect();
-
+	keepalive Alive;
+	CFlisServerDlg * mainwindow;
+	std::list<Acknowledge> Acks;
 // Dialog Data
 	enum { IDD = IDD_FLISSERVER_DIALOG };
 
@@ -38,9 +38,37 @@
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
 	DECLARE_MESSAGE_MAP()
+	CDatabase db;
+
+	int StartSerial(void);
+	std::vector<unsigned char> readFrame();
+	void writeFrame(std::vector<unsigned char> data);
+	void SendSmsData(std::vector<unsigned char> data);
+	void SendSmsHead(std::vector<unsigned char> tlfnr);
+	void SetPin();
+	void DBConnect();
+	vector<Commands> DBReadCommands(void);
+	void ReadSms();
+	void SmsSplit(CString data);
+	CString Splitter(CString& fyrdata);
+	void DeleteSms();
+	void startthread();
+	virtual void runthread();
+	void Reader();
+	void SendConfig(CString IDnr,CString CommandID,CString InstallationsID);
+	vector<Installation> DBReadPhone(CString sInstallationsID);
+	int tversum(__int64 input);
+	void AppendText(CString s);
+	vector<keepalive> keepaliveandread(void);
+
 public:
 	CEdit m_Textwindow;
-	afx_msg void OnBnClickedOk();
-	afx_msg void OnBnClickedCancel();
-	afx_msg void OnBnClickedtest();
+	afx_msg void OnBnClickedClose();
+	afx_msg void OnBnClickedGsmpin();
+	int continueThread, ResetSms;
+	friend UINT threadWrapper(LPVOID thread);
+	afx_msg void OnBnClickedStart();
+	void HandleAcknowledge(CString tlfnr);
+	void CheckAcknowledges();
+	void DumpAckList();
 };