Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 93a71a56e1 | |||
| 0df4b858d0 | |||
| 9bad2c73ff | |||
| 60e5c8b0df | |||
| 90da697f84 | |||
| 9c5c50ef95 | |||
| e8d666d922 | |||
| 1303626dd8 | |||
| ed00901a2f | |||
| f6f574875d | |||
| b35385b306 | |||
| bcdf831d0c | |||
| 0483a4ad3f | |||
| 2126bcc484 | |||
| e0689cc7e8 | |||
| 62bf803c71 | |||
| 0f63b81cb7 | |||
| 6e06af6fa2 | |||
| d9810079a9 | |||
| 0c3e79e148 |
197
.gitignore
vendored
197
.gitignore
vendored
@@ -1,197 +0,0 @@
|
||||
# Created by .ignore support plugin (hsz.mobi)
|
||||
### Python template
|
||||
# Byte-compiled / optimized / DLL files
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
|
||||
# C extensions
|
||||
*.so
|
||||
|
||||
# Distribution / packaging
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
pip-wheel-metadata/
|
||||
share/python-wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
MANIFEST
|
||||
|
||||
# PyInstaller
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
|
||||
# Installer logs
|
||||
pip-log.txt
|
||||
pip-delete-this-directory.txt
|
||||
|
||||
# Unit test / coverage reports
|
||||
htmlcov/
|
||||
.tox/
|
||||
.nox/
|
||||
.coverage
|
||||
.coverage.*
|
||||
.cache
|
||||
nosetests.xml
|
||||
coverage.xml
|
||||
*.cover
|
||||
.hypothesis/
|
||||
.pytest_cache/
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
*.pot
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
|
||||
# Flask stuff:
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Scrapy stuff:
|
||||
.scrapy
|
||||
|
||||
# Sphinx documentation
|
||||
docs/_build/
|
||||
|
||||
# PyBuilder
|
||||
target/
|
||||
|
||||
# Jupyter Notebook
|
||||
.ipynb_checkpoints
|
||||
|
||||
# IPython
|
||||
profile_default/
|
||||
ipython_config.py
|
||||
|
||||
# pyenv
|
||||
.python-version
|
||||
|
||||
# pipenv
|
||||
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
|
||||
# However, in case of collaboration, if having platform-specific dependencies or dependencies
|
||||
# having no cross-platform support, pipenv may install dependencies that don't work, or not
|
||||
# install all needed dependencies.
|
||||
#Pipfile.lock
|
||||
|
||||
# celery beat schedule file
|
||||
celerybeat-schedule
|
||||
|
||||
# SageMath parsed files
|
||||
*.sage.py
|
||||
|
||||
# Environments
|
||||
.env
|
||||
.venv
|
||||
env/
|
||||
venv/
|
||||
ENV/
|
||||
env.bak/
|
||||
venv.bak/
|
||||
|
||||
# Spyder project settings
|
||||
.spyderproject
|
||||
.spyproject
|
||||
|
||||
# Rope project settings
|
||||
.ropeproject
|
||||
|
||||
# mkdocs documentation
|
||||
/site
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
.dmypy.json
|
||||
dmypy.json
|
||||
|
||||
# Pyre type checker
|
||||
.pyre/
|
||||
|
||||
### JetBrains template
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
.idea/**/tasks.xml
|
||||
.idea/**/usage.statistics.xml
|
||||
.idea/**/dictionaries
|
||||
.idea/**/shelf
|
||||
|
||||
# Generated files
|
||||
.idea/**/contentModel.xml
|
||||
|
||||
# Sensitive or high-churn files
|
||||
.idea/**/dataSources/
|
||||
.idea/**/dataSources.ids
|
||||
.idea/**/dataSources.local.xml
|
||||
.idea/**/sqlDataSources.xml
|
||||
.idea/**/dynamic.xml
|
||||
.idea/**/uiDesigner.xml
|
||||
.idea/**/dbnavigator.xml
|
||||
|
||||
# Gradle
|
||||
.idea/**/gradle.xml
|
||||
.idea/**/libraries
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
53
.idea/$PRODUCT_WORKSPACE_FILE$
generated
Normal file
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
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
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
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
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
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
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)
|
||||
20
Pipfile
20
Pipfile
@@ -1,20 +0,0 @@
|
||||
[[source]]
|
||||
name = "pypi"
|
||||
url = "https://pypi.org/simple"
|
||||
verify_ssl = true
|
||||
|
||||
[[source]]
|
||||
name = "kivy_garden"
|
||||
url = "https://kivy-garden.github.io/simple"
|
||||
verify_ssl = true
|
||||
|
||||
[dev-packages]
|
||||
|
||||
[packages]
|
||||
Pillow = "*"
|
||||
kivy = "*"
|
||||
kivymd = "==0.102.0"
|
||||
"kivy_garden.graph" = {version="==0.4.dev0", index="kivy_garden"}
|
||||
|
||||
[requires]
|
||||
python_version = "3"
|
||||
155
Pipfile.lock
generated
155
Pipfile.lock
generated
@@ -1,155 +0,0 @@
|
||||
{
|
||||
"_meta": {
|
||||
"hash": {
|
||||
"sha256": "51bf5ddb9e803b22b92e57b842c37b473e82802072cdcb7628b4c6a07370c0c3"
|
||||
},
|
||||
"pipfile-spec": 6,
|
||||
"requires": {
|
||||
"python_version": "3"
|
||||
},
|
||||
"sources": [
|
||||
{
|
||||
"name": "pypi",
|
||||
"url": "https://pypi.org/simple",
|
||||
"verify_ssl": true
|
||||
},
|
||||
{
|
||||
"name": "kivy_garden",
|
||||
"url": "https://kivy-garden.github.io/simple",
|
||||
"verify_ssl": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"default": {
|
||||
"certifi": {
|
||||
"hashes": [
|
||||
"sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50",
|
||||
"sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
|
||||
],
|
||||
"version": "==2019.9.11"
|
||||
},
|
||||
"chardet": {
|
||||
"hashes": [
|
||||
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
|
||||
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
|
||||
],
|
||||
"version": "==3.0.4"
|
||||
},
|
||||
"docutils": {
|
||||
"hashes": [
|
||||
"sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0",
|
||||
"sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827",
|
||||
"sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
|
||||
],
|
||||
"version": "==0.15.2"
|
||||
},
|
||||
"idna": {
|
||||
"hashes": [
|
||||
"sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
|
||||
"sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
|
||||
],
|
||||
"version": "==2.8"
|
||||
},
|
||||
"kivy": {
|
||||
"hashes": [
|
||||
"sha256:090d3ded9835a17477cd93fbdaf0a7c42ff2218981cf198ded5ad8795bc74391",
|
||||
"sha256:11e85eaf6efbfa2362a3334ffdad179a1b0ca8d255cca79eaa6a2765560d4982",
|
||||
"sha256:1a1ff32f8a95f1e175198cbab81fcd2596783b180d4eafe63e87d171aa7fdb5e",
|
||||
"sha256:1d28b198a64c30db8d94a0488e85f3037af60d514ab0d7ad5ab45add3ab77090",
|
||||
"sha256:4a5480cbf837d3780c77a4f61b32b56d22ae9f03845e7a89dd3eaef1ae5fd037",
|
||||
"sha256:4d0e596f74271e901b551f77661dde238df4765484fce9f5d1c72e8022984e84",
|
||||
"sha256:5c3d0f2749522d62e9cce09cd54b2d823bf1b6b644ff1f627be49de6f3e3cba0",
|
||||
"sha256:815a5c0b3b72fcd81ca7b2aa0744087163ed03e4cf9ab4e7c9733cea99fc1571",
|
||||
"sha256:8819a27a09871af451760cb69486ced52e830c8a0a37480f22ef5e692f12c05b",
|
||||
"sha256:a687602d90c4629dd036f577ca39acb76ba581370f9d915f3cab99be818ba8ad",
|
||||
"sha256:b7ef6aad43a86d8df3fb865db864e354f2155a748019f8517f69f65c1a29cb64",
|
||||
"sha256:b85ccf165050cbf2ee8447671eebbc222b369b40f0e0038dd9547d49a5e37373",
|
||||
"sha256:c36652caa7f6c327dee834cfc699d5962d346b7a53e54bd81abc17c314226d89",
|
||||
"sha256:ece170514db3f49844a41e4c910ad9ce9bc46da6f47a49158e11266bdcc6e479",
|
||||
"sha256:f3bea6e4a21991827885d04127fc6d09a0e974ecfa12da7bf5faae93562ea102",
|
||||
"sha256:f835462dd9aa491272552ef079b948a088598e2e95d68bb1d885d2c3f3d4e2c3"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.11.1"
|
||||
},
|
||||
"kivy-garden": {
|
||||
"hashes": [
|
||||
"sha256:c256f42788421273a08fbb0a228f0fb0e80dd86b629fb8c0920507f645be6c72"
|
||||
],
|
||||
"version": "==0.1.4"
|
||||
},
|
||||
"kivy-garden.graph": {
|
||||
"hashes": [
|
||||
"sha256:9d5938b9de98c4af610b72f9d9d2d637c4f0098fbf53278b267870f425e1bd37"
|
||||
],
|
||||
"index": "kivy_garden",
|
||||
"version": "==0.4.dev0"
|
||||
},
|
||||
"kivymd": {
|
||||
"hashes": [
|
||||
"sha256:0b9fa3f5b67c08f607981e49b41f367f35e2c2bca0beffdd0e809246a5d110b7",
|
||||
"sha256:a32c430769736eba4d8fa75526828854bd09d71ddf3f539fb16bd854b1c52cfb"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.102.0"
|
||||
},
|
||||
"pillow": {
|
||||
"hashes": [
|
||||
"sha256:047d9473cf68af50ac85f8ee5d5f21a60f849bc17d348da7fc85711287a75031",
|
||||
"sha256:0f66dc6c8a3cc319561a633b6aa82c44107f12594643efa37210d8c924fc1c71",
|
||||
"sha256:12c9169c4e8fe0a7329e8658c7e488001f6b4c8e88740e76292c2b857af2e94c",
|
||||
"sha256:248cffc168896982f125f5c13e9317c059f74fffdb4152893339f3be62a01340",
|
||||
"sha256:27faf0552bf8c260a5cee21a76e031acaea68babb64daf7e8f2e2540745082aa",
|
||||
"sha256:285edafad9bc60d96978ed24d77cdc0b91dace88e5da8c548ba5937c425bca8b",
|
||||
"sha256:384b12c9aa8ef95558abdcb50aada56d74bc7cc131dd62d28c2d0e4d3aadd573",
|
||||
"sha256:38950b3a707f6cef09cd3cbb142474357ad1a985ceb44d921bdf7b4647b3e13e",
|
||||
"sha256:4aad1b88933fd6dc2846552b89ad0c74ddbba2f0884e2c162aa368374bf5abab",
|
||||
"sha256:4ac6148008c169603070c092e81f88738f1a0c511e07bd2bb0f9ef542d375da9",
|
||||
"sha256:4deb1d2a45861ae6f0b12ea0a786a03d19d29edcc7e05775b85ec2877cb54c5e",
|
||||
"sha256:59aa2c124df72cc75ed72c8d6005c442d4685691a30c55321e00ed915ad1a291",
|
||||
"sha256:5a47d2123a9ec86660fe0e8d0ebf0aa6bc6a17edc63f338b73ea20ba11713f12",
|
||||
"sha256:5cc901c2ab9409b4b7ac7b5bcc3e86ac14548627062463da0af3b6b7c555a871",
|
||||
"sha256:6c1db03e8dff7b9f955a0fb9907eb9ca5da75b5ce056c0c93d33100a35050281",
|
||||
"sha256:7ce80c0a65a6ea90ef9c1f63c8593fcd2929448613fc8da0adf3e6bfad669d08",
|
||||
"sha256:809c19241c14433c5d6135e1b6c72da4e3b56d5c865ad5736ab99af8896b8f41",
|
||||
"sha256:83792cb4e0b5af480588601467c0764242b9a483caea71ef12d22a0d0d6bdce2",
|
||||
"sha256:846fa202bd7ee0f6215c897a1d33238ef071b50766339186687bd9b7a6d26ac5",
|
||||
"sha256:9f5529fc02009f96ba95bea48870173426879dc19eec49ca8e08cd63ecd82ddb",
|
||||
"sha256:a423c2ea001c6265ed28700df056f75e26215fd28c001e93ef4380b0f05f9547",
|
||||
"sha256:ac4428094b42907aba5879c7c000d01c8278d451a3b7cccd2103e21f6397ea75",
|
||||
"sha256:b1ae48d87f10d1384e5beecd169c77502fcc04a2c00a4c02b85f0a94b419e5f9",
|
||||
"sha256:bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1",
|
||||
"sha256:c6414f6aad598364aaf81068cabb077894eb88fed99c6a65e6e8217bab62ae7a",
|
||||
"sha256:c710fcb7ee32f67baf25aa9ffede4795fd5d93b163ce95fdc724383e38c9df96",
|
||||
"sha256:c7be4b8a09852291c3c48d3c25d1b876d2494a0a674980089ac9d5e0d78bd132",
|
||||
"sha256:c9e5ffb910b14f090ac9c38599063e354887a5f6d7e6d26795e916b4514f2c1a",
|
||||
"sha256:e0697b826da6c2472bb6488db4c0a7fa8af0d52fa08833ceb3681358914b14e5",
|
||||
"sha256:e9a3edd5f714229d41057d56ac0f39ad9bdba6767e8c888c951869f0bdd129b0"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==6.2.1"
|
||||
},
|
||||
"pygments": {
|
||||
"hashes": [
|
||||
"sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127",
|
||||
"sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"
|
||||
],
|
||||
"version": "==2.4.2"
|
||||
},
|
||||
"requests": {
|
||||
"hashes": [
|
||||
"sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
|
||||
"sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
|
||||
],
|
||||
"version": "==2.22.0"
|
||||
},
|
||||
"urllib3": {
|
||||
"hashes": [
|
||||
"sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398",
|
||||
"sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"
|
||||
],
|
||||
"version": "==1.25.6"
|
||||
}
|
||||
},
|
||||
"develop": {}
|
||||
}
|
||||
9
README.md
Normal file
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
|
||||
11
main.py
11
main.py
@@ -1,11 +0,0 @@
|
||||
import kivy
|
||||
kivy.require('1.10.1')
|
||||
|
||||
from kivy.config import Config
|
||||
Config.set('kivy', 'log_enable', 0)
|
||||
Config.set('modules','inspector','')
|
||||
|
||||
if __name__ in ('__main__', '__android__'):
|
||||
from qiflora import QiFlora
|
||||
app = QiFlora.QiFlora()
|
||||
app.run()
|
||||
BIN
packaging/main_window.png
Normal file
BIN
packaging/main_window.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 145 KiB |
29
packaging/org.eyecreate.qiflora.appdata.xml
Normal file
29
packaging/org.eyecreate.qiflora.appdata.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?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>
|
||||
<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/packaging/main_window.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<releases>
|
||||
<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
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
|
||||
Exec=qiflora
|
||||
MimeType=application/x-qiflora;
|
||||
Icon=org.eyecreate.qiflora
|
||||
Type=Application
|
||||
Terminal=false
|
||||
Categories=Utility;Qt;KDE;
|
||||
96
packaging/org.eyecreate.qiflora.json
Normal file
96
packaging/org.eyecreate.qiflora.json
Normal file
@@ -0,0 +1,96 @@
|
||||
{
|
||||
"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,
|
||||
"sources": [
|
||||
{
|
||||
"type": "git",
|
||||
"url": "https://git.eyecreate.org/eyecreate/qiflora.git",
|
||||
"tag": "v1.1",
|
||||
"commit": "9bad2c73ff21515f63f5a09d7a8434bdfd98e6ee"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
46
packaging/org.eyecreate.qiflora.svg
Normal file
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 |
@@ -1,19 +0,0 @@
|
||||
from math import sin
|
||||
|
||||
from kivy.app import App
|
||||
from kivy.clock import Clock
|
||||
from kivymd.theming import ThemeManager
|
||||
from kivy_garden.graph import Graph, MeshLinePlot
|
||||
|
||||
|
||||
class QiFlora(App):
|
||||
theme_cls = ThemeManager()
|
||||
theme_cls.primary_palette = 'Blue'
|
||||
theme_cls.accent_palette = 'DeepOrange'
|
||||
theme_cls.theme_style = 'Light'
|
||||
|
||||
def refresh_data(self, *args):
|
||||
plot = MeshLinePlot(color=[1,0,0,1])
|
||||
plot.points = [(x, sin(x / 10.)) for x in range(0, 101)]
|
||||
self.root.ids.temp_graph.add_plot(plot)
|
||||
self.root.ids.moist_graph.add_plot(plot)
|
||||
@@ -1,79 +0,0 @@
|
||||
BoxLayout:
|
||||
orientation: 'vertical'
|
||||
MDToolbar:
|
||||
id: toolbar
|
||||
title: 'QiFlora'
|
||||
md_bg_color: app.theme_cls.primary_color
|
||||
background_palette: 'Primary'
|
||||
background_hue: '500'
|
||||
ScrollView:
|
||||
do_scroll_x: False
|
||||
do_scroll_y: True
|
||||
GridLayout:
|
||||
id: graphs
|
||||
padding: [10,10,10,15]
|
||||
spacing: [5,10]
|
||||
rows: 5
|
||||
cols: 1
|
||||
size_hint_y: None
|
||||
height: self.minimum_height
|
||||
AnchorLayout:
|
||||
anchor_x: "center"
|
||||
size_hint_y: None
|
||||
MDRaisedButton:
|
||||
text: "refresh"
|
||||
on_press: app.refresh_data()
|
||||
MDCard:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
MDLabel:
|
||||
halign: "center"
|
||||
text: "Temperature"
|
||||
Graph:
|
||||
id: temp_graph
|
||||
padding: 5
|
||||
xmin: -0
|
||||
ymin: -1
|
||||
xmax: 100
|
||||
ymax: 1
|
||||
x_ticks_major: 25
|
||||
y_ticks_major: 1
|
||||
x_grid_label: True
|
||||
y_grid_label: True
|
||||
x_grid: True
|
||||
y_grid: True
|
||||
xlabel: "temp (C)"
|
||||
ylabel: "time"
|
||||
MDCard:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
MDLabel:
|
||||
halign: "center"
|
||||
text: "Moisture"
|
||||
Graph:
|
||||
id: moist_graph
|
||||
padding: 5
|
||||
xmin: -0
|
||||
ymin: -1
|
||||
xmax: 100
|
||||
ymax: 1
|
||||
x_ticks_major: 25
|
||||
y_ticks_major: 1
|
||||
x_grid_label: True
|
||||
y_grid_label: True
|
||||
x_grid: True
|
||||
y_grid: True
|
||||
xlabel: "temp (C)"
|
||||
ylabel: "time"
|
||||
MDCard:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
MDLabel:
|
||||
halign: "center"
|
||||
text: "Conductivity"
|
||||
MDCard:
|
||||
orientation: "vertical"
|
||||
size_hint_y: None
|
||||
MDLabel:
|
||||
halign: "center"
|
||||
text: "Brightness"
|
||||
12
src/CMakeLists.txt
Normal file
12
src/CMakeLists.txt
Normal file
@@ -0,0 +1,12 @@
|
||||
|
||||
set(qiflora_SRCS
|
||||
miflora/miflora.cpp
|
||||
miflora/bluetoothdevices.cpp
|
||||
miflora/florahistory.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 Qt5::Charts KF5::CoreAddons)
|
||||
install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
257
src/contents/ui/main.qml
Normal file
257
src/contents/ui/main.qml
Normal file
@@ -0,0 +1,257 @@
|
||||
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 QtCharts 2.3 as Charts
|
||||
import org.eyecreate.qiflora 1.0
|
||||
|
||||
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: i18n("Query Device")
|
||||
onTriggered: {
|
||||
deviceSelect.open();
|
||||
}
|
||||
}
|
||||
contextualActions: [
|
||||
Kirigami.Action {
|
||||
iconName: "help-about"
|
||||
text: i18n("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"
|
||||
yMin: -20
|
||||
yMax: 40
|
||||
modelCol: 1
|
||||
}
|
||||
ListElement{
|
||||
chartType: "moisture"
|
||||
title: "Moisture"
|
||||
icon: "colors-chromablue"
|
||||
lineColor: "cyan"
|
||||
yMin: 0
|
||||
yMax: 75
|
||||
modelCol: 3
|
||||
}
|
||||
ListElement{
|
||||
chartType: "conductivity"
|
||||
title: "Conductivity"
|
||||
icon: "quickopen"
|
||||
lineColor: "gold"
|
||||
yMin: 0
|
||||
yMax: 6000
|
||||
modelCol: 4
|
||||
}
|
||||
ListElement{
|
||||
chartType: "brightness"
|
||||
title: "Brightness"
|
||||
icon: "contrast"
|
||||
lineColor: "orange"
|
||||
yMin: 0
|
||||
yMax: 30000
|
||||
modelCol: 2
|
||||
}
|
||||
}
|
||||
|
||||
delegate: Kirigami.Card {
|
||||
id: card
|
||||
banner {
|
||||
title: i18n(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\n" + (qiflora.temperature*1.8+32) + "°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
|
||||
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: i18n("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: "Close"
|
||||
onTriggered: {
|
||||
pageStack.clear();
|
||||
pageStack.push(mainPageComponent);
|
||||
}
|
||||
}
|
||||
aboutData: appAboutData
|
||||
}
|
||||
}
|
||||
}
|
||||
38
src/main.cpp
Normal file
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", "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,0,"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
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
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
|
||||
65
src/miflora/florahistory.cpp
Normal file
65
src/miflora/florahistory.cpp
Normal file
@@ -0,0 +1,65 @@
|
||||
/*
|
||||
* 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>
|
||||
|
||||
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(tableData[index.row()].temperature);
|
||||
} 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 {
|
||||
return QVariant();
|
||||
}
|
||||
} else {
|
||||
return QVariant();
|
||||
}
|
||||
}
|
||||
|
||||
int FloraHistory::columnCount(const QModelIndex& parent) const
|
||||
{
|
||||
return 5;
|
||||
}
|
||||
|
||||
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
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
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
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
5
src/resources.qrc
Normal file
@@ -0,0 +1,5 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file alias="main.qml">contents/ui/main.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
112
sysmacros.patch
Normal file
112
sysmacros.patch
Normal file
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user