Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d29636de7 | |||
| 08b86c44fb |
197
.gitignore
vendored
Normal file
197
.gitignore
vendored
Normal file
@@ -0,0 +1,197 @@
|
|||||||
|
# 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
53
.idea/$PRODUCT_WORKSPACE_FILE$
generated
@@ -1,53 +0,0 @@
|
|||||||
<?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
2
.idea/.gitignore
generated
vendored
@@ -1,2 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/workspace.xml
|
|
||||||
15
.idea/inspectionProfiles/Project_Default.xml
generated
15
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,15 +0,0 @@
|
|||||||
<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
9
.idea/misc.xml
generated
@@ -1,9 +0,0 @@
|
|||||||
<?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
8
.idea/modules.xml
generated
@@ -1,8 +0,0 @@
|
|||||||
<?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
6
.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
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 ${KF5_MIN_VERSION} 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)
|
|
||||||
674
LICENSE
674
LICENSE
@@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
QiFlora
|
|
||||||
Copyright (C) 2019 Kevin Whitaker
|
|
||||||
|
|
||||||
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/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
QiFlora Copyright (C) 2019 Kevin Whitaker
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
||||||
20
Pipfile
Normal file
20
Pipfile
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
[[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
Normal file
155
Pipfile.lock
generated
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
{
|
||||||
|
"_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": {}
|
||||||
|
}
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
# QiFlora
|
|
||||||
|
|
||||||
Mobile friendly application to monitor Mi Flora devices.
|
|
||||||
Plants using this device will have their 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
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
ROOT_DIR=$(dirname $(realpath -s $0))
|
|
||||||
mkdir -p $ROOT_DIR/builds
|
|
||||||
docker run --rm -it -v $ROOT_DIR:/home/user/src/qf kdeorg/android-sdk bash -c "git clone --depth 1 kde:sysadmin/ci-tooling;/opt/helpers/build-kde-project kcoreaddons Frameworks -DBUILD_TESTING=OFF; /opt/helpers/build-kde-project kirigami Frameworks -DBUILD_TESTING=OFF;/opt/helpers/build-cmake qf qf -DQTANDROID_EXPORTED_TARGET=qiflora -DANDROID_APK_DIR=/home/user/src/qf/packaging/android -DANDROID_APK_OUTPUT_DIR=/home/user/src/qf/builds;make -C /home/user/build-arm/qf create-apk;make -C /home/user/build-arm64/qf create-apk"
|
|
||||||
11
main.py
Normal file
11
main.py
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
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()
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<manifest package="org.eyecreate.qiflora" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
|
|
||||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
|
|
||||||
|
|
||||||
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
|
|
||||||
Remove the comment if you do not require these default permissions. -->
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH" />
|
|
||||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
||||||
|
|
||||||
<!-- 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. -->
|
|
||||||
|
|
||||||
|
|
||||||
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
|
||||||
|
|
||||||
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QiFlora" android:icon="@drawable/logo">
|
|
||||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc"
|
|
||||||
android:name="org.qtproject.qt5.android.bindings.QtActivity"
|
|
||||||
android:label="QiFlora"
|
|
||||||
android:icon="@drawable/logo"
|
|
||||||
android:theme="@style/AppTheme"
|
|
||||||
android:screenOrientation="unspecified"
|
|
||||||
android:launchMode="singleTop">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
|
||||||
</intent-filter>
|
|
||||||
|
|
||||||
<!-- Application arguments -->
|
|
||||||
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
|
|
||||||
<!-- Application arguments -->
|
|
||||||
|
|
||||||
<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="1"/>
|
|
||||||
|
|
||||||
<!-- Run with local libs -->
|
|
||||||
<meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
|
|
||||||
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
|
|
||||||
<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
|
|
||||||
<meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidBearer.jar:jar/QtAndroidBluetooth.jar"/>
|
|
||||||
<meta-data android:name="android.app.static_init_classes" android:value="org.qtproject.qt5.android.bluetooth.QtBluetoothBroadcastReceiver"/>
|
|
||||||
<!-- Used to specify custom system library path to run with local system libs -->
|
|
||||||
<!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
|
|
||||||
<!-- 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"/>
|
|
||||||
<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
|
|
||||||
<!-- Messages maps -->
|
|
||||||
|
|
||||||
<!-- Splash screen -->
|
|
||||||
<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
|
|
||||||
then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
|
|
||||||
use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
|
|
||||||
are done populating your window with content. -->
|
|
||||||
<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
|
|
||||||
<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
|
|
||||||
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash_logo"/>
|
|
||||||
<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
|
|
||||||
<!-- 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 -->
|
|
||||||
|
|
||||||
<!-- extract android style -->
|
|
||||||
<!-- available android:values :
|
|
||||||
* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
|
|
||||||
* full - useful QWidget & Quick Controls 1 apps
|
|
||||||
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
|
|
||||||
* none - useful for apps that don't use any of the above Qt modules
|
|
||||||
-->
|
|
||||||
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
|
|
||||||
<!-- extract android style -->
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
|
|
||||||
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="400.174dp"
|
|
||||||
android:height="400.174dp"
|
|
||||||
android:viewportWidth="400.174"
|
|
||||||
android:viewportHeight="400.174">
|
|
||||||
|
|
||||||
<path
|
|
||||||
android:fillColor="#45B549"
|
|
||||||
android:pathData="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
|
|
||||||
android:fillColor="#009549"
|
|
||||||
android:pathData="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" />
|
|
||||||
</vector>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?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 android:width="256dp" android:height="256dp" android:gravity="center" android:drawable="
|
|
||||||
@drawable/logo">
|
|
||||||
</item>
|
|
||||||
</layer-list>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
|
|
||||||
<item name="android:windowBackground">@drawable/splash_logo</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 126 KiB |
@@ -1,47 +0,0 @@
|
|||||||
<?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 their 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.3" date="2020-07-14" type="stable">
|
|
||||||
<description>
|
|
||||||
<p>Fixed icon display on some platforms.</p>
|
|
||||||
</description>
|
|
||||||
</release>
|
|
||||||
<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>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[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;
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
{
|
|
||||||
"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",
|
|
||||||
"commit": "b04da6a1f6ee22f433d1d72b1bf95b0304dddf6f"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
<?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>
|
|
||||||
|
Before Width: | Height: | Size: 1.7 KiB |
19
qiflora/QiFlora.py
Normal file
19
qiflora/QiFlora.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
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)
|
||||||
0
qiflora/__init__.py
Normal file
0
qiflora/__init__.py
Normal file
79
qiflora/qiflora.kv
Normal file
79
qiflora/qiflora.kv
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
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"
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
|
|
||||||
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 mail-sent globe)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
qt5_add_resources(RESOURCES resources.qrc)
|
|
||||||
add_executable(qiflora ${qiflora_SRCS} ${RESOURCES})
|
|
||||||
target_link_libraries(qiflora Qt5::Core Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::Svg Qt5::Bluetooth Qt5::Charts KF5::CoreAddons)
|
|
||||||
install(TARGETS qiflora ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
|
||||||
@@ -1,262 +0,0 @@
|
|||||||
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.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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
43
src/main.cpp
43
src/main.cpp
@@ -1,43 +0,0 @@
|
|||||||
#include <QApplication>
|
|
||||||
#include <QQmlApplicationEngine>
|
|
||||||
#include <QtQml>
|
|
||||||
#include <QUrl>
|
|
||||||
#include "miflora/miflora.h"
|
|
||||||
#include "miflora/bluetoothdevices.h"
|
|
||||||
#include <KAboutData>
|
|
||||||
#include <QIcon>
|
|
||||||
#include <QtQuickControls2/QQuickStyle>
|
|
||||||
|
|
||||||
Q_DECL_EXPORT int main(int argc, char *argv[])
|
|
||||||
{
|
|
||||||
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
|
||||||
QApplication app(argc, argv);
|
|
||||||
|
|
||||||
#ifdef Q_OS_ANDROID
|
|
||||||
QQuickStyle::setStyle("Material");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
KAboutData aboutData("org.eyecreate.qiflora", "QiFlora", "1.1.3", "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(":/logo.svg"));
|
|
||||||
|
|
||||||
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
@@ -1,289 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<RCC>
|
|
||||||
<qresource prefix="/">
|
|
||||||
<file alias="main.qml">contents/ui/main.qml</file>
|
|
||||||
<file alias="logo.svg">../packaging/org.eyecreate.qiflora.svg</file>
|
|
||||||
</qresource>
|
|
||||||
</RCC>
|
|
||||||
Reference in New Issue
Block a user