diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp
index da62019..78bea33 100644
--- a/src/autoapp/UI/SettingsWindow.cpp
+++ b/src/autoapp/UI/SettingsWindow.cpp
@@ -110,96 +110,94 @@ void SettingsWindow::onSave()
// generate param string for autoapp_helper
std::string params;
params.append( std::to_string(ui_->horizontalSliderSystemVolume->value()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->horizontalSliderSystemCapture->value()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->spinBoxDisconnect->value()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->spinBoxShutdown->value()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->spinBoxDay->value()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->spinBoxNight->value()) );
- params.append(";");
+ params.append("#");
if (ui_->checkBoxGPIO->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxDevMode->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxInvert->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxX11->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxRearcam->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxAndroid->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
if (ui_->radioButtonX11->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
if (ui_->radioButtonScreenRotated->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
params.append( std::string("'") + std::string(ui_->comboBoxPulseOutput->currentText().toStdString()) + std::string("'") );
- params.append(";");
+ params.append("#");
params.append( std::string("'") + std::string(ui_->comboBoxPulseInput->currentText().toStdString()) + std::string("'") );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxHardwareRTC->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxTZ->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxHardwareDAC->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
if (ui_->checkBoxDisableShutdown->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
if (ui_->checkBoxDisableScreenOff->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
if (ui_->radioButtonDebugmodeEnabled->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
params.append( std::string(ui_->comboBoxGPIOShutdown->currentText().toStdString()) );
- params.append(";");
+ params.append("#");
params.append( std::to_string(ui_->spinBoxGPIOShutdownDelay->value()) );
- params.append(";");
- params.append( std::string(ui_->lineEditWifiClientSSID->text().toStdString()) );
- params.append(";");
- params.append( std::string(ui_->lineEditWifiClientPassword->text().toStdString()) );
- params.append(";");
+ params.append("#");
if (ui_->checkBoxHotspot->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
- params.append( std::string(ui_->lineEditWifiHotspotPassword->text().toStdString()) );
- params.append(";");
+ params.append("#");
+ params.append( std::string(ui_->comboBoxCam->currentText().toStdString()) );
+ params.append("#");
if (ui_->checkBoxHardwareSave->isChecked()) {
params.append("1");
} else {
params.append("0");
}
- params.append(";");
+ params.append("#");
+
system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str());
+
this->close();
}
@@ -353,7 +351,7 @@ void SettingsWindow::loadSystemValues()
QFile paramFile(QString("/tmp/return_value"));
paramFile.open(QIODevice::ReadOnly);
QTextStream data_param(¶mFile);
- QStringList getparams = data_param.readAll().split(";");
+ QStringList getparams = data_param.readAll().split("#");
paramFile.close();
// version string
ui_->valueSystemVersion->setText(getparams[0]);
@@ -563,17 +561,18 @@ void SettingsWindow::loadSystemValues()
// Wifi Credentials
ui_->lineEditWifiClientSSID->setText(getparams[30]);
- ui_->lineEditWifiClientPassword->setText(getparams[31]);
// Wifi Hotspot Credentials
- if (getparams[32] == "1") {
+ if (getparams[31] == "1") {
ui_->checkBoxHotspot->setChecked(true);
} else {
ui_->checkBoxHotspot->setChecked(false);
}
- ui_->lineEditWifiHotspotSSID->setText(getparams[33]);
- ui_->lineEditWifiHotspotPassword->setText(getparams[34]);
+ ui_->lineEditWifiHotspotSSID->setText(getparams[32]);
+
+ // set cam
+ ui_->comboBoxCam->setCurrentText(getparams[33]);
}
}
diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui
index 6c30213..3483476 100644
--- a/src/autoapp/UI/settingswindow.ui
+++ b/src/autoapp/UI/settingswindow.ui
@@ -1250,36 +1250,17 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
Wifi client settings
-
-
-
- 390
- 30
- 251
- 31
-
-
-
- true
-
-
- QLineEdit::PasswordEchoOnEdit
-
-
- false
-
-
-
+
310
30
- 71
+ 331
31
- Password:
+ Credentials must be set in crankshaft_env.sh!
@@ -1316,7 +1297,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
- 90
+ 100
30
200
31
@@ -1328,12 +1309,12 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
10
30
- 71
+ 81
31
- SSID:
+ Used SSID:
@@ -1349,36 +1330,17 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
Hotspot settings
-
-
-
- 390
- 60
- 251
- 31
-
-
-
- true
-
-
- QLineEdit::Normal
-
-
- false
-
-
-
+
310
60
- 71
+ 331
31
- Password:
+ Credentials must be set in crankshaft_env.sh!
@@ -1415,7 +1377,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
- 90
+ 100
60
200
31
@@ -1433,12 +1395,12 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
10
60
- 71
+ 81
31
- SSID:
+ Used SSID:
@@ -3274,7 +3236,7 @@ subcontrol-position: center left;
0
10
646
- 231
+ 241
@@ -3488,26 +3450,33 @@ subcontrol-position: center left;
Timezone
-
+
- 60
- 186
- 21
- 31
+ 440
+ 118
+ 201
+ 23
+
+
+ 75
+ false
+ true
+
+
- <html><head/><body><p><img src=":/ico_info.png"/></p></body></html>
+ Exec setup on save?
-
+
- 90
- 180
- 521
- 41
+ 470
+ 143
+ 171
+ 61
@@ -3516,23 +3485,64 @@ subcontrol-position: center left;
- Timezone is needed for rtc - Sync with timeserver can be done via
-"crankshaft rtc sync" in shell.
+ This must be selected if any hw-setup should be done on save!
+
+
+ true
-
+
- 480
- 43
- 161
- 23
+ 440
+ 157
+ 21
+ 31
- Exec setup on save?
+ <html><head/><body><p><img src=":/ico_info.png"/></p></body></html>
+
+
+
+ 10
+ 190
+ 80
+ 30
+
+
+
+ RPI-Cam
+
+
+
+
+
+ 90
+ 190
+ 300
+ 30
+
+
+
+ false
+
+
+ none
+
+ -
+
+ none
+
+
+ -
+
+ enabled
+
+
+