--- trunk/H7 Server/H7 ServerDlg.cpp	2007/01/31 17:05:15	32
+++ trunk/H7 Server/H7 ServerDlg.cpp	2007/01/31 17:22:59	33
@@ -121,6 +121,7 @@
 	ON_BN_CLICKED(IDC_Start, OnBnClickedStart)
 	ON_BN_CLICKED(IDC_TEST, OnBnClickedTest)
 	ON_BN_CLICKED(IDC_RESTART, OnBnClickedRestart)
+	ON_BN_CLICKED(IDC_STOP, OnBnClickedStop)
 END_MESSAGE_MAP()
 
 
@@ -162,7 +163,7 @@
 		OnOK();
 		return false;
 	}
-
+	m_First = true;
 /**********************************************************************/
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -216,34 +217,45 @@
 	return static_cast<HCURSOR>(m_hIcon);
 }
 
+void CH7ServerDlg::OnBnClickedRestart()
+{
+	StartSerial();
+}
+
 void CH7ServerDlg::OnBnClickedStart()
 {
 // Add's user defined Baud-Rate to regedit before the server start.
 	CRegKey reg;
-	CString Baud;
-	m_BaudRate.GetWindowText(Baud);
+	CString Baud = "9600";
+//	m_BaudRate.GetWindowText(Baud);
 
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
 	reg.SetDWORDValue("BaudRate", atoi(Baud) );
 
 	StartTcp();
 	StartSerial();
+	UpdateClient();
 }
 
 int CH7ServerDlg::StartTcp(void)
 {
 // Get the TCP Port number from regedit.
+	CString Current_Port;
 	unsigned long Port;
+	m_Port.GetWindowText(Current_Port);
 	CRegKey reg;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
+	reg.SetDWORDValue("Port",atoi(Current_Port) );
 	reg.QueryDWORDValue("Port", Port);
 	reg.Close();
 
-// Restats the TCP Connection
+// Restarts the TCP Connection
 	TcpServer.Close();
 
-	TcpServer.Create(Port);
-	TcpServer.Listen();
+	if (!TcpServer.Create(Port))
+		MessageBox("Crap");
+	if (!TcpServer.Listen())
+		MessageBox("Loads of crap");
 
 // Prints TCP Port number to the status box.
 	CString tmp;
@@ -253,117 +265,12 @@
 	return 0;
 }
 
-void CH7ServerDlg::OnBnClickedRestart()
-{
-	CWaitCursor wait;		// Musen viser timeglas.
-	CString Port;
-	m_Port.GetWindowText(Port);
-	CRegKey reg;
-	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-	reg.SetDWORDValue("Port", atoi(Port) );
-	
-	CString tmp;
-	m_Serial.GetWindowText(tmp);
-	reg.SetStringValue("Serial",tmp);
-	reg.Close();
-	StartTcp();
-	StartSerial();
-}
-
 void CH7ServerDlg::OnBnClickedTest()
 {
-
+	CWaitCursor wait;
+	UpdateClient();
 }
