tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to system / fix usb detect after settings change

Browse Source
This commit is contained in:
hawkeyexp 2018-11-15 15:00:47 +01:00
parent 5f0d26e64a
commit 6f4defef40
1 changed files with 265 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/autoapp/UI/SettingsWindow.cpp
View File

@ -25,7 +25,6 @@
#include <string> #include <string>
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include <QProcess>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QNetworkConfigurationManager> #include <QNetworkConfigurationManager>
@ -463,12 +462,18 @@ void SettingsWindow::syncNTPTime()
void SettingsWindow::loadSystemValues() void SettingsWindow::loadSystemValues()
{ {
QProcess process; system("/usr/local/bin/autoapp_helper getoutputs");
process.start("/usr/local/bin/autoapp_helper getparams"); system("/usr/local/bin/autoapp_helper getinputs");
process.waitForFinished(); system("/usr/local/bin/autoapp_helper getparams");
QString output = process.readAllStandardOutput();
output.resize(output.size()-1); // remove last line break QFileInfo paramFile("/tmp/return_value");
QStringList getparams = output.split("#"); if (paramFile.exists()) {
QFile paramFile(QString("/tmp/return_value"));
paramFile.open(QIODevice::ReadOnly);
QTextStream data_param(&paramFile);
QStringList getparams = data_param.readAll().split("#");
paramFile.close();
// version string // version string
ui_->valueSystemVersion->setText(getparams[0]); ui_->valueSystemVersion->setText(getparams[0]);
@ -519,33 +524,45 @@ void SettingsWindow::loadSystemValues()
// set cpu temp // set cpu temp
ui_->valueSystemCPUTemp->setText(getparams[20]); ui_->valueSystemCPUTemp->setText(getparams[20]);
QProcess processinput; QFileInfo inputsFile("/tmp/get_inputs");
processinput.start("/usr/local/bin/autoapp_helper getinputs"); if (inputsFile.exists()) {
processinput.waitForFinished(); QFile inputsFile(QString("/tmp/get_inputs"));
QString inputs = processinput.readAllStandardOutput(); inputsFile.open(QIODevice::ReadOnly);
inputs.resize(inputs.size()-1); // remove last line break QTextStream data_return(&inputsFile);
QStringList inputdevices = inputs.split("\n"); QStringList inputs = data_return.readAll().split("\n");
inputsFile.close();
int cleanerin = ui_->comboBoxPulseInput->count(); int cleaner = ui_->comboBoxPulseInput->count();
while (cleanerin > -1) { while (cleaner > -1) {
ui_->comboBoxPulseInput->removeItem(cleanerin); ui_->comboBoxPulseInput->removeItem(cleaner);
cleanerin--; cleaner--;
}
int indexin = inputs.count();
int countin = 0;
while (countin < indexin-1) {
ui_->comboBoxPulseInput->addItem(inputs[countin]);
countin++;
}
}
QFileInfo outputsFile("/tmp/get_outputs");
if (outputsFile.exists()) {
QFile outputsFile(QString("/tmp/get_outputs"));
outputsFile.open(QIODevice::ReadOnly);
QTextStream data_return(&outputsFile);
QStringList outputs = data_return.readAll().split("\n");
outputsFile.close();
int cleaner = ui_->comboBoxPulseOutput->count();
while (cleaner > -1) {
ui_->comboBoxPulseOutput->removeItem(cleaner);
cleaner--;
}
int indexout = outputs.count();
int countout = 0;
while (countout < indexout-1) {
ui_->comboBoxPulseOutput->addItem(outputs[countout]);
countout++;
} }
ui_->comboBoxPulseInput->addItems(inputdevices);
QProcess processoutput;
processoutput.start("/usr/local/bin/autoapp_helper getoutputs");
processoutput.waitForFinished();
QString outputs = processoutput.readAllStandardOutput();
outputs.resize(outputs.size()-1); // remove last line break
QStringList outputdevices = outputs.split("\n");
int cleanerout = ui_->comboBoxPulseOutput->count();
while (cleanerout > -1) {
ui_->comboBoxPulseOutput->removeItem(cleanerout);
cleanerout--;
} }
ui_->comboBoxPulseOutput->addItems(outputdevices);
QFileInfo defaultoutputFile("/tmp/get_default_output"); QFileInfo defaultoutputFile("/tmp/get_default_output");
if (defaultoutputFile.exists()) { if (defaultoutputFile.exists()) {
@ -668,7 +685,6 @@ void SettingsWindow::loadSystemValues()
ui_->spinBoxGPIOShutdownDelay->setValue(getparams[29].toInt()); ui_->spinBoxGPIOShutdownDelay->setValue(getparams[29].toInt());
// Wifi Credentials // Wifi Credentials
//ui_->lineEditWifiSSID->setText(getparams[30]);
this->wifissid = getparams[30]; this->wifissid = getparams[30];
// Wifi Hotspot Credentials // Wifi Hotspot Credentials
@ -717,6 +733,7 @@ void SettingsWindow::loadSystemValues()
ui_->comboBoxSDOC->setCurrentIndex(0); ui_->comboBoxSDOC->setCurrentIndex(0);
} }
} }
}
void SettingsWindow::onShowBindings() void SettingsWindow::onShowBindings()
{ {