mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
detect config is readonly, adalight and other stuff (#333)
* update lightberry sketches update compilehowwto (windows disclaimer) some refactoring in main cmakelists + preparation for windows compile tune ada driver, set delayAfterConnect default to 1.5s because some arduino (e.g. mega r3) needs this set priority min/max for grabber/network services - prevent colliding prios between webui/background stuff and grabbers/net services * add check if config is writable. TODO do something usefull in webui * fix indention error * fix typo * fix webui can't write led config * typo * fix cmakelists * change methode of detecting linux
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
|
||||
// QT includes
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QSize>
|
||||
#include <QJsonObject>
|
||||
@@ -84,7 +85,7 @@ public:
|
||||
///
|
||||
void freeObjects();
|
||||
|
||||
static Hyperion* initInstance(const QJsonObject& qjsonConfig, const std::string configFile);
|
||||
static Hyperion* initInstance(const QJsonObject& qjsonConfig, const QString configFile);
|
||||
static Hyperion* getInstance();
|
||||
|
||||
///
|
||||
@@ -140,7 +141,7 @@ public:
|
||||
|
||||
/// get filename of configfile
|
||||
/// @return the current config filename
|
||||
std::string getConfigFileName() { return _configFile; };
|
||||
std::string getConfigFileName() { return _configFile.toStdString(); };
|
||||
|
||||
/// register a input source to a priority channel
|
||||
/// @param name uniq name of input source
|
||||
@@ -180,6 +181,8 @@ public:
|
||||
|
||||
bool configModified();
|
||||
|
||||
bool configWriteable();
|
||||
|
||||
public slots:
|
||||
///
|
||||
/// Writes a single color to all the leds for the given time and priority
|
||||
@@ -314,7 +317,7 @@ private:
|
||||
///
|
||||
/// @param[in] qjsonConfig The Json configuration
|
||||
///
|
||||
Hyperion(const QJsonObject& qjsonConfig, const std::string configFile);
|
||||
Hyperion(const QJsonObject& qjsonConfig, const QString configFile);
|
||||
|
||||
/// The specifiation of the led frame construction and picture integration
|
||||
LedString _ledString;
|
||||
@@ -348,7 +351,7 @@ private:
|
||||
const QJsonObject& _qjsonConfig;
|
||||
|
||||
// the name of config file
|
||||
std::string _configFile;
|
||||
QString _configFile;
|
||||
|
||||
/// The timer for handling priority channel timeouts
|
||||
QTimer _timer;
|
||||
|
Reference in New Issue
Block a user