fix validation issues and add screenshot.

Add icon and adjust build settings for first release.
Update flatpak with build deps since bluetooth doesn't connect out of box.
2019-11-08 09:29:46 -05:00 · 2019-11-08 00:26:14 -05:00 · 2019-11-07 23:48:43 -05:00 · 2019-11-07 23:05:56 -05:00 · 2019-11-07 19:14:58 -05:00 · 2019-11-06 18:30:28 -05:00
22 changed files with 1025 additions and 0 deletions
--- a/.idea/$PRODUCT_WORKSPACE_FILE$
+++ b/.idea/$PRODUCT_WORKSPACE_FILE$
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="masterDetails">
+    <states>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>Android API 26 Platform</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,15 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="2">
+            <item index="0" class="java.lang.String" itemvalue="2.7" />
+            <item index="1" class="java.lang.String" itemvalue="3.8" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_12" default="false" project-jdk-name="Pipenv (QiFlora)" project-jdk-type="Python SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="PythonCompatibilityInspectionAdvertiser">
+    <option name="version" value="3" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/QiFlora.iml" filepath="$PROJECT_DIR$/QiFlora.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,45 @@
+project(qiflora)
+
+cmake_minimum_required(VERSION 2.8.12)
+set(KF5_MIN_VERSION "5.18.0")
+set(QT_MIN_VERSION "5.5.0")
+
+################# Disallow in-source build #################
+
+if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+   message(FATAL_ERROR "This application requires an out of source build. Please create a separate build directory.")
+endif()
+
+include(FeatureSummary)
+
+################# set KDE specific information #################
+
+find_package(ECM 0.0.8 REQUIRED NO_MODULE)
+
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+include(ECMSetupVersion)
+include(ECMGenerateHeaders)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(ECMPoQmTools)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+
+################# Find dependencies #################
+
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2 Bluetooth)
+find_package(KF5Kirigami2 ${KF5_MIN_VERSION})
+
+################# Enable C++11 features for clang and gcc #################
+
+set(CMAKE_CXX_STANDARD 11)
+
+################# build and install #################
+add_subdirectory(src)
+
+install(PROGRAMS org.eyecreate.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES org.eyecreate.qiflora.svg DESTINATION ${KDE_INSTALL_ICONDIR})
+install(FILES org.eyecreate.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/README.md
+++ b/README.md
@@ -0,0 +1,9 @@
+# QiFlora
+
+Mobile friendly application to monitor Mi Flora devices.
+Plants using this device will have thier data logged when app is used and graphed to better monitor plant health.
+
+# Usage
+See [docs.plasma-mobile.org](https://docs.plasma-mobile.org/AppDevelopment.html).
+
+Icon made by Good Ware from www.flaticon.com
--- a/org.eyecreate.qiflora.appdata.xml
+++ b/org.eyecreate.qiflora.appdata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop-application">
+  <id>org.eyecreate.qiflora</id>
+  <name>QiFlora</name>
+  <summary>Mobile friendly application to monitor Mi Flora devices.</summary>
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  <content_rating type="oars-1.1" />
+  <url type="homepage">https://git.eyecreate.org/eyecreate/qiflora</url>
+  <developer_name>eyecreate</developer_name>
+  <description>
+    <p>Mobile friendly application to monitor Mi Flora devices.</p>
+    <p>Plants using this device will have thier data logged when app is used and graphed to better monitor plant health.</p>
+  </description>
+  <screenshots>
+      <screenshot type="default">
+          <image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.0/packaging/main_window.png</image>
+      </screenshot>
+  </screenshots>
+  <releases>
+      <release version="1.0" date="2019-11-8" type="stable"/>
+  </releases>
+</component>
--- a/org.eyecreate.qiflora.desktop
+++ b/org.eyecreate.qiflora.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=QiFlora
+Comment=Monitor plants with Mi Flora sensors.
+Version=1.0
+Exec=qiflora
+MimeType=application/x-qiflora;
+Icon=org.eyecreate.qiflora
+Type=Application
+Terminal=false
+Categories=Utility;Qt;KDE;
--- a/org.eyecreate.qiflora.json
+++ b/org.eyecreate.qiflora.json
@@ -0,0 +1,120 @@
+{
+    "id": "org.eyecreate.qiflora",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "5.12",
+    "sdk": "org.kde.Sdk",
+    "command": "qiflora",
+    "tags": ["kde"],
+    "finish-args": [
+        "--share=ipc",
+        "--allow=bluetooth",
+        "--system-talk-name=org.bluez",
+        "--share=network",
+        "--socket=x11",
+        "--socket=wayland",
+        "--device=dri",
+        "--filesystem=home",
+        "--talk-name=org.freedesktop.Notifications"
+    ],
+    "separate-locales": false,
+
+    "modules": [
+        {
+            "name": "udev",
+            "rm-configure": true,
+            "config-opts": [
+                "--disable-hwdb",
+                "--disable-logging",
+                "--disable-introspection",
+                "--disable-keymap",
+                "--disable-mtd_probe",
+                "--with-systemdsystemunitdir=/app/lib/systemd/"
+            ],
+            "cleanup": [
+                "/include",
+                "/etc",
+                "/libexec",
+                "/sbin",
+                "/lib/pkgconfig",
+                "/lib/systemd",
+                "/man",
+                "/share/aclocal",
+                "/share/doc",
+                "/share/gtk-doc",
+                "/share/man",
+                "/share/pkgconfig",
+                "*.la",
+                "*.a"
+            ],
+            "sources": [
+                {
+                "type": "archive",
+                "url": "https://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2",
+                "sha256": "4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab"
+                },
+                {
+                "type": "patch",
+                "path": "sysmacros.patch"
+                },
+                {
+                "type": "script",
+                "dest-filename": "autogen.sh",
+                "commands": [
+                    "autoreconf -vfi"
+                ]
+                }
+            ],
+            "post-install": [
+                "sed -i 's|${exec_prefix}|/app|g' /app/share/pkgconfig/udev.pc"
+            ]
+        },
+        {
+            "name": "ical",
+            "cleanup": [
+                "/lib/cmake"
+            ],
+            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
+                "-DCMAKE_INSTALL_LIBDIR=/app/lib",
+                "-DBUILD_SHARED_LIBS=ON"
+            ],
+            "sources": [ { "type": "archive", "url": "https://github.com/libical/libical/archive/v3.0.5.tar.gz", "sha256": "483acbf7fee66ca071c2ff8183e46b6f2b3a89e1e866eadf4870eaaa281c8db1" } ]
+        },
+        {
+            "name": "bluez",
+            "config-opts": [
+                "--disable-datafiles",
+                "--disable-systemd",
+                "--enable-library",
+                "--prefix=/app",
+                "--sysconfdir=/app/etc"
+            ],
+            "sources": [ { "type": "archive", "url": "https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.50.tar.xz", "sha256": "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"} ]
+        },
+        {
+            "name": "qtconnectivity",
+            "buildsystem": "simple",
+            "cleanup-platform": [
+                "/bin",
+                "/mkspecs"
+            ],
+            "sources": [ { "type": "git", "url": "https://github.com/qt/qtconnectivity", "branch": "5.12.4", "commit": "f6be1f73a810514335ab3d27e1d05825a36b06af" } ],
+            "build-commands": [
+                "qmake",
+                "make -j $FLATPAK_BUILDER_N_JOBS",
+                "cp -r -n bin /app",
+                "cp -r -n include /app",
+                "cp -r -n lib /app",
+                "mkdir -p /app/src/bluetooth",
+                "cp -r src/bluetooth /app/src/"
+            ]
+        },
+        {
+            "name": "qiflora",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "sources": [ { "type": "dir", "path": ".", "skip": [".git"] } ]
+        }
+    ]
+}
--- a/org.eyecreate.qiflora.svg
+++ b/org.eyecreate.qiflora.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 400.174 400.174" style="enable-background:new 0 0 400.174 400.174;" xml:space="preserve">
+<path style="fill:#45B549;" d="M201.38,88.422c113.12-12.44,149.88-84,150-84c1.856-3.567,6.252-4.953,9.819-3.097
+	c1.799,0.936,3.126,2.581,3.661,4.537c37.6,127.52,17.08,215.44-26.08,267.6c-16.709,20.331-38.11,36.296-62.36,46.52
+	c-22.339,9.474-46.587,13.584-70.8,12c-46.36-3.24-88.68-28-108.32-72.36c-5.032-11.34-8.284-23.388-9.64-35.72
+	c-2.743-24.717,2.083-49.685,13.84-71.6c12.622-23.385,32.719-41.863,57.08-52.48C172.173,93.833,186.611,89.988,201.38,88.422
+	L201.38,88.422z"/>
+<path style="fill:#009549;" d="M350.58,7.102c0.099-4.019,3.437-7.198,7.456-7.099c4.019,0.099,7.198,3.437,7.099,7.456
+	c-0.007,0.296-0.033,0.59-0.076,0.883c0,0.36-6.36,84-88,168.64l-0.76,0.8c-19.18,19.673-40.226,37.436-62.84,53.04l49.04,9.12
+	c3.909,0.943,6.313,4.876,5.37,8.784c-0.854,3.538-4.189,5.902-7.81,5.536l-64-12c-58.36,36.96-157.28,71.08-165.92,151.6
+	c-0.535,3.985-4.199,6.782-8.184,6.247c-3.793-0.509-6.544-3.868-6.296-7.687c10.32-96.52,108.4-121.36,174.56-163.56l0.92-0.6
+	c26.403-16.71,50.861-36.311,72.92-58.44l-5.8-57.4c-0.535-3.985,2.262-7.649,6.247-8.184s7.649,2.262,8.184,6.247
+	c0.022,0.165,0.039,0.331,0.049,0.497l4.4,44.56C345.18,79.142,350.54,7.422,350.58,7.102L350.58,7.102z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
--- a/packaging/main_window.png
+++ b/packaging/main_window.png
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+set(qiflora_SRCS
+    miflora/miflora.cpp
+    miflora/bluetoothdevices.cpp
+    main.cpp
+    )
+
+qt5_add_resources(RESOURCES resources.qrc)
+add_executable(qiflora ${qiflora_SRCS} ${RESOURCES})
+target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::Svg Qt5::Bluetooth)
+install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
--- a/src/contents/ui/main.qml
+++ b/src/contents/ui/main.qml
@@ -0,0 +1,129 @@
+import QtQuick 2.6
+import org.kde.kirigami 2.4 as Kirigami
+import QtQuick.Controls 2.0 as Controls
+import QtQuick.Layouts 1.12 as Layouts
+import org.eyecreate.qiflora 1.0
+
+Kirigami.ApplicationWindow {
+    id: root
+
+    title: "QiFlora"
+    
+
+    pageStack.initialPage: mainPageComponent
+    
+    QiFlora {
+        id: qiflora
+    }
+
+    Component {
+        id: mainPageComponent
+
+        Kirigami.ScrollablePage {
+            mainAction: Kirigami.Action {
+                    iconName: "view-refresh"
+                    text: i18n("Query Device")
+                    onTriggered: {
+                        deviceSelect.open();
+                    }
+            }
+            title: "Monitor"
+            
+            Component.onCompleted: {
+                monitorTypes.append({"chartType": "temperature", "title": i18n("Temperature"), "icon": "filename-bpm-amarok"});
+                monitorTypes.append({"chartType": "moisture", "title": i18n("Moisture"), "icon": "colors-chromablue"});
+                monitorTypes.append({"chartType": "conductivity", "title": i18n("Conductivity"), "icon": "quickopen"});
+                monitorTypes.append({"chartType": "brightness", "title": i18n("Brightness"), "icon": "contrast"});
+            }
+
+            Kirigami.CardsListView {
+                id: monitorView
+                model: ListModel {
+                    id: monitorTypes
+                }
+                
+                delegate: Kirigami.Card {
+                    id: card
+                    banner {
+                        title: model.title
+                        titleIcon: model.icon
+                        titleLevel: 2
+                    }
+                    header: Row {
+                        layoutDirection: Qt.RightToLeft
+                        topPadding: 10.0
+                        rightPadding: 10.0
+                        Layouts.ColumnLayout {
+                            Kirigami.Heading {
+                                Layouts.Layout.alignment: Qt.AlignCenter
+                                level: 4
+                                text: i18n("Last Measured")
+                            }
+                            Kirigami.Heading {
+                                Layouts.Layout.alignment: Qt.AlignCenter
+                                level: 3
+                                text: {
+                                    if(model.chartType == "temperature") qiflora.temperature + "°C"
+                                    else if(model.chartType == "moisture") qiflora.moisture + "%"
+                                    else if(model.chartType == "conductivity") qiflora.conduction + " µS/cm"
+                                    else if(model.chartType == "brightness") qiflora.brightness + " lux"
+                                }
+                            }
+                        }
+                    }
+                    contentItem: Controls.Label {
+                            wrapMode: Text.WordWrap
+                            text: i18n("") //TODO: replace with graph?
+                        }
+                }
+            }
+            
+            Kirigami.OverlaySheet {
+                id: deviceSelect
+                showCloseButton: false
+                contentItem: ListView {
+                        header: Column {
+                            Rectangle {
+                                height: 10
+                                color: "transparent"
+                                width: parent.width
+                            }
+                            Kirigami.Heading {
+                                text: i18n("Select Device to Query")
+                            }
+                            Rectangle {
+                                height: 10
+                                color: "transparent"
+                                width: parent.width
+                            }
+                        }
+                        id: deviceList
+                        model: qiflora.devices
+                        delegate: Kirigami.AbstractListItem {
+                            Layouts.ColumnLayout {
+                                Kirigami.Heading {
+                                    text:model.modelData.name
+                                    level: 2
+                                }
+                                Kirigami.Heading {
+                                    text:model.modelData.address
+                                    level: 5
+                                }
+                            }
+                            onClicked: {
+                                qiflora.updateDataFromDevice(model.modelData.address);
+                                deviceSelect.close();
+                            }
+                        }
+                }
+                onSheetOpenChanged: {
+                    if(!sheetOpen) {
+                        qiflora.stopSearch();
+                    } else {
+                        qiflora.startSearch();
+                    }
+                }
+            }
+        }
+    }
+}
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -0,0 +1,26 @@
+#include <QApplication>
+#include <QQmlApplicationEngine>
+#include <QtQml>
+#include <QUrl>
+#include "miflora/miflora.h"
+#include "miflora/bluetoothdevices.h"
+
+Q_DECL_EXPORT int main(int argc, char *argv[])
+{
+    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication app(argc, argv);
+    QCoreApplication::setOrganizationName("eyecreate");
+    QCoreApplication::setOrganizationDomain("eyecreate.org");
+    QCoreApplication::setApplicationName("qiflora");
+
+    QQmlApplicationEngine engine;
+    qmlRegisterType<BluetoothDevices>();
+    qmlRegisterType<MiFlora>("org.eyecreate.qiflora",1,0,"QiFlora");
+    engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
+
+    if (engine.rootObjects().isEmpty()) {
+        return -1;
+    }
+
+    return app.exec();
+}
--- a/src/miflora/bluetoothdevices.cpp
+++ b/src/miflora/bluetoothdevices.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2019  Kevin Whitaker <eyecreate@eyecreate.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bluetoothdevices.h"
+#include <QBluetoothAddress>
+
+BluetoothDevices::BluetoothDevices(QBluetoothDeviceInfo info)
+{
+    this->m_device = info;
+    this->m_address = info.address().toString();
+    this->m_name = info.name();
+}
+
+QBluetoothDeviceInfo BluetoothDevices::device() const
+{
+    return m_device;
+}
+
+void BluetoothDevices::setDevice(const QBluetoothDeviceInfo& device)
+{
+    if (m_device == device) {
+        return;
+    }
+
+    m_device = device;
+    emit deviceChanged(m_device);
+}
+
+QString BluetoothDevices::address() const
+{
+    return m_address;
+}
+
+void BluetoothDevices::setAddress(const QString& address)
+{
+    if (m_address == address) {
+        return;
+    }
+
+    m_address = address;
+    emit addressChanged(m_address);
+}
+
+QString BluetoothDevices::name() const
+{
+    return m_name;
+}
+
+void BluetoothDevices::setName(const QString& name)
+{
+    if (m_name == name) {
+        return;
+    }
+
+    m_name = name;
+    emit nameChanged(m_name);
+}
--- a/src/miflora/bluetoothdevices.h
+++ b/src/miflora/bluetoothdevices.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2019  Kevin Whitaker <eyecreate@eyecreate.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BLUETOOTHDEVICES_H
+#define BLUETOOTHDEVICES_H
+
+#include <QObject>
+#include <QBluetoothDeviceInfo>
+
+/**
+ * Data class used to represent found MiFlora devices.
+ */
+class BluetoothDevices : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QBluetoothDeviceInfo device READ device WRITE setDevice NOTIFY deviceChanged)
+    Q_PROPERTY(QString address READ address WRITE setAddress NOTIFY addressChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+public:
+    
+    BluetoothDevices(QBluetoothDeviceInfo info);
+
+    /**
+     * @return the device
+     */
+    QBluetoothDeviceInfo device() const;
+
+    /**
+     * @return the address
+     */
+    QString address() const;
+
+    /**
+     * @return the name
+     */
+    QString name() const;
+
+public Q_SLOTS:
+    /**
+     * Sets the device.
+     *
+     * @param device the new device
+     */
+    void setDevice(const QBluetoothDeviceInfo& device);
+
+    /**
+     * Sets the address.
+     *
+     * @param address the new address
+     */
+    void setAddress(const QString& address);
+
+    /**
+     * Sets the name.
+     *
+     * @param name the new name
+     */
+    void setName(const QString& name);
+
+Q_SIGNALS:
+    void deviceChanged(const QBluetoothDeviceInfo& device);
+
+    void addressChanged(const QString& address);
+
+    void nameChanged(const QString& name);
+
+private:
+    QBluetoothDeviceInfo m_device;
+    QString m_address;
+    QString m_name;
+};
+
+#endif // BLUETOOTHDEVICES_H
--- a/src/miflora/miflora.cpp
+++ b/src/miflora/miflora.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2019  Kevin Whitaker <eyecreate@eyecreate.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "miflora.h"
+#include <QDataStream>
+
+void MiFlora::startSearch()
+{
+    qDebug() << "Starting search...";
+    agent = new QBluetoothDeviceDiscoveryAgent();
+    agent->setLowEnergyDiscoveryTimeout(5000);
+    devices.clear();
+    connect(agent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &MiFlora::foundDevice);
+    agent->start(QBluetoothDeviceDiscoveryAgent::LowEnergyMethod);
+}
+
+void MiFlora::stopSearch()
+{
+    if(agent != NULL) { 
+        qDebug() << "Stopping Search.";
+        agent->stop();
+        agent->disconnect();
+        delete agent;
+    }
+}
+
+void MiFlora::updateDataFromDevice ( QString mac )
+{
+    for(BluetoothDevices *info: devices) {
+        if(info->device().address().toString() == mac) {
+            qDebug() << "Discovering on:" + info->device().name();
+            currentController = QLowEnergyController::createCentral(info->device());
+            currentController->setRemoteAddressType(QLowEnergyController::PublicAddress);
+            connect(currentController, &QLowEnergyController::serviceDiscovered, this, &MiFlora::serviceDiscovered);
+            connect(currentController, static_cast<void (QLowEnergyController::*)(QLowEnergyController::Error)>(&QLowEnergyController::error), this, &MiFlora::logControllerError);
+            connect(currentController, &QLowEnergyController::connected, this, [this]{
+                currentController->discoverServices();
+            });
+            currentController->connectToDevice();
+        }
+    }
+}
+
+void MiFlora::foundDevice ( const QBluetoothDeviceInfo& device )
+{
+    if(device.coreConfigurations() & QBluetoothDeviceInfo::LowEnergyCoreConfiguration && device.address().toString().startsWith("C4:7C")) {
+        devices.append(new BluetoothDevices(device));
+        qDebug() << "Added device";
+        emit newDeviceFound();
+    }
+}
+
+QQmlListProperty<BluetoothDevices> MiFlora::getDeviceList()
+{
+    return QQmlListProperty<BluetoothDevices>(this, devices);
+}
+
+void MiFlora::logControllerError ( QLowEnergyController::Error err )
+{
+    qDebug() << "Error:" << err;
+}
+
+void MiFlora::logServiceError(QLowEnergyService::ServiceError err)
+{
+    qDebug() << "Service Error:" << err;
+}
+
+
+void MiFlora::serviceStateChanges ( QLowEnergyService::ServiceState state )
+{
+    if(state == QLowEnergyService::ServiceState::ServiceDiscovered) {
+        for(QLowEnergyCharacteristic chrt : sensorService->characteristics()) {
+            if(chrt.uuid().toUInt16() == magicChar) {
+                sensorService->writeCharacteristic(chrt, QByteArray::fromHex("a01f"));
+            }
+        }
+    }
+}
+
+void MiFlora::serviceCharWritten(QLowEnergyCharacteristic changedChar, QByteArray value)
+{
+    if(changedChar.uuid().toUInt16() == magicChar) {
+        //Used to only check sensor data after writting magic bytes.
+        for(QLowEnergyCharacteristic chrt : sensorService->characteristics()) {
+            if(chrt.uuid().toUInt16() == batteryFirmwareChar) {
+                sensorService->readCharacteristic(chrt);
+            }
+            if(chrt.uuid().toUInt16() == sensorsChar) {
+                sensorService->readCharacteristic(chrt);
+            }
+        }
+    }
+}
+
+void MiFlora::serviceCharRead(QLowEnergyCharacteristic readChar, QByteArray value)
+{
+    if(readChar.uuid().toUInt16() == batteryFirmwareChar) {
+        QDataStream parser(value);
+        parser >> battery;
+        parser.skipRawData(1);
+        QByteArray version_buf(5, Qt::Uninitialized);
+        parser.readRawData(version_buf.data(), 5);
+        version = QString(version_buf);
+        emit batteryChanged(battery);
+        qDebug() << "Firmware: " << version;
+    } else if(readChar.uuid().toUInt16() == sensorsChar) {
+        quint16 origTemp;
+        QDataStream parser(value);
+        parser.setByteOrder(QDataStream::LittleEndian);
+        parser >> origTemp;
+        temp = origTemp/ 10.0; //original value in 0.1 C
+        parser.skipRawData(1);
+        parser >> bright;
+        parser >> moisture;
+        parser >> conduct;
+        emit brightnessChanged(bright);
+        emit temperatureChanged(temp);
+        emit moistureChanged(moisture);
+        emit conductionChanged(conduct);
+    }
+}
+
+void MiFlora::serviceDiscovered ( const QBluetoothUuid& gatt )
+{
+    if(gatt == QBluetoothUuid(dataService)) {
+        sensorService = currentController->createServiceObject(gatt);
+        connect(sensorService, &QLowEnergyService::stateChanged, this, &MiFlora::serviceStateChanges);
+        connect(sensorService, static_cast<void (QLowEnergyService::*)(QLowEnergyService::ServiceError)>(&QLowEnergyService::error), this, &MiFlora::logServiceError);
+        connect(sensorService, &QLowEnergyService::characteristicWritten, this, &MiFlora::serviceCharWritten);
+        connect(sensorService, &QLowEnergyService::characteristicRead, this, &MiFlora::serviceCharRead);
+        sensorService->discoverDetails();
+    }
+}
+
+
+
--- a/src/miflora/miflora.h
+++ b/src/miflora/miflora.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2019  Kevin Whitaker <eyecreate@eyecreate.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MIFLORA_H
+#define MIFLORA_H
+
+#include <QObject>
+#include <QtBluetooth/QBluetoothDeviceDiscoveryAgent>
+#include <QtBluetooth/QBluetoothDeviceInfo>
+#include <QtBluetooth/QLowEnergyController>
+#include <QtBluetooth/QLowEnergyService>
+#include <QtBluetooth/QLowEnergyCharacteristic>
+#include "bluetoothdevices.h"
+#include <QQmlListProperty>
+
+/**
+ * Class using QtBluetooth to find and retrive info from Mi Flora devices.
+ */
+class MiFlora : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(float temperature NOTIFY temperatureChanged MEMBER temp)
+    Q_PROPERTY(quint32 brightness NOTIFY brightnessChanged MEMBER bright)
+    Q_PROPERTY(quint8 moisture NOTIFY moistureChanged MEMBER moisture)
+    Q_PROPERTY(quint16 conduction NOTIFY conductionChanged MEMBER conduct)
+    Q_PROPERTY(quint8 battery NOTIFY batteryChanged MEMBER battery)
+    Q_PROPERTY(QQmlListProperty<BluetoothDevices> devices READ getDeviceList NOTIFY newDeviceFound)
+    
+public:
+    Q_INVOKABLE void startSearch();
+    Q_INVOKABLE void stopSearch();
+    
+    Q_INVOKABLE void updateDataFromDevice(QString mac);
+    QQmlListProperty<BluetoothDevices> getDeviceList();
+    //TODO:History?
+    
+signals:
+    void newDeviceFound();
+    void temperatureChanged(float temperature);
+    void brightnessChanged(quint32 brightness);
+    void moistureChanged(quint8 moisture);
+    void conductionChanged(quint16 conduction);
+    void batteryChanged(quint8 battery);
+    
+private:
+    void foundDevice(const QBluetoothDeviceInfo &device);
+    void serviceDiscovered(const QBluetoothUuid &gatt);
+    void logControllerError(QLowEnergyController::Error err);
+    void logServiceError(QLowEnergyService::ServiceError err);
+    void serviceStateChanges(QLowEnergyService::ServiceState state);
+    void serviceCharWritten(QLowEnergyCharacteristic changedChar, QByteArray value);
+    void serviceCharRead(QLowEnergyCharacteristic readChar, QByteArray value);
+    
+    QBluetoothDeviceDiscoveryAgent *agent;
+    QList<BluetoothDevices*> devices;
+    QLowEnergyController *currentController;
+    QLowEnergyService *sensorService;
+    
+    const quint16 dataService = 4612; //0x1204
+    const quint16 batteryFirmwareChar = 6658;//0x1a02
+    const quint16 sensorsChar = 6657; //0x1a01
+    const quint16 magicChar = 6656; //0x1a00
+
+    float temp = 0.0;
+    quint32 bright = 0;
+    quint8 moisture = 0;
+    quint16 conduct = 0;
+    quint8 battery = 0;
+    QString version;
+
+};
+
+#endif // MIFLORA_H
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="main.qml">contents/ui/main.qml</file>
+    </qresource>
+</RCC>
--- a/sysmacros.patch
+++ b/sysmacros.patch
@@ -0,0 +1,112 @@
+diff -Naur udev-175/extras/cdrom_id/cdrom_id.c udev-175-fix/extras/cdrom_id/cdrom_id.c
+--- udev-175/extras/cdrom_id/cdrom_id.c	2011-06-17 03:28:33.251601571 +0200
+++ udev-175-fix/extras/cdrom_id/cdrom_id.c	2019-04-02 12:24:40.131653700 +0200
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
+#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/extras/scsi_id/scsi_serial.c udev-175-fix/extras/scsi_id/scsi_serial.c
+--- udev-175/extras/scsi_id/scsi_serial.c	2011-04-15 00:14:23.739780499 +0200
+++ udev-175-fix/extras/scsi_id/scsi_serial.c	2019-04-02 12:24:18.781548109 +0200
+@@ -33,6 +33,7 @@
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+ #include <linux/bsg.h>
+#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-device.c udev-175-fix/libudev/libudev-device.c
+--- udev-175/libudev/libudev-device.c	2011-09-23 14:43:44.305381687 +0200
+++ udev-175-fix/libudev/libudev-device.c	2019-04-02 12:19:17.220061349 +0200
+@@ -24,6 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
+#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-device-private.c udev-175-fix/libudev/libudev-device-private.c
+--- udev-175/libudev/libudev-device-private.c	2011-04-24 00:13:02.466797877 +0200
+++ udev-175-fix/libudev/libudev-device-private.c	2019-04-02 12:19:38.570166315 +0200
+@@ -18,6 +18,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <sys/stat.h>
+#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -Naur udev-175/libudev/libudev-enumerate.c udev-175-fix/libudev/libudev-enumerate.c
+--- udev-175/libudev/libudev-enumerate.c	2011-08-04 04:26:50.130004746 +0200
+++ udev-175-fix/libudev/libudev-enumerate.c	2019-04-02 12:23:07.947864764 +0200
+@@ -20,7 +20,7 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+-
+#include <sys/sysmacros.h>
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 
+diff -Naur udev-175/udev/udevadm-info.c udev-175-fix/udev/udevadm-info.c
+--- udev-175/udev/udevadm-info.c	2011-10-09 22:49:21.817999569 +0200
+++ udev-175-fix/udev/udevadm-info.c	2019-04-02 12:25:44.908641018 +0200
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udevd.c udev-175-fix/udev/udevd.c
+--- udev-175/udev/udevd.c	2011-10-11 13:25:39.619713005 +0200
+++ udev-175-fix/udev/udevd.c	2019-04-02 12:17:59.529679774 +0200
+@@ -43,6 +43,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ #include <sys/utsname.h>
+#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "sd-daemon.h"
+diff -Naur udev-175/udev/udev-event.c udev-175-fix/udev/udev-event.c
+--- udev-175/udev/udev-event.c	2011-10-06 00:58:11.372582876 +0200
+++ udev-175-fix/udev/udev-event.c	2019-04-02 12:18:11.513071921 +0200
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <sys/signalfd.h>
+ #include <linux/sockios.h>
+#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udev-node.c udev-175-fix/udev/udev-node.c
+--- udev-175/udev/udev-node.c	2011-11-01 13:08:15.803635931 +0100
+++ udev-175-fix/udev/udev-node.c	2019-04-02 12:18:21.729788742 +0200
+@@ -28,6 +28,7 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -Naur udev-175/udev/udev-rules.c udev-175-fix/udev/udev-rules.c
+--- udev-175/udev/udev-rules.c	2011-10-22 21:17:06.587663679 +0200
+++ udev-175-fix/udev/udev-rules.c	2019-04-02 12:18:55.866623075 +0200
+@@ -29,6 +29,7 @@
+ #include <dirent.h>
+ #include <fnmatch.h>
+ #include <time.h>
+#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+
Author	SHA1	Message	Date
Kevin Whitaker	bcdf831d0c	fix validation issues and add screenshot.	2019-11-08 09:29:46 -05:00
Kevin Whitaker	0483a4ad3f	Add icon and adjust build settings for first release.	2019-11-08 00:26:14 -05:00
Kevin Whitaker	2126bcc484	Update flatpak with build deps since bluetooth doesn't connect out of box.	2019-11-07 23:48:43 -05:00
Kevin Whitaker	e0689cc7e8	Add new bluetooth class as model for scanning. Add UI to show scanned devices on top of page.	2019-11-07 23:05:56 -05:00
Kevin Whitaker	62bf803c71	Link bluetooth. Implement class that talks to BLE miflora devices. Have UI show current values from new class.	2019-11-07 19:14:58 -05:00
Kevin Whitaker	0f63b81cb7	Add to UI a section for last reading.	2019-11-06 18:30:28 -05:00
Kevin Whitaker	6e06af6fa2	Add bluetooth to requirements. Fix up main screen to represent app layout.	2019-11-06 17:16:45 -05:00
Kevin Whitaker	d9810079a9	Adapt template to app being built.	2019-11-05 15:23:19 -05:00
Kevin Whitaker	0c3e79e148	Initial import	2019-11-05 14:42:54 -05:00