From 5aa143635fcfb3b9ae72d0d32fac0809672c41dd Mon Sep 17 00:00:00 2001 From: meepingsnesroms Date: Thu, 24 May 2018 15:51:57 -0700 Subject: [PATCH] Now querys /dev for serial ports --- localTester/LocalTester/mainwindow.cpp | 19 ++++++++++++++++++- localTester/LocalTester/mainwindow.h | 2 +- localTester/LocalTester/mainwindow.ui | 7 +++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/localTester/LocalTester/mainwindow.cpp b/localTester/LocalTester/mainwindow.cpp index 6f84375..42ca375 100644 --- a/localTester/LocalTester/mainwindow.cpp +++ b/localTester/LocalTester/mainwindow.cpp @@ -2,6 +2,7 @@ #include "ui_mainwindow.h" #include +#include #include #include #include @@ -103,7 +104,7 @@ void MainWindow::on_pickTestProgram_clicked(){ void MainWindow::on_startLocalTesting_clicked(){ //ui->serialPort->setCurrentText("/dev/tty.Bluetooth-Incoming-Port"); //testProgram = "userIo.writeStringJs(\"Wrote to terminal from js!\")"; - if(!testEnv.running() /*&& ui->serialPort->currentText() != ""*/) + if(!testEnv.running() && ui->serialPort->currentText() != "") launchJs(false); } @@ -132,3 +133,19 @@ void MainWindow::on_pickDependencyBlob_clicked(){ void MainWindow::on_pickSslCertificate_clicked(){ sslCertPath = QFileDialog::getOpenFileName(this, "Select SSL Certificate", QDir::root().path(), 0); } + +void MainWindow::on_refreshSerialPorts_clicked(){ + QDir dev("/dev"); + QStringList filters; + QStringList serialPorts; + + filters.append("tty.*");//Mac OS serial ports + filters.append("ttyS*");//Linux serial ports + dev.setNameFilters(filters); + + serialPorts = dev.entryList(QDir::System | QDir::Files, QDir::Name); + + ui->serialPort->clear(); + for(uint32_t port = 0; port < serialPorts.length(); port++) + ui->serialPort->addItem("/dev/" + serialPorts[port]); +} diff --git a/localTester/LocalTester/mainwindow.h b/localTester/LocalTester/mainwindow.h index 99f8c75..f5a83ca 100644 --- a/localTester/LocalTester/mainwindow.h +++ b/localTester/LocalTester/mainwindow.h @@ -28,7 +28,6 @@ public: private slots: void updateWindow(); void launchJs(bool serialOverWifi); - bool wifiValidate(QString location); void on_pickTestProgram_clicked(); @@ -37,6 +36,7 @@ private slots: void on_startTestProxy_clicked(); void on_pickDependencyBlob_clicked(); void on_pickSslCertificate_clicked(); + void on_refreshSerialPorts_clicked(); private: SerialPortIO* serialOut; diff --git a/localTester/LocalTester/mainwindow.ui b/localTester/LocalTester/mainwindow.ui index 3e4ad98..978339a 100644 --- a/localTester/LocalTester/mainwindow.ui +++ b/localTester/LocalTester/mainwindow.ui @@ -25,6 +25,13 @@ + + + + Refresh Serial Ports + + +