From 1808515221944469cf2810ba23b8e7f71744c3e9 Mon Sep 17 00:00:00 2001 From: Denis Manherz Date: Thu, 29 Aug 2024 22:23:25 +0200 Subject: [PATCH] Somethings working --- conf1.bin | Bin 520 -> 520 bytes conf2.bin | Bin 520 -> 520 bytes src/Main.qml | 18 +++++++++++++++--- src/conf.cpp | 42 +++++++++++++++++++++++++++--------------- src/conf.h | 19 ++++++++++++++----- src/main.cpp | 2 +- 6 files changed, 57 insertions(+), 24 deletions(-) diff --git a/conf1.bin b/conf1.bin index ada055817e422a1c9c1a4828de015dae48673198..c1b2b139971bcbea00fda57813ef5dfb93a28c4e 100644 GIT binary patch delta 12 TcmeBR>0p`Q%E-9U?GPgX7nK95 delta 12 TcmeBR>0p`Q%E+|Q?GPgX7n%dB diff --git a/conf2.bin b/conf2.bin index ae723bd3b6920e7263028718630218dbd3b088a1..88617217522f621d03d4115c312f28294baf6c19 100644 GIT binary patch delta 63 zcmeBR>0p@$l+!~+f!4+tw?*WNMvvX$_B7Ow%it9S?$OAoD*EfGtBJ4zNMwnW6Fy0uVmXII#KyTo69cX;}3m z8ATTJ092O(l&Fj}6ij_SLlHwNgFeGU tsQLx3AnG?ffzTJGK Conf::deviceList() + +ssize_t Conf::lightMode(){ + return m_conf1->light_mode; +} + +void Conf::setLightMode(ssize_t mode){ + m_conf1->light_mode = mode; + + + Q_EMIT lightModeChanged(); +} + +ssize_t Conf::deviceConfig() { conf_1 *conf = (conf_1 *)malloc(sizeof(conf_1)); conf_2 *conf2 = (conf_2 *)malloc(sizeof(conf_2)); + writeConfigToDevice(m_conf1); + // readConfigFromDevice(conf); readConfigFromFile("conf1.bin", conf); readConfigFromDevice(conf2); // edit data - // conf->light_mode = 0x2; + conf->light_mode = 0x1; conf->req_type = 0x92; conf->st_brightness_colnr = {0x16}; conf->col_steady[18] = 0x00; @@ -54,20 +74,12 @@ QList Conf::deviceList() writeConfigToFile(conf, "conf1.bin"); writeConfigToFile(conf2, "conf2.bin"); - QQmlEngine engine; - - QList asd; - QQmlComponent component(&engine, - QUrl::fromLocalFile(QString::fromStdString("/home/denis/repos/a811/src/action.qml"))); - QObject *object = component.create(); - asd.append(object); - - return asd; + return 0; } -void Conf::setDeviceList(QList deviceList) +void Conf::setDeviceConfig(ssize_t stat) { - Q_EMIT deviceListChanged(); + Q_EMIT deviceConfigChanged(); } ssize_t Conf::writeConfigToDevice(conf_2 *conf) diff --git a/src/conf.h b/src/conf.h index 32aa645..0973fd9 100644 --- a/src/conf.h +++ b/src/conf.h @@ -19,13 +19,19 @@ class Conf : public QObject { Q_OBJECT - Q_PROPERTY(QList deviceList READ deviceList WRITE setDeviceList NOTIFY deviceListChanged) + Q_PROPERTY(ssize_t deviceConfig READ deviceConfig WRITE setDeviceConfig NOTIFY deviceConfigChanged) + Q_PROPERTY(ssize_t lightMode READ lightMode WRITE setLightMode NOTIFY lightModeChanged) public: explicit Conf(QObject *parent = nullptr); - QList deviceList(); - Q_INVOKABLE void setDeviceList(QList deviceList); - Q_SIGNAL void deviceListChanged(); + ssize_t deviceConfig(); + Q_INVOKABLE void setDeviceConfig(ssize_t stat); + Q_SIGNAL void deviceConfigChanged(); + + ssize_t lightMode(); + Q_INVOKABLE void setLightMode(ssize_t mode); + Q_SIGNAL void lightModeChanged(); + ssize_t writeConfigToFile(conf_1 *conf, const char *filePath); ssize_t writeConfigToFile(conf_2 *conf, const char *filePath); ssize_t readConfigFromFile(const char *filePath, conf_1 *conf); @@ -38,7 +44,10 @@ public: Q_SIGNALS: private: - QList m_deviceList; + ssize_t m_stat; + ssize_t m_lightMode; + conf_1* m_conf1; + conf_2* m_conf2; libusb_device* m_device = NULL; libusb_context* m_ctx = NULL; }; diff --git a/src/main.cpp b/src/main.cpp index 1ed89db..3072861 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) { KIconTheme::initTheme(); // this is not available in nixpkgs version of - // KiconTheme + // KiconTheme // how did i fix this?????? QApplication app(argc, argv); KLocalizedString::setApplicationDomain("tutorial"); QApplication::setOrganizationName(QStringLiteral("KDE"));