Compare commits
33 Commits
kivymd
...
old_androi
| Author | SHA1 | Date | |
|---|---|---|---|
| 235cf5f613 | |||
| e1581cd424 | |||
| 5479b04190 | |||
| e247a486e1 | |||
| 23fdbd27b6 | |||
| bdebc0833e | |||
| 0ec59fc409 | |||
| ad1fdee6c4 | |||
| c9720c9dea | |||
| 16db502a04 | |||
| 003a484fc4 | |||
| f0d203c6d6 | |||
| 9e7bf90831 | |||
| 93a71a56e1 | |||
| 0df4b858d0 | |||
| 9bad2c73ff | |||
| 60e5c8b0df | |||
| 90da697f84 | |||
| 9c5c50ef95 | |||
| e8d666d922 | |||
| 1303626dd8 | |||
| ed00901a2f | |||
| f6f574875d | |||
| b35385b306 | |||
| bcdf831d0c | |||
| 0483a4ad3f | |||
| 2126bcc484 | |||
| e0689cc7e8 | |||
| 62bf803c71 | |||
| 0f63b81cb7 | |||
| 6e06af6fa2 | |||
| d9810079a9 | |||
| 0c3e79e148 |
53
.idea/$PRODUCT_WORKSPACE_FILE$
generated
Normal 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>
|
||||||
2
.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/workspace.xml
|
||||||
15
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@@ -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>
|
||||||
9
.idea/misc.xml
generated
Normal file
@@ -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>
|
||||||
8
.idea/modules.xml
generated
Normal file
@@ -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>
|
||||||
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
46
CMakeLists.txt
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
project(qiflora)
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
set(KF5_MIN_VERSION "5.44.0")
|
||||||
|
set(QT_MIN_VERSION "5.12.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 Charts)
|
||||||
|
find_package(KF5Kirigami2 ${KF5_MIN_VERSION} REQUIRED)
|
||||||
|
find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
|
||||||
|
|
||||||
|
################# Enable C++11 features for clang and gcc #################
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
|
################# build and install #################
|
||||||
|
add_subdirectory(src)
|
||||||
|
|
||||||
|
install(PROGRAMS packaging/org.eyecreate.qiflora.desktop DESTINATION ${KDE_INSTALL_APPDIR})
|
||||||
|
install(FILES packaging/org.eyecreate.qiflora.svg DESTINATION ${KDE_INSTALL_ICONDIR})
|
||||||
|
install(FILES packaging/org.eyecreate.qiflora.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
|
||||||
|
|
||||||
|
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
||||||
9
README.md
Normal file
@@ -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
|
||||||
63
packaging/android/AndroidManifest.xml
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
|
<manifest package="org.eyecreate.qiflora" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3" android:versionCode="7" android:installLocation="auto">
|
||||||
|
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QiFlora" android:icon="@drawable/icon">
|
||||||
|
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
|
||||||
|
android:name="org.qtproject.qt5.android.bindings.QtActivity"
|
||||||
|
android:label="QiFlora"
|
||||||
|
android:theme="@style/AppTheme"
|
||||||
|
android:screenOrientation="unspecified"
|
||||||
|
android:windowSoftInputMode="adjustResize"
|
||||||
|
android:launchMode="singleTop">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data android:name="android.app.lib_name" android:value="qiflora"/>
|
||||||
|
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
|
||||||
|
<meta-data android:name="android.app.repository" android:value="default"/>
|
||||||
|
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
|
||||||
|
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
|
||||||
|
<!-- Deploy Qt libs as part of package -->
|
||||||
|
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
|
||||||
|
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
|
||||||
|
<!-- Run with local libs -->
|
||||||
|
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
|
||||||
|
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
|
||||||
|
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
|
||||||
|
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
|
||||||
|
<!-- Messages maps -->
|
||||||
|
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
|
||||||
|
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
|
||||||
|
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
|
||||||
|
<!-- Messages maps -->
|
||||||
|
|
||||||
|
<!-- Splash screen -->
|
||||||
|
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
|
||||||
|
<!-- Splash screen -->
|
||||||
|
|
||||||
|
<!-- Background running -->
|
||||||
|
<!-- Warning: changing this value to true may cause unexpected crashes if the
|
||||||
|
application still try to draw after
|
||||||
|
"applicationStateChanged(Qt::ApplicationSuspended)"
|
||||||
|
signal is sent! -->
|
||||||
|
<meta-data android:name="android.app.background_running" android:value="false"/>
|
||||||
|
<!-- Background running -->
|
||||||
|
|
||||||
|
<!-- auto screen scale factor -->
|
||||||
|
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
|
||||||
|
<!-- auto screen scale factor -->
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
<uses-sdk android:minSdkVersion="24" />
|
||||||
|
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||||
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
|
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
||||||
|
|
||||||
|
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
|
||||||
|
Remove the comment if you do not require these default features. -->
|
||||||
|
<!-- %%INSERT_FEATURES -->
|
||||||
|
|
||||||
|
</manifest>
|
||||||
BIN
packaging/android/res/drawable-xxxhdpi/icon.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
packaging/android/res/drawable-xxxhdpi/qiflora_splash.9.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
packaging/android/res/drawable/icon.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
packaging/android/res/drawable/qiflora_splash.9.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
12
packaging/android/res/drawable/splash.xml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item>
|
||||||
|
<shape android:shape="rectangle" >
|
||||||
|
<solid android:color="#FF1fca05"/>
|
||||||
|
</shape>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<bitmap android:src="@drawable/qiflora_splash"
|
||||||
|
android:gravity="center"/>
|
||||||
|
</item>
|
||||||
|
</layer-list>
|
||||||
6
packaging/android/res/values/apptheme.xml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
||||||
|
<item name="android:windowBackground">@drawable/qiflora_splash</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
4
packaging/build-android.sh
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#makes use of: kdeorg/android-arm-sdk
|
||||||
|
mkdir ../build-android
|
||||||
|
cmake -B build-android -DANDROID_EXTRA_LIBS="/opt/kdeandroid-deps/lib/libcrypto.so;/opt/kdeandroid-deps/lib/libssl.so" -DQTANDROID_EXPORTED_TARGET=qiflora -DANDROID_APK_DIR=./android -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-deps/share/ECM/toolchain/Android.cmake -DCMAKE_PREFIX_PATH="$QT_ANDROID;/opt/kdeandroid-deps" -DKF5Kirigami2_DIR=/opt/kdeandroid-deps/lib/cmake/KF5Kirigami2 -DKF5CoreAddons_DIR=/opt/kdeandroid-deps/lib/cmake/KF5CoreAddons -DECM_DIR=/opt/kdeandroid-deps/share/ECM/cmake -DECM_ADDITIONAL_FIND_ROOT_PATH=$QT_ANDROID ..
|
||||||
BIN
packaging/main_window.png
Normal file
|
After Width: | Height: | Size: 129 KiB |
BIN
packaging/mobile_window.png
Normal file
|
After Width: | Height: | Size: 126 KiB |
42
packaging/org.eyecreate.qiflora.appdata.xml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
<?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 plants using 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>
|
||||||
|
<url type="contact">https://www.eyecreate.org</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.1.2/packaging/main_window.png</image>
|
||||||
|
</screenshot>
|
||||||
|
<screenshot>
|
||||||
|
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.2/packaging/mobile_window.png</image>
|
||||||
|
</screenshot>
|
||||||
|
</screenshots>
|
||||||
|
<releases>
|
||||||
|
<release version="1.1.2" date="2019-11-15" type="stable">
|
||||||
|
<description>
|
||||||
|
<p>Fixed code causing text to sometimes not appear.</p>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
<release version="1.1.1" date="2019-11-14" type="stable">
|
||||||
|
<description>
|
||||||
|
<p>Cleaned up graph markings and temperature rounding.</p>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
<release version="1.1" date="2019-11-13" type="stable">
|
||||||
|
<description>
|
||||||
|
<p>This release adds history graph for the last 48 hours.</p>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
|
<release version="1.0" date="2019-11-8" type="stable"/>
|
||||||
|
</releases>
|
||||||
|
</component>
|
||||||
10
packaging/org.eyecreate.qiflora.desktop
Executable file
@@ -0,0 +1,10 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=QiFlora
|
||||||
|
Comment=Monitor plants with Mi Flora sensors.
|
||||||
|
Version=1.1.2
|
||||||
|
Exec=qiflora
|
||||||
|
MimeType=application/x-qiflora;
|
||||||
|
Icon=org.eyecreate.qiflora
|
||||||
|
Type=Application
|
||||||
|
Terminal=false
|
||||||
|
Categories=Utility;Qt;KDE;
|
||||||
99
packaging/org.eyecreate.qiflora.json
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
{
|
||||||
|
"id": "org.eyecreate.qiflora",
|
||||||
|
"runtime": "org.kde.Platform",
|
||||||
|
"command": "qiflora",
|
||||||
|
"finish-args": [
|
||||||
|
"--share=ipc",
|
||||||
|
"--allow=bluetooth",
|
||||||
|
"runtime-version": "5.13",
|
||||||
|
"sdk": "org.kde.Sdk",
|
||||||
|
"--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": "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",
|
||||||
|
"--disable-udev"
|
||||||
|
],
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "archive",
|
||||||
|
"url": "https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-5.52.tar.xz",
|
||||||
|
"sha256": "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "qtconnectivity",
|
||||||
|
"buildsystem": "simple",
|
||||||
|
"cleanup-platform": [
|
||||||
|
"/bin",
|
||||||
|
"/mkspecs"
|
||||||
|
],
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/qt/qtconnectivity",
|
||||||
|
"branch": "5.13.2",
|
||||||
|
"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,
|
||||||
|
"config-opts": [
|
||||||
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
|
]
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.eyecreate.org/eyecreate/qiflora.git",
|
||||||
|
"tag": "v1.1.2",
|
||||||
|
"commit": "23fdbd27b63dc48085287dcad206786ebfadb9df"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
46
packaging/org.eyecreate.qiflora.svg
Normal file
@@ -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>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
16
src/CMakeLists.txt
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
|
||||||
|
set(qiflora_SRCS
|
||||||
|
miflora/miflora.cpp
|
||||||
|
miflora/bluetoothdevices.cpp
|
||||||
|
miflora/florahistory.cpp
|
||||||
|
main.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
|
||||||
|
kirigami_package_breeze_icons(ICONS view-refresh help-about filename-bpm-amarok colors-chromablue quickopen contrast window-close)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
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 Qt5::Charts KF5::CoreAddons KF5::Kirigami2 Qt5::QuickControls2)
|
||||||
|
install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||||
263
src/contents/ui/main.qml
Normal file
@@ -0,0 +1,263 @@
|
|||||||
|
import QtQuick 2.6
|
||||||
|
import org.kde.kirigami 2.6 as Kirigami
|
||||||
|
import QtQuick.Controls 2.0 as Controls
|
||||||
|
import QtQuick.Layouts 1.12 as Layouts
|
||||||
|
import QtQml.Models 2.2 //This only exists here to help build on android.
|
||||||
|
import QtCharts 2.3 as Charts
|
||||||
|
import org.eyecreate.qiflora 1.1
|
||||||
|
|
||||||
|
Kirigami.ApplicationWindow {
|
||||||
|
id: root
|
||||||
|
|
||||||
|
title: "QiFlora"
|
||||||
|
|
||||||
|
|
||||||
|
pageStack.initialPage: mainPageComponent
|
||||||
|
contextDrawer: Kirigami.ContextDrawer {}
|
||||||
|
|
||||||
|
QiFlora {
|
||||||
|
id: qiflora
|
||||||
|
}
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: mainPageComponent
|
||||||
|
|
||||||
|
Kirigami.Page {
|
||||||
|
id: mainPage
|
||||||
|
mainAction: Kirigami.Action {
|
||||||
|
iconName: "view-refresh"
|
||||||
|
text: qsTr("Query Device")
|
||||||
|
onTriggered: {
|
||||||
|
deviceSelect.open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contextualActions: [
|
||||||
|
Kirigami.Action {
|
||||||
|
iconName: "help-about"
|
||||||
|
text: qsTr("About")
|
||||||
|
onTriggered: {
|
||||||
|
pageStack.replace(aboutPageComponent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
title: "Monitor"
|
||||||
|
leftPadding: 0
|
||||||
|
rightPadding: 0
|
||||||
|
|
||||||
|
Layouts.ColumnLayout {
|
||||||
|
anchors.fill: parent
|
||||||
|
Kirigami.InlineMessage {
|
||||||
|
Layouts.Layout.fillWidth: true
|
||||||
|
Layouts.Layout.leftMargin: 10
|
||||||
|
Layouts.Layout.rightMargin: 10
|
||||||
|
z: 9997
|
||||||
|
type: Kirigami.MessageType.Error
|
||||||
|
id: errorMessage
|
||||||
|
showCloseButton: true
|
||||||
|
Connections {
|
||||||
|
target: qiflora
|
||||||
|
onErrorHappened: {
|
||||||
|
errorMessage.text = description;
|
||||||
|
errorMessage.visible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Kirigami.CardsListView {
|
||||||
|
Layouts.Layout.fillWidth: true
|
||||||
|
Layouts.Layout.fillHeight: true
|
||||||
|
id: monitorView
|
||||||
|
model: ListModel {
|
||||||
|
id: monitorTypes
|
||||||
|
ListElement{
|
||||||
|
chartType: "temperature"
|
||||||
|
title: "Temperature"
|
||||||
|
icon: "filename-bpm-amarok"
|
||||||
|
lineColor: "red"
|
||||||
|
units: "°C"
|
||||||
|
yMin: -20
|
||||||
|
yMax: 40
|
||||||
|
modelCol: 1
|
||||||
|
}
|
||||||
|
ListElement{
|
||||||
|
chartType: "moisture"
|
||||||
|
title: "Moisture"
|
||||||
|
icon: "colors-chromablue"
|
||||||
|
lineColor: "cyan"
|
||||||
|
units: "%"
|
||||||
|
yMin: 0
|
||||||
|
yMax: 75
|
||||||
|
modelCol: 3
|
||||||
|
}
|
||||||
|
ListElement{
|
||||||
|
chartType: "conductivity"
|
||||||
|
title: "Conductivity"
|
||||||
|
icon: "quickopen"
|
||||||
|
lineColor: "gold"
|
||||||
|
units: "µS/cm"
|
||||||
|
yMin: 0
|
||||||
|
yMax: 6000
|
||||||
|
modelCol: 4
|
||||||
|
}
|
||||||
|
ListElement{
|
||||||
|
chartType: "brightness"
|
||||||
|
title: "Brightness"
|
||||||
|
icon: "contrast"
|
||||||
|
lineColor: "orange"
|
||||||
|
units: "lux"
|
||||||
|
yMin: 0
|
||||||
|
yMax: 30000
|
||||||
|
modelCol: 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delegate: Kirigami.Card {
|
||||||
|
id: card
|
||||||
|
banner {
|
||||||
|
title: qsTr(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: qsTr("Last Measured")
|
||||||
|
}
|
||||||
|
Kirigami.Heading {
|
||||||
|
Layouts.Layout.alignment: Qt.AlignCenter
|
||||||
|
level: 3
|
||||||
|
text: {
|
||||||
|
if(model.chartType == "temperature") Math.round(qiflora.temperature*10)/10 + "°C\n" + (Math.round((qiflora.temperature*1.8+32)*10)/10) + "°F"
|
||||||
|
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: Item {
|
||||||
|
implicitWidth: 300
|
||||||
|
implicitHeight: 200
|
||||||
|
Charts.ChartView {
|
||||||
|
id: chart
|
||||||
|
antialiasing: true
|
||||||
|
backgroundColor: Kirigami.Theme.buttonBackgroundColor
|
||||||
|
titleColor: Kirigami.Theme.textColor
|
||||||
|
legend.visible: false
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Charts.LineSeries {
|
||||||
|
id: series
|
||||||
|
axisX: Charts.DateTimeAxis {
|
||||||
|
id: dateAx
|
||||||
|
labelsColor: Kirigami.Theme.textColor
|
||||||
|
format: "MMM d yyyy ha"
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
//On load, change date span to last 24 to remove awkward 1969 empty dates.
|
||||||
|
var yesterday = new Date();
|
||||||
|
yesterday.setDate(yesterday.getDate() -1);
|
||||||
|
dateAx.min = yesterday;
|
||||||
|
dateAx.max = new Date();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
axisY: Charts.ValueAxis {
|
||||||
|
id: valueAx
|
||||||
|
labelFormat: "%d "+units
|
||||||
|
labelsColor: Kirigami.Theme.textColor
|
||||||
|
min: yMin
|
||||||
|
max: yMax
|
||||||
|
}
|
||||||
|
color: model.lineColor
|
||||||
|
name: model.title
|
||||||
|
|
||||||
|
Charts.VXYModelMapper {
|
||||||
|
model: qiflora.model
|
||||||
|
xColumn: 0
|
||||||
|
yColumn: modelCol
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Connections {
|
||||||
|
target: qiflora.model
|
||||||
|
onRowsInserted: {
|
||||||
|
//Readjust graphs to show date range from earliest item.
|
||||||
|
dateAx.max = new Date();
|
||||||
|
dateAx.min = qiflora.model.data(qiflora.model.index(0,0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Controls.ScrollBar.vertical: Controls.ScrollBar {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Kirigami.OverlaySheet {
|
||||||
|
id: deviceSelect
|
||||||
|
showCloseButton: false
|
||||||
|
contentItem: ListView {
|
||||||
|
header: Column {
|
||||||
|
Rectangle {
|
||||||
|
height: 10
|
||||||
|
color: "transparent"
|
||||||
|
}
|
||||||
|
Kirigami.Heading {
|
||||||
|
text: qsTr("Select Device to Query")
|
||||||
|
}
|
||||||
|
Rectangle {
|
||||||
|
height: 10
|
||||||
|
color: "transparent"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id:aboutPageComponent
|
||||||
|
Kirigami.AboutPage {
|
||||||
|
id: aboutPage
|
||||||
|
actions.main: Kirigami.Action {
|
||||||
|
iconName: "window-close"
|
||||||
|
text: qsTr("Close")
|
||||||
|
onTriggered: {
|
||||||
|
pageStack.clear();
|
||||||
|
pageStack.push(mainPageComponent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
aboutData: appAboutData
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
38
src/main.cpp
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
#include <QApplication>
|
||||||
|
#include <QQmlApplicationEngine>
|
||||||
|
#include <QtQml>
|
||||||
|
#include <QUrl>
|
||||||
|
#include "miflora/miflora.h"
|
||||||
|
#include "miflora/bluetoothdevices.h"
|
||||||
|
#include <KAboutData>
|
||||||
|
#include <QIcon>
|
||||||
|
|
||||||
|
Q_DECL_EXPORT int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
|
KAboutData aboutData("org.eyecreate.qiflora", "QiFlora", "1.1.2", "Mobile friendly application to monitor Mi Flora devices.",KAboutLicense::GPL_V3);//TODO:i18n
|
||||||
|
aboutData.setProductName("qiflora");
|
||||||
|
aboutData.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org");
|
||||||
|
aboutData.setDesktopFileName("org.eyecreate.qiflora");
|
||||||
|
|
||||||
|
QCoreApplication::setOrganizationName("eyecreate");
|
||||||
|
QCoreApplication::setOrganizationDomain("eyecreate.org");
|
||||||
|
QCoreApplication::setApplicationName(aboutData.productName());
|
||||||
|
QCoreApplication::setApplicationVersion(aboutData.version());
|
||||||
|
app.setWindowIcon(QIcon::fromTheme("org.eyecreate.qiflora"));
|
||||||
|
|
||||||
|
|
||||||
|
QQmlApplicationEngine engine;
|
||||||
|
qmlRegisterType<BluetoothDevices>();
|
||||||
|
qmlRegisterType<MiFlora>("org.eyecreate.qiflora",1,1,"QiFlora");
|
||||||
|
engine.rootContext()->setContextProperty(QStringLiteral("appAboutData"), QVariant::fromValue(aboutData));
|
||||||
|
engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
|
||||||
|
|
||||||
|
if (engine.rootObjects().isEmpty()) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return app.exec();
|
||||||
|
}
|
||||||
71
src/miflora/bluetoothdevices.cpp
Normal file
@@ -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);
|
||||||
|
}
|
||||||
88
src/miflora/bluetoothdevices.h
Normal file
@@ -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
|
||||||
68
src/miflora/florahistory.cpp
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* 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 "florahistory.h"
|
||||||
|
#include <QDebug>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
|
QVariant FloraHistory::data(const QModelIndex& index, int role) const
|
||||||
|
{
|
||||||
|
if(role == Qt::DisplayRole && tableData.size()-1 >= index.row()) {
|
||||||
|
if(index.column() == 0) {
|
||||||
|
return QVariant(tableData[index.row()].time);
|
||||||
|
} else if(index.column() == 1) {
|
||||||
|
return QVariant(std::round(tableData[index.row()].temperature*10)/10); //temp in C
|
||||||
|
} else if(index.column() == 2) {
|
||||||
|
return QVariant(tableData[index.row()].brightness);
|
||||||
|
} else if(index.column() == 3) {
|
||||||
|
return QVariant(tableData[index.row()].moisture);
|
||||||
|
} else if(index.column() == 4) {
|
||||||
|
return QVariant(tableData[index.row()].conductivity);
|
||||||
|
} else if(index.column() == 5) {
|
||||||
|
return QVariant((std::round((tableData[index.row()].temperature*1.8+32)*10)/10)); //temp in F
|
||||||
|
} else {
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int FloraHistory::columnCount(const QModelIndex& parent) const
|
||||||
|
{
|
||||||
|
return 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
int FloraHistory::rowCount(const QModelIndex& parent) const
|
||||||
|
{
|
||||||
|
return tableData.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FloraHistory::addData(QDateTime time, float temperature, quint32 brightness, quint8 moisture, quint16 conductivity)
|
||||||
|
{
|
||||||
|
beginInsertRows(QModelIndex(),tableData.size(),tableData.size());
|
||||||
|
tableData.append(flora_data{time, temperature, brightness, moisture, conductivity});
|
||||||
|
endInsertRows();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FloraHistory::clear()
|
||||||
|
{
|
||||||
|
tableData.clear();
|
||||||
|
emit layoutChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
57
src/miflora/florahistory.h
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* 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 FLORAHISTORY_H
|
||||||
|
#define FLORAHISTORY_H
|
||||||
|
|
||||||
|
#include <qabstractitemmodel.h>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QList>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Model class to hold history data from MiFlora device.
|
||||||
|
*/
|
||||||
|
class FloraHistory : public QAbstractTableModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
|
||||||
|
|
||||||
|
int columnCount(const QModelIndex& parent) const override;
|
||||||
|
|
||||||
|
int rowCount(const QModelIndex& parent) const override;
|
||||||
|
|
||||||
|
void clear();
|
||||||
|
|
||||||
|
void addData(QDateTime time, float temperature, quint32 brightness, quint8 moisture, quint16 conductivity);
|
||||||
|
|
||||||
|
private:
|
||||||
|
struct flora_data {
|
||||||
|
QDateTime time;
|
||||||
|
float temperature;
|
||||||
|
quint32 brightness;
|
||||||
|
quint8 moisture;
|
||||||
|
quint16 conductivity;
|
||||||
|
|
||||||
|
};
|
||||||
|
QList<flora_data> tableData;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // FLORAHISTORY_H
|
||||||
289
src/miflora/miflora.cpp
Normal file
@@ -0,0 +1,289 @@
|
|||||||
|
/*
|
||||||
|
* 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QAbstractTableModel * MiFlora::getModel()
|
||||||
|
{
|
||||||
|
return floraModel;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
emit errorHappened(currentController->errorString());
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::logServiceError(QLowEnergyService::ServiceError err)
|
||||||
|
{
|
||||||
|
qDebug() << "Service Error:" << err;
|
||||||
|
emit errorHappened("Possible Read/Write error!");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MiFlora::sensorServiceStateChanges ( QLowEnergyService::ServiceState state )
|
||||||
|
{
|
||||||
|
if(state == QLowEnergyService::ServiceState::ServiceDiscovered) {
|
||||||
|
for(QLowEnergyCharacteristic chrt : sensorService->characteristics()) {
|
||||||
|
if(chrt.uuid().toUInt16() == magicChar) {
|
||||||
|
sensorService->writeCharacteristic(chrt, magicBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::historyServiceStateChanges ( QLowEnergyService::ServiceState state )
|
||||||
|
{
|
||||||
|
if(state == QLowEnergyService::ServiceState::ServiceDiscovered) {
|
||||||
|
for(QLowEnergyCharacteristic chrt : historyService->characteristics()) {
|
||||||
|
if(chrt.uuid().toUInt16() == historyTimeChar) {
|
||||||
|
qDebug() << "Asking for device's view on time.";
|
||||||
|
historyService->readCharacteristic(chrt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QLowEnergyCharacteristic MiFlora::getCharFromValue(QLowEnergyService *service, quint16 characteristic)
|
||||||
|
{
|
||||||
|
for(QLowEnergyCharacteristic chrt : service->characteristics()) {
|
||||||
|
if(chrt.uuid().toUInt16() == characteristic) {
|
||||||
|
return chrt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return QLowEnergyCharacteristic();
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::historyServiceCharRead(QLowEnergyCharacteristic readChar, QByteArray value)
|
||||||
|
{
|
||||||
|
if(readChar.uuid().toUInt16() == historyReaderChar) {
|
||||||
|
QDataStream parser(value);
|
||||||
|
parser.setByteOrder(QDataStream::LittleEndian);
|
||||||
|
quint16 size;
|
||||||
|
parser >> size;
|
||||||
|
//change connect signals/slots to perform history read task.
|
||||||
|
disconnect(historyService, &QLowEnergyService::characteristicRead, this, &MiFlora::historyServiceCharRead);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicRead, this, &MiFlora::historyServiceCharReadData);
|
||||||
|
disconnect(historyService, &QLowEnergyService::characteristicWritten, this, &MiFlora::historyServiceCharWritten);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicWritten, this, &MiFlora::historyServiceCharWrittenData);
|
||||||
|
//Take size given and start by giving the last 48 numbers(if that many) to represent the last day of data. TODO: look to have amount of time be configurable.
|
||||||
|
lastHistoryEntry = 0;
|
||||||
|
if(size > 48) {
|
||||||
|
currentHistoryEntry = 48;
|
||||||
|
} else {
|
||||||
|
currentHistoryEntry = size;
|
||||||
|
}
|
||||||
|
floraModel->clear();
|
||||||
|
//Ask for first history value
|
||||||
|
QByteArray historyIndex(QByteArray::fromHex("a1"));
|
||||||
|
QDataStream historyParser(&historyIndex, QIODevice::ReadWrite);
|
||||||
|
historyParser.setByteOrder(QDataStream::LittleEndian);
|
||||||
|
historyParser.skipRawData(1);
|
||||||
|
historyParser << currentHistoryEntry;
|
||||||
|
historyService->writeCharacteristic(getCharFromValue(historyService, historyControllerChar), historyIndex);
|
||||||
|
} else if(readChar.uuid().toUInt16() == historyTimeChar) {
|
||||||
|
//Determine when device started counting by comparing system and device time.
|
||||||
|
quint32 time;
|
||||||
|
QDataStream parser(value);
|
||||||
|
parser.setByteOrder(QDataStream::LittleEndian);
|
||||||
|
parser >> time;
|
||||||
|
qint64 systemTime = QDateTime::currentSecsSinceEpoch();
|
||||||
|
deviceStartTime = systemTime - time;
|
||||||
|
//Now we start the history reading process.
|
||||||
|
qDebug() << "Writing history init.";
|
||||||
|
historyService->writeCharacteristic(getCharFromValue(historyService, historyControllerChar), historyReadInit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::historyServiceCharReadData(QLowEnergyCharacteristic readChar, QByteArray value)
|
||||||
|
{
|
||||||
|
//We are in a read loop. Read data and determine if we should stop asking for history.
|
||||||
|
if(value == QByteArray::fromHex("ffffffffffffffffffffffffffffffff") || value == QByteArray::fromHex("00000000000000000000000000000000") || value == QByteArray::fromHex("aabbccddeeff99887766554433221110")) {
|
||||||
|
qDebug() << "invalid history response:" << value;
|
||||||
|
} else {
|
||||||
|
quint16 origTemp;
|
||||||
|
quint32 time;
|
||||||
|
quint32 bright;
|
||||||
|
quint8 moisture;
|
||||||
|
quint16 conduct;
|
||||||
|
float temp;
|
||||||
|
QDataStream parser(value);
|
||||||
|
parser.setByteOrder(QDataStream::LittleEndian);
|
||||||
|
parser >> time;
|
||||||
|
parser >> origTemp;
|
||||||
|
temp = origTemp/ 10.0; //original value in 0.1 C
|
||||||
|
parser.skipRawData(1);
|
||||||
|
parser >> bright;
|
||||||
|
parser >> moisture;
|
||||||
|
parser >> conduct;
|
||||||
|
QDateTime convTime;
|
||||||
|
convTime.setSecsSinceEpoch(deviceStartTime+time);
|
||||||
|
//Write out items to table
|
||||||
|
floraModel->addData(convTime, temp, bright, moisture, conduct);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(lastHistoryEntry == currentHistoryEntry) {
|
||||||
|
disconnect(historyService, &QLowEnergyService::characteristicRead, this, &MiFlora::historyServiceCharReadData);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicRead, this, &MiFlora::historyServiceCharRead);
|
||||||
|
disconnect(historyService, &QLowEnergyService::characteristicWritten, this, &MiFlora::historyServiceCharWrittenData);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicWritten, this, &MiFlora::historyServiceCharWritten);
|
||||||
|
} else {
|
||||||
|
//Get next history entry
|
||||||
|
currentHistoryEntry -= 1;
|
||||||
|
QByteArray historyIndex(QByteArray::fromHex("a1"));
|
||||||
|
QDataStream parser(&historyIndex, QIODevice::ReadWrite);
|
||||||
|
parser.setByteOrder(QDataStream::LittleEndian);
|
||||||
|
parser.skipRawData(1);
|
||||||
|
parser << currentHistoryEntry;
|
||||||
|
historyService->writeCharacteristic(getCharFromValue(historyService, historyControllerChar), historyIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::historyServiceCharWrittenData(QLowEnergyCharacteristic changedChar, QByteArray value)
|
||||||
|
{
|
||||||
|
//We are in a read loop. Ask to read from history what should have just been requested by a write.
|
||||||
|
historyService->readCharacteristic(getCharFromValue(historyService, historyReaderChar));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MiFlora::historyServiceCharWritten(QLowEnergyCharacteristic changedChar, QByteArray value)
|
||||||
|
{
|
||||||
|
if(changedChar.uuid().toUInt16() == historyControllerChar) {
|
||||||
|
for(QLowEnergyCharacteristic chrt : historyService->characteristics()) {
|
||||||
|
if(chrt.uuid().toUInt16() == historyReaderChar) {
|
||||||
|
historyService->readCharacteristic(chrt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MiFlora::serviceDiscovered ( const QBluetoothUuid& gatt )
|
||||||
|
{
|
||||||
|
if(gatt == QBluetoothUuid(dataServiceChar)) {
|
||||||
|
sensorService = currentController->createServiceObject(gatt);
|
||||||
|
connect(sensorService, &QLowEnergyService::stateChanged, this, &MiFlora::sensorServiceStateChanges);
|
||||||
|
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();
|
||||||
|
} else if(gatt == QBluetoothUuid(historyServiceChar)) {
|
||||||
|
historyService = currentController->createServiceObject(gatt);
|
||||||
|
connect(historyService, &QLowEnergyService::stateChanged, this, &MiFlora::historyServiceStateChanges);
|
||||||
|
connect(historyService, static_cast<void (QLowEnergyService::*)(QLowEnergyService::ServiceError)>(&QLowEnergyService::error), this, &MiFlora::logServiceError);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicWritten, this, &MiFlora::historyServiceCharWritten);
|
||||||
|
connect(historyService, &QLowEnergyService::characteristicRead, this, &MiFlora::historyServiceCharRead);
|
||||||
|
historyService->discoverDetails();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
114
src/miflora/miflora.h
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
/*
|
||||||
|
* 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>
|
||||||
|
#include <QAbstractItemModel>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include "florahistory.h"
|
||||||
|
#include <QXYSeries>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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)
|
||||||
|
Q_PROPERTY(QAbstractTableModel* model READ getModel NOTIFY modelUpdated)
|
||||||
|
|
||||||
|
public:
|
||||||
|
Q_INVOKABLE void startSearch();
|
||||||
|
Q_INVOKABLE void stopSearch();
|
||||||
|
|
||||||
|
Q_INVOKABLE void updateDataFromDevice(QString mac);
|
||||||
|
|
||||||
|
QQmlListProperty<BluetoothDevices> getDeviceList();
|
||||||
|
QAbstractTableModel* getModel();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void newDeviceFound();
|
||||||
|
void modelUpdated();
|
||||||
|
void errorHappened(QString description);
|
||||||
|
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 sensorServiceStateChanges(QLowEnergyService::ServiceState state);
|
||||||
|
void historyServiceStateChanges(QLowEnergyService::ServiceState state);
|
||||||
|
void serviceCharWritten(QLowEnergyCharacteristic changedChar, QByteArray value);
|
||||||
|
void serviceCharRead(QLowEnergyCharacteristic readChar, QByteArray value);
|
||||||
|
void historyServiceCharWritten(QLowEnergyCharacteristic changedChar, QByteArray value);
|
||||||
|
void historyServiceCharWrittenData(QLowEnergyCharacteristic changedChar, QByteArray value);
|
||||||
|
void historyServiceCharRead(QLowEnergyCharacteristic readChar, QByteArray value);
|
||||||
|
void historyServiceCharReadData(QLowEnergyCharacteristic readChar, QByteArray value);
|
||||||
|
QLowEnergyCharacteristic getCharFromValue(QLowEnergyService *service, quint16 characteristic);
|
||||||
|
|
||||||
|
QBluetoothDeviceDiscoveryAgent *agent;
|
||||||
|
QList<BluetoothDevices*> devices;
|
||||||
|
QLowEnergyController *currentController;
|
||||||
|
QLowEnergyService *sensorService;
|
||||||
|
QLowEnergyService *historyService;
|
||||||
|
|
||||||
|
const quint16 dataServiceChar = 4612; //0x1204
|
||||||
|
const quint16 historyServiceChar = 4614; //0x1206
|
||||||
|
const quint16 batteryFirmwareChar = 6658;//0x1a02
|
||||||
|
const quint16 sensorsChar = 6657; //0x1a01
|
||||||
|
const quint16 magicChar = 6656; //0x1a00
|
||||||
|
const quint16 historyControllerChar = 6672; //0x1a10
|
||||||
|
const quint16 historyReaderChar = 6673; //0x1a11
|
||||||
|
const quint16 historyTimeChar = 6674; //0x1a12
|
||||||
|
const QByteArray magicBytes = QByteArray::fromHex("a01f");
|
||||||
|
const QByteArray historyReadInit = QByteArray::fromHex("a00000");
|
||||||
|
|
||||||
|
|
||||||
|
float temp = 0.0;
|
||||||
|
quint32 bright = 0;
|
||||||
|
quint8 moisture = 0;
|
||||||
|
quint16 conduct = 0;
|
||||||
|
quint8 battery = 0;
|
||||||
|
QString version;
|
||||||
|
qint64 deviceStartTime;
|
||||||
|
qint16 currentHistoryEntry;
|
||||||
|
qint16 lastHistoryEntry;
|
||||||
|
|
||||||
|
FloraHistory *floraModel = new FloraHistory();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // MIFLORA_H
|
||||||
5
src/resources.qrc
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<RCC>
|
||||||
|
<qresource prefix="/">
|
||||||
|
<file alias="main.qml">contents/ui/main.qml</file>
|
||||||
|
</qresource>
|
||||||
|
</RCC>
|
||||||