The 20150928 release of the Dummy Repeater.

Author: g4klx

DummyRepeater.nsi

@@ -11,8 +11,8 @@
 ;Configuration
 
   ;General
-  Name "DummyRepeater 20150923"
-  OutFile "DummyRepeater-20150923.exe"
+  Name "DummyRepeater 20150928"
+  OutFile "DummyRepeater-20150928.exe"
 
   ;Folder selection page
   InstallDir "$PROGRAMFILES\Dummy Repeater"

DummyRepeater/BUILD.txt

@@ -1,4 +1,4 @@
-Repeater - 20150923
+Repeater - 20150928
 ===================
 
 Windows

DummyRepeater/CHANGES.txt

@@ -1,4 +1,4 @@
-Repeater - 20150923
+Repeater - 20150928
 ===================
 
 20090530
@@ -1984,3 +1984,8 @@ Add support for the DVMEGA AMBE.
 --------
 
 Small change to the initialisation of the DVMEGA AMBE.
+
+20150928
+--------
+
+Small change to the initialisation of the DVMEGA AMBE.

DummyRepeater/Common/DVMEGAAMBEController.cpp

@@ -51,7 +51,7 @@ const unsigned int DV3000_HEADER_LEN = 4U;
 const unsigned int BUFFER_LENGTH = 400U;
 
 CDVMEGAAMBEController::CDVMEGAAMBEController(const wxString& device) :
-m_serial(device, SERIAL_115200)
+m_serial(device, SERIAL_230400)
 {
 }
 
@@ -94,8 +94,6 @@ bool CDVMEGAAMBEController::open()
 
 	m_serial.write(DV3000_REQ_RESETSOFTCFG, DV3000_REQ_RESETSOFTCFG_LEN);
 
-	m_serial.setSpeed(SERIAL_230400);
-
 	m_serial.write(DV3000_REQ_RATEP, DV3000_REQ_RATEP_LEN);
 
 	for (;;) {

DummyRepeater/Common/SerialDataController.cpp

@@ -164,30 +164,6 @@ bool CSerialDataController::open()
 	return true;
 }
 
-bool CSerialDataController::setSpeed(SERIAL_SPEED speed)
-{
-	wxASSERT(m_handle != INVALID_HANDLE_VALUE);
-
-	DWORD errCode;
-
-	DCB dcb;
-	if (::GetCommState(m_handle, &dcb) == 0) {
-		wxLogError(wxT("Cannot get the attributes for %s, err=%04lx"), m_device.c_str(), ::GetLastError());
-		::ClearCommError(m_handle, &errCode, NULL);
-		return false;
-	}
-
-	dcb.BaudRate = DWORD(speed);
-
-	if (::SetCommState(m_handle, &dcb) == 0) {
-		wxLogError(wxT("Cannot set the attributes (speed) for %s, err=%04lx"), m_device.c_str(), ::GetLastError());
-		::ClearCommError(m_handle, &errCode, NULL);
-		return false;
-	}
-
-	return true;
-}
-
 int CSerialDataController::read(unsigned char* buffer, unsigned int length)
 {
 	wxASSERT(m_handle != INVALID_HANDLE_VALUE);
@@ -410,67 +386,6 @@ bool CSerialDataController::open()
 	return true;
 }
 
-bool CSerialDataController::setSpeed(SERIAL_SPEED speed)
-{
-	wxASSERT(m_fd != -1);
-
-	termios termios;
-	if (::tcgetattr(m_fd, &termios) < 0) {
-		wxLogError(wxT("Cannot get the attributes for %s"), m_device.c_str());
-		return false;
-	}
-
-	switch (speed) {
-		case SERIAL_1200:
-			::cfsetospeed(&termios, B1200);
-			::cfsetispeed(&termios, B1200);
-			break;
-		case SERIAL_2400:
-			::cfsetospeed(&termios, B2400);
-			::cfsetispeed(&termios, B2400);
-			break;
-		case SERIAL_4800:
-			::cfsetospeed(&termios, B4800);
-			::cfsetispeed(&termios, B4800);
-			break;
-		case SERIAL_9600:
-			::cfsetospeed(&termios, B9600);
-			::cfsetispeed(&termios, B9600);
-			break;
-		case SERIAL_19200:
-			::cfsetospeed(&termios, B19200);
-			::cfsetispeed(&termios, B19200);
-			break;
-		case SERIAL_38400:
-			::cfsetospeed(&termios, B38400);
-			::cfsetispeed(&termios, B38400);
-			break;
-		case SERIAL_115200:
-			::cfsetospeed(&termios, B115200);
-			::cfsetispeed(&termios, B115200);
-			break;
-		case SERIAL_230400:
-			::cfsetospeed(&termios, B230400);
-			::cfsetispeed(&termios, B230400);
-			break;
-		case SERIAL_460800:
-			::cfsetospeed(&termios, B460800);
-			::cfsetispeed(&termios, B460800);
-			break;
-		default:
-			wxLogError(wxT("Unsupported serial port speed - %d"), int(speed));
-			::close(m_fd);
-			return false;
-	}
-
-	if (::tcsetattr(m_fd, TCSANOW, &termios) < 0) {
-		wxLogError(wxT("Cannot set the attributes for %s"), m_device.c_str());
-		return false;
-	}
-
-	return true;
-}
-
 int CSerialDataController::read(unsigned char* buffer, unsigned int length)
 {
 	wxASSERT(buffer != NULL);

DummyRepeater/Common/SerialDataController.h

@@ -46,8 +46,6 @@ class CSerialDataController {
 
 	bool open();
 
-	bool setSpeed(SERIAL_SPEED speed);
-
 	int  read(unsigned char* buffer, unsigned int length);
 	int  write(const unsigned char* buffer, unsigned int length);
 

DummyRepeater/Common/Version.h

@@ -24,9 +24,9 @@
 const wxString VENDOR_NAME = wxT("G4KLX");
 
 #if defined(__WXDEBUG__)
-const wxString VERSION = wxT("20150923 - DEBUG");
+const wxString VERSION = wxT("20150928 - DEBUG");
 #else
-const wxString VERSION = wxT("20150923");
+const wxString VERSION = wxT("20150928");
 #endif
 
 #endif