diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp
index 7a922df..f25303a 100644
--- a/src/autoapp/UI/SettingsWindow.cpp
+++ b/src/autoapp/UI/SettingsWindow.cpp
@@ -152,6 +152,13 @@ void SettingsWindow::onSave()
params.append( std::string("'") + std::string(ui_->comboBoxPulseOutput->currentText().toStdString()) + std::string("'") );
params.append("#");
params.append( std::string("'") + std::string(ui_->comboBoxPulseInput->currentText().toStdString()) + std::string("'") );
+ params.append("#");
+ params.append( std::string(ui_->comboBoxHardwareRTC->currentText().toStdString()) );
+ params.append("#");
+ params.append( std::string(ui_->comboBoxTZ->currentText().toStdString()) );
+ params.append("#");
+ params.append( std::string(ui_->comboBoxHardwareDAC->currentText().toStdString()) );
+ params.append("#");
system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str());
this->close();
}
@@ -417,6 +424,59 @@ void SettingsWindow::loadSystemValues()
ui_->comboBoxPulseInput->setCurrentText(definput[0]);
}
+ QFileInfo zoneFile("/tmp/timezone_listing");
+ if (zoneFile.exists()) {
+ QFile zoneFile(QString("/tmp/timezone_listing"));
+ zoneFile.open(QIODevice::ReadOnly);
+ QTextStream data_return(&zoneFile);
+ QStringList zones = data_return.readAll().split("\n");
+ zoneFile.close();
+ int cleaner = ui_->comboBoxTZ->count();
+ while (cleaner > 0) {
+ ui_->comboBoxTZ->removeItem(cleaner);
+ cleaner--;
+ }
+ int indexout = zones.count();
+ int countzone = 0;
+ while (countzone < indexout-1) {
+ ui_->comboBoxTZ->addItem(zones[countzone]);
+ countzone++;
+ }
+ }
+
+ // set rtc
+ ui_->comboBoxHardwareRTC->setCurrentText(getparams[21]);
+ // set timezone
+ ui_->comboBoxTZ->setCurrentText(getparams[22]);
+
+ // set dac
+ QString dac = "";
+ if (getparams[23] == "allo-boss") {
+ dac = "Allo - Boss";
+ }
+ if (getparams[23] == "allo-piano") {
+ dac = "Allo - Piano";
+ }
+ if (getparams[23] == "Audioinjector-zero") {
+ dac = "Audioinjector - Zero";
+ }
+ if (getparams[23] == "Audioinjector-stereo") {
+ dac = "Audioinjector - Stereo";
+ }
+ if (getparams[23] == "hifiberry-dac") {
+ dac = "Hifiberry - DAC";
+ }
+ if (getparams[23] == "hifiberry-dacplus") {
+ dac = "Hifiberry - DAC Plus";
+ }
+ if (getparams[23] == "hifiberry-digi") {
+ dac = "Hifiberry - DAC Digi";
+ }
+ if (getparams[23] == "hifiberry-amp") {
+ dac = "Hifiberry - DAC Amp";
+ }
+
+ ui_->comboBoxHardwareDAC->setCurrentText(dac);
}
}
diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui
index 169a6ff..38ac01d 100644
--- a/src/autoapp/UI/settingswindow.ui
+++ b/src/autoapp/UI/settingswindow.ui
@@ -1134,7 +1134,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}
- CS-NG Base
+ CS Base
@@ -1538,7 +1538,7 @@ subcontrol-position: center left;
- CS-NG Special
+ CS Env
@@ -2634,6 +2634,275 @@ subcontrol-position: center left;
+
+
+ CS HW
+
+
+
+
+ 0
+ 10
+ 616
+ 231
+
+
+
+ Hardware Setup
+
+
+
+
+ 90
+ 90
+ 200
+ 30
+
+
+
+ false
+
+
+ none
+
+ -
+
+ none
+
+
+ -
+
+ abx80x
+
+
+ -
+
+ ds1307
+
+
+ -
+
+ ds1339
+
+
+ -
+
+ ds3231
+
+
+ -
+
+ mcp7940x
+
+
+ -
+
+ mcp7941x
+
+
+ -
+
+ pcf2127
+
+
+ -
+
+ pcf8523
+
+
+ -
+
+ pcf8563
+
+
+
+
+
+
+ 10
+ 90
+ 80
+ 30
+
+
+
+ RTC
+
+
+
+
+
+ 90
+ 40
+ 200
+ 30
+
+
+
+ false
+
+
+ Raspberry Pi - Onboard
+
+ -
+
+ Custom
+
+
+ -
+
+ Raspberry Pi - Onboard
+
+
+ -
+
+ Allo - Boss
+
+
+ -
+
+ Allo - Piano
+
+
+ -
+
+ Audioinjector - Zero
+
+
+ -
+
+ Audioinjector - Stereo
+
+
+ -
+
+ Hifiberry - DAC
+
+
+ -
+
+ Hifiberry - DAC Plus
+
+
+ -
+
+ Hifiberry - DAC Digi
+
+
+ -
+
+ Hifiberry - DAC Amp
+
+
+
+
+
+
+ 10
+ 40
+ 80
+ 30
+
+
+
+ DAC
+
+
+
+
+
+ 90
+ 140
+ 200
+ 30
+
+
+
+ false
+
+
+
+
+
+
+
+
+ 10
+ 140
+ 80
+ 30
+
+
+
+ Timezone
+
+
+
+
+
+ 60
+ 186
+ 21
+ 31
+
+
+
+ <html><head/><body><p><img src=":/ico_info.png"/></p></body></html>
+
+
+
+
+
+ 90
+ 180
+ 521
+ 41
+
+
+
+ Timezone is needed for rtc - Sync with timeserver can be done via
+"crankshaft rtc sync" in shell.
+
+
+
+
+
+
+ 0
+ 410
+ 616
+ 23
+
+
+
+
+ true
+
+
+
+ To activate this settings you have to reboot after changing!
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+
+
+ 10
+ 406
+ 31
+ 31
+
+
+
+ <html><head/><body><p align="justify"><img src=":/ico_warning.png"/></p></body></html>
+
+
+