Browse Source

thermostat: use a config file

master
Richard Genoud 4 years ago
parent
commit
36c16aaa3c
3 changed files with 12 additions and 14 deletions
  1. +1
    -2
      soft/thermostat/inc/mainwindow.h
  2. +2
    -0
      soft/thermostat/inc/settings.h
  3. +9
    -12
      soft/thermostat/src/settings.cpp

+ 1
- 2
soft/thermostat/inc/mainwindow.h View File

@ -16,8 +16,7 @@
#include "mqttclient.h"
#include "zoneitem.h"
#include "backgroundloop.h"
#define NB_ZONES 4
#include "settings.h"
class MainWindow : public QMainWindow
{


+ 2
- 0
soft/thermostat/inc/settings.h View File

@ -12,6 +12,8 @@
#include <QStringList>
#include <QSettings>
#define NB_ZONES 4
class Settings : public QSettings
{
Q_OBJECT


+ 9
- 12
soft/thermostat/src/settings.cpp View File

@ -16,18 +16,15 @@ Settings *Settings::_singleton = NULL;
Settings::Settings()
{
m_rooms_names << QString(tr("Bedroom"));
m_rooms_names << QString(tr("Workspace"));
m_rooms_names << QString(tr("Living room"));
m_rooms_names << QString(tr("Bathroom"));
m_sensor_topics << QString::fromUtf8("sensors/chambre_so/xiaomi");
m_sensor_topics << QString::fromUtf8("sensors/chambre_rico/xiaomi");
m_sensor_topics << QString::fromUtf8("sensors/salon/xiaomi");
m_sensor_topics << QString::fromUtf8("sensors/salle_de_bains/xiaomi");
m_availability_topics << QString::fromUtf8("sensors/chambre_so/availability");
m_availability_topics << QString::fromUtf8("sensors/chambre_rico/availability");
m_availability_topics << QString::fromUtf8("sensors/salon/availability");
m_availability_topics << QString::fromUtf8("sensors/salle_de_bains/availability");
QSettings s;
(void)s.beginReadArray("rooms");
for (int i = 0; i < NB_ZONES; ++i) {
s.setArrayIndex(i);
m_rooms_names << s.value("name", "").toString();
m_sensor_topics << s.value("sensor_topic", "").toString();
m_availability_topics << s.value("availability_topic", "").toString();
}
s.endArray();
}
Settings::~Settings()


Loading…
Cancel
Save