mirror of
https://github.com/libretro/Mu.git
synced 2026-09-23 23:25:04 +00:00
Now querys /dev for serial ports
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "ui_mainwindow.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QStringList>
|
||||
#include <QTimer>
|
||||
#include <QImage>
|
||||
#include <QPixmap>
|
||||
@@ -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]);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -25,6 +25,13 @@
|
||||
<item>
|
||||
<widget class="QComboBox" name="serialPort"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="refreshSerialPorts">
|
||||
<property name="text">
|
||||
<string>Refresh Serial Ports</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="sizePolicy">
|
||||
|
||||
Reference in New Issue
Block a user