From c9076949f224994b17ca0ce068fd37bb3b3d1ae0 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Wed, 7 Aug 2013 06:02:32 +0000 Subject: [PATCH] populating both serial port lists for Win32 git-svn-id: https://svn.code.sf.net/p/freetel/code@1327 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/src/dlg_ptt.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fdmdv2/src/dlg_ptt.cpp b/fdmdv2/src/dlg_ptt.cpp index 97f888cd..e62debc9 100644 --- a/fdmdv2/src/dlg_ptt.cpp +++ b/fdmdv2/src/dlg_ptt.cpp @@ -211,6 +211,7 @@ void ComPortsDlg::populatePortList() { #ifdef __WXMSW__ m_listCtrlPorts->Clear(); + m_cbSerialPort->Clear(); wxArrayString aStr; wxRegKey key(wxRegKey::HKLM, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM")); if(!key.Exists()) @@ -248,6 +249,7 @@ void ComPortsDlg::populatePortList() } } m_listCtrlPorts->Append(aStr); + m_cbSerialPort->Append(aStr); #endif #ifdef __WXGTK__ /* TODO(Joel): http://stackoverflow.com/questions/2530096/how-to-find-all-serial-devices-ttys-ttyusb-on-linux-without-opening-them */ @@ -256,6 +258,13 @@ void ComPortsDlg::populatePortList() m_cbSerialPort->Append("/dev/ttyUSB1"); m_cbSerialPort->Append("/dev/ttyS0"); m_cbSerialPort->Append("/dev/ttyS1"); + /* + m_txtCtlDevicePath->Clear(); + m_txtCtlDevicePath->Append("/dev/ttyUSB0"); + m_txtCtlDevicePath->Append("/dev/ttyUSB1"); + m_txtCtlDevicePath->Append("/dev/ttyS0"); + m_txtCtlDevicePath->Append("/dev/ttyS1"); + */ #endif } -- 2.25.1