-bool CH7ServerDlg::ServerInit(void)
-{
-	unsigned int i;
-	CRegKey reg;
-// Sets values in baud-rate combo box	
-	m_BaudRate.AddString("1200");					
-	m_BaudRate.AddString("2400");					
-	m_BaudRate.AddString("4800");	// Don't work, used for error test.			
-	m_BaudRate.AddString("9600");					
-	m_BaudRate.AddString("19200");
 
-	unsigned long Baud;
-	CString GetBaud;
-	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-	reg.QueryDWORDValue("BaudRate", Baud);
-
-	switch (Baud)
-	{
-	case 1200:
-		m_BaudRate.SetCurSel(0);
-		break;
-	case 2400:
-		m_BaudRate.SetCurSel(1);
-		break;
-	case 4800:
-		m_BaudRate.SetCurSel(2);
-		break;
-	case 9600:
-		m_BaudRate.SetCurSel(3);
-		break;
-	case 19200:
-		m_BaudRate.SetCurSel(4);
-		break;
-	default:
-		m_BaudRate.SetCurSel(3);
-		break;
-	}
-
-	m_BaudRate.GetWindowText(GetBaud);
-	reg.SetDWORDValue("BaudRate", atoi(GetBaud) );
-
-// Checks how many COM ports there are.
-	std::vector<CString> Serial = GetAvailableComPorts();
-	for (i=0; i<Serial.size(); i++)
-		m_Serial.AddString(Serial[i]);
-
-// Load saved settings from regedit.
-	unsigned long Port;
-	unsigned long BaudRate;
-
-	// Used to format the loaded values.
-	CString TPort;
-	CString TBaudRate;
-
-	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-	reg.QueryDWORDValue("Port", Port);
-	reg.QueryDWORDValue("BaudRate", BaudRate);
-
-	char LoadCom[20];
-	unsigned long size = 20;
-	reg.QueryStringValue("Serial", LoadCom, &size);
-
-	TPort.Format("%d", Port);
-	TBaudRate.Format("%d", BaudRate);
-
-	m_Port.SetWindowText(TPort);
-	m_BaudRate.SetWindowText(TBaudRate);
-	m_Serial.SetWindowText(LoadCom);
-
-	if( Serial.size() == 0 ){
-		MessageBox( "No (free) serial port's found" );
-		return false;
-	}
-// Checks for valid COM port in regedit.
-	for (i=0; i< Serial.size() ; i++)
-	{
-		if (LoadCom == Serial[i])
-		{
-			m_Serial.SetCurSel(i);
-			break;
-		}
-	}
-	if (i == Serial.size() )
-	{
-		m_Serial.SetCurSel(0);
-		reg.SetStringValue("Serial", Serial[0]);
-	}
-	reg.Close();
-	return true;
-}
 
 int CH7ServerDlg::StartSerial(void)
 {
@@ -371,31 +278,87 @@
 	unsigned long size = 6;
 	unsigned long Baud;
 
-	CRegKey reg;
 
+	CRegKey reg;
 	
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-
 	reg.QueryStringValue("Serial", SerialPort, &size);
 	reg.QueryDWORDValue("BaudRate", Baud);
 
 // Starter Serial forbindelsen, hvis den ikke allerede er startet.
+	if( m_First == 1 ){
+		Baud = 9600;
+	}
+	else
+	{
+		int selected = m_BaudRate.GetCurSel();
+		try
+		{
+			H7Serial.writeTarget(10,selected);
+		}
+		catch (std::exception e)
+		{
+			MessageBox("PIC could not use selected baudrate");
+			return 0;
+
+		}
+		switch (selected)
+		{
+		case 0:
+			Baud = 1200;
+			break;
+		case 1:
+			Baud = 2400;
+			break;
+		case 2:
+			Baud = 4800;
+			break;
+		case 3:
+			Baud = 9600;;
+			break;
+		case 4:
+			Baud = 19200;
+			break;
+
+		default: //this should not be possible, but ...
+			Baud = 9600;
+			break;
+		}
+		H7Serial.close();
+	}
+
 	if (!H7Serial.isOpen())
 		H7Serial.open(SerialPort,Baud);
+	
+
+	m_First = false;
+// Nulstiller LED's
+	H7Serial.writeTarget(LED3,OFF);
+	H7Serial.writeTarget(LED4,OFF);
+	H7Serial.writeTarget(LED5,OFF);
+	return 0;
+}
 
+void CH7ServerDlg::UpdateClient(void)
+{
 // Updater status vindue.
+	const int sleep = 10;
+
+	m_Status.SetWindowText("");
 	UpdateStatus( "LED3: ",H7Serial.readTarget(0) );
+	Sleep(sleep);
 	UpdateStatus( "LED4: ",H7Serial.readTarget(1) );
+	Sleep(sleep);
 	UpdateStatus( "LED5: ",H7Serial.readTarget(2) );
+	Sleep(sleep);
 	UpdateStatus( "Switch2: ",H7Serial.readTarget(3) );
+	Sleep(sleep);
 	UpdateStatus( "Switch3: ", H7Serial.readTarget(4) );
+	Sleep(sleep);
 	UpdateStatus( "Potmeter: ", H7Serial.readTarget(5) );
+	Sleep(sleep);
 	UpdateStatus( "Temperatur: ", H7Serial.readTarget(6) );
-
-
-
-	H7Serial.writeTarget(LED3,OFF);
-	return 0;
+	Sleep(sleep);
 }
 
 void CH7ServerDlg::NewLine(void)
@@ -422,7 +385,6 @@
 {
 	CString tmp,StatusWindow;
 	tmp.Format( "%d", value );
-
 	m_Status.GetWindowText(StatusWindow);
 	StatusWindow += name;
 	StatusWindow += tmp;
@@ -430,3 +392,18 @@
 	NewLine();
 
 }
+
+void CH7ServerDlg::OnBnClickedStop()
+{
+// Close TCP and Sreial connections
+	TcpServer.Close();
+	H7Serial.close();
+	// Close server app.
+	OnOK();
+}
+
+void CH7ServerDlg::TcpStatus(void)
+{
+	
+}
+