Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e6f2f464b | |||
| a2e5ca6c7e | |||
| 870d8d065b | |||
| 73674548e3 | |||
| 6a20324c6d | |||
| 7ee7060c7c | |||
| cc00efe5ea | |||
| 0877e6ffbb | |||
| 737b98778a | |||
| c3ccf12a5c | |||
| 4a9afc8ec2 | |||
| 59d8a36489 |
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
/.vs
|
||||||
|
/Utils-IoT/obj
|
||||||
|
/Utils-IoT/bin
|
||||||
92
CONTRIBUTING.md
Normal file
92
CONTRIBUTING.md
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
# Contributing
|
||||||
|
|
||||||
|
When contributing to this repository, please first discuss the change you wish to make via issue,
|
||||||
|
email, or any other method with the owners of this repository before making a change.
|
||||||
|
|
||||||
|
Please note we have a code of conduct, please follow it in all your interactions with the project.
|
||||||
|
|
||||||
|
## Pull Request Process
|
||||||
|
|
||||||
|
1. Ensure any install or build dependencies are removed before the end of the layer when doing a
|
||||||
|
build.
|
||||||
|
2. Update the README.md with details of changes to the interface, this includes new environment
|
||||||
|
variables, exposed ports, useful file locations and container parameters.
|
||||||
|
3. Increase the version numbers in any examples files and the README.md to the new version that this
|
||||||
|
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
|
||||||
|
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
|
||||||
|
do not have permission to do that, you may request the second reviewer to merge it for you.
|
||||||
|
|
||||||
|
## Code of Conduct
|
||||||
|
|
||||||
|
### Our Pledge
|
||||||
|
|
||||||
|
In the interest of fostering an open and welcoming environment, we as
|
||||||
|
contributors and maintainers pledge to making participation in our project and
|
||||||
|
our community a harassment-free experience for everyone, regardless of age, body
|
||||||
|
size, disability, ethnicity, gender identity and expression, level of experience,
|
||||||
|
nationality, personal appearance, race, religion, or sexual identity and
|
||||||
|
orientation.
|
||||||
|
|
||||||
|
### Our Standards
|
||||||
|
|
||||||
|
Examples of behavior that contributes to creating a positive environment
|
||||||
|
include:
|
||||||
|
|
||||||
|
* Using welcoming and inclusive language
|
||||||
|
* Being respectful of differing viewpoints and experiences
|
||||||
|
* Gracefully accepting constructive criticism
|
||||||
|
* Focusing on what is best for the community
|
||||||
|
* Showing empathy towards other community members
|
||||||
|
|
||||||
|
Examples of unacceptable behavior by participants include:
|
||||||
|
|
||||||
|
* The use of sexualized language or imagery and unwelcome sexual attention or
|
||||||
|
advances
|
||||||
|
* Trolling, insulting/derogatory comments, and personal or political attacks
|
||||||
|
* Public or private harassment
|
||||||
|
* Publishing others' private information, such as a physical or electronic
|
||||||
|
address, without explicit permission
|
||||||
|
* Other conduct which could reasonably be considered inappropriate in a
|
||||||
|
professional setting
|
||||||
|
|
||||||
|
### Our Responsibilities
|
||||||
|
|
||||||
|
Project maintainers are responsible for clarifying the standards of acceptable
|
||||||
|
behavior and are expected to take appropriate and fair corrective action in
|
||||||
|
response to any instances of unacceptable behavior.
|
||||||
|
|
||||||
|
Project maintainers have the right and responsibility to remove, edit, or
|
||||||
|
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||||
|
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||||
|
permanently any contributor for other behaviors that they deem inappropriate,
|
||||||
|
threatening, offensive, or harmful.
|
||||||
|
|
||||||
|
### Scope
|
||||||
|
|
||||||
|
This Code of Conduct applies both within project spaces and in public spaces
|
||||||
|
when an individual is representing the project or its community. Examples of
|
||||||
|
representing a project or community include using an official project e-mail
|
||||||
|
address, posting via an official social media account, or acting as an appointed
|
||||||
|
representative at an online or offline event. Representation of a project may be
|
||||||
|
further defined and clarified by project maintainers.
|
||||||
|
|
||||||
|
### Enforcement
|
||||||
|
|
||||||
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
|
reported by contacting the project team at git ATTTT blubbfish.net. All
|
||||||
|
complaints will be reviewed and investigated and will result in a response that
|
||||||
|
is deemed necessary and appropriate to the circumstances. The project team is
|
||||||
|
obligated to maintain confidentiality with regard to the reporter of an incident.
|
||||||
|
Further details of specific enforcement policies may be posted separately.
|
||||||
|
|
||||||
|
Project maintainers who do not follow or enforce the Code of Conduct in good
|
||||||
|
faith may face temporary or permanent repercussions as determined by other
|
||||||
|
members of the project's leadership.
|
||||||
|
|
||||||
|
### Attribution
|
||||||
|
|
||||||
|
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
|
||||||
|
available at [http://contributor-covenant.org/version/1/4][version]
|
||||||
|
|
||||||
|
[homepage]: http://contributor-covenant.org
|
||||||
|
[version]: http://contributor-covenant.org/version/1/4/
|
||||||
33
Changelog.md
Normal file
33
Changelog.md
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## 1.3.0 - 2022-01-15 - Netcore default
|
||||||
|
### New Features
|
||||||
|
* Netcore is now default
|
||||||
|
* ABackend thows exeption if loading failed
|
||||||
|
### Bugfixes
|
||||||
|
### Changes
|
||||||
|
* Make ref for github in readme
|
||||||
|
* Refactoring
|
||||||
|
* Codingstyles
|
||||||
|
|
||||||
|
## 1.2.0 - 2019-12.01 - Refactoring
|
||||||
|
### New Features
|
||||||
|
* Add netcore
|
||||||
|
* ABackend now return null if type is not loadable
|
||||||
|
### Bugfixes
|
||||||
|
### Changes
|
||||||
|
* Refactoring
|
||||||
|
|
||||||
|
## 1.1.0 - 2019-05-29 - Readme
|
||||||
|
### New Features
|
||||||
|
* Add Readme, Contribution and Licence
|
||||||
|
### Bugfixes
|
||||||
|
### Changes
|
||||||
|
* Coding Styles
|
||||||
|
|
||||||
|
## 1.0.0.0 - 2019-02-14 - Init
|
||||||
|
### New Features
|
||||||
|
* First Version
|
||||||
|
### Bugfixes
|
||||||
|
### Changes
|
||||||
|
|
||||||
165
LICENSE
Normal file
165
LICENSE
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER 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.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser 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
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
11
README.md
Normal file
11
README.md
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# BlubbFish.Utils.IoT (Utils-IoT)
|
||||||
|
Library contains utils for Iot
|
||||||
|
|
||||||
|
Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/Utils-IoT).
|
||||||
|
|
||||||
|
## Linking to
|
||||||
|
### Internal
|
||||||
|
* BlubbFish.Utils ([Utils](http://git.blubbfish.net/vs_utils/Utils))
|
||||||
|
|
||||||
|
### External
|
||||||
|
* litjson ([Used Fork](https://github.com/blubbfish/litjson), [Original](https://github.com/LitJSON/litjson))
|
||||||
37
Utils-IoT-4.7.1.sln
Normal file
37
Utils-IoT-4.7.1.sln
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 16
|
||||||
|
VisualStudioVersion = 16.0.29519.87
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "Utils-IoT\Utils-IoT-4.7.1.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-4.7.1", "..\Utils\Utils\Utils-4.7.1.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@ -1,55 +1,37 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 15
|
# Visual Studio Version 16
|
||||||
VisualStudioVersion = 15.0.27004.2010
|
VisualStudioVersion = 16.0.29519.87
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "Utils-IoT\Utils-IoT.csproj", "{549D532E-F859-4128-BA8E-9658E7349F64}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{5A666820-02FF-4649-95F7-476CE95E0E29}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{822DFFA0-7838-4590-8160-63EC92AE15B5}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "IoT\Connector\User\Telegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}"
|
Global
|
||||||
EndProject
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
|
Debug|Any CPU = Debug|Any CPU
|
||||||
EndProject
|
Release|Any CPU = Release|Any CPU
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
|
EndGlobalSection
|
||||||
EndProject
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
Global
|
{549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
{549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
Debug|Any CPU = Debug|Any CPU
|
{549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
Release|Any CPU = Release|Any CPU
|
{549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
{5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
{5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
EndGlobalSection
|
||||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
HideSolutionNode = FALSE
|
||||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
EndGlobalSection
|
||||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
SolutionGuid = {28A0A2C2-A747-4FB6-80F6-50CA564403B8}
|
||||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
EndGlobalSection
|
||||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
EndGlobal
|
||||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
|
|||||||
@ -1,54 +1,44 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using BlubbFish.Utils.IoT.Events;
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
namespace BlubbFish.Utils.IoT.Connector {
|
||||||
using BlubbFish.Utils.IoT.Events;
|
public abstract class ABackend {
|
||||||
|
public enum BackendType {
|
||||||
namespace BlubbFish.Utils.IoT.Connector {
|
Data,
|
||||||
public abstract class ABackend {
|
User
|
||||||
public enum BackendType {
|
}
|
||||||
Data,
|
public event BackendMessage MessageIncomming;
|
||||||
User
|
public event BackendMessage MessageSending;
|
||||||
}
|
public delegate void BackendMessage(Object sender, BackendEvent e);
|
||||||
public event BackendMessage MessageIncomming;
|
|
||||||
public event BackendMessage MessageSending;
|
protected Dictionary<String, String> settings;
|
||||||
public delegate void BackendMessage(Object sender, BackendEvent e);
|
|
||||||
|
public abstract Boolean IsConnected { get; }
|
||||||
protected Dictionary<String, String> settings;
|
|
||||||
|
public ABackend(Dictionary<String, String> settings) => this.settings = settings;
|
||||||
public abstract Boolean IsConnected { get; }
|
|
||||||
|
public static ABackend GetInstance(Dictionary<String, String> settings, BackendType ty) {
|
||||||
public ABackend(Dictionary<String, String> settings) {
|
if (settings.Count == 0) {
|
||||||
this.settings = settings;
|
return null;
|
||||||
}
|
}
|
||||||
|
String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower();
|
||||||
public static ABackend GetInstance(Dictionary<String, String> settings, BackendType ty) {
|
try {
|
||||||
if (settings.Count == 0) {
|
Type t = Type.GetType(object_sensor, true);
|
||||||
return null;
|
return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
|
||||||
}
|
} catch (TypeLoadException) {
|
||||||
String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower();
|
throw new TypeLoadException("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend");
|
||||||
Type t = null;
|
} catch (System.IO.FileNotFoundException) {
|
||||||
try {
|
throw new DllNotFoundException("Driver " + object_sensor + " could not load!");
|
||||||
t = Type.GetType(object_sensor, true);
|
} catch (Exception e) {
|
||||||
} catch (TypeLoadException) {
|
throw new Exception("Something bad Happend while Loading Connectior: "+e.Message);
|
||||||
Console.Error.WriteLine("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend");
|
}
|
||||||
return null;
|
}
|
||||||
} catch (System.IO.FileNotFoundException) {
|
|
||||||
Console.Error.WriteLine("Driver " + object_sensor + " could not load!");
|
protected void NotifyClientIncomming(BackendEvent value) => this.MessageIncomming?.Invoke(this, value);
|
||||||
return null;
|
|
||||||
}
|
protected void NotifyClientSending(BackendEvent value) => this.MessageSending?.Invoke(this, value);
|
||||||
return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
|
|
||||||
}
|
public abstract void Dispose();
|
||||||
|
}
|
||||||
protected void NotifyClientIncomming(BackendEvent value) {
|
}
|
||||||
this.MessageIncomming?.Invoke(this, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void NotifyClientSending(BackendEvent value) {
|
|
||||||
this.MessageSending?.Invoke(this, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using BlubbFish.Utils.IoT.Events;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Connector {
|
namespace BlubbFish.Utils.IoT.Connector {
|
||||||
public abstract class ADataBackend : ABackend {
|
public abstract class ADataBackend : ABackend {
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using BlubbFish.Utils.IoT.Events;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Connector {
|
namespace BlubbFish.Utils.IoT.Connector {
|
||||||
public abstract class AUserBackend : ABackend {
|
public abstract class AUserBackend : ABackend {
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
using System;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Connector {
|
|
||||||
public class UserMessageEventArgs : EventArgs {
|
|
||||||
public UserMessageEventArgs() : base() { }
|
|
||||||
public UserMessageEventArgs(String message, Int64 UserId, DateTime date) {
|
|
||||||
this.UserId = UserId;
|
|
||||||
this.Message = message;
|
|
||||||
this.Date = date;
|
|
||||||
}
|
|
||||||
public Int64 UserId { get; private set; }
|
|
||||||
public String Message { get; private set; }
|
|
||||||
public DateTime Date { get; private set; }
|
|
||||||
}
|
|
||||||
public class MqttEventArgs : EventArgs {
|
|
||||||
public MqttEventArgs() : base() { }
|
|
||||||
public MqttEventArgs(String message, String topic) {
|
|
||||||
this.Topic = topic;
|
|
||||||
this.Message = message;
|
|
||||||
this.Date = DateTime.Now;
|
|
||||||
}
|
|
||||||
public String Topic { get; private set; }
|
|
||||||
public String Message { get; private set; }
|
|
||||||
public DateTime Date { get; private set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,8 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Events {
|
namespace BlubbFish.Utils.IoT.Events {
|
||||||
public class BackendEvent : EventArgs {
|
public class BackendEvent : EventArgs {
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Events {
|
namespace BlubbFish.Utils.IoT.Events {
|
||||||
public class DataEvent : BackendEvent {
|
public class DataEvent : BackendEvent {
|
||||||
public DataEvent(String data) : base() { }
|
public DataEvent() : base() { }
|
||||||
public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { }
|
public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
21
Utils-IoT/Events/MqttEventArgs.cs
Normal file
21
Utils-IoT/Events/MqttEventArgs.cs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BlubbFish.Utils.IoT.Events {
|
||||||
|
public class MqttEventArgs : EventArgs {
|
||||||
|
public MqttEventArgs() : base() { }
|
||||||
|
public MqttEventArgs(String message, String topic) {
|
||||||
|
this.Topic = topic;
|
||||||
|
this.Message = message;
|
||||||
|
this.Date = DateTime.Now;
|
||||||
|
}
|
||||||
|
public String Topic {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
public String Message {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
public DateTime Date {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,8 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.Events {
|
namespace BlubbFish.Utils.IoT.Events {
|
||||||
public class UserEvent : BackendEvent {
|
public class UserEvent : BackendEvent {
|
||||||
|
|||||||
21
Utils-IoT/Events/UserMessageEventArgs.cs
Normal file
21
Utils-IoT/Events/UserMessageEventArgs.cs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace BlubbFish.Utils.IoT.Events {
|
||||||
|
public class UserMessageEventArgs : EventArgs {
|
||||||
|
public UserMessageEventArgs() : base() { }
|
||||||
|
public UserMessageEventArgs(String message, Int64 UserId, DateTime date) {
|
||||||
|
this.UserId = UserId;
|
||||||
|
this.Message = message;
|
||||||
|
this.Date = date;
|
||||||
|
}
|
||||||
|
public Int64 UserId {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
public String Message {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
public DateTime Date {
|
||||||
|
get; private set;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,19 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace BlubbFish.Utils.IoT {
|
|
||||||
static class Helper {
|
|
||||||
internal static String ToUpperLower(this String s) {
|
|
||||||
if (s.Length == 0) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
if (s.Length == 1) {
|
|
||||||
return s.ToUpper();
|
|
||||||
}
|
|
||||||
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,129 +1,134 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using BlubbFish.Utils.IoT.Connector;
|
|
||||||
using BlubbFish.Utils.IoT.Events;
|
using BlubbFish.Utils.IoT.Connector;
|
||||||
|
using BlubbFish.Utils.IoT.Events;
|
||||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
|
||||||
public abstract class AJsonSensor : IDisposable {
|
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||||
protected String topic;
|
public abstract class AJsonSensor : IDisposable {
|
||||||
protected Int32 pollcount;
|
protected String topic;
|
||||||
protected Dictionary<String, String> settings;
|
protected Int32 pollcount;
|
||||||
protected ABackend backend;
|
protected Dictionary<String, String> settings;
|
||||||
private Thread pollingThread;
|
protected ABackend backend;
|
||||||
private Boolean pollEnabled = false;
|
private Thread pollingThread;
|
||||||
|
private Boolean pollEnabled = false;
|
||||||
public AJsonSensor(Dictionary<String, String> settings, String name, ABackend backend) {
|
|
||||||
this.GetBool = true;
|
public AJsonSensor(Dictionary<String, String> settings, String name, ABackend backend) {
|
||||||
this.GetFloat = 0.0f;
|
this.GetBool = true;
|
||||||
this.GetInt = 0;
|
this.GetFloat = 0.0f;
|
||||||
this.topic = (settings.Keys.Contains("topic")) ? settings["topic"] : "";
|
this.GetInt = 0;
|
||||||
this.settings = settings;
|
this.topic = settings.Keys.Contains("topic") ? settings["topic"] : "";
|
||||||
this.Title = (settings.Keys.Contains("title")) ? settings["title"] : "";
|
this.settings = settings;
|
||||||
this.Name = name;
|
this.Title = settings.Keys.Contains("title") ? settings["title"] : "";
|
||||||
this.backend = backend;
|
this.Name = name;
|
||||||
this.backend.MessageIncomming += this.IncommingMqttMessage;
|
this.backend = backend;
|
||||||
if (settings.Keys.Contains("polling")) {
|
this.backend.MessageIncomming += this.IncommingMqttMessage;
|
||||||
this.pollEnabled = true;
|
if (settings.Keys.Contains("polling")) {
|
||||||
this.Polling = Int32.Parse(settings["polling"]);
|
this.pollEnabled = true;
|
||||||
this.pollcount = this.Polling;
|
this.Polling = Int32.Parse(settings["polling"]);
|
||||||
this.pollingThread = new Thread(this.SensorPolling);
|
this.pollcount = this.Polling;
|
||||||
this.pollingThread.Start();
|
this.pollingThread = new Thread(this.SensorPolling);
|
||||||
}
|
this.pollingThread.Start();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void SensorPolling() {
|
|
||||||
while(this.pollEnabled) {
|
private void SensorPolling() {
|
||||||
Thread.Sleep(1000);
|
while(this.pollEnabled) {
|
||||||
this.Poll();
|
Thread.Sleep(1000);
|
||||||
}
|
this.Poll();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void IncommingMqttMessage(Object sender, BackendEvent e) {
|
|
||||||
if(Regex.Match(e.From.ToString(), this.topic).Success) {
|
private void IncommingMqttMessage(Object sender, BackendEvent e) {
|
||||||
if (this.UpdateValue(e)) {
|
if(Regex.Match(e.From.ToString(), this.topic).Success) {
|
||||||
this.Timestamp = DateTime.Now;
|
if (this.UpdateValue(e)) {
|
||||||
this.Update?.Invoke(this, e);
|
this.Timestamp = DateTime.Now;
|
||||||
}
|
this.Update?.Invoke(this, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public static AJsonSensor GetInstance(Dictionary<String, ABackend> backends, Dictionary<String, String> settings, String name) {
|
|
||||||
String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower();
|
public static AJsonSensor GetInstance(Dictionary<String, ABackend> backends, Dictionary<String, String> settings, String name) {
|
||||||
Type t = null;
|
if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) {
|
||||||
try {
|
throw new ArgumentException("Backend not specified!");
|
||||||
t = Type.GetType(object_sensor, true);
|
}
|
||||||
} catch(TypeLoadException) {
|
String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + settings["type"].ToUpperLower();
|
||||||
throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor");
|
try {
|
||||||
}
|
Type t = Type.GetType(object_sensor, true);
|
||||||
if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) {
|
return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] });
|
||||||
throw new ArgumentException("Backend not specified!");
|
} catch(TypeLoadException) {
|
||||||
}
|
throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor");
|
||||||
return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] });
|
} catch(Exception e) {
|
||||||
}
|
Helper.WriteError("Something went wrong! " + e.Message);
|
||||||
|
throw e;
|
||||||
protected virtual void Poll() {
|
}
|
||||||
if(this.pollcount++ >= this.Polling) {
|
}
|
||||||
this.pollcount = 1;
|
|
||||||
if (this.backend is ADataBackend) {
|
protected virtual void Poll() {
|
||||||
((ADataBackend)this.backend).Send(this.topic + "/get", "");
|
if(this.pollcount++ >= this.Polling) {
|
||||||
}
|
this.pollcount = 1;
|
||||||
}
|
if (this.backend is ADataBackend databackend) {
|
||||||
}
|
databackend.Send(this.topic + "/get", "");
|
||||||
|
}
|
||||||
public virtual void SetBool(Boolean v) {
|
}
|
||||||
if (this.backend is ADataBackend) {
|
}
|
||||||
((ADataBackend)this.backend).Send(this.topic + "/set", v ? "on" : "off");
|
|
||||||
}
|
public virtual void SetBool(Boolean v) {
|
||||||
}
|
if (this.backend is ADataBackend databackend) {
|
||||||
|
databackend.Send(this.topic + "/set", v ? "on" : "off");
|
||||||
protected abstract Boolean UpdateValue(BackendEvent e);
|
}
|
||||||
|
}
|
||||||
public Single GetFloat { get; protected set; }
|
|
||||||
public Boolean GetBool { get; protected set; }
|
protected abstract Boolean UpdateValue(BackendEvent e);
|
||||||
public Int32 GetInt { get; protected set; }
|
|
||||||
public Types Datatypes { get; protected set; }
|
public Single GetFloat { get; protected set; }
|
||||||
public DateTime Timestamp { get; protected set; }
|
public Boolean GetBool { get; protected set; }
|
||||||
public Int32 Polling { get; private set; }
|
public Int32 GetInt { get; protected set; }
|
||||||
public String Title { get; protected set; }
|
public Types Datatypes { get; protected set; }
|
||||||
public String Name { get; internal set; }
|
public DateTime Timestamp { get; protected set; }
|
||||||
|
public Int32 Polling { get; private set; }
|
||||||
public enum Types {
|
public String Title { get; protected set; }
|
||||||
Bool,
|
public String Name { get; internal set; }
|
||||||
Int,
|
|
||||||
Float
|
public enum Types {
|
||||||
}
|
Bool,
|
||||||
public delegate void UpdatedValue(Object sender, EventArgs e);
|
Int,
|
||||||
public event UpdatedValue Update;
|
Float
|
||||||
|
}
|
||||||
#region IDisposable Support
|
public delegate void UpdatedValue(Object sender, EventArgs e);
|
||||||
private Boolean disposedValue = false;
|
public event UpdatedValue Update;
|
||||||
|
|
||||||
|
#region IDisposable Support
|
||||||
protected virtual void Dispose(Boolean disposing) {
|
private Boolean disposedValue = false;
|
||||||
if(!this.disposedValue) {
|
|
||||||
if(disposing) {
|
|
||||||
this.pollEnabled = false;
|
protected virtual void Dispose(Boolean disposing) {
|
||||||
if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) {
|
if(!this.disposedValue) {
|
||||||
this.pollingThread.Abort();
|
if(disposing) {
|
||||||
while (this.pollingThread.ThreadState != ThreadState.Aborted) { }
|
this.pollEnabled = false;
|
||||||
}
|
if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) {
|
||||||
this.backend.MessageIncomming -= this.IncommingMqttMessage;
|
this.pollingThread.Abort();
|
||||||
}
|
while (this.pollingThread.ThreadState != ThreadState.Aborted) { }
|
||||||
this.settings = null;
|
}
|
||||||
this.pollingThread = null;
|
this.backend.MessageIncomming -= this.IncommingMqttMessage;
|
||||||
this.disposedValue = true;
|
}
|
||||||
}
|
this.settings = null;
|
||||||
}
|
this.pollingThread = null;
|
||||||
~AJsonSensor() {
|
this.disposedValue = true;
|
||||||
Dispose(false);
|
}
|
||||||
}
|
}
|
||||||
public void Dispose() {
|
|
||||||
Dispose(true);
|
~AJsonSensor() {
|
||||||
GC.SuppressFinalize(this);
|
this.Dispose(false);
|
||||||
}
|
}
|
||||||
#endregion
|
|
||||||
}
|
public void Dispose() {
|
||||||
|
this.Dispose(true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -5,12 +5,10 @@ using BlubbFish.Utils.IoT.Events;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||||
class Pir : AJsonSensor {
|
class Pir : AJsonSensor {
|
||||||
public Pir(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
public Pir(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) => this.Datatypes = Types.Bool;
|
||||||
this.Datatypes = Types.Bool;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Boolean UpdateValue(BackendEvent e) {
|
protected override Boolean UpdateValue(BackendEvent e) {
|
||||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
this.GetBool = e.Message.ToLower() == "on";
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,12 +5,10 @@ using BlubbFish.Utils.IoT.Events;
|
|||||||
|
|
||||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||||
class Switch : AJsonSensor {
|
class Switch : AJsonSensor {
|
||||||
public Switch(Dictionary<System.String, System.String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
public Switch(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) => this.Datatypes = Types.Bool;
|
||||||
this.Datatypes = Types.Bool;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Boolean UpdateValue(BackendEvent e) {
|
protected override Boolean UpdateValue(BackendEvent e) {
|
||||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
this.GetBool = e.Message.ToLower() == "on";
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,18 +1,20 @@
|
|||||||
using System.Reflection;
|
#if !NETCOREAPP
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Resources;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
|
||||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||||
|
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||||
// die einer Assembly zugeordnet sind.
|
// die einer Assembly zugeordnet sind.
|
||||||
[assembly: AssemblyTitle("IoT")]
|
[assembly: AssemblyTitle("Utils-IoT")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("Provides classes for iot development")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("BlubbFish")]
|
||||||
[assembly: AssemblyProduct("IoT")]
|
[assembly: AssemblyProduct("Utils-IoT")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
[assembly: AssemblyCopyright("Copyright © BlubbFish 2017 - 24.11.2019")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("BlubbFish")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
[assembly: NeutralResourcesLanguage("de-DE")]
|
||||||
|
|
||||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||||
@ -32,5 +34,6 @@ using System.Runtime.InteropServices;
|
|||||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||||
// indem Sie "*" wie unten gezeigt eingeben:
|
// indem Sie "*" wie unten gezeigt eingeben:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
[assembly: AssemblyVersion("1.0.0")]
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
[assembly: AssemblyFileVersion("1.0.0")]
|
||||||
|
#endif
|
||||||
|
|||||||
69
Utils-IoT/Utils-IoT-4.7.1.csproj
Normal file
69
Utils-IoT/Utils-IoT-4.7.1.csproj
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProjectGuid>{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
||||||
|
<AssemblyName>Utils-IoT</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||||
|
<FileAlignment>512</FileAlignment>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Connector\ABackend.cs" />
|
||||||
|
<Compile Include="Connector\ADataBackend.cs" />
|
||||||
|
<Compile Include="Connector\AUserBackend.cs" />
|
||||||
|
<Compile Include="Events\BackendEvent.cs" />
|
||||||
|
<Compile Include="Events\DataEvent.cs" />
|
||||||
|
<Compile Include="Events\UserEvent.cs" />
|
||||||
|
<Compile Include="JsonSensor\Bosmon.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="JsonSensor\AJsonSensor.cs" />
|
||||||
|
<Compile Include="JsonSensor\Luminanz.cs" />
|
||||||
|
<Compile Include="JsonSensor\Pir.cs" />
|
||||||
|
<Compile Include="JsonSensor\Power.cs" />
|
||||||
|
<Compile Include="JsonSensor\Switch.cs" />
|
||||||
|
<Compile Include="JsonSensor\Temperatur.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="..\CHANGELOG.md" />
|
||||||
|
<Content Include="..\CONTRIBUTING.md" />
|
||||||
|
<Content Include="..\LICENSE" />
|
||||||
|
<Content Include="..\README.md" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
||||||
|
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
||||||
|
<Name>litjson_4.7.1</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
|
||||||
|
<Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
|
||||||
|
<Name>Utils</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
@ -1,60 +1,44 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
<PropertyGroup>
|
||||||
<PropertyGroup>
|
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
<AssemblyName>Utils-IoT</AssemblyName>
|
||||||
<ProjectGuid>{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}</ProjectGuid>
|
<NeutralLanguage>de-DE</NeutralLanguage>
|
||||||
<OutputType>Library</OutputType>
|
<PackageReleaseNotes>
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
1.3.0 Netcore default
|
||||||
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
1.2.0 Refactoring
|
||||||
<AssemblyName>Utils-IoT</AssemblyName>
|
1.1.0 Readme
|
||||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
1.0.0.0 Init
|
||||||
<FileAlignment>512</FileAlignment>
|
</PackageReleaseNotes>
|
||||||
<TargetFrameworkProfile />
|
<Copyright>Copyright © BlubbFish 2017 - 15.01.2022</Copyright>
|
||||||
</PropertyGroup>
|
<Description>Provides classes for iot development</Description>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<Company>BlubbFish</Company>
|
||||||
<DebugType>full</DebugType>
|
<Authors>BlubbFish</Authors>
|
||||||
<Optimize>false</Optimize>
|
<PackageProjectUrl>http://git.blubbfish.net/vs_utils/Utils-IoT</PackageProjectUrl>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<RepositoryUrl>http://git.blubbfish.net/vs_utils/Utils-IoT.git</RepositoryUrl>
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<RepositoryType>git</RepositoryType>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<Version>1.3.0</Version>
|
||||||
<WarningLevel>4</WarningLevel>
|
<PackageId>IoT.Utils.BlubbFish</PackageId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>pdbonly</DebugType>
|
<ItemGroup>
|
||||||
<Optimize>true</Optimize>
|
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson.csproj" />
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<ProjectReference Include="..\..\Utils\Utils\Utils.csproj" />
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
</ItemGroup>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
<ItemGroup>
|
||||||
</PropertyGroup>
|
<Content Include="../CHANGELOG.md" />
|
||||||
<ItemGroup>
|
<Content Include="../CONTRIBUTING.md" />
|
||||||
<Reference Include="System" />
|
<Content Include="../LICENSE" />
|
||||||
</ItemGroup>
|
<Content Include="../README.md" />
|
||||||
<ItemGroup>
|
</ItemGroup>
|
||||||
<Compile Include="Connector\ABackend.cs" />
|
<ItemGroup>
|
||||||
<Compile Include="Connector\ADataBackend.cs" />
|
<None Include="..\LICENSE">
|
||||||
<Compile Include="Connector\AUserBackend.cs" />
|
<Pack>True</Pack>
|
||||||
<Compile Include="Events\BackendEvent.cs" />
|
<PackagePath></PackagePath>
|
||||||
<Compile Include="Events\DataEvent.cs" />
|
</None>
|
||||||
<Compile Include="Events\UserEvent.cs" />
|
</ItemGroup>
|
||||||
<Compile Include="Helper.cs" />
|
|
||||||
<Compile Include="JsonSensor\Bosmon.cs" />
|
</Project>
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
<Compile Include="JsonSensor\AJsonSensor.cs" />
|
|
||||||
<Compile Include="JsonSensor\Luminanz.cs" />
|
|
||||||
<Compile Include="JsonSensor\Pir.cs" />
|
|
||||||
<Compile Include="JsonSensor\Power.cs" />
|
|
||||||
<Compile Include="JsonSensor\Switch.cs" />
|
|
||||||
<Compile Include="JsonSensor\Temperatur.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
|
||||||
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
|
||||||
<Name>litjson_4.7.1</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
</Project>
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user