# HG changeset patch # User Michiel Broek # Date 1648406305 -7200 # Node ID 231a0b1292f3ff92e8130411d752a43551955f25 # Parent 64cf5468fd22293d99102e4845c0b13737149138 Added MQTT settings. diff -r 64cf5468fd22 -r 231a0b1292f3 bmsapp.desktop --- a/bmsapp.desktop Sun Mar 27 11:59:15 2022 +0200 +++ b/bmsapp.desktop Sun Mar 27 20:38:25 2022 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;KDE;Education;Utility;Engineering; -Exec=bmsapp +Exec=bmsapp -d Name=BMSapp GenericName=Brewery Management System Keywords=Beer;Ale;Lager;Cider;Brew;Brewing;Recipe;Beersmith; diff -r 64cf5468fd22 -r 231a0b1292f3 src/bmsapp.cpp --- a/src/bmsapp.cpp Sun Mar 27 11:59:15 2022 +0200 +++ b/src/bmsapp.cpp Sun Mar 27 20:38:25 2022 +0200 @@ -70,7 +70,7 @@ dbProd.charset = settings.value("charset").toString(); } settings.endGroup(); - qDebug() << dbProd.host << dbProd.port << dbProd.name << dbProd.pass; + qDebug() << "MySQL prod" << dbProd.host << dbProd.port << dbProd.name << dbProd.pass; settings.beginGroup("dbdev"); dbDev.host = settings.value("host").toString(); @@ -95,7 +95,45 @@ dbDev.charset = settings.value("charset").toString(); } settings.endGroup(); - qDebug() << dbDev.host << dbDev.port << dbDev.name << dbDev.pass; + qDebug() << "MySQL dev" << dbDev.host << dbDev.port << dbDev.name << dbDev.pass; + + settings.beginGroup("mqttprod"); + mqttProd.host = settings.value("host").toString(); + if (mqttProd.host.isEmpty()) { + mqttProd.host = "localhost"; + mqttProd.port = "1883"; + mqttProd.user = "nobody"; + mqttProd.pass = "secret"; + settings.setValue("host", mqttProd.host); + settings.setValue("port", mqttProd.port); + settings.setValue("user", mqttProd.user); + settings.setValue("pass", mqttProd.pass); + } else { + mqttProd.port = settings.value("port").toString(); + mqttProd.user = settings.value("user").toString(); + mqttProd.pass = settings.value("pass").toString(); + } + settings.endGroup(); + qDebug() << "MQTT prod" << mqttProd.host << mqttProd.port << mqttProd.user << mqttProd.pass; + + settings.beginGroup("mqttdev"); + mqttDev.host = settings.value("host").toString(); + if (mqttDev.host.isEmpty()) { + mqttDev.host = "localhost"; + mqttDev.port = "1883"; + mqttDev.user = "nobody"; + mqttDev.pass = "secret"; + settings.setValue("host", mqttDev.host); + settings.setValue("port", mqttDev.port); + settings.setValue("user", mqttDev.user); + settings.setValue("pass", mqttDev.pass); + } else { + mqttDev.port = settings.value("port").toString(); + mqttDev.user = settings.value("user").toString(); + mqttDev.pass = settings.value("pass").toString(); + } + settings.endGroup(); + qDebug() << "MQTT dev" << mqttDev.host << mqttDev.port << mqttDev.user << mqttDev.pass; } @@ -120,6 +158,21 @@ settings.setValue("pass", dbDev.pass); settings.setValue("charset", dbDev.charset); settings.endGroup(); + + settings.beginGroup("mqttprod"); + settings.setValue("host", mqttProd.host); + settings.setValue("port", mqttProd.port); + settings.setValue("user", mqttProd.user); + settings.setValue("pass", mqttProd.pass); + settings.endGroup(); + + settings.beginGroup("mqttdev"); + settings.setValue("host", mqttDev.host); + settings.setValue("port", mqttDev.port); + settings.setValue("user", mqttDev.user); + settings.setValue("pass", mqttDev.pass); + settings.endGroup(); + qDebug() << "writesettings() done."; } diff -r 64cf5468fd22 -r 231a0b1292f3 src/bmsapp.h --- a/src/bmsapp.h Sun Mar 27 11:59:15 2022 +0200 +++ b/src/bmsapp.h Sun Mar 27 20:38:25 2022 +0200 @@ -53,6 +53,17 @@ static IniMySQL dbProd; static IniMySQL dbDev; +typedef struct IniMQTT +{ + QString host; ///< MQTT host + QString port; ///< MQTT port + QString user; ///< MQTT username + QString pass; ///< MQTT password +} IniMQTT; + +static IniMQTT mqttProd; +static IniMQTT mqttDev; + class MainWindow;