Skip to content

Commit 831de19

Browse files
committed
Fixes Windows serial port names
1 parent 964d5fa commit 831de19

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ endif ()
5757
set(QFM1000_APPLICATION_NAME "qFM1000")
5858
set(QFM1000_APPLICATION_VERSION_MAJOR "0")
5959
set(QFM1000_APPLICATION_VERSION_MINOR "4")
60-
set(QFM1000_APPLICATION_VERSION_PATCH "1")
60+
set(QFM1000_APPLICATION_VERSION_PATCH "2")
6161

6262
set(QFM1000_ORGANIZATION_NAME "The HellNet.org")
6363
set(QFM1000_ORGANIZATION_DOMAIN "thehellnet.org")

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Windows build are created using the official releases of Qt 5.9.2. Just download
3030
## Changelog
3131

3232

33+
* 0.4.2
34+
* FIX: Arduino serial port in Windows
3335
* 0.4.1
3436
* FIX: Fix build for old Qt version
3537
* FIX: Arduino serial port in Windows

src/windows/configwindow.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ void ConfigWindow::initUi() {
6060

6161
for (portIterator = portList.begin(); portIterator != portList.end(); portIterator++) {
6262
QSerialPortInfo serialPortInfo = *portIterator;
63-
#if defined(Q_OS_WIN)
64-
ui->arduinoSerialPortCombo->addItem(serialPortInfo.portName());
65-
#else
6663
ui->arduinoSerialPortCombo->addItem(serialPortInfo.systemLocation());
67-
#endif
6864
}
6965

7066
ui->arduinoSerialSpeedCombo->clear();

src/windows/mainwindow.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
5353
initStatusBar();
5454

5555
eepromUpdated();
56+
configUpdated();
5657
}
5758

5859
MainWindow::~MainWindow() {
@@ -220,6 +221,10 @@ void MainWindow::eepromUpdated() {
220221
valueReadLowPower();
221222
}
222223

224+
void MainWindow::configUpdated() {
225+
statusBarWidgets->updateFromConfig();
226+
}
227+
223228
void MainWindow::arduinoProgrammerUpdated() {
224229
QString message;
225230

src/windows/mainwindow.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Q_OBJECT
5050

5151
public slots:
5252

53+
void configUpdated();
54+
5355
void eepromUpdated();
5456

5557
void arduinoProgrammerUpdated();

0 commit comments

Comments
 (0)